google-genai 1.27.0__py3-none-any.whl → 1.29.0__py3-none-any.whl

google/genai/_common.py

@@ -22,15 +22,17 @@ import enum
 import functools
 import logging
 import typing
-from typing import Any, Callable, Optional, FrozenSet, Union, get_args, get_origin
+from typing import Any, Callable, FrozenSet, Optional, Union, get_args, get_origin
 import uuid
 import warnings
-
 import pydantic
 from pydantic import alias_generators
+from typing_extensions import TypeAlias
 
 logger = logging.getLogger('google_genai._common')
 
+StringDict: TypeAlias = dict[str, Any]
+
 
 class ExperimentalWarning(Warning):
   """Warning for experimental features."""
@@ -355,7 +357,6 @@ def _pretty_repr(
     return raw_repr.replace('\n', f'\n{next_indent_str}')
 
 
-
 def _format_collection(
     obj: Any,
     *,
@@ -555,7 +556,9 @@ def _normalize_key_for_matching(key_str: str) -> str:
   return key_str.replace("_", "").lower()
 
 
-def align_key_case(target_dict: dict[str, Any], update_dict: dict[str, Any]) -> dict[str, Any]:
+def align_key_case(
+    target_dict: StringDict, update_dict: StringDict
+) -> StringDict:
   """Aligns the keys of update_dict to the case of target_dict keys.
 
   Args:
@@ -565,7 +568,7 @@ def align_key_case(target_dict: dict[str, Any], update_dict: dict[str, Any]) ->
   Returns:
       A new dictionary with keys aligned to target_dict's key casing.
   """
-  aligned_update_dict: dict[str, Any] = {}
+  aligned_update_dict: StringDict = {}
   target_keys_map = {_normalize_key_for_matching(key): key for key in target_dict.keys()}
 
   for key, value in update_dict.items():
@@ -587,7 +590,7 @@ def align_key_case(target_dict: dict[str, Any], update_dict: dict[str, Any]) ->
 
 
 def recursive_dict_update(
-    target_dict: dict[str, Any], update_dict: dict[str, Any]
+    target_dict: StringDict, update_dict: StringDict
 ) -> None:
   """Recursively updates a target dictionary with values from an update dictionary.
 

google/genai/_extra_utils.py

@@ -155,8 +155,8 @@ def get_function_map(
 
 
 def convert_number_values_for_dict_function_call_args(
-    args: dict[str, Any],
-) -> dict[str, Any]:
+    args: _common.StringDict,
+) -> _common.StringDict:
   """Converts float values in dict with no decimal to integers."""
   return {
       key: convert_number_values_for_function_call_args(value)
@@ -257,8 +257,8 @@ def convert_if_exist_pydantic_model(
 
 
 def convert_argument_from_function(
-    args: dict[str, Any], function: Callable[..., Any]
-) -> dict[str, Any]:
+    args: _common.StringDict, function: Callable[..., Any]
+) -> _common.StringDict:
   signature = inspect.signature(function)
   func_name = function.__name__
   converted_args = {}
@@ -274,7 +274,7 @@ def convert_argument_from_function(
 
 
 def invoke_function_from_dict_args(
-    args: Dict[str, Any], function_to_invoke: Callable[..., Any]
+    args: _common.StringDict, function_to_invoke: Callable[..., Any]
 ) -> Any:
   converted_args = convert_argument_from_function(args, function_to_invoke)
   try:
@@ -288,7 +288,7 @@ def invoke_function_from_dict_args(
 
 
 async def invoke_function_from_dict_args_async(
-    args: Dict[str, Any], function_to_invoke: Callable[..., Any]
+    args: _common.StringDict, function_to_invoke: Callable[..., Any]
 ) -> Any:
   converted_args = convert_argument_from_function(args, function_to_invoke)
   try:
@@ -321,7 +321,7 @@ def get_function_response_parts(
         args = convert_number_values_for_dict_function_call_args(
             part.function_call.args
         )
-        func_response: dict[str, Any]
+        func_response: _common.StringDict
         try:
           if not isinstance(func, McpToGenAiToolAdapter):
             func_response = {
@@ -356,7 +356,7 @@ async def get_function_response_parts_async(
         args = convert_number_values_for_dict_function_call_args(
             part.function_call.args
         )
-        func_response: dict[str, Any]
+        func_response: _common.StringDict
         try:
           if isinstance(func, McpToGenAiToolAdapter):
             mcp_tool_response = await func.call_tool(

google/genai/_live_converters.py

@@ -1098,6 +1098,13 @@ def _LiveMusicGenerationConfig_to_mldev(
         getv(from_object, ['only_bass_and_drums']),
     )
 
+  if getv(from_object, ['music_generation_mode']) is not None:
+    setv(
+        to_object,
+        ['musicGenerationMode'],
+        getv(from_object, ['music_generation_mode']),
+    )
+
   return to_object
 
 
@@ -2871,6 +2878,13 @@ def _LiveMusicGenerationConfig_from_mldev(
         getv(from_object, ['onlyBassAndDrums']),
     )
 
+  if getv(from_object, ['musicGenerationMode']) is not None:
+    setv(
+        to_object,
+        ['music_generation_mode'],
+        getv(from_object, ['musicGenerationMode']),
+    )
+
   return to_object
 
 

google/genai/_mcp_utils.py

@@ -19,6 +19,7 @@ from importlib.metadata import PackageNotFoundError, version
 import typing
 from typing import Any
 
+from . import _common
 from . import types
 
 if typing.TYPE_CHECKING:
@@ -89,7 +90,9 @@ def set_mcp_usage_header(headers: dict[str, str]) -> None:
   ).lstrip()
 
 
-def _filter_to_supported_schema(schema: dict[str, Any]) -> dict[str, Any]:
+def _filter_to_supported_schema(
+    schema: _common.StringDict,
+) -> _common.StringDict:
   """Filters the schema to only include fields that are supported by JSONSchema."""
   supported_fields: set[str] = set(types.JSONSchema.model_fields.keys())
   schema_field_names: tuple[str] = ("items",)  # 'additional_properties' to come

google/genai/_replay_api_client.py

@@ -479,13 +479,14 @@ class ReplayApiClient(BaseApiClient):
   def _request(
       self,
       http_request: HttpRequest,
+      http_options: Optional[HttpOptionsOrDict] = None,
       stream: bool = False,
   ) -> HttpResponse:
     self._initialize_replay_session_if_not_loaded()
     if self._should_call_api():
       _debug_print('api mode request: %s' % http_request)
       try:
-        result = super()._request(http_request, stream)
+        result = super()._request(http_request, http_options, stream)
       except errors.APIError as e:
         self._record_interaction(http_request, e)
         raise e
@@ -507,13 +508,16 @@ class ReplayApiClient(BaseApiClient):
   async def _async_request(
       self,
       http_request: HttpRequest,
+      http_options: Optional[HttpOptionsOrDict] = None,
       stream: bool = False,
   ) -> HttpResponse:
     self._initialize_replay_session_if_not_loaded()
     if self._should_call_api():
       _debug_print('api mode request: %s' % http_request)
       try:
-        result = await super()._async_request(http_request, stream)
+        result = await super()._async_request(
+            http_request, http_options, stream
+        )
       except errors.APIError as e:
         self._record_interaction(http_request, e)
         raise e

google/genai/_transformers.py

@@ -35,6 +35,7 @@ if typing.TYPE_CHECKING:
 import pydantic
 
 from . import _api_client
+from . import _common
 from . import types
 
 logger = logging.getLogger('google_genai._transformers')
@@ -195,20 +196,20 @@ def t_models_url(
 
 
 def t_extract_models(
-    response: dict[str, Any],
-) -> list[dict[str, Any]]:
+    response: _common.StringDict,
+) -> list[_common.StringDict]:
   if not response:
     return []
 
-  models: Optional[list[dict[str, Any]]] = response.get('models')
+  models: Optional[list[_common.StringDict]] = response.get('models')
   if models is not None:
     return models
 
-  tuned_models: Optional[list[dict[str, Any]]] = response.get('tunedModels')
+  tuned_models: Optional[list[_common.StringDict]] = response.get('tunedModels')
   if tuned_models is not None:
     return tuned_models
 
-  publisher_models: Optional[list[dict[str, Any]]] = response.get(
+  publisher_models: Optional[list[_common.StringDict]] = response.get(
       'publisherModels'
   )
   if publisher_models is not None:
@@ -560,7 +561,7 @@ def t_contents(
   return result
 
 
-def handle_null_fields(schema: dict[str, Any]) -> None:
+def handle_null_fields(schema: _common.StringDict) -> None:
   """Process null fields in the schema so it is compatible with OpenAPI.
 
   The OpenAPI spec does not support 'type: 'null' in the schema. This function
@@ -639,9 +640,9 @@ def _raise_for_unsupported_mldev_properties(
 
 
 def process_schema(
-    schema: dict[str, Any],
+    schema: _common.StringDict,
     client: Optional[_api_client.BaseApiClient],
-    defs: Optional[dict[str, Any]] = None,
+    defs: Optional[_common.StringDict] = None,
     *,
     order_properties: bool = True,
 ) -> None:
@@ -740,7 +741,7 @@ def process_schema(
   if (ref := schema.pop('$ref', None)) is not None:
     schema.update(defs[ref.split('defs/')[-1]])
 
-  def _recurse(sub_schema: dict[str, Any]) -> dict[str, Any]:
+  def _recurse(sub_schema: _common.StringDict) -> _common.StringDict:
     """Returns the processed `sub_schema`, resolving its '$ref' if any."""
     if (ref := sub_schema.pop('$ref', None)) is not None:
       sub_schema = defs[ref.split('defs/')[-1]]
@@ -820,7 +821,7 @@ def _process_enum(
 
 def _is_type_dict_str_any(
     origin: Union[types.SchemaUnionDict, Any],
-) -> TypeGuard[dict[str, Any]]:
+) -> TypeGuard[_common.StringDict]:
   """Verifies the schema is of type dict[str, Any] for mypy type checking."""
   return isinstance(origin, dict) and all(
       isinstance(key, str) for key in origin
@@ -1075,10 +1076,10 @@ LRO_POLLING_MULTIPLIER = 1.5
 
 
 def t_resolve_operation(
-    api_client: _api_client.BaseApiClient, struct: dict[str, Any]
+    api_client: _api_client.BaseApiClient, struct: _common.StringDict
 ) -> Any:
   if (name := struct.get('name')) and '/operations/' in name:
-    operation: dict[str, Any] = struct
+    operation: _common.StringDict = struct
     total_seconds = 0.0
     delay_seconds = LRO_POLLING_INITIAL_DELAY_SECONDS
     while operation.get('done') != True:

google/genai/batches.py

@@ -1492,6 +1492,9 @@ def _GenerateContentResponse_from_mldev(
   if getv(from_object, ['promptFeedback']) is not None:
     setv(to_object, ['prompt_feedback'], getv(from_object, ['promptFeedback']))
 
+  if getv(from_object, ['responseId']) is not None:
+    setv(to_object, ['response_id'], getv(from_object, ['responseId']))
+
   if getv(from_object, ['usageMetadata']) is not None:
     setv(to_object, ['usage_metadata'], getv(from_object, ['usageMetadata']))
 
@@ -1648,6 +1651,11 @@ def _DeleteResourceJob_from_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
+  if getv(from_object, ['sdkHttpResponse']) is not None:
+    setv(
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+    )
+
   if getv(from_object, ['name']) is not None:
     setv(to_object, ['name'], getv(from_object, ['name']))
 
@@ -1815,6 +1823,11 @@ def _DeleteResourceJob_from_vertex(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
+  if getv(from_object, ['sdkHttpResponse']) is not None:
+    setv(
+        to_object, ['sdk_http_response'], getv(from_object, ['sdkHttpResponse'])
+    )
+
   if getv(from_object, ['name']) is not None:
     setv(to_object, ['name'], getv(from_object, ['name']))
 
@@ -2186,7 +2199,9 @@ class Batches(_api_module.BaseModule):
     return_value = types.DeleteResourceJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
     )
-
+    return_value.sdk_http_response = types.HttpResponse(
+        headers=response.headers
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
@@ -2619,7 +2634,9 @@ class AsyncBatches(_api_module.BaseModule):
     return_value = types.DeleteResourceJob._from_response(
         response=response_dict, kwargs=parameter_model.model_dump()
     )
-
+    return_value.sdk_http_response = types.HttpResponse(
+        headers=response.headers
+    )
     self._api_client._verify_response(return_value)
     return return_value
 

google/genai/errors.py

@@ -65,7 +65,7 @@ class APIError(Exception):
         'code', response_json.get('error', {}).get('code', None)
     )
 
-  def _to_replay_record(self) -> dict[str, Any]:
+  def _to_replay_record(self) -> _common.StringDict:
     """Returns a dictionary representation of the error for replay recording.
 
     details is not included since it may expose internal information in the
@@ -172,18 +172,21 @@ class ServerError(APIError):
 
 class UnknownFunctionCallArgumentError(ValueError):
   """Raised when the function call argument cannot be converted to the parameter annotation."""
-
   pass
 
 
 class UnsupportedFunctionError(ValueError):
   """Raised when the function is not supported."""
+  pass
 
 
 class FunctionInvocationError(ValueError):
   """Raised when the function cannot be invoked with the given arguments."""
-
   pass
 
 
+class UnknownApiResponseError(ValueError):
+  """Raised when the response from the API cannot be parsed as JSON."""
+  pass
+
 ExperimentalWarning = _common.ExperimentalWarning

google/genai/live.py

@@ -33,7 +33,6 @@ from . import _common
 from . import _live_converters as live_converters
 from . import _mcp_utils
 from . import _transformers as t
-from . import client
 from . import errors
 from . import types
 from ._api_client import BaseApiClient
@@ -288,7 +287,7 @@ class AsyncSession:
           print(f'{msg.text}')
     ```
     """
-    kwargs: dict[str, Any] = {}
+    kwargs: _common.StringDict = {}
     if media is not None:
       kwargs['media'] = media
     if audio is not None:
@@ -639,7 +638,7 @@ class AsyncSession:
     elif isinstance(formatted_input, Sequence) and any(
         isinstance(c, str) for c in formatted_input
     ):
-      to_object: dict[str, Any] = {}
+      to_object: _common.StringDict = {}
       content_input_parts: list[types.PartUnion] = []
       for item in formatted_input:
         if isinstance(item, get_args(types.PartUnion)):