mirascope 1.21.1__py3-none-any.whl → 1.21.3__py3-none-any.whl

mirascope/core/bedrock/_utils/_setup_call.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import os
 from collections.abc import AsyncGenerator, Awaitable, Callable, Coroutine, Generator
 from functools import wraps
 from typing import Any, ParamSpec, cast, overload
@@ -223,12 +224,23 @@ def setup_call(
 
     call_kwargs |= cast(BedrockCallKwargs, {"modelId": model, "messages": messages})
 
+    env_vars = {}
+    if access_key_id := os.getenv("AWS_ACCESS_KEY_ID"):
+        env_vars["aws_access_key_id"] = access_key_id
+    if secret_access_key := os.getenv("AWS_SECRET_ACCESS_KEY"):
+        env_vars["aws_secret_access_key"] = secret_access_key
+    if session_token := os.getenv("AWS_SESSION_TOKEN"):
+        env_vars["aws_session_token"] = session_token
+    if region_name := os.getenv("AWS_REGION_NAME"):
+        env_vars["region_name"] = region_name
+    if profile_name := os.getenv("AWS_PROFILE"):
+        env_vars["profile_name"] = profile_name
     if client is None:
         if fn_is_async(fn):
-            session = get_session()
+            session = get_session(env_vars=env_vars)
             _client = _AsyncBedrockRuntimeWrappedClient(session, model)
         else:
-            session = Session()
+            session = Session(**env_vars)
             _client = session.client("bedrock-runtime")
     else:
         _client = client

mirascope/core/google/tool.py

@@ -70,41 +70,50 @@ class GoogleTool(BaseTool):
             fn["parameters"] = model_schema
 
         if "parameters" in fn:
-            # Resolve $defs and $ref
+            # Define a function to handle both ref resolution and examples conversion
+            def resolve_refs_and_fix_examples(
+                schema: dict[str, Any], defs: dict[str, Any] | None = None
+            ) -> dict[str, Any]:
+                """Recursively resolve $ref references and fix examples/example fields."""
+                # If this is a reference, resolve it
+                if "$ref" in schema:
+                    ref = schema["$ref"]
+                    if ref.startswith("#/$defs/") and defs:
+                        ref_key = ref.replace("#/$defs/", "")
+                        if ref_key in defs:
+                            # Merge the definition with the current schema (excluding $ref)
+                            resolved = {
+                                **{k: v for k, v in schema.items() if k != "$ref"},
+                                **resolve_refs_and_fix_examples(defs[ref_key], defs),
+                            }
+                            return resolved
+
+                # Handle examples -> example conversion
+                result = {}
+                for key, value in schema.items():
+                    # Convert "examples" to "example" for Google Schema
+                    if key == "examples":
+                        result["example"] = value
+                    elif isinstance(value, dict):
+                        result[key] = resolve_refs_and_fix_examples(value, defs)
+                    elif isinstance(value, list):
+                        result[key] = [
+                            resolve_refs_and_fix_examples(item, defs)
+                            if isinstance(item, dict)
+                            else item
+                            for item in value
+                        ]
+                    else:
+                        result[key] = value
+                return result
+
+            # Extract $defs if they exist
+            defs = {}
             if "$defs" in fn["parameters"]:
                 defs = fn["parameters"].pop("$defs")
 
-                def resolve_refs(schema: dict[str, Any]) -> dict[str, Any]:
-                    """Recursively resolve $ref references using the $defs dictionary."""
-                    # If this is a reference, resolve it
-                    if "$ref" in schema:
-                        ref = schema["$ref"]
-                        if ref.startswith("#/$defs/"):
-                            ref_key = ref.replace("#/$defs/", "")
-                            if ref_key in defs:
-                                # Merge the definition with the current schema (excluding $ref)
-                                resolved = {
-                                    **{k: v for k, v in schema.items() if k != "$ref"},
-                                    **resolve_refs(defs[ref_key]),
-                                }
-                                return resolved
-
-                    # Process all other keys recursively
-                    result = {}
-                    for key, value in schema.items():
-                        if isinstance(value, dict):
-                            result[key] = resolve_refs(value)
-                        elif isinstance(value, list):
-                            result[key] = [
-                                resolve_refs(item) if isinstance(item, dict) else item
-                                for item in value
-                            ]
-                        else:
-                            result[key] = value
-                    return result
-
-                # Resolve all references in the parameters
-                fn["parameters"] = resolve_refs(fn["parameters"])
+            # Resolve all references in the parameters and fix examples
+            fn["parameters"] = resolve_refs_and_fix_examples(fn["parameters"], defs)
 
             def handle_enum_schema(prop_schema: dict[str, Any]) -> dict[str, Any]:
                 if "enum" in prop_schema:
@@ -112,6 +121,7 @@ class GoogleTool(BaseTool):
                 return prop_schema
 
             # Process properties after resolving references
+            # We're already handling examples -> example conversion recursively above
             fn["parameters"]["properties"] = {
                 prop: {
                     key: value
@@ -120,6 +130,7 @@ class GoogleTool(BaseTool):
                 }
                 for prop, prop_schema in fn["parameters"]["properties"].items()
             }
+
         return Tool(function_declarations=[FunctionDeclaration(**fn)])
 
     @classmethod

{mirascope-1.21.1.dist-info → mirascope-1.21.3.dist-info}/METADATA

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

{mirascope-1.21.1.dist-info → mirascope-1.21.3.dist-info}/RECORD

@@ -158,7 +158,7 @@ mirascope/core/bedrock/_utils/_convert_message_params.py,sha256=ZPFj34ed0-4bmMld
 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/_setup_call.py,sha256=md-1FilnhgPpNqJpkOZKlrVpt6kRQneEeCU8GvK-p8o,8572
+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
 mirascope/core/cohere/_call_kwargs.py,sha256=YmHwiofs0QADGp0wXUtOr_Z5Pt849zaCtIZmVyjw2OM,292
@@ -217,7 +217,7 @@ mirascope/core/google/call_response.py,sha256=8yn1cRtqxhnjjzLltfWMzLbaS1Dg7gmS4I
 mirascope/core/google/call_response_chunk.py,sha256=oORYaGjOBv4U1IVhsR_ZS-Vr-B58I8G0-9d6Kcj9RM4,3427
 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=HPe7CZEn1nPFkvuigpDiTdU9y9cQGp6R68FChjETMAU,4623
+mirascope/core/google/tool.py,sha256=61a9Ejdxz41pwaab9VE2yvP_J1Aebua3BeRPJ_GJSnE,5138
 mirascope/core/google/_utils/__init__.py,sha256=vL0hx6WKW5lqpUcFTFCFGvmwtR-pts0JzWgCXhaUVrI,388
 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
@@ -368,7 +368,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.21.1.dist-info/METADATA,sha256=G2jXSfZomkT1FvuLahmGaE83CA4RMPdhwIujlADIbc8,8730
-mirascope-1.21.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mirascope-1.21.1.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
-mirascope-1.21.1.dist-info/RECORD,,
+mirascope-1.21.3.dist-info/METADATA,sha256=C4EyG1JBa6VMuS-WqgsCGClL3eLVtBN0dPzL1nJ6Rsg,8730
+mirascope-1.21.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mirascope-1.21.3.dist-info/licenses/LICENSE,sha256=LAs5Q8mdawTsVdONpDGukwsoc4KEUBmmonDEL39b23Y,1072
+mirascope-1.21.3.dist-info/RECORD,,