Upload 4 files

app.py

@@ -93,6 +93,16 @@ class ResponseWrapper:
         self._prompt_token_count = self._extract_prompt_token_count()
         self._candidates_token_count = self._extract_candidates_token_count()
         self._total_token_count = self._extract_total_token_count()
+        self._thoughts = self._extract_thoughts()
+
+    def _extract_thoughts(self) -> Optional[str]:
+        try:
+            for part in self._data['candidates'][0]['content']['parts']:
+                if 'thought' in part:
+                    return part['text']
+            return None
+        except (KeyError, IndexError):
+            return None
 
     def _extract_text(self) -> str:
         try:
@@ -522,18 +532,13 @@ def chat_completions():
             prompt_tokens = response.prompt_token_count
             completion_tokens = response.candidates_token_count
             total_tokens = response.total_token_count
-        except (AttributeError, IndexError, TypeError, ValueError) as e:
-            if "response.candidates" in str(e) or "response.text" in str(e):
-                logger.error(f"用户输入被AI安全过滤器阻止")
-                return jsonify({
-                    'error': {
-                        'message': '用户输入被AI安全过滤器阻止',
-                        'type': 'prompt_blocked_error',
-                        'details': str(e)
-                    }
-                }), 400
-            else:
-                return jsonify({
+            finish_reason = response.finish_reason
+            if is_thinking and show_thoughts:
+                # 把thoughts加到text_content的前面再加一个回车
+                text_content = response.thoughts + '\n' + text_content
+            logger.info("finish_reason: ")
+        except AttributeError as e:
+            return jsonify({
                     'error': {
                         'message': 'AI响应处理失败',
                         'type': 'response_processing_error'
@@ -551,7 +556,7 @@ def chat_completions():
                     'role': 'assistant',
                     'content': text_content
                 },
-                'finish_reason': 'stop'
+                'finish_reason': finish_reason
             }],
             'usage': {
                 'prompt_tokens': prompt_tokens,