mirascope 1.24.0__py3-none-any.whl → 1.24.1__py3-none-any.whl

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/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/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/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/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/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/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.dist-info → mirascope-1.24.1.dist-info}/METADATA

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

{mirascope-1.24.0.dist-info → mirascope-1.24.1.dist-info}/RECORD

@@ -66,7 +66,7 @@ mirascope/core/azure/_call.py,sha256=SHqSJe6_4zgn4Y9PkpDl4vXvLuT4QmVnWUcws9e_RR8
 mirascope/core/azure/_call_kwargs.py,sha256=q38xKSgCBWi8DLScepG-KnUfgi67AU6xr2uOHwCZ2mI,435
 mirascope/core/azure/call_params.py,sha256=NK_ggVJbactDip85DbfCaqSWRpO0CgwN1svY-KW4_Yg,1836
 mirascope/core/azure/call_response.py,sha256=FzSqAunmZCeVhQIei2_YcUqZBnJUgmEFFT4jHiJFm28,7068
-mirascope/core/azure/call_response_chunk.py,sha256=2NorPZ6szna3G-xDx63kuPuMQ7PCh5WNeGhiBRvwCYM,3155
+mirascope/core/azure/call_response_chunk.py,sha256=bWgpT-XldmetNwcQmpVVHRCLn6B6UKM6NK_RAxb2Zio,3224
 mirascope/core/azure/dynamic_config.py,sha256=6SBMGFce7tuXdwHrlKNISpZxVxUnnumbIQB9lGR6nbs,1066
 mirascope/core/azure/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mirascope/core/azure/stream.py,sha256=XfEO6sOgnXiOhhuagrFdtFI-oQECxBP0Zt0wbfUH1TU,4637
@@ -88,7 +88,7 @@ mirascope/core/base/_extract_with_tools.py,sha256=MW4v8D1xty7LqLb5RwMFkX-peQqA73
 mirascope/core/base/_partial.py,sha256=w_ACCgsDKNLtMyAP-lNmfRdrFEPmzh2BT4aninajxyY,3240
 mirascope/core/base/call_kwargs.py,sha256=0mznCsrj1dYxvdwYNF0RKbc9CiU5G6WvvcjPqOMsOE4,351
 mirascope/core/base/call_params.py,sha256=wtuuOY-SwIZYCDBKfn_xRC0Kf1cUuI4eSQaXu6VrtaE,1331
-mirascope/core/base/call_response.py,sha256=YBQvOrNcDKZG9H_aOlB88WJ4D9oIQiSybZhUTPMOxBY,10721
+mirascope/core/base/call_response.py,sha256=2f7ETVpr3ZPcTfGJ7aQp4xlN-7fU7IWDvdfT-fMzDr0,10632
 mirascope/core/base/call_response_chunk.py,sha256=ZfulgERwgva55TLrQI9XimX8bpgOqBNLs_I-_kELl-4,3606
 mirascope/core/base/dynamic_config.py,sha256=V5IG2X5gPFpfQ47uO8JU1zoC2eNdRftsRZEmwhRPaYI,2859
 mirascope/core/base/from_call_args.py,sha256=8ijMX7PN6a4o6uLdmXJlSRnE-rEVJU5NLxUmNrS8dvU,909
@@ -101,7 +101,7 @@ mirascope/core/base/response_model_config_dict.py,sha256=OUdx_YkV2vBzUSSB2OYLAAH
 mirascope/core/base/stream.py,sha256=ZHjC9MQ3HT9KMbqCKTB0um2fvMLJmRYU_eSGdfRj79I,17274
 mirascope/core/base/stream_config.py,sha256=vwWqNh9NJhTYjiJmfDbC9D5O84je_lBRhNOt4wI3FHM,238
 mirascope/core/base/structured_stream.py,sha256=FIvLXXKninrpQ5P7MsLEqGrU4cfvEDiPbueZqgJ4Dlw,10395
-mirascope/core/base/tool.py,sha256=ISk4MKfNljfsMe0rEwW0J8Dqty7WXJej7gV2oSiVxa8,6885
+mirascope/core/base/tool.py,sha256=or8Zv0reSLSGjBAxlcfX4MzEQyhyPv-HOivJLJ9rQGs,7220
 mirascope/core/base/toolkit.py,sha256=GmZquYPqvQL2J9Hd6StEwx6jfeFsqtcUyxKvp4iW_7Q,6271
 mirascope/core/base/types.py,sha256=4GVyVzHThWJU2Og-wpVbYNPZD8QMdHltIAV83FUlisM,9247
 mirascope/core/base/_utils/__init__.py,sha256=Tm-9-6k7cZL3IaqebOEaKpTg9nFUMfAGHHeKmC3YzLQ,3192
@@ -145,19 +145,19 @@ mirascope/core/bedrock/_call.py,sha256=8Z8sdzpTdJsMHBev35B1KH3O16_eMLbtTkOmPB7bz
 mirascope/core/bedrock/_call_kwargs.py,sha256=N1d_iglnwZW3JrcaT8WTOeuLT5MYcVLU5vS8u8uyEL4,408
 mirascope/core/bedrock/_types.py,sha256=ntmzYsgT6wuigv1GavkdqCvJnAYRsFvVuIwxafE4DFY,3229
 mirascope/core/bedrock/call_params.py,sha256=3eKNYTteCTaPLqvAcy1vHU5aY9nMVNhmApL45ugPbrQ,1716
-mirascope/core/bedrock/call_response.py,sha256=86_AJOAsNORjADX7DV2pUiRuG8DWABOL07r804lOK4U,8413
+mirascope/core/bedrock/call_response.py,sha256=V9YFYdPxW415t-yBq4Y5Jexn5hkewiePnWv9gghW9JA,8359
 mirascope/core/bedrock/call_response_chunk.py,sha256=EAs0mJseL-C4dlnEhggtUT8_s6L2d5lSAqrIjLxQepI,3524
 mirascope/core/bedrock/dynamic_config.py,sha256=X6v93X9g14mfvkGLL08yX-xTFGgX8y8bVngNmExdUhQ,1166
 mirascope/core/bedrock/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 mirascope/core/bedrock/stream.py,sha256=UyA6b7l3-MjEULzo-DXF-le7N3oQw6W5FFk48_K93a0,5219
-mirascope/core/bedrock/tool.py,sha256=rE5rx-CyJTy5kFOtYwZh9kkr4eR_4uUxGqDQRS9OWSE,2657
+mirascope/core/bedrock/tool.py,sha256=tgt__paZyzpN1_NdTVKh-2hIWHah2Ect8lAfM1GEl-s,2758
 mirascope/core/bedrock/_utils/__init__.py,sha256=OYpHXxPRbgasCLz_emLatmNa5WCb_S6pvVFHcNoGy9E,389
 mirascope/core/bedrock/_utils/_convert_common_call_params.py,sha256=i17yrW-_7qdIsf-zS3OD5HIO0uykCdfanPsjV3WxTEY,1091
 mirascope/core/bedrock/_utils/_convert_finish_reason_to_common_finish_reasons.py,sha256=A67-Q3zgpXh9q0iub5IfJw9VRgHvK-pczt1Btot_jks,792
 mirascope/core/bedrock/_utils/_convert_message_params.py,sha256=ZPFj34ed0-4bmMldj4tR6EGb9RsuHkXzSwjmwEeN-KU,4680
 mirascope/core/bedrock/_utils/_get_json_output.py,sha256=hW-IBBQ5YW85VljjFJHDDtu66zsaF2ydTbFxgCX_j6A,1159
 mirascope/core/bedrock/_utils/_handle_stream.py,sha256=s8KNMNDKzvSIkFROtaZgbEJry78X_qCzTvGmHcL7UW0,3776
-mirascope/core/bedrock/_utils/_message_param_converter.py,sha256=T45kksn78idbqD9NZ3Omx1nS_IoYmTfA5y-bAHlX2fM,6846
+mirascope/core/bedrock/_utils/_message_param_converter.py,sha256=BCoFozjclkqAZq1InB1ar_IAVGMW9xclU1bK-oi2zI0,6765
 mirascope/core/bedrock/_utils/_setup_call.py,sha256=XQs-JlviE0uhbBxEpjXP8812NbiObLYx5VkAwJJAF84,9168
 mirascope/core/cohere/__init__.py,sha256=vk73WFGBOEmMFEiqWMRnPfxsCBDlDcq8SaLB2A6RKeo,830
 mirascope/core/cohere/_call.py,sha256=y0nB_7h7FWCNxHRPywtAVCYXyeYX3uzTyYBPWnuLwUE,2261
@@ -339,7 +339,7 @@ mirascope/llm/_context.py,sha256=vtHJkLlFfUwyR_hYEHXAw3xunpHhLn67k4kuFw50GR8,124
 mirascope/llm/_override.py,sha256=m4MdOhM-aJRIGP7NBJhscq3ISNct6FBPn3jjmryFo_Q,112292
 mirascope/llm/_protocols.py,sha256=HXspRAC0PduGqbh2BM0CGe5iVj7CC3ZKMPAYvFvbDNQ,16406
 mirascope/llm/_response_metaclass.py,sha256=6DLQb5IrqMldyEXHT_pAsr2DlUVc9CmZuZiBXG37WK8,851
-mirascope/llm/call_response.py,sha256=cOOyONfkcBluk1m2FNliVcdGtiNnSZpz71nMyxsZko8,5232
+mirascope/llm/call_response.py,sha256=tJ6jHZ4PFaYf_4Hn9OihlVqOxNEM9d6gAi4Bo15XXnQ,4825
 mirascope/llm/call_response_chunk.py,sha256=bZwO43ipc6PO1VLgGSaAPRqCIUyZD_Ty5oxdJX62yno,1966
 mirascope/llm/stream.py,sha256=GtUKyLBlKqqZTOKjdL9FLInCXJ0ZOEAe6nymbjKwyTQ,5293
 mirascope/llm/tool.py,sha256=MQRJBPhP1d-OyOz3PE_VsKmSXca0chySyYO1U9OW8ck,1824
@@ -371,7 +371,7 @@ mirascope/v0/base/ops_utils.py,sha256=1Qq-VIwgHBaYutiZsS2MUQ4OgPC3APyywI5bTiTAmA
 mirascope/v0/base/prompts.py,sha256=FM2Yz98cSnDceYogiwPrp4BALf3_F3d4fIOCGAkd-SE,1298
 mirascope/v0/base/types.py,sha256=ZfatJoX0Yl0e3jhv0D_MhiSVHLYUeJsdN3um3iE10zY,352
 mirascope/v0/base/utils.py,sha256=XREPENRQTu8gpMhHU8RC8qH_am3FfGUvY-dJ6x8i-mw,681
-mirascope-1.24.0.dist-info/METADATA,sha256=wShWCcdl1mgsX_rev-w_nWQghO27G71zLJ4Y8goHGeo,8542
-mirascope-1.24.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mirascope-1.24.0.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
-mirascope-1.24.0.dist-info/RECORD,,
+mirascope-1.24.1.dist-info/METADATA,sha256=CF6YrOzpQRtxq7M0Pz_cl5d3m2dyjy2rO08z64sEzN8,8542
+mirascope-1.24.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mirascope-1.24.1.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
+mirascope-1.24.1.dist-info/RECORD,,