isa-model 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

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.dist-info → isa_model-0.3.4.dist-info}/METADATA

@@ -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.dist-info → isa_model-0.3.4.dist-info}/RECORD

@@ -43,7 +43,7 @@ isa_model/inference/services/embedding/ollama_embed_service.py,sha256=s6LPSh-D06
 isa_model/inference/services/embedding/openai_embed_service.py,sha256=cjAzmYXlY0XLgwemdlhhUVlDecgzFy2xn3DSycoYvdo,8474
 isa_model/inference/services/llm/__init__.py,sha256=C6t9w33j3Ap4oGcJal9-htifKe0rxwws_kC3F-_B_Ps,341
 isa_model/inference/services/llm/base_llm_service.py,sha256=SXxFhH2z1UYqt2ihiuursrKEjiiiC3vWCvRQVETsdVc,5238
-isa_model/inference/services/llm/llm_adapter.py,sha256=Zb9-M7lqnryOVN18U5zvpy67B-jlks2ZlhFU0gcIUDM,17201
+isa_model/inference/services/llm/llm_adapter.py,sha256=cxvvBpyhyrDxe9xIuEIjAwElAFkEZmGOWtM_wlyidcg,20159
 isa_model/inference/services/llm/ollama_llm_service.py,sha256=c5xAdbbicskbxhivIQUse-QiUbCElR_Bo88wIA3dZUI,10194
 isa_model/inference/services/llm/openai_llm_service.py,sha256=e5GmO4YpVUBImQvQTZ26UwiAmHkU1RPl_vIa1dNe_NM,8148
 isa_model/inference/services/llm/triton_llm_service.py,sha256=ZFo7JoZ799Nvyi8Cz1jfWOa6TUn0hDRJtBrotadMAd4,17673
@@ -85,7 +85,7 @@ isa_model/training/core/config.py,sha256=oqgKpBvtzrN6jwLIQYQ2707lH6nmjrktRiSxp9i
 isa_model/training/core/dataset.py,sha256=XCFsnf0NUMU1dJpdvo_CAMyvXB-9_RCUEiy8TU50e20,7802
 isa_model/training/core/trainer.py,sha256=h5TjqjdFr0Fsv5y4-0siy1KmOlqLfliVaUXybvuoeXU,26932
 isa_model/training/core/utils.py,sha256=Nik0M2ssfNbWqP6fKO0Kfyhzr_H6Q19ioxB-qCYbn5E,8387
-isa_model-0.3.2.dist-info/METADATA,sha256=nzfl95_XbhGMH8eXAqOBsAp4qU_3QTGBVhfunEi6eXQ,12226
-isa_model-0.3.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-isa_model-0.3.2.dist-info/top_level.txt,sha256=eHSy_Xb3kNkh2kK11mi1mZh0Wz91AQ5b8k2KFYO-rE8,10
-isa_model-0.3.2.dist-info/RECORD,,
+isa_model-0.3.4.dist-info/METADATA,sha256=CDkFSLl4Z0B44AmxdCZBdwP-fNiik5kPu1Vks0iP3bU,12226
+isa_model-0.3.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+isa_model-0.3.4.dist-info/top_level.txt,sha256=eHSy_Xb3kNkh2kK11mi1mZh0Wz91AQ5b8k2KFYO-rE8,10
+isa_model-0.3.4.dist-info/RECORD,,