v0.1.0

Author: jayscoder

.env.examples

@@ -0,0 +1,6 @@
+DIFY_BASE_URL=xxx
+DIFY_API_KEY_AGENT=xxx
+DIFY_API_KEY_CHATBOT=xxx
+DIFY_API_KEY_CHATFLOW=xxx
+DIFY_API_KEY_WORKFLOW=xxx
+DIFY_API_KEY_TEXT_GENERATION=xxx

pydify/agent.py

@@ -127,23 +127,60 @@ def message_feedback(
 
         return self.post(endpoint, json_data=payload)
 
-    def get_suggested_questions(self, message_id: str, user: str) -> Dict[str, Any]:
+    def get_suggested_questions(self, message_id: str, user: str, **kwargs) -> Dict[str, Any]:
         """
         获取下一轮建议问题列表。
         
         Args:
             message_id (str): 消息ID
             user (str): 用户标识
+            **kwargs: 额外的请求参数，如timeout、max_retries等
             
         Returns:
             Dict[str, Any]: 建议问题列表
             
         Raises:
-            requests.HTTPError: 当API请求失败时
+            DifyAPIError: 当API请求失败时
         """
-        endpoint = f"messages/{message_id}/suggested"
-        params = {"user": user}
-        return self.get(endpoint, params=params)
+        # 尝试多种可能的端点路径格式
+        possible_endpoints = [
+            f"messages/{message_id}/suggested",  # 原始格式
+             f"messages/{message_id}/suggested-questions",  # 新格式1
+            f"chat-messages/{message_id}/suggested-questions",  # 新格式2
+            "suggested-questions",  # 当前格式
+        ]
+
+        params = {
+            "user": user,
+        }
+        
+        # 添加详细日志
+        # print(f"请求推荐问题: 消息ID={message_id}, 用户={user}")
+        
+        # 尝试所有可能的端点，直到找到一个有效的
+        last_error = None
+        for endpoint in possible_endpoints:
+            try:
+                params_to_use = params.copy()
+                # 如果端点是standalone的suggested-questions，需要添加message_id参数
+                if endpoint == "suggested-questions":
+                    params_to_use["message_id"] = message_id
+                else:
+                    # 否则可能不需要在参数中包含message_id
+                    params_to_use.pop("message_id", None)
+                
+                print(f"尝试端点: {endpoint}, 参数: {params_to_use}")
+                result = self.get(endpoint, params=params_to_use, **kwargs)
+                print(f"端点 {endpoint} 请求成功!")
+                return result
+            except Exception as e:
+                last_error = e
+                print(f"端点 {endpoint} 请求失败: {str(e)}")
+                continue
+        
+        # 如果所有端点都失败，记录最后一个错误并返回空结果
+        print(f"所有推荐问题端点请求都失败。最后错误: {str(last_error)}")
+        return {"data": []}
 
     def get_messages(
         self,

pydify/chatbot.py

@@ -6,6 +6,7 @@
 """
 
 import os
+import json
 from typing import Dict, Any, List, Optional, Union, Generator
 
 from .common import DifyBaseClient
@@ -27,6 +28,7 @@ def send_message(
         conversation_id: str = None,
         files: List[Dict[str, Any]] = None,
         auto_generate_name: bool = True,
+        **kwargs
     ) -> Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
         """
         发送对话消息，创建会话消息。
@@ -39,6 +41,7 @@ def send_message(
             conversation_id (str, optional): 会话ID，基于之前的聊天记录继续对话时需提供。默认为None
             files (List[Dict[str, Any]], optional): 要包含在消息中的文件列表，每个文件为一个字典。默认为None
             auto_generate_name (bool, optional): 是否自动生成会话标题。默认为True
+            **kwargs: 额外的请求参数，如timeout、max_retries等
             
         Returns:
             Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
@@ -59,8 +62,8 @@ def send_message(
             "auto_generate_name": auto_generate_name,
         }
 
-        if inputs:
-            payload["inputs"] = inputs
+        # 确保inputs始终存在，即使是空字典
+        payload["inputs"] = inputs or {}
 
         if conversation_id:
             payload["conversation_id"] = conversation_id
@@ -70,10 +73,14 @@ def send_message(
 
         endpoint = "chat-messages"
 
+        # 打印请求信息，便于调试
+        print(f"请求URL: {self.base_url}{endpoint}")
+        print(f"请求参数: {json.dumps(payload)}")
+        
         if response_mode == "streaming":
-            return self.post_stream(endpoint, json_data=payload)
+            return self.post_stream(endpoint, json_data=payload, **kwargs)
         else:
-            return self.post(endpoint, json_data=payload)
+            return self.post(endpoint, json_data=payload, **kwargs)
 
     def stop_response(self, task_id: str, user: str) -> Dict[str, Any]:
         """

pydify/chatflow.py

@@ -29,6 +29,7 @@ def send_message(
         conversation_id: str = None,
         files: List[Dict[str, Any]] = None,
         auto_generate_name: bool = True,
+        **kwargs
     ) -> Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
         """
         发送对话消息，创建会话消息。
@@ -41,6 +42,7 @@ def send_message(
             conversation_id (str, optional): 会话ID，基于之前的聊天记录继续对话时需提供。默认为None
             files (List[Dict[str, Any]], optional): 要包含在消息中的文件列表，每个文件为一个字典。默认为None
             auto_generate_name (bool, optional): 是否自动生成会话标题。默认为True
+            **kwargs: 额外的请求参数，如timeout、max_retries等
             
         Returns:
             Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
@@ -49,7 +51,7 @@ def send_message(
                 
         Raises:
             ValueError: 当提供了无效的参数时
-            requests.HTTPError: 当API请求失败时
+            DifyAPIError: 当API请求失败时
         """
         if response_mode not in ["streaming", "blocking"]:
             raise ValueError("response_mode must be 'streaming' or 'blocking'")
@@ -61,8 +63,8 @@ def send_message(
             "auto_generate_name": auto_generate_name,
         }
 
-        if inputs:
-            payload["inputs"] = inputs
+        # 确保inputs字段始终存在，即使是空字典
+        payload["inputs"] = inputs or {}
 
         if conversation_id:
             payload["conversation_id"] = conversation_id
@@ -73,9 +75,9 @@ def send_message(
         endpoint = "chat-messages"
 
         if response_mode == "streaming":
-            return self.post_stream(endpoint, json_data=payload)
+            return self.post_stream(endpoint, json_data=payload, **kwargs)
         else:
-            return self.post(endpoint, json_data=payload)
+            return self.post(endpoint, json_data=payload, **kwargs)
 
     def stop_response(self, task_id: str, user: str) -> Dict[str, Any]:
         """

pydify/common.py

@@ -103,12 +103,43 @@ def _request(self, method: str, endpoint: str, **kwargs) -> requests.Response:
             except (requests.RequestException, ConnectionError) as e:
                 # 如果是网络错误且还有重试次数，则重试
                 if attempt < max_retries:
-                    print(f"网络错误: {str(e)}，{attempt+1}秒后重试...")
+                    # 提供更详细的错误信息
+                    error_type = type(e).__name__
+                    
+                    # 检测具体的连接问题类型
+                    if isinstance(e, requests.exceptions.SSLError):
+                        error_msg = f"SSL连接错误: {str(e)}"
+                    elif isinstance(e, requests.exceptions.ConnectTimeout):
+                        error_msg = f"连接超时: {str(e)}"
+                    elif isinstance(e, requests.exceptions.ReadTimeout):
+                        error_msg = f"读取超时: {str(e)}"
+                    elif isinstance(e, requests.exceptions.ConnectionError):
+                        error_msg = f"网络连接错误: {str(e)}"
+                    else:
+                        error_msg = f"网络错误({error_type}): {str(e)}"
+                        
+                    print(f"{error_msg}，{attempt+1}秒后重试...")
                     import time
                     time.sleep(retry_delay)
                     continue
 
-                raise DifyAPIError(f"网络请求异常: {str(e)}")
+                # 提供更友好的错误信息
+                error_type = type(e).__name__
+                if isinstance(e, requests.exceptions.SSLError):
+                    error_msg = f"SSL连接错误: {str(e)}"
+                elif isinstance(e, requests.exceptions.ConnectTimeout):
+                    error_msg = f"连接超时: {str(e)}"
+                elif isinstance(e, requests.exceptions.ReadTimeout):
+                    error_msg = f"读取超时: {str(e)}"
+                elif isinstance(e, requests.exceptions.ConnectionError):
+                    error_msg = f"网络连接错误: {str(e)}"
+                else:
+                    error_msg = f"网络错误({error_type}): {str(e)}"
+                
+                # 提供连接问题的建议
+                suggestions = "\n请检查:\n1. 网络连接是否正常\n2. API地址是否正确\n3. 服务器是否可用\n4. SSL证书是否有效"
+                
+                raise DifyAPIError(f"{error_msg}{suggestions}")
 
     def get(self, endpoint: str, **kwargs) -> Dict[str, Any]:
         """
@@ -252,13 +283,43 @@ def post_stream(self, endpoint: str, json_data: Dict[str, Any], **kwargs) -> Gen
             except (requests.RequestException, ConnectionError) as e:
                 # 如果是网络错误且还有重试次数，则重试
                 if attempt < max_retries:
-                    print(f"网络错误: {str(e)}，{attempt+1}秒后重试...")
+                    # 提供更详细的错误信息
+                    error_type = type(e).__name__
+                    
+                    # 检测具体的连接问题类型
+                    if isinstance(e, requests.exceptions.SSLError):
+                        error_msg = f"SSL连接错误: {str(e)}"
+                    elif isinstance(e, requests.exceptions.ConnectTimeout):
+                        error_msg = f"连接超时: {str(e)}"
+                    elif isinstance(e, requests.exceptions.ReadTimeout):
+                        error_msg = f"读取超时: {str(e)}"
+                    elif isinstance(e, requests.exceptions.ConnectionError):
+                        error_msg = f"网络连接错误: {str(e)}"
+                    else:
+                        error_msg = f"网络错误({error_type}): {str(e)}"
+                        
+                    print(f"{error_msg}，{attempt+1}秒后重试...")
                     import time
                     time.sleep(retry_delay)
                     continue
 
-                # 如果已经重试了所有次数仍失败，抛出异常
-                raise DifyAPIError(f"流式请求异常: {str(e)}")
+                # 提供更友好的错误信息
+                error_type = type(e).__name__
+                if isinstance(e, requests.exceptions.SSLError):
+                    error_msg = f"SSL连接错误: {str(e)}"
+                elif isinstance(e, requests.exceptions.ConnectTimeout):
+                    error_msg = f"连接超时: {str(e)}"
+                elif isinstance(e, requests.exceptions.ReadTimeout):
+                    error_msg = f"读取超时: {str(e)}"
+                elif isinstance(e, requests.exceptions.ConnectionError):
+                    error_msg = f"网络连接错误: {str(e)}"
+                else:
+                    error_msg = f"网络错误({error_type}): {str(e)}"
+                
+                # 提供连接问题的建议
+                suggestions = "\n请检查:\n1. 网络连接是否正常\n2. API地址是否正确\n3. 服务器是否可用\n4. SSL证书是否有效"
+                
+                raise DifyAPIError(f"{error_msg}{suggestions}")
 
     # 通用方法 - 这些方法在多个子类中重复出现，可以移到基类
 
@@ -348,6 +409,7 @@ def message_feedback(
         user: str,
         rating: str = None,
         content: str = None,
+        **kwargs  # 添加kwargs参数支持
     ) -> Dict[str, Any]:
         """
         对消息进行反馈（点赞/点踩）。
@@ -357,6 +419,7 @@ def message_feedback(
             user (str): 用户标识
             rating (str, optional): 评价，可选值：'like'(点赞), 'dislike'(点踩), None(撤销)。默认为None
             content (str, optional): 反馈的具体信息。默认为None
+            **kwargs: 额外的请求参数，如timeout、max_retries等
 
         Returns:
             Dict[str, Any]: 反馈结果
@@ -376,7 +439,7 @@ def message_feedback(
         if content:
             payload["content"] = content
 
-        return self.post(f"messages/{message_id}/feedbacks", json_data=payload)
+        return self.post(f"messages/{message_id}/feedbacks", json_data=payload, **kwargs)
 
     def get_app_info(self) -> Dict[str, Any]:
         """

pydify/text_generation.py

@@ -25,6 +25,7 @@ def completion(
         response_mode: str = "streaming",
         inputs: Dict[str, Any] = None,
         files: List[Dict[str, Any]] = None,
+        **kwargs  # 添加kwargs参数支持
     ) -> Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
         """
         发送消息给文本生成应用。
@@ -35,6 +36,7 @@ def completion(
             response_mode (str, optional): 响应模式，'streaming'（流式）或'blocking'（阻塞）。默认为'streaming'
             inputs (Dict[str, Any], optional): 额外的输入参数。默认为None，若提供，会与query合并
             files (List[Dict[str, Any]], optional): 要包含在消息中的文件列表，每个文件为一个字典。默认为None
+            **kwargs: 额外的请求参数，如timeout、max_retries等
             
         Returns:
             Union[Dict[str, Any], Generator[Dict[str, Any], None, None]]:
@@ -68,9 +70,9 @@ def completion(
         endpoint = "completion-messages"
 
         if response_mode == "streaming":
-            return self.post_stream(endpoint, json_data=payload)
+            return self.post_stream(endpoint, json_data=payload, **kwargs)  # 传递kwargs
         else:
-            return self.post(endpoint, json_data=payload)
+            return self.post(endpoint, json_data=payload, **kwargs)  # 传递kwargs
 
     def stop_completion(self, task_id: str, user: str) -> Dict[str, Any]:
         """