update sth. at 2024-11-15 19:25:36

app.py

@@ -2,7 +2,8 @@ import gradio as gr
 import subprocess
 from huggingface_hub import InferenceClient
 from PIL import Image
-
+import requests
+import json
 # ===================== 核心逻辑模块 =====================
 
 # 初始化模型客户端
@@ -37,7 +38,7 @@ def chat_with_model(messages):
 # ---------- chatgpt-4o-mini 模块 ----------
 def chatgpt_4o_mini(messages):
     """
-    调用 gpt-4o-mini API 进行对话。
+    调用 gpt-4o-mini API 进行对话，并解析流式响应。
     """
     try:
         # 构建请求数据
@@ -47,22 +48,34 @@ def chatgpt_4o_mini(messages):
             "stream": True
         }
 
-        # 执行 curl 请求
-        curl_command = [
-            "curl", "--location", "https://sanbo1200-duck2api.hf.space/completions",
-            "--header", "Content-Type: application/json",
-            "--data", str(data)
-        ]
-
-        # 使用 subprocess 调用 curl 命令
-        result = subprocess.run(curl_command, capture_output=True, text=True)
-        response = result.stdout
-
-        if result.returncode != 0:
-            return "请求失败，请稍后再试。"
+        # 发送请求
+        url = 'https://sanbo1200-duck2api.hf.space/completions'
+        headers = {'Content-Type': 'application/json'}
+        
+        # 使用 requests 发送 POST 请求
+        response = requests.post(url, headers=headers, json=data, stream=True)
+        
+        # 检查响应状态码
+        if response.status_code != 200:
+            return f"请求失败，状态码：{response.status_code}"
+
+        # 处理流式响应
+        full_response = ""
+        for line in response.iter_lines():
+            if line:
+                # 解析每一行的内容
+                try:
+                    chunk = json.loads(line.decode('utf-8'))
+                    # 解析返回的每个 chunk
+                    if 'choices' in chunk and len(chunk['choices']) > 0:
+                        content = chunk['choices'][0]['delta'].get('content', '')
+                        full_response += content
+                except Exception as e:
+                    print(f"Error parsing response chunk: {e}")
+        
+        # 返回拼接后的完整对话内容
+        return full_response.strip()
 
-        # 解析返回结果
-        return response  # 这里你可以进一步解析 `response` 格式化成适当的返回信息
     except Exception as e:
         print(f"Error during gpt-4o-mini request: {e}")
         return "gpt-4o-mini 请求失败，请稍后再试。"
@@ -113,7 +126,7 @@ def build_interface():
             chatbox_button.click(chat_handler, inputs=chatbox_input, outputs=chatbox_output)
 
         # chatgpt-4o-mini 模块
-        with gr.Tab("chatgpt-4o-mini"):
+        with gr.Tab("gpt4o"):
             chatgpt_input = gr.Textbox(label="输入你的问题", placeholder="请提问...")
             chatgpt_output = gr.Textbox(label="回答")
             chatgpt_button = gr.Button("发送")

requirements.txt

@@ -1,3 +1,4 @@
 gradio
 huggingface_hub
 Pillow
+requests