Update app.py

app.py

@@ -1,6 +1,8 @@
 import gradio as gr
 import requests
 import time
+import json
+
 
 # 设置 FastGPT API 的基本信息
 #API_URL = "https://api.fastgpt.in/api/v1/chat/completions"  # 请根据您的部署地址修改
@@ -16,27 +18,96 @@ import time
 
 API_KEY = "fastgpt-aleL83PzPiul9lZDJQFD4NHYfVIxP7mDIWFCyin2FuMhYgwlRC3NMkV2K5lxc8gF"  # 请替换为您的实际 API 密钥
 
-API_URL = "https://api.fastgpt.com/v1/chat"
+#API_URL = "https://api.fastgpt.com/v1/chat"
+
+
+# 替换成你的 FastGPT 的 BaseURL 和 应用特定 API Key
+BASE_URL = "https://api.fastgpt.in/api/v1"  
+API_KEY = "fastgpt-aleL83PzPiul9lZDJQFD4NHYfVIxP7mDIWFCyin2FuMhYgwlRC3NMkV2K5lxc8gF"  # 应用特定 key
+
+def chat_with_fastgpt(message, history):
+    """
+    与 FastGPT 进行对话的函数
 
-def chat_with_fastgpt(prompt):
+    Args:
+        message: 用户输入的消息
+        history: 聊天历史记录
+
+    Returns:
+        生成器的响应内容
+    """
     headers = {
         "Authorization": f"Bearer {API_KEY}",
-        "Content-Type": "application/json"
+        "Content-Type": "application/json",
     }
-    payload = {
-        "model": "fastgpt",
-        "prompt": prompt
+
+    # 构建消息历史
+    messages = []
+    for human, assistant in history:
+        messages.append({"role": "user", "content": human})
+        messages.append({"role": "assistant", "content": assistant})
+    messages.append({"role": "user", "content": message})
+
+    data = {
+        "chatId": "your_chat_id",  # 如果需要，替换成你的 chatId
+        "stream": True,  # 使用流式输出
+        "detail": False,
+        "messages": messages,
     }
-    response = requests.post(API_URL, headers=headers, json=payload)
-    if response.status_code == 200:
-        return response.json().get("response", "I didn't get that.")
-    else:
-        return "Failed to get a response from the API."
-
-iface = gr.Interface(fn=chat_with_fastgpt, 
-                     inputs="text", 
-                     outputs="text", 
-                     title="Chat with FastGPT")
-
-if __name__ == "__main__":
-    iface.launch()
+
+    try:
+        response = requests.post(
+            f"{BASE_URL}/chat/completions", headers=headers, json=data, stream=True
+        )
+        response.raise_for_status()  # 检查请求是否成功
+
+        # 处理流式输出
+        for chunk in response.iter_content(chunk_size=8192): # 根据实际情况调整chunk_size
+          if chunk:
+            decoded_chunk = chunk.decode('utf-8').replace("data: ", "")
+            
+            # 移除末尾的\n
+            if decoded_chunk.endswith('\n'):
+              decoded_chunk = decoded_chunk[:-1]
+              
+            # 如果解码后的内容为空，跳过
+            if not decoded_chunk:
+                continue
+            
+            # 处理JSON字符串
+            try:
+                # 有时候一个chunk可能包含多个JSON对象，所以需要循环处理
+                json_start_index = 0
+                while json_start_index < len(decoded_chunk):
+                    try:
+                        json_obj, pos = json.JSONDecoder().raw_decode(decoded_chunk[json_start_index:])
+                        json_start_index += pos
+                        if json_obj.get("choices"):
+                            delta = json_obj["choices"][0].get("delta")
+                            if delta and delta.get("content"):
+                                yield delta["content"]
+                    except json.JSONDecodeError as e:
+                        # 找到解码错误的位置，更新起始索引，跳过当前无效的JSON片段
+                        json_start_index += e.pos
+                        print(f"Skipped invalid JSON part: {e.msg} at position {e.pos}")
+                        # 或者如果希望直接跳到下一个字符，可以简单地 json_start_index += 1
+                        #json_start_index += 1
+
+            except Exception as e:
+                print(f"Error processing chunk: {e}")
+
+    except requests.exceptions.RequestException as e:
+        print(f"请求错误: {e}")
+        yield "请求 FastGPT API 出错，请检查网络或 API Key。"
+    except Exception as e:
+        print(f"未知错误: {e}")
+        yield "发生未知错误。"
+
+# Gradio 界面
+iface = gr.ChatInterface(
+    fn=chat_with_fastgpt,
+    title="FastGPT Chatbot",
+    description="与 FastGPT 支持的聊天机器人对话",
+)
+
+iface.launch()