isa-model 0.3.9__py3-none-any.whl → 0.4.0__py3-none-any.whl

isa_model/inference/services/llm/helpers/llm_adapter.py

@@ -427,15 +427,69 @@ class StandardMessageAdapter:
     
     def from_openai_format(self, response: Union[str, Any], original_input: Any) -> Any:
         """从 OpenAI 格式转换回原始格式"""
-        # Handle response objects with tool_calls (preserve message object for compatibility)
-        if hasattr(response, 'tool_calls') and response.tool_calls:
-            # For standard format, we preserve the message object for tool_calls access
-            # This handles both OpenAI and Ollama message objects
-            return response
-        else:
-            # Handle simple string response
+        # For consistency, always return a message object similar to LangChain
+        try:
+            from langchain_core.messages import AIMessage
+            
+            # Extract content
             content = response if isinstance(response, str) else getattr(response, 'content', str(response))
-            return content
+            
+            # Handle tool_calls if present
+            if hasattr(response, 'tool_calls') and response.tool_calls:
+                # Convert to LangChain format tool_calls
+                tool_calls = []
+                for tc in response.tool_calls:
+                    if hasattr(tc, 'function'):
+                        # OpenAI format: tc.function.name, tc.function.arguments
+                        try:
+                            import json
+                            args = json.loads(tc.function.arguments) if tc.function.arguments else {}
+                        except:
+                            args = {}
+                        
+                        tool_call = {
+                            "name": tc.function.name,
+                            "args": args,
+                            "id": getattr(tc, 'id', 'unknown'),
+                            "type": "tool_call"
+                        }
+                        tool_calls.append(tool_call)
+                
+                return AIMessage(content=content, tool_calls=tool_calls)
+            else:
+                return AIMessage(content=content)
+                
+        except ImportError:
+            # Fallback: create a simple message object
+            class SimpleAIMessage:
+                def __init__(self, content, tool_calls=None):
+                    self.content = content
+                    self.type = "ai"
+                    self.tool_calls = tool_calls or []
+            
+            # Handle tool_calls if present
+            if hasattr(response, 'tool_calls') and response.tool_calls:
+                tool_calls = []
+                for tc in response.tool_calls:
+                    if hasattr(tc, 'function'):
+                        try:
+                            import json
+                            args = json.loads(tc.function.arguments) if tc.function.arguments else {}
+                        except:
+                            args = {}
+                        
+                        tool_call = {
+                            "name": tc.function.name,
+                            "args": args,
+                            "id": getattr(tc, 'id', 'unknown'),
+                            "type": "tool_call"
+                        }
+                        tool_calls.append(tool_call)
+                
+                return SimpleAIMessage(content, tool_calls)
+            else:
+                content = response if isinstance(response, str) else getattr(response, 'content', str(response))
+                return SimpleAIMessage(content)
 
 
 # ============= 适配器管理器 =============
@@ -504,7 +558,7 @@ class AdapterManager:
         # 不应该到这里，因为有回退适配器
         return [{"role": "user", "content": str(input_data)}]
     
-    def format_response(self, response: str, original_input: Any) -> Any:
+    def format_response(self, response: Union[str, Any], original_input: Any) -> Any:
         """格式化响应"""
         for adapter in self.message_adapters:
             if adapter.can_handle(original_input):

isa_model/inference/services/llm/ollama_llm_service.py

@@ -143,7 +143,8 @@ class OllamaLLMService(BaseLLMService):
     async def chat(
         self,
         input_data: Union[str, List[Dict[str, str]], Any],
-        max_tokens: Optional[int] = None
+        max_tokens: Optional[int] = None,
+        show_reasoning: bool = False
     ) -> Dict[str, Any]:
         """
         Chat method that wraps ainvoke for compatibility with base class