Update app.py

app.py

@@ -215,6 +215,22 @@ def list_models():
             "owned_by": "openai",
             "root": "deepseek-reasoner",
             "parent": None
+        },
+        {
+            "id": "deepseek-reasoner-thinking",
+            "object": "model",
+            "created": 1678888889,
+            "owned_by": "openai",
+            "root": "deepseek-reasoner",
+            "parent": None
+        },
+        {
+            "id": "deepseek-reasoner-openwebui",
+            "object": "model",
+            "created": 1678888889,
+            "owned_by": "openai",
+            "root": "deepseek-reasoner",
+            "parent": None
         }
     ]
 
@@ -312,8 +328,14 @@ def handsome_chat_completions():
         return jsonify({"error": "Invalid request data"}), 400
 
     model_name = data['model']
+    if model_name == "deepseek-reasoner-thinking" or model_name == "deepseek-reasoner-openwebui":
+        model_realname = "deepseek-reasoner"
+    else:
+        model_realname = model_name
+
+    data['model'] = model_realname
 
-    api_key = select_key(model_name)
+    api_key = select_key(model_realname)
 
     if not api_key:
         return jsonify(
@@ -326,11 +348,6 @@ def handsome_chat_completions():
             }
         ), 429
 
-    if model_name == "deepseek-reasoner":
-        for param in ["temperature", "top_p", "presence_penalty", "frequency_penalty", "logprobs", "top_logprobs"]:
-            if param in data:
-                del data[param]
-
     headers = {
         "Authorization": f"Bearer {api_key}",
         "Content-Type": "application/json"
@@ -343,7 +360,7 @@ def handsome_chat_completions():
             headers=headers,
             json=data,
             stream=data.get("stream", False),
-            timeout=60
+            timeout=120
         )
 
         if response.status_code == 429:
@@ -364,8 +381,6 @@ def handsome_chat_completions():
                         full_response_content += chunk.decode("utf-8")
                         
                         for line in chunk.decode("utf-8").splitlines():
-                            # print(line)
-
                             if line.startswith("data:"):
                                 try:
                                     chunk_json = json.loads(line.lstrip("data: ").strip())
@@ -382,8 +397,6 @@ def handsome_chat_completions():
                                             
                                         if delta.get("content") is not None:
                                             if not first_reasoning_chunk:
-                                                # yield f"data: {json.dumps({'choices': [{'delta': {'content': '\n```\n'}, 'index': 0}]})}\n\n"
-                                                # yield f"data: {json.dumps({'choices': [{'delta': {'content': '\n\n---\n\n### 结果输出\n'}, 'index': 0}]})}\n\n"
                                                 yield f"data: {json.dumps({'choices': [{'delta': {'content': '\n\n'}, 'index': 0}]})}\n\n"
                                                 first_reasoning_chunk = True
                                             yield f"data: {json.dumps({'choices': [{'delta': {'content': delta["content"]}, 'index': 0}]})}\n\n"
@@ -493,7 +506,7 @@ def handsome_chat_completions():
                 completion_tokens = response_json["usage"]["completion_tokens"]
                 response_content = ""
 
-                if model_name == "deepseek-reasoner" and "choices" in response_json and len(response_json["choices"]) > 0:
+                if model_name == "deepseek-reasoner-thingking" and "choices" in response_json and len(response_json["choices"]) > 0:
                     choice = response_json["choices"][0]
                     if "message" in choice:
                         if "reasoning_content" in choice["message"]:
@@ -507,6 +520,19 @@ def handsome_chat_completions():
                 elif "choices" in response_json and len(response_json["choices"]) > 0:
                     response_content = response_json["choices"][0]["message"]["content"]
 
+                if model_name == "deepseek-reasoner-openwebui" and "choices" in response_json and len(response_json["choices"]) > 0:
+                    choice = response_json["choices"][0]
+                    if "message" in choice:
+                        if "reasoning_content" in choice["message"]:
+                            response_content += f"<think>\n"
+                            reasoning_content = choice["message"]["reasoning_content"]
+                            formatted_reasoning = f"\n<\think>\n"
+                            response_content += formatted_reasoning
+                        if "content" in choice["message"]:
+                            response_content += choice["message"]["content"]
+                elif "choices" in response_json and len(response_json["choices"]) > 0:
+                    response_content = response_json["choices"][0]["message"]["content"]
+
             except (KeyError, ValueError, IndexError) as e:
                 logging.error(
                     f"解析非流式响应 JSON 失败: {e}, "