mirascope 1.22.2__tar.gz → 1.22.3__tar.gz

{mirascope-1.22.2 → mirascope-1.22.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mirascope
-Version: 1.22.2
+Version: 1.22.3
 Summary: LLM abstractions that aren't obstructions
 Project-URL: Homepage, https://mirascope.com
 Project-URL: Documentation, https://mirascope.com/WELCOME

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/anthropic/_utils/_convert_message_params.py

@@ -92,6 +92,11 @@ def convert_message_params(
                         f"control parts. Part provided: {part.type}"
                     )
             converted_message_params.append(
-                {"role": message_param.role, "content": converted_content}
+                {
+                    "role": "user"
+                    if message_param.role == "tool"
+                    else message_param.role,
+                    "content": converted_content,
+                }
             )
     return converted_message_params

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/anthropic/_utils/_message_param_converter.py

@@ -107,48 +107,23 @@ class AnthropicMessageParamConverter(BaseMessageParamConverter):
                         )
 
                 elif block["type"] == "tool_use":
-                    if converted_content:
-                        converted.append(
-                            BaseMessageParam(
-                                role=message_param["role"], content=converted_content
-                            )
-                        )
-                        converted_content = []
-                    converted.append(
-                        BaseMessageParam(
-                            role="assistant",
-                            content=[
-                                ToolCallPart(
-                                    type="tool_call",
-                                    args=cast(dict, block["input"]),
-                                    id=block["id"],
-                                    name=block["name"],
-                                )
-                            ],
+                    converted_content.append(
+                        ToolCallPart(
+                            type="tool_call",
+                            args=cast(dict, block["input"]),
+                            id=block["id"],
+                            name=block["name"],
                         )
                     )
-
                 elif block["type"] == "tool_result":
-                    if converted_content:
-                        converted.append(
-                            BaseMessageParam(
-                                role=message_param["role"], content=converted_content
-                            )
-                        )
-                        converted_content = []
-                    converted.append(
-                        BaseMessageParam(
-                            role="user",
-                            content=[
-                                ToolResultPart(
-                                    type="tool_result",
-                                    content=block["content"]  # pyright: ignore [reportTypedDictNotRequiredAccess]
-                                    if isinstance(block["content"], str)  # pyright: ignore [reportTypedDictNotRequiredAccess]
-                                    else list(block["content"])[0]["text"],  # pyright: ignore [reportTypedDictNotRequiredAccess, reportGeneralTypeIssues]
-                                    id=block["tool_use_id"],
-                                    is_error=block.get("is_error", False),
-                                )
-                            ],
+                    converted_content.append(
+                        ToolResultPart(
+                            type="tool_result",
+                            content=block["content"]  # pyright: ignore [reportTypedDictNotRequiredAccess]
+                            if isinstance(block["content"], str)  # pyright: ignore [reportTypedDictNotRequiredAccess]
+                            else list(block["content"])[0]["text"],  # pyright: ignore [reportTypedDictNotRequiredAccess, reportGeneralTypeIssues]
+                            id=block["tool_use_id"],
+                            is_error=block.get("is_error", False),
                         )
                     )
                 else:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/anthropic/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 
 from anthropic.types import (
@@ -156,12 +157,12 @@ class AnthropicCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[AnthropicTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[AnthropicTool, str]]
     ) -> list[MessageParam]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/azure/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 from typing import cast
 
@@ -175,12 +176,12 @@ class AzureCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[AzureTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[AzureTool, str]]
     ) -> list[ToolMessage]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/base/call_response.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 import base64
 import json
 from abc import ABC, abstractmethod
-from collections.abc import Callable
+from collections.abc import Callable, Sequence
 from functools import cached_property, wraps
 from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar, cast
 
@@ -47,17 +47,17 @@ _BaseMessageParamConverterT = TypeVar(
 
 def transform_tool_outputs(
     fn: Callable[
-        [type[_BaseCallResponseT], list[tuple[_BaseToolT, str]]],
+        [type[_BaseCallResponseT], Sequence[tuple[_BaseToolT, str]]],
         list[_ToolMessageParamT],
     ],
 ) -> Callable[
-    [type[_BaseCallResponseT], list[tuple[_BaseToolT, JsonableType]]],
+    [type[_BaseCallResponseT], Sequence[tuple[_BaseToolT, JsonableType]]],
     list[_ToolMessageParamT],
 ]:
     @wraps(fn)
     def wrapper(
         cls: type[_BaseCallResponseT],
-        tools_and_outputs: list[tuple[_BaseToolT, JsonableType]],
+        tools_and_outputs: Sequence[tuple[_BaseToolT, JsonableType]],
     ) -> list[_ToolMessageParamT]:
         def recursive_serializer(value: JsonableType) -> BaseType:
             if isinstance(value, str):
@@ -290,12 +290,12 @@ class BaseCallResponse(
     @abstractmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[_BaseToolT, str]]
+        cls, tools_and_outputs: Sequence[tuple[_BaseToolT, str]]
     ) -> list[Any]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
         """
         ...

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/bedrock/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 from typing import cast
 
@@ -197,12 +198,12 @@ class BedrockCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[BedrockTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[BedrockTool, str]]
     ) -> list[ToolResultBlockMessageTypeDef]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/cohere/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 
 from cohere.types import (
@@ -164,12 +165,12 @@ class CohereCallResponse(
     @transform_tool_outputs
     def tool_message_params(
         cls,
-        tools_and_outputs: list[tuple[CohereTool, str]],
+        tools_and_outputs: Sequence[tuple[CohereTool, str]],
     ) -> list[ToolResult]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/gemini/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 
 from google.generativeai.protos import FunctionResponse
@@ -173,12 +174,12 @@ class GeminiCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[GeminiTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[GeminiTool, str]]
     ) -> list[ContentDict]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/google/_utils/_convert_message_params.py

@@ -10,6 +10,8 @@ from google.genai.types import (
     BlobDict,
     ContentDict,
     FileDataDict,
+    FunctionCallDict,
+    FunctionResponseDict,
     PartDict,
 )
 
@@ -59,6 +61,24 @@ async def _convert_message_params_async(
             for index, part in enumerate(content):
                 if part.type == "text":
                     converted_content.append(PartDict(text=part.text))
+                elif part.type == "tool_call":
+                    converted_content.append(
+                        PartDict(
+                            function_call=FunctionCallDict(
+                                name=part.name, args=part.args, id=part.id
+                            )
+                        )
+                    )
+                elif part.type == "tool_result":
+                    converted_content.append(
+                        PartDict(
+                            function_response=FunctionResponseDict(
+                                name=part.name,
+                                response={"content": part.content},
+                                id=part.id,
+                            )
+                        )
+                    )
                 elif part.type == "image":
                     _check_image_media_type(part.media_type)
                     blob_dict = BlobDict(data=part.image, mime_type=part.media_type)
@@ -136,7 +156,7 @@ async def _convert_message_params_async(
                             total_payload_size -= audio_size
                 else:
                     raise ValueError(
-                        "Google currently only supports text, image, and audio parts. "
+                        "Google currently only supports text, tool_call, tool_result, image, and audio parts. "
                         f"Part provided: {part.type}"
                     )
 

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/google/_utils/_message_param_converter.py

@@ -136,7 +136,7 @@ class GoogleMessageParamConverter(BaseMessageParamConverter):
                                     type="tool_result",
                                     name=part.function_response.name,  # pyright: ignore [reportArgumentType]
                                     content=part.function_response.response[  # pyright: ignore [reportArgumentType, reportOptionalSubscript]
-                                        "result"
+                                        "content"
                                     ],
                                     id=None,
                                     is_error=False,

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/google/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 
 from google.genai.types import (
@@ -155,13 +156,12 @@ class GoogleCallResponse(
 
     @cached_property
     def tools(self) -> list[GoogleTool] | None:
-        """Returns the list of tools for the 0th candidate's 0th content part."""
+        """Returns the list of tools for the response."""
         if self.tool_types is None:
             return None
 
         extracted_tools = []
-        for part in self.response.candidates[0].content.parts:  # pyright: ignore [reportReturnType, reportOptionalSubscript, reportOptionalMemberAccess, reportOptionalIterable]
-            tool_call = part.function_call
+        for tool_call in self.response.function_calls or []:
             for tool_type in self.tool_types:
                 if tool_call.name == tool_type._name():  # pyright: ignore [reportOptionalMemberAccess]
                     extracted_tools.append(tool_type.from_tool_call(tool_call))  # pyright: ignore [reportArgumentType]
@@ -184,12 +184,12 @@ class GoogleCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[GoogleTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[GoogleTool, str]]
     ) -> list[ContentDict]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/groq/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 from typing import cast
 
@@ -155,12 +156,12 @@ class GroqCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[GroqTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[GroqTool, str]]
     ) -> list[ChatCompletionToolMessageParam]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/mistral/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 from typing import Any, cast
 
@@ -163,12 +164,12 @@ class MistralCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[MistralTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[MistralTool, str]]
     ) -> list[ToolMessage]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/openai/call_response.py

@@ -4,6 +4,7 @@ usage docs: learn/calls.md#handling-responses
 """
 
 import base64
+from collections.abc import Sequence
 from functools import cached_property
 from typing import cast
 
@@ -196,12 +197,12 @@ class OpenAICallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[OpenAITool, str]]
+        cls, tools_and_outputs: Sequence[tuple[OpenAITool, str]]
     ) -> list[ChatCompletionToolMessageParam]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/core/vertex/call_response.py

@@ -3,6 +3,7 @@
 usage docs: learn/calls.md#handling-responses
 """
 
+from collections.abc import Sequence
 from functools import cached_property
 
 from google.cloud.aiplatform_v1beta1.types import GenerateContentResponse
@@ -163,12 +164,12 @@ class VertexCallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[VertexTool, str]]
+        cls, tools_and_outputs: Sequence[tuple[VertexTool, str]]
     ) -> list[Content]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
 
         Returns:

{mirascope-1.22.2 → mirascope-1.22.3}/mirascope/llm/call_response.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Sequence
 from functools import cached_property
 from typing import Any
 
@@ -26,7 +27,7 @@ from .tool import Tool
 class CallResponse(
     BaseCallResponse[
         Any,
-        Tool,
+        BaseTool,
         Any,
         BaseDynamicConfig[Any, Any, Any],
         BaseMessageParam,
@@ -42,11 +43,11 @@ class CallResponse(
     We rely on _response having `common_` methods or properties for normalization.
     """
 
-    _response: BaseCallResponse[Any, Tool, Any, Any, Any, Any, Any, Any]
+    _response: BaseCallResponse[Any, BaseTool, Any, Any, Any, Any, Any, Any]
 
     def __init__(
         self,
-        response: BaseCallResponse[Any, Tool, Any, Any, Any, Any, Any, Any],
+        response: BaseCallResponse[Any, BaseTool, Any, Any, Any, Any, Any, Any],
     ) -> None:
         super().__init__(
             **{
@@ -133,12 +134,12 @@ class CallResponse(
     @classmethod
     @transform_tool_outputs
     def tool_message_params(
-        cls, tools_and_outputs: list[tuple[Tool, str]]
+        cls, tools_and_outputs: Sequence[tuple[BaseTool, str]]
     ) -> list[BaseMessageParam]:
         """Returns the tool message parameters for tool call results.
 
         Args:
-            tools_and_outputs: The list of tools and their outputs from which the tool
+            tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
         """
 

{mirascope-1.22.2 → mirascope-1.22.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "mirascope"
-version = "1.22.2"
+version = "1.22.3"
 description = "LLM abstractions that aren't obstructions"
 readme = "README.md"
 license = { file = "LICENSE" }

{mirascope-1.22.2 → mirascope-1.22.3}/tests/core/anthropic/_utils/test_message_param_converter.py

@@ -317,17 +317,15 @@ def test_mixed_content_tool_calls():
         ],
     }
     results = AnthropicMessageParamConverter.from_provider([message_param])  # pyright: ignore [reportArgumentType]
-    assert len(results) == 2
+    assert len(results) == 1
     assert results == [
-        BaseMessageParam(
-            role="assistant", content=[TextPart(type="text", text="Hello")]
-        ),
         BaseMessageParam(
             role="assistant",
             content=[
+                TextPart(type="text", text="Hello"),
                 ToolCallPart(
                     type="tool_call", name="my_tool", args={"arg": 123}, id="tool_123"
-                )
+                ),
             ],
         ),
     ]
@@ -388,20 +386,20 @@ def test_tool_result_with_text():
         ],
     }
     results = AnthropicMessageParamConverter.from_provider([message_param])  # pyright: ignore [reportArgumentType]
-    assert len(results) == 2
+    assert len(results) == 1
 
     assert results == [
-        BaseMessageParam(role="user", content=[TextPart(type="text", text="Hello")]),
         BaseMessageParam(
             role="user",
             content=[
+                TextPart(type="text", text="Hello"),
                 ToolResultPart(
                     type="tool_result",
                     name="",
                     content="result",
                     id="tool_id",
                     is_error=False,
-                )
+                ),
             ],
         ),
     ]

{mirascope-1.22.2 → mirascope-1.22.3}/tests/core/base/test_call_response.py

@@ -2,6 +2,7 @@
 
 import base64
 import json
+from collections.abc import Sequence
 from typing import Any
 from unittest.mock import MagicMock, patch
 
@@ -110,7 +111,9 @@ class NestedModel(BaseModel):
 @pytest.fixture
 def process_tools():
     @transform_tool_outputs
-    def _process_tools(cls: Any, tools_and_outputs: list[tuple[Any, str]]) -> list[str]:
+    def _process_tools(
+        cls: Any, tools_and_outputs: Sequence[tuple[Any, str]]
+    ) -> list[str]:
         return [output for _, output in tools_and_outputs]
 
     return _process_tools

{mirascope-1.22.2 → mirascope-1.22.3}/tests/core/google/_utils/test_convert_message_params.py

@@ -14,6 +14,8 @@ from mirascope.core.base import (
     ImagePart,
     ImageURLPart,
     TextPart,
+    ToolCallPart,
+    ToolResultPart,
 )
 from mirascope.core.google._utils._convert_message_params import convert_message_params
 
@@ -97,7 +99,7 @@ def test_convert_message_params(mock_image_open: MagicMock) -> None:
 
     with pytest.raises(
         ValueError,
-        match="Google currently only supports text, image, and audio parts. Part provided: cache_control",
+        match="Google currently only supports text, tool_call, tool_result, image, and audio parts. Part provided: cache_control",
     ):
         convert_message_params(
             [
@@ -668,3 +670,73 @@ async def test_convert_message_in_running_loop():
     """Tests convert_message_params in an async context."""
     result = convert_message_params([], MagicMock())
     assert result == []
+
+
+def test_tool_call_parts() -> None:
+    """Test handling of tool_call parts."""
+    message = BaseMessageParam(
+        role="user",
+        content=[
+            TextPart(type="text", text="I need to search for something"),
+            ToolCallPart(
+                type="tool_call",
+                name="search",
+                args={"query": "python programming"},
+                id="tool-1234",
+            ),
+        ],
+    )
+
+    result = convert_message_params([message], MagicMock())
+
+    assert result == [
+        {
+            "parts": [
+                {"text": "I need to search for something"},
+                {
+                    "function_call": {
+                        "name": "search",
+                        "args": {"query": "python programming"},
+                        "id": "tool-1234",
+                    }
+                },
+            ],
+            "role": "user",
+        }
+    ]
+
+
+def test_tool_result_parts() -> None:
+    """Test handling of tool_result parts."""
+    message = BaseMessageParam(
+        role="assistant",
+        content=[
+            TextPart(type="text", text="Here are the search results:"),
+            ToolResultPart(
+                type="tool_result",
+                name="search",
+                content="Python is a programming language",
+                id="tool-1234",
+            ),
+        ],
+    )
+
+    result = convert_message_params([message], MagicMock())
+
+    assert result == [
+        {
+            "parts": [
+                {"text": "Here are the search results:"},
+                {
+                    "function_response": {
+                        "name": "search",
+                        "response": {
+                            "content": "Python is a programming language",
+                        },
+                        "id": "tool-1234",
+                    }
+                },
+            ],
+            "role": "model",
+        }
+    ]

{mirascope-1.22.2 → mirascope-1.22.3}/tests/core/google/_utils/test_message_param_converter.py

@@ -191,7 +191,7 @@ def test_inline_data_unknown_mime_type():
 def test_function_response():
     part = PartDict(
         function_response=FunctionResponseDict(
-            name="some_tool", response={"result": "value"}
+            name="some_tool", response={"content": "value"}
         )
     )
     results = GoogleMessageParamConverter.from_provider(