update

Author: jayscoder

pydify/__init__.py

@@ -5,12 +5,12 @@
 包括对话、文本生成、工作流、文件上传等。
 """
 
-from .agent import AgentClient, DifyBaseClient
+from .agent import AgentClient
 from .chatbot import ChatbotClient
 from .chatflow import ChatflowClient
 from .text_generation import TextGenerationClient
 from .workflow import WorkflowClient
-
+from .common import DifyType, DifyBaseClient
 
 def create_client(type: str, base_url: str, api_key: str) -> DifyBaseClient:
     if type == "workflow":

pydify/agent.py

@@ -10,15 +10,16 @@
 import os
 from typing import Any, BinaryIO, Dict, Generator, List, Optional, Tuple, Union
 
-from .common import DifyBaseClient
+from .common import DifyBaseClient, DifyType
 
 
 class AgentClient(DifyBaseClient):
     """Dify Agent应用客户端类。
 
     提供与Dify Agent应用API交互的方法，包括发送消息、获取历史消息、管理会话、
     上传文件、语音转文字、文字转语音等功能。Agent应用支持迭代式规划推理和自主工具调用。
-    """
+    """ 
+    type = DifyType.Agent
 
     def send_message(
         self,
@@ -185,358 +186,6 @@ def get_suggested_questions(
         print(f"所有推荐问题端点请求都失败。最后错误: {str(last_error)}")
         return {"data": []}
 
-    def get_messages(
-        self,
-        conversation_id: str,
-        user: str,
-        first_id: str = None,
-        limit: int = 20,
-    ) -> Dict[str, Any]:
-        """
-        获取会话历史消息，滚动加载形式返回历史聊天记录，第一页返回最新limit条（倒序返回）。
-
-        Args:
-            conversation_id (str): 会话ID
-            user (str): 用户标识
-            first_id (str, optional): 当前页第一条聊天记录的ID。默认为None
-            limit (int, optional): 一次请求返回多少条聊天记录。默认为20
-
-        Returns:
-            Dict[str, Any]: 消息列表及分页信息，包含agent_thoughts（Agent的思考过程）
-
-        Raises:
-            requests.HTTPError: 当API请求失败时
-        """
-        endpoint = "messages"
-
-        params = {
-            "conversation_id": conversation_id,
-            "user": user,
-            "limit": limit,
-        }
-
-        if first_id:
-            params["first_id"] = first_id
-
-        return self.get(endpoint, params=params)
-
-    def get_conversations(
-        self,
-        user: str,
-        last_id: str = None,
-        limit: int = 20,
-        sort_by: str = "-updated_at",
-    ) -> Dict[str, Any]:
-        """
-        获取会话列表，默认返回最近的20条。
-
-        Args:
-            user (str): 用户标识
-            last_id (str, optional): 当前页最后面一条记录的ID。默认为None
-            limit (int, optional): 一次请求返回多少条记录，默认20条，最大100条，最小1条。默认为20
-            sort_by (str, optional): 排序字段，可选值：created_at, -created_at, updated_at, -updated_at。默认为"-updated_at"
-
-        Returns:
-            Dict[str, Any]: 会话列表及分页信息
-
-        Raises:
-            ValueError: 当提供了无效的参数时
-            requests.HTTPError: 当API请求失败时
-        """
-        valid_sort_values = ["created_at", "-created_at", "updated_at", "-updated_at"]
-        if sort_by not in valid_sort_values:
-            raise ValueError(f"sort_by must be one of {valid_sort_values}")
-
-        if limit < 1 or limit > 100:
-            raise ValueError("limit must be between 1 and 100")
-
-        endpoint = "conversations"
-
-        params = {
-            "user": user,
-            "limit": limit,
-            "sort_by": sort_by,
-        }
-
-        if last_id:
-            params["last_id"] = last_id
-
-        return self.get(endpoint, params=params)
-
-    def delete_conversation(self, conversation_id: str, user: str) -> Dict[str, Any]:
-        """
-        删除会话。
-
-        Args:
-            conversation_id (str): 会话ID
-            user (str): 用户标识
-
-        Returns:
-            Dict[str, Any]: 删除结果
-
-        Raises:
-            requests.HTTPError: 当API请求失败时
-        """
-        endpoint = f"conversations/{conversation_id}"
-        payload = {"user": user}
-        return self._request("DELETE", endpoint, json=payload).json()
-
-    def rename_conversation(
-        self,
-        conversation_id: str,
-        user: str,
-        name: str = None,
-        auto_generate: bool = False,
-    ) -> Dict[str, Any]:
-        """
-        会话重命名，对会话进行重命名，会话名称用于显示在支持多会话的客户端上。
-
-        Args:
-            conversation_id (str): 会话ID
-            user (str): 用户标识
-            name (str, optional): 名称，若auto_generate为True时，该参数可不传。默认为None
-            auto_generate (bool, optional): 自动生成标题。默认为False
-
-        Returns:
-            Dict[str, Any]: 重命名后的会话信息
-
-        Raises:
-            ValueError: 当提供了无效的参数时
-            requests.HTTPError: 当API请求失败时
-        """
-        if not auto_generate and not name:
-            raise ValueError("name is required when auto_generate is False")
-
-        endpoint = f"conversations/{conversation_id}/name"
-
-        payload = {"user": user, "auto_generate": auto_generate}
-
-        if name:
-            payload["name"] = name
-
-        return self.post(endpoint, json_data=payload)
-
-    def audio_to_text(self, file_path: str, user: str) -> Dict[str, Any]:
-        """
-        语音转文字。
-
-        Args:
-            file_path (str): 语音文件路径，支持格式：['mp3', 'mp4', 'mpeg', 'mpga', 'm4a', 'wav', 'webm']
-            user (str): 用户标识
-
-        Returns:
-            Dict[str, Any]: 转换结果，包含文字内容
-
-        Raises:
-            FileNotFoundError: 当文件不存在时
-            ValueError: 当文件格式不支持时
-            requests.HTTPError: 当API请求失败时
-        """
-        if not os.path.exists(file_path):
-            raise FileNotFoundError(f"File not found: {file_path}")
-
-        # 检查文件类型
-        supported_extensions = ["mp3", "mp4", "mpeg", "mpga", "m4a", "wav", "webm"]
-        file_extension = os.path.splitext(file_path)[1].lower().replace(".", "")
-
-        if file_extension not in supported_extensions:
-            raise ValueError(
-                f"Unsupported file type. Supported types: {supported_extensions}"
-            )
-
-        with open(file_path, "rb") as file:
-            files = {"file": file}
-            data = {"user": user}
-
-            url = os.path.join(self.base_url, "audio-to-text")
-
-            headers = self._get_headers()
-            # 移除Content-Type，让requests自动设置multipart/form-data
-            headers.pop("Content-Type", None)
-
-            response = self._request(
-                "POST", "audio-to-text", headers=headers, files=files, data=data
-            )
-            return response.json()
-
-    def audio_to_text_obj(
-        self, file_obj: BinaryIO, filename: str, user: str
-    ) -> Dict[str, Any]:
-        """
-        使用文件对象进行语音转文字。
-
-        Args:
-            file_obj (BinaryIO): 语音文件对象
-            filename (str): 文件名，用于确定文件类型
-            user (str): 用户标识
-
-        Returns:
-            Dict[str, Any]: 转换结果，包含文字内容
-
-        Raises:
-            ValueError: 当文件格式不支持时
-            requests.HTTPError: 当API请求失败时
-        """
-        # 检查文件类型
-        supported_extensions = ["mp3", "mp4", "mpeg", "mpga", "m4a", "wav", "webm"]
-        file_extension = os.path.splitext(filename)[1].lower().replace(".", "")
-
-        if file_extension not in supported_extensions:
-            raise ValueError(
-                f"Unsupported file type. Supported types: {supported_extensions}"
-            )
-
-        files = {"file": (filename, file_obj)}
-        data = {"user": user}
-
-        headers = self._get_headers()
-        # 移除Content-Type，让requests自动设置multipart/form-data
-        headers.pop("Content-Type", None)
-
-        response = self._request(
-            "POST", "audio-to-text", headers=headers, files=files, data=data
-        )
-        return response.json()
-
-    def text_to_audio(
-        self,
-        user: str,
-        message_id: str = None,
-        text: str = None,
-    ) -> Dict[str, Any]:
-        """
-        文字转语音。
-
-        Args:
-            user (str): 用户标识
-            message_id (str, optional): Dify生成的文本消息ID，如果提供，系统会自动查找相应的内容直接合成语音。默认为None
-            text (str, optional): 语音生成内容，如果没有传message_id，则使用此字段内容。默认为None
-
-        Returns:
-            Dict[str, Any]: 转换结果，包含音频数据
-
-        Raises:
-            ValueError: 当必要参数缺失时
-            requests.HTTPError: 当API请求失败时
-        """
-        if not message_id and not text:
-            raise ValueError("Either message_id or text must be provided")
-
-        endpoint = "text-to-audio"
-
-        payload = {"user": user}
-
-        if message_id:
-            payload["message_id"] = message_id
-
-        if text:
-            payload["text"] = text
-
-        return self.post(endpoint, json_data=payload)
-
-    def upload_file(self, file_path: str, user: str) -> Dict[str, Any]:
-        """
-        上传文件（目前仅支持图片）到Dify API，可用于图文多模态理解。
-
-        Args:
-            file_path (str): 要上传的文件路径，支持png, jpg, jpeg, webp, gif格式
-            user (str): 用户标识
-
-        Returns:
-            Dict[str, Any]: 上传文件的响应数据
-
-        Raises:
-            FileNotFoundError: 当文件不存在时
-            ValueError: 当文件格式不支持时
-            requests.HTTPError: 当API请求失败时
-        """
-        if not os.path.exists(file_path):
-            raise FileNotFoundError(f"File not found: {file_path}")
-
-        # 检查文件类型
-        supported_extensions = ["png", "jpg", "jpeg", "webp", "gif"]
-        file_extension = os.path.splitext(file_path)[1].lower().replace(".", "")
-
-        if file_extension not in supported_extensions:
-            raise ValueError(
-                f"Unsupported file type. Supported types: {supported_extensions}"
-            )
-
-        with open(file_path, "rb") as file:
-            files = {"file": file}
-            data = {"user": user}
-
-            headers = self._get_headers()
-            # 移除Content-Type，让requests自动设置multipart/form-data
-            headers.pop("Content-Type", None)
-
-            response = self._request(
-                "POST", "files/upload", headers=headers, files=files, data=data
-            )
-            return response.json()
-
-    def upload_file_obj(
-        self, file_obj: BinaryIO, filename: str, user: str
-    ) -> Dict[str, Any]:
-        """
-        使用文件对象上传文件（目前仅支持图片）到Dify API。
-
-        Args:
-            file_obj (BinaryIO): 文件对象
-            filename (str): 文件名，用于确定文件类型
-            user (str): 用户标识
-
-        Returns:
-            Dict[str, Any]: 上传文件的响应数据
-
-        Raises:
-            ValueError: 当文件格式不支持时
-            requests.HTTPError: 当API请求失败时
-        """
-        # 检查文件类型
-        supported_extensions = ["png", "jpg", "jpeg", "webp", "gif"]
-        file_extension = os.path.splitext(filename)[1].lower().replace(".", "")
-
-        if file_extension not in supported_extensions:
-            raise ValueError(
-                f"Unsupported file type. Supported types: {supported_extensions}"
-            )
-
-        files = {"file": (filename, file_obj)}
-        data = {"user": user}
-
-        headers = self._get_headers()
-        # 移除Content-Type，让requests自动设置multipart/form-data
-        headers.pop("Content-Type", None)
-
-        response = self._request(
-            "POST", "files/upload", headers=headers, files=files, data=data
-        )
-        return response.json()
-
-    def get_app_info(self) -> Dict[str, Any]:
-        """
-        获取应用基本信息。
-
-        Returns:
-            Dict[str, Any]: 应用信息，包含名称、描述和标签
-
-        Raises:
-            requests.HTTPError: 当API请求失败时
-        """
-        return self.get("info")
-
-    def get_parameters(self) -> Dict[str, Any]:
-        """
-        获取应用参数，包括功能开关、输入参数名称、类型及默认值等。
-
-        Returns:
-            Dict[str, Any]: 应用参数配置
-
-        Raises:
-            requests.HTTPError: 当API请求失败时
-        """
-        return self.get("parameters")
 
     def get_meta(self) -> Dict[str, Any]:
         """