mirascope 1.22.4__py3-none-any.whl → 1.22.6__py3-none-any.whl

mirascope/core/google/call_response_chunk.py

@@ -48,7 +48,14 @@ class GoogleCallResponseChunk(
     @property
     def content(self) -> str:
         """Returns the chunk content for the 0th choice."""
-        return self.chunk.candidates[0].content.parts[0].text  # pyright: ignore [reportOptionalMemberAccess, reportOptionalSubscript, reportReturnType]
+        if (
+            not (candidates := self.chunk.candidates)
+            or not (content := candidates[0].content)
+            or not (parts := content.parts)
+            or not (text := parts[0].text)
+        ):
+            return ""
+        return text
 
     @property
     def finish_reasons(self) -> list[GoogleFinishReason]:

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

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

{mirascope-1.22.4.dist-info → mirascope-1.22.6.dist-info}/RECORD

@@ -214,7 +214,7 @@ mirascope/core/google/_call.py,sha256=GJOPyvHzVlSXvJpgQhJFg4wFHFUYsvvrbjhNxU-nSl
 mirascope/core/google/_call_kwargs.py,sha256=baCYcxWsmV06ATw6nuQhh6FPm3k6oWmKOn0MyjESDGc,372
 mirascope/core/google/call_params.py,sha256=9Dt5m1pPVjpl5Qppz6Egl_9FyGjjz9aGCnXkVps7C_Q,538
 mirascope/core/google/call_response.py,sha256=nAlH1XWQMiMfCKgi6sG3qIA0YccxIzLWzY_NNl2JtqM,7372
-mirascope/core/google/call_response_chunk.py,sha256=oORYaGjOBv4U1IVhsR_ZS-Vr-B58I8G0-9d6Kcj9RM4,3427
+mirascope/core/google/call_response_chunk.py,sha256=14ggxCYtl92LdyA3nxY8awKQVSBvFV1Wse2Jm7rfvJc,3535
 mirascope/core/google/dynamic_config.py,sha256=O6j8F0fLVFuuNwURneu5OpPuu_bMEtbDEFHhJXRT6V0,857
 mirascope/core/google/stream.py,sha256=bTxB8OUrKXxzmcX0C7_-LqtBfaAAazA5HjKZGSxxtLw,4466
 mirascope/core/google/tool.py,sha256=61a9Ejdxz41pwaab9VE2yvP_J1Aebua3BeRPJ_GJSnE,5138
@@ -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
@@ -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.4.dist-info/METADATA,sha256=lsep1js-JxiEH9Vp0oEpQJyXZbbdk_VtpJATwtzvFoE,8783
-mirascope-1.22.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mirascope-1.22.4.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
-mirascope-1.22.4.dist-info/RECORD,,
+mirascope-1.22.6.dist-info/METADATA,sha256=j1V88cvscUYrvPpSsjyRRBzf0RzxuUux6jnu7ZC7U9c,8783
+mirascope-1.22.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mirascope-1.22.6.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
+mirascope-1.22.6.dist-info/RECORD,,