bizyengine 1.2.50__py3-none-any.whl → 1.2.51__py3-none-any.whl

bizyengine/bizybot/models.py

@@ -0,0 +1,344 @@
+"""
+Data models for conversation management
+"""
+
+import json
+import uuid
+from dataclasses import dataclass, field
+from datetime import datetime
+from typing import Any, Dict, List, Optional
+
+
+class ConversationValidationError(Exception):
+    """对话验证错误"""
+
+    pass
+
+
+@dataclass
+class ToolCall:
+    """Represents a tool call from LLM"""
+
+    id: str
+    type: str  # Currently only "function"
+    function: "ToolFunction"
+    result: Optional[Dict[str, Any]] = None
+    error: Optional[str] = None
+
+    def to_dict(self) -> Dict[str, Any]:
+        """Convert to dictionary format"""
+        return {
+            "id": self.id,
+            "type": self.type,
+            "function": {
+                "name": self.function.name,
+                "arguments": self.function.arguments,
+            },
+        }
+
+
+@dataclass
+class ToolFunction:
+    """Represents a function call within a tool call"""
+
+    name: str
+    arguments: str  # JSON string format
+
+
+@dataclass
+class Message:
+    """Represents a conversation message"""
+
+    role: str  # "user", "assistant", "system", "tool"
+    content: Optional[str] = None
+    tool_calls: Optional[List[ToolCall]] = None
+    tool_call_id: Optional[str] = None
+    timestamp: datetime = field(default_factory=datetime.now)
+    reasoning_content: Optional[str] = None  # For reasoning models like deepseek-R1
+
+    def __post_init__(self):
+        """Validate message after initialization"""
+        if self.role not in ["user", "assistant", "system", "tool"]:
+            raise ValueError(f"Invalid role: {self.role}")
+
+        if self.role == "tool" and not self.tool_call_id:
+            raise ValueError("Tool messages must have a tool_call_id")
+
+        if self.role == "tool" and not self.content:
+            raise ValueError("Tool messages must have content")
+
+    def to_openai_format(self) -> Dict[str, Any]:
+        """Convert to OpenAI API format"""
+        msg = {"role": self.role}
+
+        # Only include content if it's not None
+        if self.content is not None:
+            msg["content"] = self.content
+
+        if self.tool_calls:
+            msg["tool_calls"] = [tc.to_dict() for tc in self.tool_calls]
+
+        if self.tool_call_id:
+            msg["tool_call_id"] = self.tool_call_id
+
+        # Note: reasoning_content is not included in OpenAI format
+        # as it's handled separately in the conversation flow
+
+        return msg
+
+
+@dataclass
+class Conversation:
+    """Represents a conversation with message history"""
+
+    id: str
+    messages: List[Message]
+    created_at: datetime
+    updated_at: datetime
+
+    def add_user_message(self, content: str) -> None:
+        """Add a user message to the conversation"""
+        message = Message(role="user", content=content)
+        self.messages.append(message)
+        self.updated_at = datetime.now()
+
+    def add_assistant_message(
+        self, content: str, tool_calls: Optional[List[ToolCall]] = None
+    ) -> None:
+        """Add an assistant message to the conversation"""
+        message = Message(role="assistant", content=content, tool_calls=tool_calls)
+        self.messages.append(message)
+        self.updated_at = datetime.now()
+
+    def add_tool_result(self, tool_call_id: str, result: Any) -> None:
+        """Add a tool result message to the conversation"""
+        # Handle different result types
+        if isinstance(result, str):
+            content = result
+        elif isinstance(result, dict):
+            # 如果是字典，尝试提取有用信息
+            content = str(result)
+        else:
+            content = str(result)
+
+        message = Message(role="tool", content=content, tool_call_id=tool_call_id)
+        self.messages.append(message)
+        self.updated_at = datetime.now()
+
+    def add_system_message(self, content: str) -> None:
+        """Add a system message to the conversation"""
+        message = Message(role="system", content=content)
+        self.messages.append(message)
+        self.updated_at = datetime.now()
+
+    def add_message(self, message: Message) -> None:
+        """Add a message to the conversation"""
+        self.messages.append(message)
+        self.updated_at = datetime.now()
+
+    def to_openai_format(self) -> List[Dict[str, Any]]:
+        """Convert conversation to OpenAI API format"""
+        return [msg.to_openai_format() for msg in self.messages]
+
+    def get_message_count(self) -> int:
+        """Get total number of messages"""
+        return len(self.messages)
+
+    def get_last_message(self) -> Optional[Message]:
+        """Get the last message in the conversation"""
+        return self.messages[-1] if self.messages else None
+
+    def get_messages_by_role(self, role: str) -> List[Message]:
+        """Get all messages with a specific role"""
+        return [msg for msg in self.messages if msg.role == role]
+
+    def get_recent_messages(self, count: int) -> List[Message]:
+        """Get the most recent N messages"""
+        return self.messages[-count:] if count > 0 else []
+
+    def clear_messages(self) -> None:
+        """Clear all messages from the conversation"""
+        self.messages.clear()
+        self.updated_at = datetime.now()
+
+    def has_tool_calls(self) -> bool:
+        """Check if the conversation has any pending tool calls"""
+        last_message = self.get_last_message()
+        return (
+            last_message
+            and last_message.role == "assistant"
+            and last_message.tool_calls is not None
+            and len(last_message.tool_calls) > 0
+        )
+
+    @classmethod
+    def from_openai_format(
+        cls,
+        conversation_history: List[Dict[str, Any]],
+        conversation_id: Optional[str] = None,
+    ) -> "Conversation":
+        """
+        从OpenAI格式的对话历史创建Conversation实例
+
+        Args:
+            conversation_history: OpenAI格式的消息列表
+            conversation_id: 可选的对话ID，如果不提供则生成新的
+
+        Returns:
+            Conversation实例
+
+        Raises:
+            ConversationValidationError: 如果消息格式无效
+        """
+        if conversation_id is None:
+            conversation_id = str(uuid.uuid4())
+
+        messages = []
+        current_time = datetime.now()
+
+        for i, msg_data in enumerate(conversation_history):
+            try:
+                message = cls._parse_message_from_dict(msg_data)
+                messages.append(message)
+            except Exception as e:
+                raise ConversationValidationError(
+                    f"Invalid message format at index {i}: {e}"
+                ) from e
+
+        return cls(
+            id=conversation_id,
+            messages=messages,
+            created_at=current_time,
+            updated_at=current_time,
+        )
+
+    @staticmethod
+    def _parse_message_from_dict(msg_data: Dict[str, Any]) -> Message:
+        """解析单个消息字典为Message对象"""
+
+        # 验证必需字段
+        if "role" not in msg_data:
+            raise ConversationValidationError("Message must have 'role' field")
+
+        role = msg_data["role"]
+        if role not in ["user", "assistant", "system", "tool"]:
+            raise ConversationValidationError(f"Invalid role: {role}")
+
+        content = msg_data.get("content")
+
+        # 解析工具调用（如果存在）
+        tool_calls = None
+        if "tool_calls" in msg_data and msg_data["tool_calls"]:
+            tool_calls = []
+            for tc_data in msg_data["tool_calls"]:
+                if not isinstance(tc_data, dict):
+                    raise ConversationValidationError(
+                        "Each tool_call must be a dictionary"
+                    )
+
+                if "id" not in tc_data or "function" not in tc_data:
+                    raise ConversationValidationError(
+                        "tool_call must have 'id' and 'function' fields"
+                    )
+
+                function = tc_data["function"]
+                if "name" not in function or "arguments" not in function:
+                    raise ConversationValidationError(
+                        "function must have 'name' and 'arguments' fields"
+                    )
+
+                # 验证arguments是否为有效JSON
+                try:
+                    json.loads(function["arguments"])
+                except json.JSONDecodeError as e:
+                    raise ConversationValidationError(
+                        f"Invalid JSON in function arguments: {e}"
+                    )
+
+                tool_call = ToolCall(
+                    id=str(tc_data["id"]),
+                    type=tc_data.get("type", "function"),
+                    function=ToolFunction(
+                        name=str(function["name"]), arguments=str(function["arguments"])
+                    ),
+                )
+                tool_calls.append(tool_call)
+
+        # 获取工具调用ID（用于tool角色消息）
+        tool_call_id = msg_data.get("tool_call_id")
+        if role == "tool" and not tool_call_id:
+            raise ConversationValidationError("Tool messages must have a tool_call_id")
+
+        # 处理推理内容（如果存在）
+        reasoning_content = msg_data.get("reasoning_content")
+
+        return Message(
+            role=role,
+            content=content,
+            tool_calls=tool_calls,
+            tool_call_id=str(tool_call_id) if tool_call_id else None,
+            reasoning_content=reasoning_content,
+        )
+
+    @staticmethod
+    def validate_conversation_history(
+        conversation_history: List[Dict[str, Any]],
+    ) -> bool:
+        """验证对话历史格式是否正确"""
+        try:
+            if not isinstance(conversation_history, list):
+                return False
+
+            for msg_data in conversation_history:
+                # 基本字段验证
+                if not isinstance(msg_data, dict):
+                    return False
+
+                if "role" not in msg_data:
+                    return False
+
+                role = msg_data["role"]
+                if role not in ["user", "assistant", "system", "tool"]:
+                    return False
+
+                # 角色特定验证
+                if role == "tool":
+                    if "tool_call_id" not in msg_data or not msg_data["tool_call_id"]:
+                        return False
+                    if "content" not in msg_data:
+                        return False
+
+                # 工具调用格式验证
+                if "tool_calls" in msg_data and msg_data["tool_calls"]:
+                    tool_calls = msg_data["tool_calls"]
+                    if not isinstance(tool_calls, list):
+                        return False
+
+                    for tc in tool_calls:
+                        if not isinstance(tc, dict):
+                            return False
+                        if "id" not in tc or "function" not in tc:
+                            return False
+                        if (
+                            "name" not in tc["function"]
+                            or "arguments" not in tc["function"]
+                        ):
+                            return False
+
+                        # 验证arguments是否为有效JSON
+                        try:
+                            json.loads(tc["function"]["arguments"])
+                        except json.JSONDecodeError:
+                            return False
+
+            return True
+        except Exception:
+            return False
+
+    def add_user_message_from_request(self, message: str) -> None:
+        """从请求中添加用户消息"""
+        self.add_user_message(message)
+
+    def get_openai_messages_for_llm(self) -> List[Dict[str, Any]]:
+        """获取用于LLM调用的OpenAI格式消息"""
+        return self.to_openai_format()

bizyengine/core/common/client.py

@@ -107,7 +107,6 @@ def get_api_key() -> str:
             if validate_api_key(BIZYAIR_API_KEY):
                 api_key_state.is_valid = True
                 api_key_state.current_api_key = BIZYAIR_API_KEY
-                logging.info("API key set successfully")
     except Exception as e:
         logging.error(str(e))
         raise ValueError(str(e))

bizyengine/version.txt

@@ -1 +1 @@
-1.2.50
+1.2.51

{bizyengine-1.2.50.dist-info → bizyengine-1.2.51.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizyengine
-Version: 1.2.50
+Version: 1.2.51
 Summary: [a/BizyAir](https://github.com/siliconflow/BizyAir) Comfy Nodes that can run in any environment.
 Author-email: SiliconFlow <yaochi@siliconflow.cn>
 Project-URL: Repository, https://github.com/siliconflow/BizyAir
@@ -13,6 +13,7 @@ Requires-Dist: requests
 Requires-Dist: inputimeout
 Requires-Dist: openai>=1.77.0
 Requires-Dist: pycryptodome
+Requires-Dist: mcp>=1.8.0
 Requires-Dist: bizyairsdk>=0.0.4
 
 ## BizyEngine

{bizyengine-1.2.50.dist-info → bizyengine-1.2.51.dist-info}/RECORD

@@ -1,13 +1,13 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=zGrmrSrzHGOEzO23IqIfRL3venxRA-IUVh6N6ZhB4X8,7
+bizyengine/version.txt,sha256=AvxtajeVm2SVm3pKmMIouv9qTZ-GSKH6a35TmY6KQVo,7
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=Z7G5IjaEqSJkF6nLLw2R3bpgBAOi5ClQiUbel6NMXmE,43932
-bizyengine/bizy_server/errno.py,sha256=1UiFmE2U7r7hCHgsw4-p_YL0VCmTJc9NyYDEbhkanaY,16336
+bizyengine/bizy_server/errno.py,sha256=RIyvegX3lzpx_1L1q2XVvu3on0kvYgKiUQ8U3ZtyF68,16823
 bizyengine/bizy_server/error_handler.py,sha256=MGrfO1AEqbfEgMWPL8B6Ypew_zHiQAdYGlhN9bZohrY,167
 bizyengine/bizy_server/execution.py,sha256=ayaEf6eGJKQsVZV-1_UlGlvwwmlH7FEek31Uq-MbUjA,1644
 bizyengine/bizy_server/profile.py,sha256=f4juAzJ73gCm0AhagYpt9WnG8HEI6xze_U96-omBLqU,3044
 bizyengine/bizy_server/resp.py,sha256=iOFT5Ud7VJBP2uqkojJIgc3y2ifMjjEXoj0ewneL9lc,710
-bizyengine/bizy_server/server.py,sha256=7OWEA8GMrqpg4jxCvakX5zR2JukEOhKbqPRefYo6t8c,59707
+bizyengine/bizy_server/server.py,sha256=isOzHDk2kD6WjdlemeOA7j_xLnZ2vat_NvE1I0bsOFw,57490
 bizyengine/bizy_server/stream_response.py,sha256=H2XHqlVRtQMhgdztAuG7l8-iV_Pm42u2x6WJ0gNVIW0,9654
 bizyengine/bizy_server/utils.py,sha256=Kkn-AATZcdaDhg8Rg_EJW6aKqkyiSE2EYmuyOhUwXso,3863
 bizyengine/bizyair_extras/__init__.py,sha256=lsGuqMnFX-WSOUszSQ5NB6FnKcHlhhO1WG9iiywWQug,1092
@@ -46,6 +46,17 @@ bizyengine/bizyair_extras/nodes_ipadapter_plus/__init__.py,sha256=ECKATm_EKi_4G4
 bizyengine/bizyair_extras/nodes_ipadapter_plus/nodes_ipadapter_plus.py,sha256=lOKRem7oiPs8ZkA_p68HxagAgiCSvn3Rk-L4fSXIjyE,54846
 bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py,sha256=HsCCCphW8q0SrWEiFlZKK_W2lQr1T0UJIJL7gEn37ME,3729
 bizyengine/bizyair_extras/oauth_callback/main.py,sha256=KQOZWor3kyNx8xvUNHYNMoHfCF9g_ht13_iPk4K_5YM,3633
+bizyengine/bizybot/__init__.py,sha256=NINN_7QECKQwtAwKPBTrrSiAK6KbxaZCkIvJ-e1J1xk,262
+bizyengine/bizybot/client.py,sha256=PWdcjslMaW4xmNaAq3TwRGV8twg9yPEfDNyfuZzpCyY,26029
+bizyengine/bizybot/config.py,sha256=F2uN-2z-VGDtwe0aK8mDQ6-2wzRzy6EI0gH7i8UkoPU,4398
+bizyengine/bizybot/coordinator.py,sha256=qFqZIwthJo1EZLgelMrW5PuwuPqCx2eIPxcQxLmW3NU,22038
+bizyengine/bizybot/exceptions.py,sha256=8Mw7Y10LWdjImSkPXvCgGJqKFinCCYFgj7oRO72cNb0,4067
+bizyengine/bizybot/models.py,sha256=oHfdvqcmjF2WsqbttyqHVarndrNBoPylENirBC7u6zY,11760
+bizyengine/bizybot/mcp/__init__.py,sha256=qWrcVAgX6B88qqRwVXQoTcybuE1lcBN9mURmPyL0o1U,27
+bizyengine/bizybot/mcp/manager.py,sha256=uPpqtJpCbr5u9Ey5qtDHKX2mt_ifNzD50kczITCE4GE,19205
+bizyengine/bizybot/mcp/models.py,sha256=Ybo7QK4T32YpYwcUs88d5Hi39pz7yEu7qIeaQ5BkX4M,998
+bizyengine/bizybot/mcp/registry.py,sha256=jUqny2Km9EcvHmpBZl06HqNxWm0PQT6TZS8EOiiBVAw,4855
+bizyengine/bizybot/mcp/routing.py,sha256=COgeao02y-oIiHpcXEZGl2cccgcR1u343BEcJ95sCJw,13780
 bizyengine/core/__init__.py,sha256=EV9ZtTwOHC0S_eNvCu-tltIydfxfMsH59LbgVX4e_1c,359
 bizyengine/core/data_types.py,sha256=2f7QqqZvhKmXw3kZV1AvXuPTda34b4wXQE9tyO8nUSM,1595
 bizyengine/core/image_utils.py,sha256=vJt42FcEDD8-fQumuogZM1XXwgYseSQ79_9Qzu9YTQk,409
@@ -60,7 +71,7 @@ bizyengine/core/commands/servers/model_server.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 bizyengine/core/commands/servers/prompt_server.py,sha256=e8JhtKRM8nw0kQwe2Ofl-zQtiVqQdbbWRxOqkFmSclM,10873
 bizyengine/core/common/__init__.py,sha256=GicZw6YeAZk1PsKmFDt9dm1F75zPUlpia9Q_ki5vW1Y,179
 bizyengine/core/common/caching.py,sha256=hRNsSrfNxgc1zzvBzLVjMY0iMkKqA0TBCr-iYhEpzik,6946
-bizyengine/core/common/client.py,sha256=KzKEzsiiY4RXT3kFZ84oBbdpLJopmV_BjHAaRe03qlo,10682
+bizyengine/core/common/client.py,sha256=gk8hfw8sjbJJM7zgz5-54YiC25PHibuT1UtgKFTAhO4,10625
 bizyengine/core/common/env_var.py,sha256=1EAW3gOXY2bKouCqrGa583vTJRdDasQ1IsFTnzDg7Dk,3450
 bizyengine/core/common/utils.py,sha256=bm-XmSPy83AyjD0v5EfWp6jiO6_5p7rkZ_HQAuVmgmo,3086
 bizyengine/core/configs/conf.py,sha256=D_UWG9SSJnK5EhbrfNFryJQ8hUwwdvhOGlq1TielwpI,3830
@@ -80,7 +91,7 @@ bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,
 bizyengine/misc/segment_anything.py,sha256=wNKYwlYPMszfwj23524geFZJjZaG4eye65SGaUnh77I,8941
 bizyengine/misc/supernode.py,sha256=STN9gaxfTSErH8OiHeZa47d8z-G9S0I7fXuJvHQOBFM,4532
 bizyengine/misc/utils.py,sha256=CKduySGSMNGlJMImHyZmN-giABY5VUaB88f6Kq-HAV0,6831
-bizyengine-1.2.50.dist-info/METADATA,sha256=oDy6bxpEMjEUlrLgBDEdsI-Rz1pW7SM_lDl3b5HbNJk,708
-bizyengine-1.2.50.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.50.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.50.dist-info/RECORD,,
+bizyengine-1.2.51.dist-info/METADATA,sha256=ubIks74xsnM0PG1697BjTcGvw-LxY5gaG-btFI8-cUk,734
+bizyengine-1.2.51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.51.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.51.dist-info/RECORD,,