Update app.py

app.py

@@ -8,9 +8,6 @@ import requests
 import logging
 from threading import Event
 
-# 如果使用 GPT 模型的 tokenization，可以引入 tiktoken
-# import tiktoken  # 如果需要使用 GPT 的 token 化库
-
 app = Flask(__name__)
 logging.basicConfig(level=logging.INFO)
 
@@ -175,10 +172,15 @@ def messages():
             def on_query_progress(data):
                 nonlocal response_text
                 if 'text' in data:
-                    text = json.loads(data['text'])
-                    chunk = text['chunks'][-1] if text['chunks'] else None
-                    if chunk:
-                        response_text.append(chunk)
+                    try:
+                        # 解析嵌套的 JSON 字符串
+                        text_content = json.loads(data['text'])  # data['text'] 是一个 JSON 字符串
+                        chunk = text_content['chunks'][-1] if 'chunks' in text_content and text_content['chunks'] else None
+                        if chunk:
+                            response_text.append(chunk)
+                    except json.JSONDecodeError as e:
+                        logging.error(f"Failed to decode JSON from 'text' field: {e}")
+                        response_text.append(f"Error decoding response: {e}")
 
                 # 检查是否是最终响应
                 if data.get('final', False):
@@ -273,10 +275,15 @@ def handle_non_stream(previous_messages, msg_id, model, input_tokens):
         def on_query_progress(data):
             nonlocal response_text
             if 'text' in data:
-                text = json.loads(data['text'])
-                chunk = text['chunks'][-1] if text['chunks'] else None
-                if chunk:
-                    response_text.append(chunk)
+                try:
+                    # 解析嵌套的 JSON 字符串
+                    text_content = json.loads(data['text'])  # data['text'] 是一个 JSON 字符串
+                    chunk = text_content['chunks'][-1] if 'chunks' in text_content and text_content['chunks'] else None
+                    if chunk:
+                        response_text.append(chunk)
+                except json.JSONDecodeError as e:
+                    logging.error(f"Failed to decode JSON from 'text' field: {e}")
+                    response_text.append(f"Error decoding response: {e}")
 
             # 检查是否是最终响应
             if data.get('final', False):