Update app.py

app.py

@@ -495,17 +495,14 @@ def handsome_chat_completions():
                                     "usage"
                                 ]["completion_tokens"]
 
-                            if (
-                                "choices" in response_json and
-                                len(response_json["choices"]) > 0 and
-                                "delta" in response_json["choices"][0] and
-                                "content" in response_json[
-                                    "choices"
-                                ][0]["delta"]
-                            ):
-                                response_content += response_json[
-                                    "choices"
-                                ][0]["delta"]["content"]
+                            if "choices" in response_json and len(response_json["choices"]) > 0:
+                                delta = response_json["choices"][0].get("delta", {})
+                                if "reasoning_content" in delta and delta["reasoning_content"]:
+                                    reasoning_lines = delta["reasoning_content"].splitlines()
+                                    formatted_reasoning = "\n".join(f"> {line}" for line in reasoning_lines)
+                                    response_content += formatted_reasoning + "\n"  # Add a newline after reasoning
+                                if "content" in delta and delta["content"]:
+                                    response_content += delta["content"]
 
                             if (
                                 "usage" in response_json and
@@ -581,9 +578,15 @@ def handsome_chat_completions():
                 completion_tokens = response_json[
                     "usage"
                 ]["completion_tokens"]
-                response_content = response_json[
-                    "choices"
-                ][0]["message"]["content"]
+                response_content = ""
+                if "choices" in response_json and len(response_json["choices"]) > 0:
+                    choice = response_json["choices"][0]
+                    if "reasoning_content" in choice:
+                        reasoning_lines = choice["reasoning_content"].splitlines()
+                        formatted_reasoning = "\n".join(f"> {line}" for line in reasoning_lines)
+                        response_content += formatted_reasoning + "\n"
+                    if "message" in choice and "content" in choice["message"]:
+                        response_content += choice["message"]["content"]
             except (KeyError, ValueError, IndexError) as e:
                 logging.error(
                     f"解析非流式响应 JSON 失败: {e}, "
@@ -634,8 +637,31 @@ def handsome_chat_completions():
                     token_counts.append(response_json["usage"]["prompt_tokens"] + response_json["usage"]["completion_tokens"])
                 else:
                     token_counts.append(0)
+            
+            # Reformat the response to standard OpenAI format for non-streaming responses
+            formatted_response = {
+                "id": response_json.get("id", ""),
+                "object": "chat.completion",
+                "created": response_json.get("created", int(time.time())),
+                "model": model_name,
+                "choices": [
+                    {
+                        "index": 0,
+                        "message": {
+                            "role": "assistant",
+                            "content": response_content
+                        },
+                        "finish_reason": "stop"
+                    }
+                ],
+                "usage": {
+                    "prompt_tokens": prompt_tokens,
+                    "completion_tokens": completion_tokens,
+                    "total_tokens": prompt_tokens + completion_tokens
+                }
+            }
 
-            return jsonify(response_json)
+            return jsonify(formatted_response)
 
     except requests.exceptions.RequestException as e:
         logging.error(f"请求转发异常: {e}")