mirascope 1.24.0__tar.gz → 1.24.2__tar.gz

{mirascope-1.24.0 → mirascope-1.24.2}/PKG-INFO

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

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/core/azure/call_response_chunk.py

@@ -75,14 +75,14 @@ class AzureCallResponseChunk(
         return self.chunk.id
 
     @property
-    def usage(self) -> CompletionsUsage:
+    def usage(self) -> CompletionsUsage | None:
         """Returns the usage of the chat completion."""
         return self.chunk.usage
 
     @property
-    def input_tokens(self) -> int:
+    def input_tokens(self) -> int | None:
         """Returns the number of input tokens."""
-        return self.usage.prompt_tokens
+        return self.usage.prompt_tokens if self.usage else None
 
     @property
     def cached_tokens(self) -> int:
@@ -90,9 +90,9 @@ class AzureCallResponseChunk(
         return 0
 
     @property
-    def output_tokens(self) -> int:
+    def output_tokens(self) -> int | None:
         """Returns the number of output tokens."""
-        return self.usage.completion_tokens
+        return self.usage.completion_tokens if self.usage else None
 
     @property
     def cost_metadata(self) -> CostMetadata:

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/core/base/call_response.py

@@ -60,10 +60,8 @@ def transform_tool_outputs(
         tools_and_outputs: Sequence[tuple[_BaseToolT, JsonableType]],
     ) -> list[_ToolMessageParamT]:
         def recursive_serializer(value: JsonableType) -> BaseType:
-            if isinstance(value, str):
+            if isinstance(value, str | int | float | bool | None):
                 return value
-            if isinstance(value, int | float | bool):
-                return value  # Don't serialize primitives yet
             if isinstance(value, bytes):
                 return base64.b64encode(value).decode("utf-8")
             if isinstance(value, BaseModel):

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/core/base/tool.py

@@ -122,6 +122,15 @@ class BaseTool(BaseModel, ABC):
             if field not in {"tool_call", "delta"}
         }
 
+    @property
+    def id(self) -> str | None:
+        """The id of the tool."""
+        if tool_call := getattr(self, "tool_call", None):
+            # Expect tool_call has an id attribute.
+            # If not, we should override this method on the provider tool
+            return getattr(tool_call, "id", None)
+        return None
+
     @abstractmethod
     def call(self, *args: Any, **kwargs: Any) -> Any:  # noqa: ANN401
         """The method to call the tool."""

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/core/bedrock/_utils/_message_param_converter.py

@@ -100,25 +100,27 @@ class BedrockMessageParamConverter(BaseMessageParamConverter):
                     )
                 elif "toolUse" in block:
                     tool_use = block["toolUse"]
+
+                    tool_use_part = ToolCallPart(
+                        type="tool_call",
+                        name=tool_use["name"],
+                        id=tool_use["toolUseId"],
+                        args=tool_use["input"],
+                    )
                     if converted_content:
+                        converted_content.append(tool_use_part)
                         converted.append(
                             BaseMessageParam(
                                 role=message_param["role"], content=converted_content
                             )
                         )
                         converted_content = []
+                        continue
 
                     converted.append(
                         BaseMessageParam(
                             role="assistant",
-                            content=[
-                                ToolCallPart(
-                                    type="tool_call",
-                                    name=tool_use["name"],
-                                    id=tool_use["toolUseId"],
-                                    args=tool_use["input"],
-                                )
-                            ],
+                            content=[tool_use_part],
                         )
                     )
                 elif "toolResult" in block:
@@ -137,7 +139,6 @@ class BedrockMessageParamConverter(BaseMessageParamConverter):
                                 ToolResultPart(
                                     type="tool_result",
                                     id=tool_result["toolUseId"],
-                                    name=tool_result["name"],  # pyright: ignore [reportGeneralTypeIssues]
                                     content=tool_result["content"]
                                     if isinstance(tool_result["content"], str)
                                     else tool_result["content"][0]["text"],  # pyright: ignore [reportTypedDictNotRequiredAccess]

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/core/bedrock/call_response.py

@@ -219,7 +219,6 @@ class BedrockCallResponse(
                             "toolResult": {
                                 "content": [{"text": output}],
                                 "toolUseId": tool.tool_call["toolUse"]["toolUseId"],  # pyright: ignore [reportOptionalSubscript]
-                                "name": tool._name(),
                             }
                         },
                     )

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/core/bedrock/tool.py

@@ -56,6 +56,10 @@ class BedrockTool(BaseTool):
 
     tool_call: SkipJsonSchema[ToolUseBlockContentTypeDef]
 
+    @property
+    def id(self) -> str | None:
+        return self.tool_call["toolUse"]["toolUseId"]
+
     @classmethod
     def tool_schema(cls) -> ToolTypeDef:
         """Constructs a JSON Schema tool schema from the `BaseModel` schema defined.

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/llm/call_response.py

@@ -142,15 +142,6 @@ class CallResponse(
             tools_and_outputs: The sequence of tools and their outputs from which the tool
                 message parameters should be constructed.
         """
-
-        def _get_tool_call_id(_tool: BaseTool) -> str | None:
-            """Get the tool call ID."""
-            if tool_call := getattr(_tool, "tool_call", None):
-                # Expect tool_call has an id attribute.
-                # If not, we should implement a method to get the id on the provider tool
-                return getattr(tool_call, "id", None)
-            return None
-
         return [
             BaseMessageParam(
                 role="tool",
@@ -159,7 +150,7 @@ class CallResponse(
                         type="tool_result",
                         name=tool._name(),
                         content=output,
-                        id=_get_tool_call_id(tool),
+                        id=tool.id,
                     )
                 ],
             )

{mirascope-1.24.0 → mirascope-1.24.2}/mirascope/mcp/_utils.py

@@ -22,6 +22,8 @@ from pydantic import BaseModel, ConfigDict, Field, create_model
 from ..core import BaseMessageParam, BaseTool
 from ..core.base import AudioPart, DocumentPart, ImagePart
 
+_UNSET = object()
+
 
 def create_tool_call(
     name: str,
@@ -38,7 +40,8 @@ def create_tool_call(
     """
 
     async def call(self: BaseTool) -> list[str | ImageContent | EmbeddedResource]:
-        result = await call_tool(name, self.args)  # pyright: ignore [reportOptionalCall]
+        args = {key: value for key, value in self.args.items() if value is not _UNSET}
+        result = await call_tool(name, args if args else None)
         if result.isError:
             raise RuntimeError(f"MCP Server returned error: {self._name()}")
         return [
@@ -225,15 +228,18 @@ def create_tool_from_mcp_tool(tool: MCPTool) -> type[BaseTool]:
     fields = {}
     for field_name, field_schema in properties.items():
         field_type = json_schema_to_python_type(field_schema)
+        if field_schema.get("nullable", False):
+            field_type = field_type | None
 
-        if field_name in required_fields:
-            default = Field(..., description=field_schema.get("description"))
-            annotation = field_type
-        else:
-            default = Field(None, description=field_schema.get("description"))
-            annotation = field_type | None
+        field_info = {
+            "default": field_schema.get(
+                "default", ... if field_name in required_fields else _UNSET
+            )
+        }
+        if description := field_schema.get("description", ""):
+            field_info["description"] = description
 
-        fields[field_name] = (annotation, default)
+        fields[field_name] = (field_type, Field(**field_info))
 
     return create_model(snake_to_pascal(tool.name), __base__=BaseTool, **fields)
 

{mirascope-1.24.0 → mirascope-1.24.2}/pyproject.toml

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

{mirascope-1.24.0 → mirascope-1.24.2}/tests/core/bedrock/_utils/test_message_param_converter.py

@@ -163,7 +163,6 @@ def test_tool_result():
                 "toolResult": {
                     "toolUseId": "tool_123",
                     "content": [{"text": "result"}],
-                    "name": "tool_123",
                 }
             }
         ],
@@ -175,7 +174,6 @@ def test_tool_result():
             content=[
                 ToolResultPart(
                     type="tool_result",
-                    name="tool_123",
                     content="result",
                     id="tool_123",
                     is_error=False,
@@ -187,7 +185,7 @@ def test_tool_result():
 
 def test_tool_use_with_text():
     message_param = {
-        "role": "user",
+        "role": "assistant",
         "content": [
             {"text": "Hello"},
             {
@@ -201,16 +199,16 @@ def test_tool_use_with_text():
     }
     results = BedrockMessageParamConverter.from_provider([message_param])  # pyright: ignore [reportArgumentType]
     assert results == [
-        BaseMessageParam(role="user", content=[TextPart(type="text", text="Hello")]),
         BaseMessageParam(
             role="assistant",
             content=[
+                TextPart(type="text", text="Hello"),
                 ToolCallPart(
                     type="tool_call",
                     name="tool_name",
                     args={"arg": "val"},
                     id="tool_id",
-                )
+                ),
             ],
         ),
     ]
@@ -225,7 +223,6 @@ def test_tool_result_with_text():
                 "toolResult": {
                     "toolUseId": "tool_id",
                     "content": [{"text": "result"}],
-                    "name": "tool_name",
                 }
             },
         ],
@@ -238,7 +235,6 @@ def test_tool_result_with_text():
             content=[
                 ToolResultPart(
                     type="tool_result",
-                    name="tool_name",
                     content="result",
                     id="tool_id",
                     is_error=False,

{mirascope-1.24.0 → mirascope-1.24.2}/tests/core/bedrock/test_call_response.py

@@ -183,7 +183,6 @@ def test_bedrock_call_response_with_tools() -> None:
                             {"text": "The Name of the Wind by Patrick Rothfuss"}
                         ],
                         "toolUseId": "id",
-                        "name": "FormatBook",
                     }
                 }
             ],

{mirascope-1.24.0 → mirascope-1.24.2}/tests/core/bedrock/test_tool.py

@@ -40,6 +40,7 @@ def test_bedrock_tool() -> None:
     assert tool.title == "The Name of the Wind"
     assert tool.author == "Patrick Rothfuss"
     assert tool.call() == "The Name of the Wind by Patrick Rothfuss"
+    assert tool.id == "id"
 
     expected_schema = ToolTypeDef(
         toolSpec=ToolSpecificationTypeDef(

{mirascope-1.24.0 → mirascope-1.24.2}/tests/llm/test_call_response.py

@@ -186,39 +186,34 @@ def test_tool_message_params_various_tool_call_ids_with_annotations():
     class ToolCallWithID:
         id = "tool_call_with_id"
 
-    class ToolWithID(Tool):
+    class ToolWithID(BaseTool):
         tool_call: ClassVar[Any] = ToolCallWithID()
 
         def call(self): ...
-        @property
-        def model_fields(self): ...  # pyright: ignore [reportIncompatibleVariableOverride]
 
         field1: str = "tool_field"
 
-    class ToolNoCall(Tool):
+    class ToolNoCall(BaseTool):  # pyright: ignore [reportIncompatibleVariableOverride]
         def call(self): ...
-        @property
-        def model_fields(self): ...  # pyright: ignore [reportIncompatibleVariableOverride]
 
         field1: str = "tool_field"
 
     class ToolCallNoIDClass:
         pass
 
-    class ToolCallNoID(Tool):
+    class ToolCallNoID(BaseTool):
         tool_call: ClassVar[Any] = ToolCallNoIDClass()  # no id attribute
 
         def call(self): ...
-        @property
-        def model_fields(self): ...  # pyright: ignore [reportIncompatibleVariableOverride]
 
         field1: str = "tool_field"
 
-    mock_tool = MagicMock(spec=BaseTool)
-    mock_tool._name.return_value = "tool_name"
-    tool_with_id = ToolWithID(mock_tool)
-    tool_no_call = ToolNoCall(mock_tool)
-    tool_call_no_id = ToolCallNoID(mock_tool)
+    class MockTool(Tool):
+        def call(self): ...
+
+    tool_with_id = MockTool(ToolWithID())
+    tool_no_call = MockTool(ToolNoCall())
+    tool_call_no_id = MockTool(ToolCallNoID())
 
     result_with_id = CallResponse.tool_message_params([(tool_with_id, "output1")])
     assert isinstance(result_with_id[0].content[0], ToolResultPart)

{mirascope-1.24.0 → mirascope-1.24.2}/tests/mcp/test_client.py

@@ -29,6 +29,7 @@ from pydantic import AnyUrl, BaseModel
 from mirascope.core import BaseTool
 from mirascope.core.base import AudioPart, DocumentPart, ImagePart, TextPart
 from mirascope.mcp._utils import (
+    _UNSET,
     build_object_type,
     convert_prompt_message_to_base_message_params,
     create_tool_from_mcp_tool,
@@ -192,6 +193,7 @@ def test_create_model_from_tool_extra():
             "properties": {
                 "opt_str": {"type": "string", "description": "optional string"},
                 "req_arr": {"type": "array", "items": {"type": "integer"}},
+                "nullable": {"type": "string", "nullable": True},
             },
             "required": ["req_arr"],
         },
@@ -202,7 +204,7 @@ def test_create_model_from_tool_extra():
     update_abstractmethods(Model)
     instance = Model(req_arr=[1, 2, 3])  # pyright: ignore [reportCallIssue]
     assert instance.req_arr == [1, 2, 3]  # pyright: ignore [reportAttributeAccessIssue]
-    assert instance.opt_str is None  # pyright: ignore [reportAttributeAccessIssue]
+    assert instance.opt_str is _UNSET  # pyright: ignore [reportAttributeAccessIssue]
 
 
 def test_convert_prompt_message_all_content_types():