Update app.py

app.py

@@ -74,16 +74,6 @@ def normalize_content(content):
         # 如果是其他类型，返回空字符串
         return ""
 
-def is_valid_json(response_text):
-    """
-    检查响应是否为有效的 JSON 格式。
-    """
-    try:
-        json.loads(response_text)
-        return True
-    except ValueError:
-        return False
-
 @app.route('/')
 def root():
     log_request(request.remote_addr, request.path, 200)
@@ -169,14 +159,10 @@ def messages():
             def on_query_progress(data):
                 nonlocal response_text
                 if 'text' in data:
-                    text = data['text']  # 不再使用 json.loads() 解析
-                    if is_valid_json(text):
-                        text = json.loads(text)  # 确保是有效的 JSON
-                        chunk = text['chunks'][-1] if text['chunks'] else None
-                        if chunk:
-                            response_text.append(chunk)
-                    else:
-                        logging.error(f"Received non-JSON response: {text}")
+                    text = json.loads(data['text'])
+                    chunk = text['chunks'][-1] if text['chunks'] else None
+                    if chunk:
+                        response_text.append(chunk)
 
                 # 检查是否是最终响应
                 if data.get('final', False):
@@ -268,14 +254,10 @@ def handle_non_stream(previous_messages, msg_id, model):
         def on_query_progress(data):
             nonlocal response_text
             if 'text' in data:
-                text = data['text']  # 不再使用 json.loads() 解析
-                if is_valid_json(text):
-                    text = json.loads(text)  # 确保是有效的 JSON
-                    chunk = text['chunks'][-1] if text['chunks'] else None
-                    if chunk:
-                        response_text.append(chunk)
-                else:
-                    logging.error(f"Received non-JSON response: {text}")
+                text = json.loads(data['text'])
+                chunk = text['chunks'][-1] if text['chunks'] else None
+                if chunk:
+                    response_text.append(chunk)
 
             # 检查是否是最终响应
             if data.get('final', False):
@@ -302,11 +284,13 @@ def handle_non_stream(previous_messages, msg_id, model):
 
         # 生成完整的响应
         full_response = {
+            "content": [{"text": ''.join(response_text), "type": "text"}],  # 合并所有文本块
             "id": msg_id,
-            "content": [{"text": ''.join(response_text)}],  # 合并所有文本块
             "model": model,  # 动态模型
+            "role": "assistant",
             "stop_reason": "end_turn",
             "stop_sequence": None,
+            "type": "message",
             "usage": {
                 "input_tokens": 8,
                 "output_tokens": len(''.join(response_text)),