mirascope 1.18.0__py3-none-any.whl → 1.18.2__py3-none-any.whl

mirascope/core/azure/_utils/_setup_call.py

@@ -10,7 +10,6 @@ from azure.ai.inference import ChatCompletionsClient
 from azure.ai.inference.aio import ChatCompletionsClient as AsyncChatCompletionsClient
 from azure.ai.inference.models import (
     ChatCompletions,
-    ChatCompletionsResponseFormatJSON,
     ChatRequestMessage,
     StreamingChatCompletionsUpdate,
     UserMessage,
@@ -29,13 +28,27 @@ from ...base._utils import (
 from ...base.call_params import CommonCallParams
 from ...base.stream_config import StreamConfig
 from .._call_kwargs import AzureCallKwargs
-from ..call_params import AzureCallParams
+from ..call_params import AzureCallParams, ResponseFormatJSON
 from ..dynamic_config import AsyncAzureDynamicConfig, AzureDynamicConfig
 from ..tool import AzureTool, GenerateAzureStrictToolJsonSchema
 from ._convert_common_call_params import convert_common_call_params
 from ._convert_message_params import convert_message_params
 from ._get_credential import get_credential
 
+try:
+    from azure.ai.inference.models._models import (
+        ChatCompletionsResponseFormatJSON as FormatJSON,
+    )
+
+    json_object: ResponseFormatJSON | None = None
+except ImportError:  # pragma: no cover
+    # https://github.com/Azure/azure-sdk-for-python/commit/cf61ada8243d619ee6164bf1d32b3939b3c271e5#diff-0fb29d8cce6df3a014592ba8e9959409b8c471088381549807239324f5e8ddc4R15-R17
+    from azure.ai.inference.models._models import (
+        JsonSchemaFormat as FormatJSON,  # pyright: ignore [reportAttributeAccessIssue]
+    )
+
+    json_object = "json_object"  # pyright: ignore [reportAssignmentType]
+
 
 @overload
 def setup_call(
@@ -116,7 +129,7 @@ def setup_call(
     messages = convert_message_params(messages)
     if json_mode:
         if response_model and response_model.model_config.get("strict", False):
-            call_kwargs["response_format"] = ChatCompletionsResponseFormatJSON(
+            call_kwargs["response_format"] = FormatJSON(
                 {
                     "name": response_model.__name__,
                     "description": response_model.__doc__ or DEFAULT_TOOL_DOCSTRING,
@@ -127,7 +140,7 @@ def setup_call(
                 }
             )
         else:
-            call_kwargs["response_format"] = ChatCompletionsResponseFormatJSON()
+            call_kwargs["response_format"] = json_object or FormatJSON()
             json_mode_content = _utils.json_mode_content(response_model).strip()
             messages.append(UserMessage(content=json_mode_content))
     elif response_model:

mirascope/core/azure/call_params.py

@@ -2,13 +2,26 @@
 
 from __future__ import annotations
 
-from typing import Any
+from typing import Any, Literal, TypeAlias
 
 from azure.ai.inference.models import (
     ChatCompletionsNamedToolChoice,
-    ChatCompletionsResponseFormat,
     ChatCompletionsToolChoicePreset,
 )
+
+try:
+    from azure.ai.inference.models import (
+        ChatCompletionsResponseFormatJSON,
+    )
+
+    ResponseFormatJSON: TypeAlias = ChatCompletionsResponseFormatJSON  # pyright: ignore [reportRedeclaration]
+except ImportError:  # pragma: no cover
+    from azure.ai.inference.models import (
+        JsonSchemaFormat,  # pyright: ignore [reportAttributeAccessIssue]
+    )
+
+    ResponseFormatJSON: TypeAlias = JsonSchemaFormat | Literal["json_object"]  # pyright: ignore [reportRedeclaration]
+
 from typing_extensions import NotRequired
 
 from ..base import BaseCallParams
@@ -36,7 +49,7 @@ class AzureCallParams(BaseCallParams):
     max_tokens: NotRequired[int | None]
     model_extras: NotRequired[dict[str, Any] | None]
     presence_penalty: NotRequired[float | None]
-    response_format: NotRequired[ChatCompletionsResponseFormat | None]
+    response_format: NotRequired[ResponseFormatJSON | None]
     seed: NotRequired[int | None]
     stop: NotRequired[list[str] | None]
     temperature: NotRequired[float | None]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mirascope
-Version: 1.18.0
+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.0.dist-info → mirascope-1.18.2.dist-info}/RECORD

@@ -65,7 +65,7 @@ mirascope/core/anthropic/_utils/_setup_call.py,sha256=tR-SFT_ZJd_Gk7RY4NOU3do536
 mirascope/core/azure/__init__.py,sha256=ozfFhyCC0bFLDUA7m2v1POywSFpLJi6E7xZ2bhBIdC0,852
 mirascope/core/azure/_call.py,sha256=SHqSJe6_4zgn4Y9PkpDl4vXvLuT4QmVnWUcws9e_RR8,2237
 mirascope/core/azure/_call_kwargs.py,sha256=q38xKSgCBWi8DLScepG-KnUfgi67AU6xr2uOHwCZ2mI,435
-mirascope/core/azure/call_params.py,sha256=o5xhlWlyUB8bTewp9fj3l0jvbCpoOsZFnaGwhkEWTD0,1366
+mirascope/core/azure/call_params.py,sha256=NK_ggVJbactDip85DbfCaqSWRpO0CgwN1svY-KW4_Yg,1836
 mirascope/core/azure/call_response.py,sha256=eYH55I5awZ0Yhu3sK2N-4XLImjvRgDKOGF1pTs_QjIY,6834
 mirascope/core/azure/call_response_chunk.py,sha256=tcLgURISaGONGDvWjWDfDPs2c0hQJT_tVELiDqL33SQ,2884
 mirascope/core/azure/dynamic_config.py,sha256=6SBMGFce7tuXdwHrlKNISpZxVxUnnumbIQB9lGR6nbs,1066
@@ -81,7 +81,7 @@ mirascope/core/azure/_utils/_get_credential.py,sha256=hEWoKtB27PLZtC35qvPx36CPvQ
 mirascope/core/azure/_utils/_get_json_output.py,sha256=Qec7WJY5is1Q63Vp9uUNNfkRwgxhdoLMCI7AF_e2t90,1017
 mirascope/core/azure/_utils/_handle_stream.py,sha256=M_BGnjBGWTPefNyIMuJSHiDxIvqmENmqfVlDx_qzL1c,4638
 mirascope/core/azure/_utils/_message_param_converter.py,sha256=JAUeHObtd_V225YyZqEruuih3HRozq43pqjYJCbJj8A,4443
-mirascope/core/azure/_utils/_setup_call.py,sha256=07fVPaM56CC-nNgf9hjIAxiNTGC9XD3bvADEEOCKJ9E,5936
+mirascope/core/azure/_utils/_setup_call.py,sha256=cdUof-RCxsPbKuJvevsEUYXU-ckoql3wTevNEQiEpz4,6496
 mirascope/core/base/__init__.py,sha256=iq8HMwrTt7MK-zgHg2JgBP4F7ruBTbDituFR2P4Jg2k,1904
 mirascope/core/base/_call_factory.py,sha256=YdFHAa9WtGfYeqVcM2xaDNh5gMg584rOe26_E51-1to,9663
 mirascope/core/base/_create.py,sha256=1UNRA6pwMguaiLyLiQkPzTk12ASaXT_hh7jlNw4UFX4,10016
@@ -212,10 +212,10 @@ mirascope/core/google/_utils/__init__.py,sha256=5MKOhK3NFseq2AlapU8TtWS82f8Z0ayJ
 mirascope/core/google/_utils/_calculate_cost.py,sha256=fUyi6QAEa_NpPhtoAgVdQ7PpUa0QykNghsODrDtAYvw,3069
 mirascope/core/google/_utils/_convert_common_call_params.py,sha256=KA-z6uvRtdD4WydC0eXd3dzQuSh4x4WKNR8PAqFNUVY,1065
 mirascope/core/google/_utils/_convert_finish_reason_to_common_finish_reasons.py,sha256=ig4tb7Zanz-tyZpvc9Ncd47a2FNTOS7-wl1PYBq-4cY,879
-mirascope/core/google/_utils/_convert_message_params.py,sha256=Da2690Pvb1eGbnz0iHdTcsdtBzYADC_RUlNIkxIJGyQ,7632
+mirascope/core/google/_utils/_convert_message_params.py,sha256=h2RfIOw26QSjF5ybdo7W2Ah9u-7qI3rewLzma1sgKQ0,7852
 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=FcPWdMdMcz3Th4q7-vATkPoRPYdT-WdT-sDXsTJO8zQ,6240
+mirascope/core/google/_utils/_message_param_converter.py,sha256=j-5fLlW2-3vI0kGQs-nVep_1kDr4kYYUBYYS9MV08Ks,6495
 mirascope/core/google/_utils/_setup_call.py,sha256=LAoIrNTTF5EOHNLZroBcN8sNKOjMYKJ07hM49yBaUgE,5791
 mirascope/core/groq/__init__.py,sha256=wo-_txqiLC3iswnXmPX4C6IgsU-_wv1DbBlNDY4rEvo,798
 mirascope/core/groq/_call.py,sha256=gR8VN5IaYWIFXc0csn995q59FM0nBs-xVFjkVycPjMM,2223
@@ -350,7 +350,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.18.0.dist-info/METADATA,sha256=P63GzWcu4PhSMPV6Wie3XbEgz_Jpu1xu-FNl2yJeftk,8678
-mirascope-1.18.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mirascope-1.18.0.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
-mirascope-1.18.0.dist-info/RECORD,,
+mirascope-1.18.2.dist-info/METADATA,sha256=37QK3S0KrXlyR3HrMikdN36fE4cATMWLQfARj56jHoA,8678
+mirascope-1.18.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mirascope-1.18.2.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
+mirascope-1.18.2.dist-info/RECORD,,