google-genai 1.5.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

google/genai/_transformers.py

@@ -26,9 +26,7 @@ import sys
 import time
 import types as builtin_types
 import typing
-from typing import Any, GenericAlias, Optional, Union
-
-import types as builtin_types
+from typing import Any, GenericAlias, Optional, Union  # type: ignore[attr-defined]
 
 if typing.TYPE_CHECKING:
   import PIL.Image
@@ -43,10 +41,11 @@ logger = logging.getLogger('google_genai._transformers')
 if sys.version_info >= (3, 10):
   VersionedUnionType = builtin_types.UnionType
   _UNION_TYPES = (typing.Union, builtin_types.UnionType)
+  from typing import TypeGuard
 else:
   VersionedUnionType = typing._UnionGenericAlias
   _UNION_TYPES = (typing.Union,)
-
+  from typing_extensions import TypeGuard
 
 def _resource_name(
     client: _api_client.BaseApiClient,
@@ -165,7 +164,9 @@ def t_model(client: _api_client.BaseApiClient, model: str):
       return f'models/{model}'
 
 
-def t_models_url(api_client: _api_client.BaseApiClient, base_models: bool) -> str:
+def t_models_url(
+    api_client: _api_client.BaseApiClient, base_models: bool
+) -> str:
   if api_client.vertexai:
     if base_models:
       return 'publishers/google/models'
@@ -179,7 +180,8 @@ def t_models_url(api_client: _api_client.BaseApiClient, base_models: bool) -> st
 
 
 def t_extract_models(
-    api_client: _api_client.BaseApiClient, response: dict[str, list[types.ModelDict]]
+    api_client: _api_client.BaseApiClient,
+    response: dict[str, list[types.ModelDict]],
 ) -> Optional[list[types.ModelDict]]:
   if not response:
     return []
@@ -240,9 +242,7 @@ def pil_to_blob(img) -> types.Blob:
   return types.Blob(mime_type=mime_type, data=data)
 
 
-def t_part(
-    part: Optional[types.PartUnionDict]
-) -> types.Part:
+def t_part(part: Optional[types.PartUnionDict]) -> types.Part:
   try:
     import PIL.Image
 
@@ -268,7 +268,7 @@ def t_part(
 
 
 def t_parts(
-    parts: Optional[Union[list[types.PartUnionDict], types.PartUnionDict]],
+    parts: Optional[Union[list[types.PartUnionDict], types.PartUnionDict, list[types.Part]]],
 ) -> list[types.Part]:
   #
   if parts is None or (isinstance(parts, list) and not parts):
@@ -332,22 +332,35 @@ def t_content(
 def t_contents_for_embed(
     client: _api_client.BaseApiClient,
     contents: Union[list[types.Content], list[types.ContentDict], ContentType],
-):
-  if client.vertexai and isinstance(contents, list):
-    # TODO: Assert that only text is supported.
-    return [t_content(client, content).parts[0].text for content in contents]
-  elif client.vertexai:
-    return [t_content(client, contents).parts[0].text]
-  elif isinstance(contents, list):
-    return [t_content(client, content) for content in contents]
+) -> Union[list[str], list[types.Content]]:
+  if isinstance(contents, list):
+    transformed_contents = [t_content(client, content) for content in contents]
   else:
-    return [t_content(client, contents)]
+    transformed_contents = [t_content(client, contents)]
+
+  if client.vertexai:
+    text_parts = []
+    for content in transformed_contents:
+      if content is not None:
+        if isinstance(content, dict):
+          content = types.Content.model_validate(content)
+        if content.parts is not None:
+          for part in content.parts:
+            if part.text:
+              text_parts.append(part.text)
+            else:
+              logger.warning(
+                  f'Non-text part found, only returning text parts.'
+              )
+    return text_parts
+  else:
+    return transformed_contents
 
 
 def t_contents(
     client: _api_client.BaseApiClient,
     contents: Optional[
-        Union[types.ContentListUnion, types.ContentListUnionDict]
+        Union[types.ContentListUnion, types.ContentListUnionDict, types.Content]
     ],
 ) -> list[types.Content]:
   if contents is None or (isinstance(contents, list) and not contents):
@@ -365,7 +378,7 @@ def t_contents(
   result: list[types.Content] = []
   accumulated_parts: list[types.Part] = []
 
-  def _is_part(part: types.PartUnionDict) -> bool:
+  def _is_part(part: Union[types.PartUnionDict, Any]) -> TypeGuard[types.PartUnionDict]:
     if (
         isinstance(part, str)
         or isinstance(part, types.File)
@@ -429,11 +442,11 @@ def t_contents(
     ):
       _append_accumulated_parts_as_content(result, accumulated_parts)
       if isinstance(content, list):
-        result.append(types.UserContent(parts=content))
+        result.append(types.UserContent(parts=content))  # type: ignore[arg-type]
       else:
         result.append(content)
-    elif (_is_part(content)): # type: ignore
-      _handle_current_part(result, accumulated_parts, content) # type: ignore
+    elif (_is_part(content)):
+      _handle_current_part(result, accumulated_parts, content)
     elif isinstance(content, dict):
       # PactDict is already handled in _is_part
       result.append(types.Content.model_validate(content))
@@ -499,7 +512,7 @@ def handle_null_fields(schema: dict[str, Any]):
         schema['anyOf'].remove({'type': 'null'})
         if len(schema['anyOf']) == 1:
           # If there is only one type left after removing null, remove the anyOf field.
-          for key,val in schema['anyOf'][0].items():
+          for key, val in schema['anyOf'][0].items():
             schema[key] = val
           del schema['anyOf']
 
@@ -574,7 +587,8 @@ def process_schema(
 
     if schema.get('default') is not None:
       raise ValueError(
-          'Default value is not supported in the response schema for the Gemini API.'
+          'Default value is not supported in the response schema for the Gemini'
+          ' API.'
       )
 
   if schema.get('title') == 'PlaceholderLiteralEnum':
@@ -604,10 +618,6 @@ def process_schema(
 
   any_of = schema.get('anyOf', None)
   if any_of is not None:
-    if client and not client.vertexai:
-      raise ValueError(
-          'AnyOf is not supported in the response schema for the Gemini API.'
-      )
     for sub_schema in any_of:
       # $ref is present in any_of if the schema is a union of Pydantic classes
       ref_key = sub_schema.get('$ref', None)
@@ -670,7 +680,7 @@ def process_schema(
 
 
 def _process_enum(
-    enum: EnumMeta, client: Optional[_api_client.BaseApiClient] = None  # type: ignore
+    enum: EnumMeta, client: _api_client.BaseApiClient
 ) -> types.Schema:
   for member in enum:  # type: ignore
     if not isinstance(member.value, str):
@@ -680,7 +690,7 @@ def _process_enum(
       )
 
   class Placeholder(pydantic.BaseModel):
-    placeholder: enum
+    placeholder: enum  # type: ignore[valid-type]
 
   enum_schema = Placeholder.model_json_schema()
   process_schema(enum_schema, client)
@@ -688,12 +698,19 @@ def _process_enum(
   return types.Schema.model_validate(enum_schema)
 
 
+def _is_type_dict_str_any(origin: Union[types.SchemaUnionDict, Any]) -> TypeGuard[dict[str, Any]]:
+  """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
+  )
+
+
 def t_schema(
     client: _api_client.BaseApiClient, origin: Union[types.SchemaUnionDict, Any]
 ) -> Optional[types.Schema]:
   if not origin:
     return None
-  if isinstance(origin, dict):
+  if isinstance(origin, dict) and _is_type_dict_str_any(origin):
     process_schema(origin, client, order_properties=False)
     return types.Schema.model_validate(origin)
   if isinstance(origin, EnumMeta):
@@ -724,7 +741,7 @@ def t_schema(
   ):
 
     class Placeholder(pydantic.BaseModel):
-      placeholder: origin
+      placeholder: origin  # type: ignore[valid-type]
 
     schema = Placeholder.model_json_schema()
     process_schema(schema, client)
@@ -735,7 +752,8 @@ def t_schema(
 
 
 def t_speech_config(
-    _: _api_client.BaseApiClient, origin: Union[types.SpeechConfigUnionDict, Any]
+    _: _api_client.BaseApiClient,
+    origin: Union[types.SpeechConfigUnionDict, Any],
 ) -> Optional[types.SpeechConfig]:
   if not origin:
     return None
@@ -794,7 +812,10 @@ def t_tools(
     transformed_tool = t_tool(client, tool)
     # All functions should be merged into one tool.
     if transformed_tool is not None:
-      if transformed_tool.function_declarations:
+      if (
+          transformed_tool.function_declarations
+          and function_tool.function_declarations is not None
+      ):
         function_tool.function_declarations += (
             transformed_tool.function_declarations
         )
@@ -896,7 +917,10 @@ def t_file_name(
   elif isinstance(name, types.Video):
     name = name.uri
   elif isinstance(name, types.GeneratedVideo):
-    name = name.video.uri
+    if name.video is not None:
+      name = name.video.uri
+    else:
+      name = None
 
   if name is None:
     raise ValueError('File name is required.')

google/genai/batches.py

@@ -998,6 +998,8 @@ class Batches(_api_module.BaseModule):
       for batch_job in batch_jobs:
         print(f"Batch job: {batch_job.name}, state {batch_job.state}")
     """
+    if config is None:
+      config = types.ListBatchJobsConfig()
     return Pager(
         'batch_jobs',
         self._list,
@@ -1373,6 +1375,8 @@ class AsyncBatches(_api_module.BaseModule):
       await batch_jobs_pager.next_page()
       print(f"next page: {batch_jobs_pager.page}")
     """
+    if config is None:
+      config = types.ListBatchJobsConfig()
     return AsyncPager(
         'batch_jobs',
         self._list,

google/genai/caches.py

@@ -174,15 +174,9 @@ def _Schema_to_mldev(
   if getv(from_object, ['pattern']) is not None:
     raise ValueError('pattern parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['minimum']) is not None:
-    raise ValueError('minimum parameter is not supported in Gemini API.')
-
   if getv(from_object, ['default']) is not None:
     raise ValueError('default parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['any_of']) is not None:
-    raise ValueError('any_of parameter is not supported in Gemini API.')
-
   if getv(from_object, ['max_length']) is not None:
     raise ValueError('max_length parameter is not supported in Gemini API.')
 
@@ -195,12 +189,12 @@ def _Schema_to_mldev(
   if getv(from_object, ['min_properties']) is not None:
     raise ValueError('min_properties parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['maximum']) is not None:
-    raise ValueError('maximum parameter is not supported in Gemini API.')
-
   if getv(from_object, ['max_properties']) is not None:
     raise ValueError('max_properties parameter is not supported in Gemini API.')
 
+  if getv(from_object, ['any_of']) is not None:
+    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
+
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -216,9 +210,15 @@ def _Schema_to_mldev(
   if getv(from_object, ['max_items']) is not None:
     setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
 
+  if getv(from_object, ['maximum']) is not None:
+    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
+
   if getv(from_object, ['min_items']) is not None:
     setv(to_object, ['minItems'], getv(from_object, ['min_items']))
 
+  if getv(from_object, ['minimum']) is not None:
+    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
+
   if getv(from_object, ['nullable']) is not None:
     setv(to_object, ['nullable'], getv(from_object, ['nullable']))
 
@@ -253,15 +253,9 @@ def _Schema_to_vertex(
   if getv(from_object, ['pattern']) is not None:
     setv(to_object, ['pattern'], getv(from_object, ['pattern']))
 
-  if getv(from_object, ['minimum']) is not None:
-    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
-
   if getv(from_object, ['default']) is not None:
     setv(to_object, ['default'], getv(from_object, ['default']))
 
-  if getv(from_object, ['any_of']) is not None:
-    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
-
   if getv(from_object, ['max_length']) is not None:
     setv(to_object, ['maxLength'], getv(from_object, ['max_length']))
 
@@ -274,12 +268,12 @@ def _Schema_to_vertex(
   if getv(from_object, ['min_properties']) is not None:
     setv(to_object, ['minProperties'], getv(from_object, ['min_properties']))
 
-  if getv(from_object, ['maximum']) is not None:
-    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
-
   if getv(from_object, ['max_properties']) is not None:
     setv(to_object, ['maxProperties'], getv(from_object, ['max_properties']))
 
+  if getv(from_object, ['any_of']) is not None:
+    setv(to_object, ['anyOf'], getv(from_object, ['any_of']))
+
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
 
@@ -295,9 +289,15 @@ def _Schema_to_vertex(
   if getv(from_object, ['max_items']) is not None:
     setv(to_object, ['maxItems'], getv(from_object, ['max_items']))
 
+  if getv(from_object, ['maximum']) is not None:
+    setv(to_object, ['maximum'], getv(from_object, ['maximum']))
+
   if getv(from_object, ['min_items']) is not None:
     setv(to_object, ['minItems'], getv(from_object, ['min_items']))
 
+  if getv(from_object, ['minimum']) is not None:
+    setv(to_object, ['minimum'], getv(from_object, ['minimum']))
+
   if getv(from_object, ['nullable']) is not None:
     setv(to_object, ['nullable'], getv(from_object, ['nullable']))
 
@@ -1176,10 +1176,7 @@ class Caches(_api_module.BaseModule):
       model: str,
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
-    """Creates cached content, this call will initialize the cached
-
-    content in the data storage, and users need to pay for the cache data
-    storage.
+    """Creates a cached contents resource.
 
     Usage:
 
@@ -1562,10 +1559,7 @@ class AsyncCaches(_api_module.BaseModule):
       model: str,
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
-    """Creates cached content, this call will initialize the cached
-
-    content in the data storage, and users need to pay for the cache data
-    storage.
+    """Creates a cached contents resource.
 
     Usage: