修复bug

Author: jayscoder

examples/agent_example.py

@@ -17,6 +17,7 @@
 sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
 
 from pydify import AgentClient
+from pydify.common import DifyAPIError
 
 # 从环境变量或直接设置 API 密钥
 API_KEY = os.environ.get("DIFY_API_KEY_AGENT", "app-JH2PWol59GDhOfLpB1Qwvts3")
@@ -73,7 +74,7 @@ def example_send_message_streaming():
 
     # 定义处理函数
     def on_agent_message(chunk):
-        print(f"收到文本块: {chunk.get('answer', '')}", end="", flush=True)
+        print(f"{chunk.get('answer', '')}", end="", flush=True)
 
     def on_agent_thought(chunk):
         print(f"\n\n[Agent思考] {chunk.get('position')}:")
@@ -96,29 +97,47 @@ def on_message_end(chunk):
     def on_error(chunk):
         print(f"\n错误: {chunk.get('message', '未知错误')}")
 
-    # 发送消息（流式模式，Agent只支持流式模式）
-    stream = client.send_message(
-        query="帮我搜索最近一周的股市行情，并分析趋势",
-        user=USER_ID
-    )
+    # 请求参数，包括加入重试和超时设置
+    request_kwargs = get_request_kwargs()
 
-    # 处理流式响应
-    result = client.process_streaming_response(
-        stream,
-        handle_agent_message=on_agent_message,
-        handle_agent_thought=on_agent_thought,
-        handle_message_file=on_message_file,
-        handle_message_end=on_message_end,
-        handle_error=on_error
-    )
-    
-    print("\n\n处理结果摘要:")
-    print(f"消息ID: {result.get('message_id')}")
-    print(f"会话ID: {result.get('conversation_id')}")
-    print(f"Agent思考步骤数: {len(result.get('agent_thoughts', []))}")
+    try:
+        # 发送消息（流式模式，Agent只支持流式模式）
+        print("发送查询: '帮我搜索最近一周的股市行情，并分析趋势'")
+        stream = client.send_message(
+            query="帮我搜索最近一周的股市行情，并分析趋势",
+            user=USER_ID,
+            inputs={},  # 添加空的inputs参数
+            **request_kwargs  # 传递请求参数
+        )
+        
+        # 处理流式响应
+        result = client.process_streaming_response(
+            stream,
+            handle_agent_message=on_agent_message,
+            handle_agent_thought=on_agent_thought,
+            handle_message_file=on_message_file,
+            handle_message_end=on_message_end,
+            handle_error=on_error
+        )
+        
+        print("\n\n处理结果摘要:")
+        print(f"消息ID: {result.get('message_id')}")
+        print(f"会话ID: {result.get('conversation_id')}")
+        print(f"Agent思考步骤数: {len(result.get('agent_thoughts', []))}")
+        
+        # 返回会话ID，可用于后续对话
+        return result.get("conversation_id")
 
-    # 返回会话ID，可用于后续对话
-    return result.get("conversation_id")
+    except DifyAPIError as e:
+        print(f"API错误: {str(e)}")
+        print(f"状态码: {e.status_code}")
+        print(f"错误数据: {e.error_data}")
+        return None
+    except Exception as e:
+        print(f"发生异常: {str(e)}")
+        import traceback
+        traceback.print_exc()
+        return None
 
 def example_continuation_conversation():
     """多轮对话示例"""
@@ -133,7 +152,7 @@ def example_continuation_conversation():
 
     # 继续对话函数
     def on_agent_message(chunk):
-        print(f"收到文本块: {chunk.get('answer', '')}", end="", flush=True)
+        print(f"{chunk.get('answer', '')}", end="", flush=True)
 
     def on_agent_thought(chunk):
         print(f"\n\n[Agent思考] {chunk.get('position')}:")
@@ -409,7 +428,7 @@ def example_send_message_with_image():
 
     # 定义处理函数
     def on_agent_message(chunk):
-        print(f"收到文本块: {chunk.get('answer', '')}", end="", flush=True)
+        print(f"{chunk.get('answer', '')}", end="", flush=True)
 
     def on_agent_thought(chunk):
         print(f"\n\n[Agent思考] {chunk.get('position')}:")

examples/chatbot_example.py

@@ -73,7 +73,7 @@ def example_send_message_streaming():
 
     # 消息处理函数
     def on_message(chunk):
-        print(f"收到文本块: {chunk.get('answer', '')}", end="", flush=True)
+        print(f"{chunk.get('answer', '')}", end="", flush=True)
 
     def on_message_end(chunk):
         print("\n消息完成！")

examples/chatflow_example.py

@@ -74,7 +74,7 @@ def example_send_message_streaming():
 
     # 消息处理函数
     def on_message(chunk):
-        print(f"收到文本块: {chunk.get('answer', '')}", end="", flush=True)
+        print(f"{chunk.get('answer', '')}", end="", flush=True)
 
     def on_message_end(chunk):
         print("\n消息完成！")

pydify/agent.py

@@ -28,6 +28,7 @@ def send_message(
         conversation_id: str = None,
         files: List[Dict[str, Any]] = None,
         auto_generate_name: bool = True,
+        **kwargs  # 添加kwargs参数，用于接收额外的请求参数
     ) -> Generator[Dict[str, Any], None, None]:
         """
         发送对话消息，创建会话消息。在Agent模式下，只支持streaming流式模式。
@@ -40,13 +41,14 @@ def send_message(
             conversation_id (str, optional): 会话ID，基于之前的聊天记录继续对话时需提供。默认为None
             files (List[Dict[str, Any]], optional): 要包含在消息中的文件列表，每个文件为一个字典。默认为None
             auto_generate_name (bool, optional): 是否自动生成会话标题。默认为True
+            **kwargs: 传递给底层API请求的额外参数，如timeout, max_retries等
             
         Returns:
             Generator[Dict[str, Any], None, None]: 返回字典生成器
                 
         Raises:
             ValueError: 当提供了无效的参数时
-            requests.HTTPError: 当API请求失败时
+            DifyAPIError: 当API请求失败时
         """
         if response_mode != "streaming":
             raise ValueError("Agent mode only supports streaming response mode")
@@ -56,11 +58,9 @@ def send_message(
             "user": user,
             "response_mode": "streaming",
             "auto_generate_name": auto_generate_name,
+            "inputs": inputs or {},  # 确保inputs参数总是存在，如果未提供则使用空字典
         }
 
-        if inputs:
-            payload["inputs"] = inputs
-            
         if conversation_id:
             payload["conversation_id"] = conversation_id
 
@@ -69,7 +69,7 @@ def send_message(
 
         endpoint = "chat-messages"
 
-        return self.post_stream(endpoint, json_data=payload)
+        return self.post_stream(endpoint, json_data=payload, **kwargs)  # 传递额外参数
 
     def stop_response(self, task_id: str, user: str) -> Dict[str, Any]:
         """
@@ -528,7 +528,8 @@ def process_streaming_response(
         示例:
             ```python
             def on_agent_message(chunk):
-                print(f"收到文本块: {chunk['answer']}")
+                # 打印Agent返回的文本块
+                print(f"{chunk['answer']}")
                 
             def on_agent_thought(chunk):
                 print(f"Agent思考: {chunk['thought']}")

pydify/chatbot.py

@@ -202,7 +202,7 @@ def process_streaming_response(
         示例:
             ```python
             def on_message(chunk):
-                print(f"收到文本块: {chunk['answer']}")
+                print(f"{chunk['answer']}")
                 
             def on_message_end(chunk):
                 print(f"消息结束: ID={chunk['message_id']}")

pydify/common.py

@@ -191,20 +191,37 @@ def post_stream(self, endpoint: str, json_data: Dict[str, Any], **kwargs) -> Gen
         # 添加超时参数
         kwargs["timeout"] = timeout
 
+        # 打印请求信息，方便调试
+        print(f"请求URL: {url}")
+        print(f"请求参数: {json.dumps(json_data, ensure_ascii=False)[:500]}")
+        
         for attempt in range(max_retries + 1):
             try:
                 with requests.post(url, json=json_data, headers=headers, stream=True, **kwargs) as response:
                     if not response.ok:
                         error_msg = f"API request failed: {response.status_code}"
                         error_data = {}
+                        
                         try:
+                            # 尝试解析响应内容作为JSON
                             error_data = response.json()
-                            error_msg = f"{error_msg} - {error_data.get('error', {}).get('message', '')}"
-                        except RequestsJSONDecodeError:
-                            # 如果无法解析为JSON，提供一个简单的错误消息
-                            error_msg = f"{error_msg} - 响应无法解析为JSON"
+                            # 提取标准错误信息字段
+                            if "error" in error_data and isinstance(error_data["error"], dict):
+                                error_msg = f"{error_msg} - {error_data['error'].get('message', '')}"
+                            elif "message" in error_data:
+                                error_msg = f"{error_msg} - {error_data.get('message', '')}"
+                        except Exception:
+                            # 如果无法解析为JSON，提供原始响应内容
                             if response.text:
-                                print(f"响应内容: {response.text[:100]}")
+                                error_msg = f"{error_msg} - 响应内容: {response.text[:200]}"
+                            else:
+                                error_msg = f"{error_msg} - 服务器未返回错误详情"
+                        
+                        # 打印详细的错误信息，方便调试
+                        print(f"API请求失败 ({endpoint}):")
+                        print(f"状态码: {response.status_code}")
+                        print(f"响应头: {dict(response.headers)}")
+                        print(f"响应内容: {response.text[:500] if response.text else '(无内容)'}")
 
                         # 如果是可重试的错误码，并且还有重试次数，则重试
                         if response.status_code in [429, 500, 502, 503, 504] and attempt < max_retries:

pydify/text_generation.py

@@ -122,7 +122,7 @@ def process_streaming_response(
         示例:
             ```python
             def on_message(chunk):
-                print(f"收到文本块: {chunk['answer']}")
+                print(f"{chunk['answer']}")
                 
             def on_message_end(chunk):
                 print(f"消息结束: ID={chunk['message_id']}")