mirascope 1.18.1__tar.gz → 1.18.2__tar.gz

{mirascope-1.18.1 → mirascope-1.18.2}/PKG-INFO

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

{mirascope-1.18.1 → mirascope-1.18.2}/mirascope/core/google/_utils/_convert_message_params.py

@@ -63,7 +63,10 @@ def convert_message_params(
                         )
                     )
                 elif part.type == "image_url":
-                    if part.url.startswith(("https://", "http://")):
+                    if (
+                        part.url.startswith(("https://", "http://"))
+                        and "generativelanguage.googleapis.com" not in part.url
+                    ):
                         downloaded_image = io.BytesIO(_load_media(part.url))
                         image = PIL.Image.open(downloaded_image)
                         media_type = (
@@ -92,24 +95,15 @@ def convert_message_params(
                             )
                             uri = file_ref.uri
                             media_type = file_ref.mime_type
-
-                        converted_content.append(
-                            PartDict(
-                                file_data=FileDataDict(
-                                    file_uri=uri, mime_type=media_type
-                                )
-                            )
-                        )
                     else:
-                        media_type = "image/unknown"
                         uri = part.url
-                        converted_content.append(
-                            PartDict(
-                                file_data=FileDataDict(
-                                    file_uri=uri, mime_type=media_type
-                                )
-                            )
+                        media_type = None
+
+                    converted_content.append(
+                        PartDict(
+                            file_data=FileDataDict(file_uri=uri, mime_type=media_type)
                         )
+                    )
                 elif part.type == "audio":
                     if part.media_type not in [
                         "audio/wav",
@@ -135,9 +129,12 @@ def convert_message_params(
                         )
                     )
                 elif part.type == "audio_url":
-                    if part.url.startswith(("https://", "http://")):
-                        audio = _load_media(part.url)
-                        audio_type = get_audio_type(audio)
+                    if (
+                        part.url.startswith(("https://", "http://"))
+                        and "generativelanguage.googleapis.com" not in part.url
+                    ):
+                        downloaded_audio = _load_media(part.url)
+                        audio_type = get_audio_type(downloaded_audio)
                         if audio_type not in [
                             "audio/wav",
                             "audio/mp3",
@@ -151,16 +148,23 @@ def convert_message_params(
                                 "Google currently only supports WAV, MP3, AIFF, AAC, OGG, "
                                 "and FLAC audio file types."
                             )
-                        converted_content.append(
-                            {"mime_type": audio_type, "data": audio}
-                        )
+                        if client.vertexai:
+                            uri = part.url
+                        else:
+                            downloaded_audio = io.BytesIO(downloaded_audio)
+                            downloaded_audio.seek(0)
+                            file_ref = client.files.upload(
+                                file=downloaded_audio, config={"mime_type": audio_type}
+                            )
+                            uri = file_ref.uri
+                            media_type = file_ref.mime_type
                     else:
-                        audio_type = "audio/unknown"
+                        uri = part.url
+                        audio_type = None
+
                     converted_content.append(
                         PartDict(
-                            file_data=FileDataDict(
-                                file_uri=part.url, mime_type=audio_type
-                            )
+                            file_data=FileDataDict(file_uri=uri, mime_type=audio_type)
                         )
                     )
                 else:

{mirascope-1.18.1 → mirascope-1.18.2}/mirascope/core/google/_utils/_message_param_converter.py

@@ -104,8 +104,14 @@ class GoogleMessageParamConverter(BaseMessageParamConverter):
                             )
                         )
                     else:
-                        raise ValueError(
-                            f"Unsupported file_data mime type: {part.file_data.mime_type}. Cannot convert to BaseMessageParam."
+                        # Since `FileDataDict` handles any file data, we use
+                        # `ImageURLPart` for unknown mime types
+                        content_list.append(
+                            ImageURLPart(
+                                type="image_url",
+                                url=cast(str, part.file_data.file_uri),
+                                detail=None,
+                            )
                         )
                 elif part.function_call:
                     converted.append(

{mirascope-1.18.1 → mirascope-1.18.2}/pyproject.toml

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

{mirascope-1.18.1 → mirascope-1.18.2}/tests/core/google/_utils/test_convert_message_params.py

@@ -241,7 +241,7 @@ def test_image_url_with_non_http(mock_load_media: MagicMock) -> None:
     assert part == {
         "file_data": {
             "file_uri": "file://local/path/image",
-            "mime_type": "image/unknown",
+            "mime_type": None,
         }
     }
     mock_load_media.assert_not_called()
@@ -267,7 +267,6 @@ def test_audio_url_with_http_valid(
     assert result == [
         {
             "parts": [
-                {"data": b"audio_data", "mime_type": "audio/wav"},
                 {
                     "file_data": {
                         "file_uri": "https://example.com/audio",
@@ -282,6 +281,44 @@ def test_audio_url_with_http_valid(
     mock_get_audio_type.assert_called_once_with(b"audio_data")
 
 
+@patch(
+    "mirascope.core.google._utils._convert_message_params.get_audio_type",
+    return_value="audio/wav",
+)
+@patch(
+    "mirascope.core.google._utils._convert_message_params._load_media",
+    return_value=b"audio_data",
+)
+def test_audio_url_with_http_valid_gemini(
+    mock_load_media: MagicMock, mock_get_audio_type: MagicMock
+) -> None:
+    """Test image_url part with an HTTP URL and valid media type."""
+    message = BaseMessageParam(
+        role="user",
+        content=[AudioURLPart(type="audio_url", url="https://example.com/audio")],
+    )
+    mock_client = MagicMock()
+    mock_client.vertexai = False
+    mock_file = MagicMock(uri="file://local/path/audio", mime_type="audio/wav")
+    mock_client.files.upload.return_value = mock_file
+    result = convert_message_params([message], mock_client)
+    assert result == [
+        {
+            "parts": [
+                {
+                    "file_data": {
+                        "file_uri": "file://local/path/audio",
+                        "mime_type": "audio/wav",
+                    }
+                }
+            ],
+            "role": "user",
+        }
+    ]
+    # Check that _load_media was called with the URL.
+    mock_load_media.assert_called_once_with("https://example.com/audio")
+
+
 @patch(
     "mirascope.core.google._utils._convert_message_params._load_media",
     return_value=b"audio_data",
@@ -322,6 +359,6 @@ def test_audio_url_with_non_http() -> None:
     assert part == {
         "file_data": {
             "file_uri": "ftp://example.com/audio",
-            "mime_type": "audio/unknown",
+            "mime_type": None,
         }
     }

{mirascope-1.18.1 → mirascope-1.18.2}/tests/core/google/_utils/test_message_param_converter.py

@@ -73,13 +73,10 @@ def test_google_convert_parts_document():
     part = PartDict(
         file_data=FileDataDict(mime_type="application/pdf", file_uri="%PDF-1.4...")
     )
-    with pytest.raises(
-        ValueError,
-        match="Unsupported file_data mime type: application/pdf. Cannot convert to BaseMessageParam.",
-    ):
-        GoogleMessageParamConverter.from_provider(
-            [{"role": "assistant", "parts": [part]}]
-        )
+    converted_message = GoogleMessageParamConverter.from_provider(
+        [{"role": "assistant", "parts": [part]}]
+    )[0]
+    assert isinstance(converted_message.content[0], ImageURLPart)
 
 
 def test_google_convert_parts_unsupported_image():
@@ -238,18 +235,14 @@ def test_google_convert_parts_file_data_audio():
     assert result.content[0].url == "http://example.com/audio"
 
 
-def test_google_convert_parts_file_data_unsupported():
-    """
-    When a part has file_data with an unsupported mime type, the converter should raise ValueError.
-    """
+def test_google_convert_parts_file_data_unknown_mime_type():
+    """When a part has file_data with an unknown mime type, it should use ImageURLPart."""
     file_data = FileDataDict(
-        mime_type="application/zip", file_uri="http://example.com/zip"
+        mime_type="application/zip",
+        file_uri="http://generativelanguage.googleapis.com/files/zip",
     )
     part = PartDict(file_data=file_data)
-    with pytest.raises(
-        ValueError,
-        match="Unsupported file_data mime type: application/zip. Cannot convert to BaseMessageParam.",
-    ):
-        GoogleMessageParamConverter.from_provider(
-            [{"role": "assistant", "parts": [part]}]
-        )
+    converted_message = GoogleMessageParamConverter.from_provider(
+        [{"role": "assistant", "parts": [part]}]
+    )[0]
+    assert isinstance(converted_message.content[0], ImageURLPart)

{mirascope-1.18.1 → mirascope-1.18.2}/tests/core/google/_utils/test_setup_call.py

@@ -1,5 +1,6 @@
 """Tests the `google._utils.setup_call` module."""
 
+from collections.abc import Callable
 from unittest.mock import MagicMock, patch
 
 import pytest
@@ -8,6 +9,7 @@ from google.genai.types import (
     FunctionCallingConfigMode,
     GenerateContentConfig,
     Part,
+    Tool,
 )
 from pydantic import BaseModel
 
@@ -105,7 +107,7 @@ def test_setup_call_json_mode(
         },
         {"role": "user", "parts": [{"type": "text", "text": "test"}]},
     ]
-    tools = [MagicMock()]
+    tools: list[Tool | Callable] = [MagicMock(spec=Tool)]
     mock_base_setup_call.return_value[-1]["tools"] = tools
     mock_base_setup_call.return_value[-1]["config"] = generation_config_type(
         candidate_count=1,
@@ -167,7 +169,7 @@ def test_setup_call_json_mode(
         response_schema=None,
         routing_config=None,
         safety_settings=None,
-        tools=tools,  # pyright: ignore [reportArgumentType]
+        tools=tools,
         tool_config=None,
         cached_content=None,
         response_modalities=None,

{mirascope-1.18.1 → mirascope-1.18.2}/uv.lock

@@ -3174,7 +3174,7 @@ wheels = [
 
 [[package]]
 name = "mirascope"
-version = "1.17.0"
+version = "1.18.2"
 source = { editable = "." }
 dependencies = [
     { name = "docstring-parser" },