agentle 0.9.35__py3-none-any.whl → 0.9.36__py3-none-any.whl

agentle/generations/providers/openrouter/_adapters/agentle_message_to_openrouter_message_adapter.py

@@ -29,14 +29,17 @@ from agentle.generations.providers.openrouter._types import (
     OpenRouterMessage,
     OpenRouterSystemMessage,
     OpenRouterToolCall,
+    OpenRouterToolMessage,
     OpenRouterUserMessage,
 )
+from agentle.generations.tools.tool_execution_result import ToolExecutionResult
+import json
 
 
 class AgentleMessageToOpenRouterMessageAdapter(
     Adapter[
         AssistantMessage | DeveloperMessage | UserMessage,
-        OpenRouterMessage,
+        OpenRouterMessage | list[OpenRouterMessage],
     ]
 ):
     """
@@ -44,15 +47,18 @@ class AgentleMessageToOpenRouterMessageAdapter(
 
     Handles conversion of:
     - DeveloperMessage -> OpenRouterSystemMessage
-    - UserMessage -> OpenRouterUserMessage
+    - UserMessage -> OpenRouterUserMessage (or OpenRouterToolMessage if contains tool results)
     - AssistantMessage -> OpenRouterAssistantMessage (with tool calls)
+
+    Note: When a message contains ToolExecutionResult parts, they are extracted
+    and returned as separate OpenRouterToolMessage objects.
     """
 
     @override
     def adapt(
         self,
         _f: AssistantMessage | DeveloperMessage | UserMessage,
-    ) -> OpenRouterMessage:
+    ) -> OpenRouterMessage | list[OpenRouterMessage]:
         """
         Convert an Agentle message to OpenRouter format.
 
@@ -60,7 +66,9 @@ class AgentleMessageToOpenRouterMessageAdapter(
             _f: The Agentle message to convert.
 
         Returns:
-            The corresponding OpenRouter message.
+            The corresponding OpenRouter message(s). Returns a list when the message
+            contains ToolExecutionResult parts that need to be split into separate
+            tool messages.
         """
         message = _f
         part_adapter = AgentlePartToOpenRouterPartAdapter()
@@ -76,12 +84,28 @@ class AgentleMessageToOpenRouterMessageAdapter(
                 )
 
             case UserMessage():
+                # Check if this message contains tool execution results
+                tool_results = [
+                    p for p in message.parts if isinstance(p, ToolExecutionResult)
+                ]
+
+                if tool_results:
+                    # Convert each tool result to a separate tool message
+                    return [
+                        OpenRouterToolMessage(
+                            role="tool",
+                            tool_call_id=result.suggestion.id,
+                            content=self._serialize_tool_result(result.result),
+                        )
+                        for result in tool_results
+                    ]
+
                 # User messages can have multimodal content
-                # Filter out non-content parts (like tool execution suggestions)
+                # Filter out non-content parts (like tool execution suggestions and results)
                 content_parts = [
                     p
                     for p in message.parts
-                    if not isinstance(p, ToolExecutionSuggestion)
+                    if not isinstance(p, (ToolExecutionSuggestion, ToolExecutionResult))
                 ]
 
                 # If only text parts, concatenate into a string
@@ -102,6 +126,69 @@ class AgentleMessageToOpenRouterMessageAdapter(
                 )
 
             case AssistantMessage():
+                # Check if this message contains tool execution results
+                tool_results = [
+                    p for p in message.parts if isinstance(p, ToolExecutionResult)
+                ]
+
+                if tool_results:
+                    # If assistant message has tool results, we need to split it
+                    # First, create the assistant message with tool calls (if any)
+                    messages: list[OpenRouterMessage] = []
+
+                    # Separate text content from tool calls
+                    text_parts = [p for p in message.parts if isinstance(p, TextPart)]
+                    tool_suggestions = [
+                        p
+                        for p in message.parts
+                        if isinstance(p, ToolExecutionSuggestion)
+                    ]
+
+                    # Only create assistant message if there's content or tool calls
+                    if text_parts or tool_suggestions:
+                        content = (
+                            "".join(str(p) for p in text_parts) if text_parts else None
+                        )
+
+                        tool_calls: list[OpenRouterToolCall] = [
+                            OpenRouterToolCall(
+                                id=suggestion.id,
+                                type="function",
+                                function={
+                                    "name": suggestion.tool_name,
+                                    "arguments": self._serialize_tool_arguments(
+                                        suggestion.args
+                                    ),
+                                },
+                            )
+                            for suggestion in tool_suggestions
+                        ]
+
+                        assistant_msg = OpenRouterAssistantMessage(
+                            role="assistant",
+                            content=content,
+                        )
+
+                        if tool_calls:
+                            assistant_msg["tool_calls"] = tool_calls
+
+                        if hasattr(message, "reasoning") and message.reasoning:
+                            assistant_msg["reasoning"] = message.reasoning
+
+                        messages.append(assistant_msg)
+
+                    # Add tool result messages
+                    for result in tool_results:
+                        messages.append(
+                            OpenRouterToolMessage(
+                                role="tool",
+                                tool_call_id=result.suggestion.id,
+                                content=self._serialize_tool_result(result.result),
+                            )
+                        )
+
+                    return messages
+
                 # Separate text content from tool calls
                 text_parts = [p for p in message.parts if isinstance(p, TextPart)]
                 tool_suggestions = [
@@ -118,7 +205,9 @@ class AgentleMessageToOpenRouterMessageAdapter(
                         type="function",
                         function={
                             "name": suggestion.tool_name,
-                            "arguments": str(suggestion.args),  # Should be JSON string
+                            "arguments": self._serialize_tool_arguments(
+                                suggestion.args
+                            ),
                         },
                     )
                     for suggestion in tool_suggestions
@@ -137,3 +226,34 @@ class AgentleMessageToOpenRouterMessageAdapter(
                     result["reasoning"] = message.reasoning
 
                 return result
+
+    def _serialize_tool_arguments(self, args: object) -> str:
+        """
+        Serialize tool arguments to JSON string.
+
+        Args:
+            args: The arguments to serialize.
+
+        Returns:
+            JSON string representation of the arguments.
+        """
+        if isinstance(args, str):
+            return args
+        return json.dumps(args)
+
+    def _serialize_tool_result(self, result: object) -> str:
+        """
+        Serialize tool execution result to string.
+
+        Args:
+            result: The result to serialize.
+
+        returns:
+            String representation of the result.
+        """
+        if isinstance(result, str):
+            return result
+        try:
+            return json.dumps(result)
+        except (TypeError, ValueError):
+            return str(result)

agentle/generations/providers/openrouter/openrouter_generation_provider.py

@@ -71,6 +71,7 @@ from agentle.generations.providers.openrouter._types import (
     OpenRouterFileParserPlugin,
     OpenRouterModelsResponse,
     OpenRouterModel,
+    OpenRouterMessage,
 )
 from agentle.generations.providers.openrouter.error_handler import (
     parse_and_raise_openrouter_error,
@@ -1247,10 +1248,14 @@ class OpenRouterGenerationProvider(GenerationProvider):
                     ),
                 )
 
-        # Convert messages
-        openrouter_messages = [
-            self.message_adapter.adapt(message) for message in messages_list
-        ]
+        # Convert messages - adapter may return single message or list of messages
+        openrouter_messages: list[OpenRouterMessage] = []
+        for message in messages_list:
+            adapted = self.message_adapter.adapt(message)
+            if isinstance(adapted, list):
+                openrouter_messages.extend(adapted)
+            else:
+                openrouter_messages.append(adapted)
 
         # Convert tools if provided
         openrouter_tools = (
@@ -1404,10 +1409,14 @@ class OpenRouterGenerationProvider(GenerationProvider):
         """
         _generation_config = self._normalize_generation_config(generation_config)
 
-        # Convert messages
-        openrouter_messages = [
-            self.message_adapter.adapt(message) for message in messages
-        ]
+        # Convert messages - adapter may return single message or list of messages
+        openrouter_messages: list[OpenRouterMessage] = []
+        for message in messages:
+            adapted = self.message_adapter.adapt(message)
+            if isinstance(adapted, list):
+                openrouter_messages.extend(adapted)
+            else:
+                openrouter_messages.append(adapted)
 
         # Convert tools if provided
         openrouter_tools = (

{agentle-0.9.35.dist-info → agentle-0.9.36.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentle
-Version: 0.9.35
+Version: 0.9.36
 Summary: ...
 Author-email: Arthur Brenno <64020210+arthurbrenno@users.noreply.github.com>
 License-File: LICENSE

{agentle-0.9.35.dist-info → agentle-0.9.36.dist-info}/RECORD

@@ -355,9 +355,9 @@ agentle/generations/providers/openrouter/__init__.py,sha256=47DEQpj8HBSa-_TImW-5
 agentle/generations/providers/openrouter/_types.py,sha256=VSAf1auxopTqhYwLHPWl_Q0-okWUfLKJa0JmWlAFuGg,10557
 agentle/generations/providers/openrouter/error_handler.py,sha256=4qm8v_cjdrB-59UXyCJLnIkOxzIfmsltZY8Q137-8Qg,8075
 agentle/generations/providers/openrouter/exceptions.py,sha256=o3_-tuyhewc0v5L2cAXH0f9ixHyyDgZbHq0KX5cUyPE,23179
-agentle/generations/providers/openrouter/openrouter_generation_provider.py,sha256=c2fQMdm-xFzIR2Z3ClAXiu6BzKfrnQQTpzX2jJQSNlI,66596
+agentle/generations/providers/openrouter/openrouter_generation_provider.py,sha256=XhXU_Ix10jmWl2SzRUHwsVSPRIWq6zHnia7IMaY6Yy4,67129
 agentle/generations/providers/openrouter/_adapters/__init__.py,sha256=orgZeEBqH4X_cpyOMiClvfZHY5cLwLNqhAYLqNjGIH4,1826
-agentle/generations/providers/openrouter/_adapters/agentle_message_to_openrouter_message_adapter.py,sha256=xqLumYTs__1UHD1_WwvHsHhzpEUKOAwMAj4pvo4BWMU,4957
+agentle/generations/providers/openrouter/_adapters/agentle_message_to_openrouter_message_adapter.py,sha256=IvaovVP0ChYEreysiDyqF8SXdXxnD_Y9MjA2raEoncw,9790
 agentle/generations/providers/openrouter/_adapters/agentle_part_to_openrouter_part_adapter.py,sha256=eIfwQQ9BokHy3FQ90GJ4i_J3L46XCiSBd1RWnzu-gAo,5967
 agentle/generations/providers/openrouter/_adapters/agentle_tool_to_openrouter_tool_adapter.py,sha256=41i3B6awaTNZsdQ46Oi1e10cuNhQqWL-KBJ5V_sHkiI,9547
 agentle/generations/providers/openrouter/_adapters/openrouter_message_to_generated_assistant_message_adapter.py,sha256=uB4TYc0fuwsoYdRnEnLhbwQISyaZ2Z2RWkPFGQXUc80,5295
@@ -1018,7 +1018,7 @@ agentle/web/actions/scroll.py,sha256=WqVVAORNDK3BL1oASZBPmXJYeSVkPgAOmWA8ibYO82I
 agentle/web/actions/viewport.py,sha256=KCwm88Pri19Qc6GLHC69HsRxmdJz1gEEAODfggC_fHo,287
 agentle/web/actions/wait.py,sha256=IKEywjf-KC4ni9Gkkv4wgc7bY-hk7HwD4F-OFWlyf2w,571
 agentle/web/actions/write_text.py,sha256=9mxfHcpKs_L7BsDnJvOYHQwG8M0GWe61SRJAsKk3xQ8,748
-agentle-0.9.35.dist-info/METADATA,sha256=x56kvGN-I-GmLRyrLOcTFTdrVFgpI4KV6tKbFRr_2Gc,86849
-agentle-0.9.35.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-agentle-0.9.35.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
-agentle-0.9.35.dist-info/RECORD,,
+agentle-0.9.36.dist-info/METADATA,sha256=hSUSyQ9vk4kdTs91_EW7Yb1tEi41flD2JGVlqugY4YA,86849
+agentle-0.9.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+agentle-0.9.36.dist-info/licenses/LICENSE,sha256=T90S9vqRS6qP-voULxAcvwEs558wRRo6dHuZrjgcOUI,1085
+agentle-0.9.36.dist-info/RECORD,,