Update app.py

app.py

@@ -9,9 +9,10 @@ logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(__name__)
 
 class FastGPTChat:
-    def __init__(self, api_key, base_url="https://api.fastgpt.in/api"):
+    def __init__(self, api_key, system_prompt="", base_url="https://api.fastgpt.in/api"):
         self.api_key = api_key
         self.base_url = base_url
+        self.system_prompt = system_prompt
         self.headers = {
             "Authorization": f"Bearer {api_key}",
             "Content-Type": "application/json"
@@ -23,87 +24,69 @@ class FastGPTChat:
             
         chat_id = str(uuid.uuid4())
         
+        # 构建消息历史，包含系统提示词
+        messages = []
+        if self.system_prompt:
+            messages.append({
+                "role": "system",
+                "content": self.system_prompt
+            })
+        
+        # 添加聊天历史
+        for user_msg, bot_msg in chat_history:
+            messages.append({"role": "user", "content": user_msg})
+            messages.append({"role": "assistant", "content": bot_msg})
+        
+        # 添加当前用户消息
+        messages.append({"role": "user", "content": message})
+        
         # 准备请求数据
         data = {
             "chatId": chat_id,
-            "stream": False,
+            "stream": True,  # 启用流式响应
             "detail": True,
-            "model": "gpt-4o",  # 指定使用 gpt-4 模型
-            "messages": [
-                {
-                    "role": "user",
-                    "content": message
-                }
-            ]
+            "model": "gpt-4o",
+            "messages": messages
         }
         
         try:
-            # 打印请求信息
-            logger.debug(f"Request URL: {self.base_url}/v1/chat/completions")
-            logger.debug(f"Request Headers: {json.dumps(self.headers, indent=2)}")
-            logger.debug(f"Request Data: {json.dumps(data, indent=2)}")
-            
-            # 发送请求
+            # 发送流式请求
             response = requests.post(
                 f"{self.base_url}/v1/chat/completions",
                 headers=self.headers,
                 json=data,
+                stream=True,
                 timeout=30
             )
             
-            # 打印响应信息
-            logger.debug(f"Response Status Code: {response.status_code}")
-            logger.debug(f"Response Headers: {dict(response.headers)}")
-            logger.debug(f"Response Content: {response.text}")
-            
-            # 检查响应状态
             if response.status_code != 200:
-                error_msg = f"API Error: Status {response.status_code}, Response: {response.text}"
+                error_msg = f"API Error: Status {response.status_code}"
                 logger.error(error_msg)
                 chat_history.append((message, f"Error: {error_msg}"))
                 return "", chat_history
             
-            # 解析响应
-            try:
-                response_data = response.json()
-                logger.debug(f"Parsed Response: {json.dumps(response_data, indent=2)}")
-                
-                # 检查是否有错误信息
-                if "responseData" in response_data:
-                    for item in response_data["responseData"]:
-                        if "error" in item:
-                            error_msg = item["error"].get("message", "Unknown error")
-                            logger.error(f"API Error: {error_msg}")
-                            chat_history.append((message, f"Error: {error_msg}"))
-                            return "", chat_history
-                
-                if "choices" in response_data and len(response_data["choices"]) > 0:
-                    content = response_data["choices"][0]["message"]["content"]
-                    # 如果content是列表，提取文本内容
-                    if isinstance(content, list):
-                        text_contents = []
-                        for item in content:
-                            if isinstance(item, dict) and "text" in item:
-                                text_contents.append(item["text"].get("content", ""))
-                        ai_message = " ".join(text_contents)
-                    else:
-                        ai_message = content
-                    
-                    if not ai_message:
-                        ai_message = "No response generated from the API"
-                        logger.warning("Empty response content")
-                else:
-                    ai_message = "No response generated from the API"
-                    logger.warning("No choices in response data")
-                
-                chat_history.append((message, ai_message))
-                return "", chat_history
-                
-            except json.JSONDecodeError as e:
-                error_msg = f"Failed to parse API response: {str(e)}"
-                logger.error(error_msg)
-                chat_history.append((message, f"Error: {error_msg}"))
-                return "", chat_history
+            # 处理流式响应
+            full_response = ""
+            for line in response.iter_lines():
+                if line:
+                    try:
+                        line = line.decode('utf-8')
+                        if line.startswith('data: '):
+                            data = json.loads(line[6:])
+                            if 'choices' in data and len(data['choices']) > 0:
+                                content = data['choices'][0]['delta'].get('content', '')
+                                if content:
+                                    full_response += content
+                                    # 更新聊天历史
+                                    if len(chat_history) > 0 and chat_history[-1][0] == message:
+                                        chat_history[-1] = (message, full_response)
+                                    else:
+                                        chat_history.append((message, full_response))
+                                    yield "", chat_history
+                    except Exception as e:
+                        logger.error(f"Error processing stream: {str(e)}")
+            
+            return "", chat_history
                 
         except requests.exceptions.RequestException as e:
             error_msg = f"Request failed: {str(e)}"
@@ -115,41 +98,74 @@ def create_chat_interface(api_key):
     # 创建FastGPT聊天实例
     fastgpt_chat = FastGPTChat(api_key)
     
-    # 创建Gradio界面
-    with gr.Blocks(title="FastGPT Chat") as interface:
-        gr.Markdown("# FastGPT Chat Interface (Using GPT-4o)")
-        
-        with gr.Row():
-            api_key_input = gr.Textbox(
-                label="API Key",
-                value=api_key,
-                type="password"
-            )
-        
-        chatbot = gr.Chatbot(height=400)
-        with gr.Row():
-            message = gr.Textbox(
-                label="Type your message here...",
-                placeholder="Enter your message and press enter",
-                lines=2
+    # 创建美化后的Gradio界面
+    with gr.Blocks(
+        title="FastGPT Chat",
+        css="""
+        .container { max-width: 800px; margin: auto; }
+        .chat-header { text-align: center; padding: 20px; }
+        .chat-container { background-color: #f5f5f5; border-radius: 10px; padding: 20px; }
+        """
+    ) as interface:
+        with gr.Column(elem_classes="container"):
+            gr.Markdown(
+                """
+                # 🤖 FastGPT Chat Interface
+                ### Powered by GPT-4o
+                """
             )
-        with gr.Row():
-            submit = gr.Button("Submit")
-            clear = gr.Button("Clear Chat")
-        
-        # 状态显示
-        status = gr.Textbox(label="Status", interactive=False)
+            
+            with gr.Row():
+                api_key_input = gr.Textbox(
+                    label="API Key",
+                    value=api_key,
+                    type="password",
+                    container=False,
+                    scale=4
+                )
+            
+            with gr.Row():
+                system_prompt = gr.Textbox(
+                    label="System Prompt",
+                    placeholder="Set the behavior of AI assistant...",
+                    lines=2,
+                    container=False
+                )
+            
+            with gr.Column(elem_classes="chat-container"):
+                chatbot = gr.Chatbot(
+                    height=500,
+                    container=False,
+                    elem_classes="chatbot"
+                )
+                
+                with gr.Row():
+                    message = gr.Textbox(
+                        label="Message",
+                        placeholder="Type your message here...",
+                        lines=2,
+                        container=False,
+                        scale=4
+                    )
+                
+                with gr.Row():
+                    submit = gr.Button("Send 📤", variant="primary")
+                    clear = gr.Button("Clear 🗑️", variant="secondary")
+            
+            # 状态显示
+            status = gr.Textbox(label="Status", interactive=False)
         
-        def update_api_key(new_key):
+        def update_chat_settings(new_key, new_prompt):
             nonlocal fastgpt_chat
-            fastgpt_chat = FastGPTChat(new_key)
-            return "API Key updated"
+            fastgpt_chat = FastGPTChat(new_key, new_prompt)
+            return "Settings updated"
         
         # 设置事件处理
         submit_event = submit.click(
             fastgpt_chat.chat,
             inputs=[message, chatbot],
-            outputs=[message, chatbot]
+            outputs=[message, chatbot],
+            api_name="chat"
         )
         
         message.submit(
@@ -159,7 +175,19 @@ def create_chat_interface(api_key):
         )
         
         clear.click(lambda: None, None, chatbot, queue=False)
-        api_key_input.change(update_api_key, inputs=[api_key_input], outputs=[status])
+        
+        # 更新设置
+        api_key_input.change(
+            update_chat_settings,
+            inputs=[api_key_input, system_prompt],
+            outputs=[status]
+        )
+        
+        system_prompt.change(
+            update_chat_settings,
+            inputs=[api_key_input, system_prompt],
+            outputs=[status]
+        )
         
     return interface