mirascope 1.22.3__py3-none-any.whl → 1.22.5__py3-none-any.whl

mirascope/core/google/_utils/_message_param_converter.py

@@ -48,7 +48,9 @@ class GoogleMessageParamConverter(BaseMessageParamConverter):
         for message_param in message_params:
             if isinstance(message_param, dict):
                 message_param = Content.model_validate(message_param)
-            role: str = "assistant"
+            role = message_param.role
+            if not role or role == "model":
+                role = "assistant"
             content_list = []
             for part in message_param.parts or []:
                 if part.text:

mirascope/core/openai/_utils/_convert_message_params.py

@@ -22,6 +22,7 @@ def convert_message_params(
         else:
             converted_content = []
 
+            tool_calls = []
             for part in content:
                 if part.type == "text":
                     converted_content.append(part.model_dump())
@@ -100,25 +101,16 @@ def convert_message_params(
                         }
                     )
                 elif part.type == "tool_call":
-                    converted_message_param = {
-                        "role": "assistant",
-                        "name": part.name,
-                        "tool_calls": [
-                            {
-                                "function": {
-                                    "name": part.name,
-                                    "arguments": json.dumps(part.args),
-                                },
-                                "type": "function",
-                                "id": part.id,
-                            }
-                        ],
-                    }
-
-                    if converted_content:
-                        converted_message_param["content"] = converted_content
-                        converted_content = []
-                    converted_message_params.append(converted_message_param)
+                    tool_calls.append(
+                        {
+                            "function": {
+                                "name": part.name,
+                                "arguments": json.dumps(part.args),
+                            },
+                            "type": "function",
+                            "id": part.id,
+                        }
+                    )
                 elif part.type == "tool_result":
                     if converted_content:
                         converted_message_params.append(
@@ -138,9 +130,19 @@ def convert_message_params(
                         "OpenAI currently only supports text, image and audio parts. "
                         f"Part provided: {part.type}"
                     )
-            if converted_content:
+            if tool_calls:
+                converted_message_param = {
+                    "role": "assistant",
+                    "tool_calls": tool_calls,
+                }
+                converted_message_params.append(converted_message_param)
+                if converted_content:
+                    converted_message_param["content"] = converted_content
+            elif converted_content:
                 converted_message_params.append(
-                    {"role": message_param.role, "content": converted_content}
+                    {
+                        "role": message_param.role,
+                        "content": converted_content,
+                    }
                 )
-    # print(converted_message_params)
     return converted_message_params

mirascope/llm/_call.py

@@ -238,6 +238,7 @@ def _call(
         | Awaitable[_ParsedOutputT]
         | Awaitable[(_ResponseModelT | CallResponse)],
     ]:
+        fn.__mirascope_call__ = True  # pyright: ignore [reportFunctionMemberAccess]
         if fn_is_async(fn):
             # Create a wrapper function that captures the current context when called
             @wraps(fn)

{mirascope-1.22.3.dist-info → mirascope-1.22.5.dist-info}/METADATA

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

{mirascope-1.22.3.dist-info → mirascope-1.22.5.dist-info}/RECORD

@@ -224,7 +224,7 @@ mirascope/core/google/_utils/_convert_finish_reason_to_common_finish_reasons.py,
 mirascope/core/google/_utils/_convert_message_params.py,sha256=9I7Q79Z8tBCLZtfjWJNQkuKgz0n2L43SzHB3cV3hNmY,8926
 mirascope/core/google/_utils/_get_json_output.py,sha256=sxDgT0Ra6YJynL5_hhakf0dNJEhZm0DfAgfcvC_DAFU,1596
 mirascope/core/google/_utils/_handle_stream.py,sha256=BxFuheAu1LKPrPsDxxiLWd2KoajkwJyx2_QT1NXwtWE,1212
-mirascope/core/google/_utils/_message_param_converter.py,sha256=wvvxUY9lOhR_kFZ4JigjWmN8O8Vovu-fLoi-NDtyorE,6580
+mirascope/core/google/_utils/_message_param_converter.py,sha256=qOj8bAdQusFhLg-mzQ1TJwbMQHvjY7DYrTGOIylu5hs,6661
 mirascope/core/google/_utils/_setup_call.py,sha256=UoV4McGgSS79PKErjArCmrq1HmpFvq2qegJYoyY4P5U,6469
 mirascope/core/google/_utils/_validate_media_type.py,sha256=sUOjKpC498L-NCiECejAAfSzMUAvZT84rf-2Yo-JE58,1042
 mirascope/core/groq/__init__.py,sha256=8jWCQScdei_TImGMWUwiKnlOwffQqaXdAL-bluFmEL0,798
@@ -285,7 +285,7 @@ mirascope/core/openai/stream.py,sha256=jyI9Q4-Ne4N34n30RzRCYsi8z-hFqXbV_Occ7KrFk
 mirascope/core/openai/tool.py,sha256=iJWJQrY3-1Rq5OywzKFO9JUAcglneGD0UtkS3pcA0pg,3154
 mirascope/core/openai/_utils/__init__.py,sha256=Y1nMFOydpFvMWcuoB8TzMD33uZoMIM0C8_kYJkv_JJE,388
 mirascope/core/openai/_utils/_convert_common_call_params.py,sha256=gvxsRdULxiC2137M9l53hUmF0ZkBxFQFurhWBcl_5Cg,739
-mirascope/core/openai/_utils/_convert_message_params.py,sha256=1VkGEQktopnhmYWJ8-xJKi1KY54ego7Jc3xBhdezbBA,6236
+mirascope/core/openai/_utils/_convert_message_params.py,sha256=B4pNV-QDR6bLaJVif1pjEogeEASzhPA6YokPGGLQaNw,6219
 mirascope/core/openai/_utils/_get_json_output.py,sha256=Q_5R6NFFDvmLoz9BQiymC5AEyYvxKPH2_XnOQZ8hIkU,1215
 mirascope/core/openai/_utils/_handle_stream.py,sha256=adsHAcTtGyMMFU9xnUsE4Yd2wrhSNSjcVddkS74mli0,5226
 mirascope/core/openai/_utils/_message_param_converter.py,sha256=r6zJ54xHMxxJ-2daY8l5FyDIa0HsdXeP0cN1wHNt6-E,4101
@@ -334,7 +334,7 @@ mirascope/integrations/otel/_utils.py,sha256=SCVb3MpcpqLpCpumJEbEdINceNdusnyT6iu
 mirascope/integrations/otel/_with_hyperdx.py,sha256=f17uxXQk5zZPtyj6zwPwJz5i7atsnUPOoq1LqT8JO0E,1637
 mirascope/integrations/otel/_with_otel.py,sha256=tbjd6BEbcSfnsm5CWHBoHwbRNrHt6-t4or-SYGQSD-w,1659
 mirascope/llm/__init__.py,sha256=rCukXJUqSGiDGNMMM9g3NS8clnrCxgCpaFIXIG1M660,432
-mirascope/llm/_call.py,sha256=zPULSy5GLlJszphRvc3WUSFEsmP83Abp0FzbZefTa8Y,13848
+mirascope/llm/_call.py,sha256=_YOmo5Y4NU2Jz1XcgEEI94UCyzgiAFrKwIH7o2KQ5vM,13933
 mirascope/llm/_context.py,sha256=vtHJkLlFfUwyR_hYEHXAw3xunpHhLn67k4kuFw50GR8,12481
 mirascope/llm/_override.py,sha256=m4MdOhM-aJRIGP7NBJhscq3ISNct6FBPn3jjmryFo_Q,112292
 mirascope/llm/_protocols.py,sha256=HXspRAC0PduGqbh2BM0CGe5iVj7CC3ZKMPAYvFvbDNQ,16406
@@ -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.22.3.dist-info/METADATA,sha256=FCTObICqUL1p5C3m5zBUJP2tvPnWlT_Rsumt0u90_H0,8783
-mirascope-1.22.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mirascope-1.22.3.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
-mirascope-1.22.3.dist-info/RECORD,,
+mirascope-1.22.5.dist-info/METADATA,sha256=HIVPcLXEYG16Rr2SxAz1ogSCdHk5vQGGJZrcmmdB56M,8783
+mirascope-1.22.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mirascope-1.22.5.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
+mirascope-1.22.5.dist-info/RECORD,,