isa-model 0.3.2__tar.gz → 0.3.4__tar.gz

{isa_model-0.3.2 → isa_model-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isa_model
-Version: 0.3.2
+Version: 0.3.4
 Summary: Unified AI model serving framework
 Author: isA_Model Contributors
 Classifier: Development Status :: 3 - Alpha

{isa_model-0.3.2 → isa_model-0.3.4}/isa_model/inference/services/llm/llm_adapter.py

@@ -89,6 +89,33 @@ class LangChainMessageAdapter:
                     msg_dict["role"] = "user"
                 elif msg.type == "ai":
                     msg_dict["role"] = "assistant"
+                    # Handle tool calls if present in LangChain AI messages
+                    if hasattr(msg, 'tool_calls') and msg.tool_calls:
+                        tool_calls = []
+                        for tc in msg.tool_calls:
+                            if isinstance(tc, dict):
+                                # LangChain format: {"name": "func", "args": {...}, "id": "..."}
+                                tool_call = {
+                                    "id": tc.get("id", f"call_{len(tool_calls)}"),
+                                    "type": "function",
+                                    "function": {
+                                        "name": tc.get("name", "unknown"),
+                                        "arguments": json.dumps(tc.get("args", {}))
+                                    }
+                                }
+                            else:
+                                # Handle other tool call formats
+                                tool_call = {
+                                    "id": getattr(tc, 'id', f"call_{len(tool_calls)}"),
+                                    "type": "function",
+                                    "function": {
+                                        "name": getattr(tc, 'name', 'unknown'),
+                                        "arguments": json.dumps(getattr(tc, 'args', {}))
+                                    }
+                                }
+                            tool_calls.append(tool_call)
+                        
+                        msg_dict["tool_calls"] = tool_calls  # type: ignore
                 elif msg.type == "tool":
                     msg_dict["role"] = "tool"
                     if hasattr(msg, 'tool_call_id'):
@@ -218,6 +245,35 @@ class LangChainToolAdapter:
             return f"Error executing LangChain tool {tool.name}: {str(e)}"
 
 
+# ============= OpenAI 格式工具适配器 =============
+
+class DictToolAdapter:
+    """OpenAI 格式工具字典适配器"""
+    
+    def __init__(self):
+        self.adapter_name = "dict_tool"
+        self.priority = 9  # Higher priority than Python functions
+    
+    def can_handle(self, tool: Any) -> bool:
+        """检查是否是 OpenAI 格式的工具字典"""
+        return (isinstance(tool, dict) and 
+                tool.get("type") == "function" and
+                "function" in tool and
+                isinstance(tool["function"], dict) and
+                "name" in tool["function"])
+    
+    def to_openai_schema(self, tool: Any) -> Dict[str, Any]:
+        """工具已经是 OpenAI 格式，直接返回"""
+        return tool
+    
+    async def execute_tool(self, tool: Any, arguments: Dict[str, Any]) -> Any:
+        """执行 OpenAI 格式工具（通常需要外部执行器）"""
+        # 对于 OpenAI 格式的工具字典，我们无法直接执行
+        # 这种情况下返回一个指示，让调用方处理
+        tool_name = tool["function"]["name"]
+        return f"Error: Cannot execute dict tool {tool_name} directly. Requires external executor."
+
+
 # ============= Python 函数适配器 =============
 
 class PythonFunctionAdapter:
@@ -364,10 +420,11 @@ class AdapterManager:
             StandardMessageAdapter()  # 回退适配器
         ]
         
-        # 工具适配器
+        # 工具适配器（按优先级排序）
         self.tool_adapters = [
-            LangChainToolAdapter(),
-            PythonFunctionAdapter()
+            DictToolAdapter(),        # 最高优先级 - OpenAI格式工具
+            LangChainToolAdapter(),   # 中等优先级 - LangChain工具
+            PythonFunctionAdapter()   # 最低优先级 - Python函数
         ]
     
     def register_custom_adapter(self, adapter, adapter_type: str):

{isa_model-0.3.2 → isa_model-0.3.4}/isa_model.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: isa_model
-Version: 0.3.2
+Version: 0.3.4
 Summary: Unified AI model serving framework
 Author: isA_Model Contributors
 Classifier: Development Status :: 3 - Alpha

{isa_model-0.3.2 → isa_model-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "isa_model"
-version = "0.3.2"
+version = "0.3.4"
 description = "Unified AI model serving framework"
 authors = [{name = "isA_Model Contributors"}]
 readme = "README.md"