更新错误处理

modules/base_model.py

@@ -287,24 +287,28 @@ class BaseLLMModel:
 
         self.history.append(construct_user(inputs))
 
-        if stream:
-            logging.debug("使用流式传输")
-            iter = self.stream_next_chatbot(
-                inputs,
-                chatbot,
-                fake_input=old_inputs,
-                display_append=display_reference,
-            )
-            for chatbot, status_text in iter:
+        try:
+            if stream:
+                logging.debug("使用流式传输")
+                iter = self.stream_next_chatbot(
+                    inputs,
+                    chatbot,
+                    fake_input=old_inputs,
+                    display_append=display_reference,
+                )
+                for chatbot, status_text in iter:
+                    yield chatbot, status_text
+            else:
+                logging.debug("不使用流式传输")
+                chatbot, status_text = self.next_chatbot_at_once(
+                    inputs,
+                    chatbot,
+                    fake_input=old_inputs,
+                    display_append=display_reference,
+                )
                 yield chatbot, status_text
-        else:
-            logging.debug("不使用流式传输")
-            chatbot, status_text = self.next_chatbot_at_once(
-                inputs,
-                chatbot,
-                fake_input=old_inputs,
-                display_append=display_reference,
-            )
+        except Exception as e:
+            status_text = STANDARD_ERROR_MSG + str(e)
             yield chatbot, status_text
 
         if len(self.history) > 1 and self.history[-1]["content"] != inputs:

modules/models.py

@@ -186,6 +186,7 @@ class OpenAIClient(BaseLLMModel):
             )
 
     def _decode_chat_response(self, response):
+        error_msg = ""
         for chunk in response.iter_lines():
             if chunk:
                 chunk = chunk.decode()
@@ -194,6 +195,7 @@ class OpenAIClient(BaseLLMModel):
                     chunk = json.loads(chunk[6:])
                 except json.JSONDecodeError:
                     print(f"JSON解析错误,收到的内容: {chunk}")
+                    error_msg+=chunk
                     continue
                 if chunk_length > 6 and "delta" in chunk["choices"][0]:
                     if chunk["choices"][0]["finish_reason"] == "stop":
@@ -203,6 +205,8 @@ class OpenAIClient(BaseLLMModel):
                     except Exception as e:
                         # logging.error(f"Error: {e}")
                         continue
+        if error_msg:
+            raise Exception(error_msg)
 
 
 class ChatGLM_Client(BaseLLMModel):