google-genai 0.7.0__py3-none-any.whl → 1.0.0__py3-none-any.whl

google/genai/_transformers.py

@@ -34,10 +34,12 @@ import pydantic
 from . import _api_client
 from . import types
 
-if sys.version_info >= (3, 11):
-  from types import UnionType
+if sys.version_info >= (3, 10):
+  VersionedUnionType = typing.types.UnionType
+  _UNION_TYPES = (typing.Union, typing.types.UnionType)
 else:
-  UnionType = typing._UnionGenericAlias
+  VersionedUnionType = typing._UnionGenericAlias
+  _UNION_TYPES = (typing.Union,)
 
 
 def _resource_name(
@@ -225,6 +227,7 @@ PartType = Union[types.Part, types.PartDict, str, 'PIL.Image.Image']
 def t_part(client: _api_client.ApiClient, part: PartType) -> types.Part:
   try:
     import PIL.Image
+
     PIL_Image = PIL.Image.Image
   except ImportError:
     PIL_Image = None
@@ -342,7 +345,7 @@ def handle_null_fields(schema: dict[str, Any]):
               "type": "null"
             }
           ],
-          "default": null,
+          "default": None,
           "title": "Total Area Sq Mi"
         }
       }
@@ -356,16 +359,12 @@ def handle_null_fields(schema: dict[str, Any]):
         "total_area_sq_mi": {
           "type": "integer",
           "nullable": true,
-          "default": null,
+          "default": None,
           "title": "Total Area Sq Mi"
         }
       }
   """
-  if (
-      isinstance(schema, dict)
-      and 'type' in schema
-      and schema['type'] == 'null'
-  ):
+  if schema.get('type', None) == 'null':
     schema['nullable'] = True
     del schema['type']
   elif 'anyOf' in schema:
@@ -445,6 +444,11 @@ def process_schema(
   if client and not client.vertexai:
     schema.pop('title', None)
 
+    if schema.get('default') is not None:
+      raise ValueError(
+          'Default value is not supported in the response schema for the Gemmini API.'
+      )
+
   if defs is None:
     defs = schema.pop('$defs', {})
     for _, sub_schema in defs.items():
@@ -454,8 +458,19 @@ def process_schema(
 
   any_of = schema.get('anyOf', None)
   if any_of is not None:
+    if not client.vertexai:
+      raise ValueError(
+          'AnyOf is not supported in the response schema for the Gemini API.'
+      )
     for sub_schema in any_of:
-      process_schema(sub_schema, client, defs)
+      # $ref is present in any_of if the schema is a union of Pydantic classes
+      ref_key = sub_schema.get('$ref', None)
+      if ref_key is None:
+        process_schema(sub_schema, client, defs)
+      else:
+        ref = defs[ref_key.split('defs/')[-1]]
+        any_of.append(ref)
+    schema['anyOf'] = [item for item in any_of if '$ref' not in item]
     return
 
   schema_type = schema.get('type', None)
@@ -526,15 +541,18 @@ def t_schema(
   if (
       # in Python 3.9 Generic alias list[int] counts as a type,
       # and breaks issubclass because it's not a class.
-      not isinstance(origin, GenericAlias) and 
-      isinstance(origin, type) and 
+      not isinstance(origin, GenericAlias) and
+      isinstance(origin, type) and
       issubclass(origin, pydantic.BaseModel)
   ):
     schema = origin.model_json_schema()
     process_schema(schema, client)
     return types.Schema.model_validate(schema)
   elif (
-        isinstance(origin, GenericAlias) or isinstance(origin, type) or isinstance(origin, UnionType)
+      isinstance(origin, GenericAlias)
+      or isinstance(origin, type)
+      or isinstance(origin, VersionedUnionType)
+      or typing.get_origin(origin) in _UNION_TYPES
   ):
     class Placeholder(pydantic.BaseModel):
       placeholder: origin

google/genai/errors.py

@@ -128,3 +128,7 @@ class FunctionInvocationError(ValueError):
   """Raised when the function cannot be invoked with the given arguments."""
 
   pass
+
+
+class ExperimentalWarning(Warning):
+  """Warning for experimental features."""

google/genai/files.py

@@ -19,7 +19,7 @@ import io
 import mimetypes
 import os
 import pathlib
-from typing import Optional, Union
+from typing import Any, Optional, Union
 from urllib.parse import urlencode
 from . import _api_module
 from . import _common
@@ -351,12 +351,12 @@ def _DeleteFileParameters_to_vertex(
   return to_object
 
 
-def _FileState_to_vertex_enum_validate(enum_value: any):
+def _FileState_to_vertex_enum_validate(enum_value: Any):
   if enum_value in set(['STATE_UNSPECIFIED', 'PROCESSING', 'ACTIVE', 'FAILED']):
     raise ValueError(f'{enum_value} enum value is not supported in Vertex AI.')
 
 
-def _FileSource_to_vertex_enum_validate(enum_value: any):
+def _FileSource_to_vertex_enum_validate(enum_value: Any):
   if enum_value in set(['SOURCE_UNSPECIFIED', 'UPLOADED', 'GENERATED']):
     raise ValueError(f'{enum_value} enum value is not supported in Vertex AI.')
 
@@ -494,6 +494,8 @@ def _CreateFileResponse_from_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+  if getv(from_object, ['httpHeaders']) is not None:
+    setv(to_object, ['http_headers'], getv(from_object, ['httpHeaders']))
 
   return to_object
 
@@ -504,6 +506,8 @@ def _CreateFileResponse_from_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+  if getv(from_object, ['httpHeaders']) is not None:
+    setv(to_object, ['http_headers'], getv(from_object, ['httpHeaders']))
 
   return to_object
 
@@ -781,16 +785,17 @@ class Files(_api_module.BaseModule):
   def upload(
       self,
       *,
-      path: Union[str, pathlib.Path, os.PathLike, io.IOBase],
+      file: Union[str, pathlib.Path, os.PathLike, io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file using a supported file service.
 
     Args:
-      path: The path to the file or an `IOBase` object to be uploaded. If it's
-        an IOBase object, it must be opened in blocking mode and binary mode. In
-        other words, do not use non-blocking mode or text mode. The given stream
-        must be seekable, that is, it must be able to call seek() on 'path'.
+      file: A path to the file or an `IOBase` object to be uploaded. If it's an
+        IOBase object, it must be opened in blocking (the default) mode and
+        binary mode. In other words, do not use non-blocking mode or text mode.
+        The given stream must be seekable, that is, it must be able to call
+        `seek()` on 'path'.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
     if self._api_client.vertexai:
@@ -804,42 +809,42 @@ class Files(_api_module.BaseModule):
         config_model = types.UploadFileConfig(**config)
       else:
         config_model = config
-      file = types.File(
+      file_obj = types.File(
           mime_type=config_model.mime_type,
           name=config_model.name,
           display_name=config_model.display_name,
       )
     else:  # if not config
-      file = types.File()
-    if file.name is not None and not file.name.startswith('files/'):
-      file.name = f'files/{file.name}'
+      file_obj = types.File()
+    if file_obj.name is not None and not file_obj.name.startswith('files/'):
+      file_obj.name = f'files/{file_obj.name}'
 
-    if isinstance(path, io.IOBase):
-      if file.mime_type is None:
+    if isinstance(file, io.IOBase):
+      if file_obj.mime_type is None:
         raise ValueError(
             'Unknown mime type: Could not determine the mimetype for your'
             ' file\n please set the `mime_type` argument'
         )
-      if hasattr(path, 'mode'):
-        if 'b' not in path.mode:
+      if hasattr(file, 'mode'):
+        if 'b' not in file.mode:
           raise ValueError('The file must be opened in binary mode.')
-      offset = path.tell()
-      path.seek(0, os.SEEK_END)
-      file.size_bytes = path.tell() - offset
-      path.seek(offset, os.SEEK_SET)
+      offset = file.tell()
+      file.seek(0, os.SEEK_END)
+      file_obj.size_bytes = file.tell() - offset
+      file.seek(offset, os.SEEK_SET)
     else:
-      fs_path = os.fspath(path)
+      fs_path = os.fspath(file)
       if not fs_path or not os.path.isfile(fs_path):
-        raise FileNotFoundError(f'{path} is not a valid file path.')
-      file.size_bytes = os.path.getsize(fs_path)
-      if file.mime_type is None:
-        file.mime_type, _ = mimetypes.guess_type(fs_path)
-      if file.mime_type is None:
+        raise FileNotFoundError(f'{file} is not a valid file path.')
+      file_obj.size_bytes = os.path.getsize(fs_path)
+      if file_obj.mime_type is None:
+        file_obj.mime_type, _ = mimetypes.guess_type(fs_path)
+      if file_obj.mime_type is None:
         raise ValueError(
             'Unknown mime type: Could not determine the mimetype for your'
             ' file\n    please set the `mime_type` argument'
         )
-    response = {}
+
     if config_model and config_model.http_options:
       http_options = config_model.http_options
     else:
@@ -849,30 +854,31 @@ class Files(_api_module.BaseModule):
               'Content-Type': 'application/json',
               'X-Goog-Upload-Protocol': 'resumable',
               'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file.mime_type}',
+              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
+              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
           },
-          'deprecated_response_payload': response,
       }
-    self._create(file=file, config={'http_options': http_options})
+    response = self._create(
+        file=file_obj, config={'http_options': http_options}
+    )
 
     if (
-        'headers' not in response
-        or 'X-Goog-Upload-URL' not in response['headers']
+        response.http_headers is None
+        or 'X-Goog-Upload-URL' not in response.http_headers
     ):
       raise KeyError(
           'Failed to create file. Upload URL did not returned from the create'
           ' file request.'
       )
-    upload_url = response['headers']['X-Goog-Upload-URL']
+    upload_url = response.http_headers['X-Goog-Upload-URL']
 
-    if isinstance(path, io.IOBase):
+    if isinstance(file, io.IOBase):
       return_file = self._api_client.upload_file(
-          path, upload_url, file.size_bytes
+          file, upload_url, file_obj.size_bytes
       )
     else:
       return_file = self._api_client.upload_file(
-          fs_path, upload_url, file.size_bytes
+          fs_path, upload_url, file_obj.size_bytes
       )
 
     return types.File._from_response(
@@ -1211,16 +1217,17 @@ class AsyncFiles(_api_module.BaseModule):
   async def upload(
       self,
       *,
-      path: Union[str, pathlib.Path, os.PathLike, io.IOBase],
+      file: Union[str, pathlib.Path, os.PathLike, io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file asynchronously using a supported file service.
 
     Args:
-      path:  The path to the file or an `IOBase` object to be uploaded. If it's
-        an IOBase object, it must be opened in blocking mode and binary mode. In
-        other words, do not use non-blocking mode or text mode. The given stream
-        must be seekable, that is, it must be able to call seek() on 'path'.
+      file: A path to the file or an `IOBase` object to be uploaded. If it's an
+        IOBase object, it must be opened in blocking (the default) mode and
+        binary mode. In other words, do not use non-blocking mode or text mode.
+        The given stream must be seekable, that is, it must be able to call
+        `seek()` on 'path'.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
     if self._api_client.vertexai:
@@ -1234,43 +1241,42 @@ class AsyncFiles(_api_module.BaseModule):
         config_model = types.UploadFileConfig(**config)
       else:
         config_model = config
-      file = types.File(
+      file_obj = types.File(
           mime_type=config_model.mime_type,
           name=config_model.name,
           display_name=config_model.display_name,
       )
     else:  # if not config
-      file = types.File()
-    if file.name is not None and not file.name.startswith('files/'):
-      file.name = f'files/{file.name}'
+      file_obj = types.File()
+    if file_obj.name is not None and not file_obj.name.startswith('files/'):
+      file_obj.name = f'files/{file_obj.name}'
 
-    if isinstance(path, io.IOBase):
-      if file.mime_type is None:
+    if isinstance(file, io.IOBase):
+      if file_obj.mime_type is None:
         raise ValueError(
             'Unknown mime type: Could not determine the mimetype for your'
             ' file\n    please set the `mime_type` argument'
         )
-      if hasattr(path, 'mode'):
-        if 'b' not in path.mode:
+      if hasattr(file, 'mode'):
+        if 'b' not in file.mode:
           raise ValueError('The file must be opened in binary mode.')
-      offset = path.tell()
-      path.seek(0, os.SEEK_END)
-      file.size_bytes = path.tell() - offset
-      path.seek(offset, os.SEEK_SET)
+      offset = file.tell()
+      file.seek(0, os.SEEK_END)
+      file_obj.size_bytes = file.tell() - offset
+      file.seek(offset, os.SEEK_SET)
     else:
-      fs_path = os.fspath(path)
+      fs_path = os.fspath(file)
       if not fs_path or not os.path.isfile(fs_path):
-        raise FileNotFoundError(f'{path} is not a valid file path.')
-      file.size_bytes = os.path.getsize(fs_path)
-      if file.mime_type is None:
-        file.mime_type, _ = mimetypes.guess_type(fs_path)
-      if file.mime_type is None:
+        raise FileNotFoundError(f'{file} is not a valid file path.')
+      file_obj.size_bytes = os.path.getsize(fs_path)
+      if file_obj.mime_type is None:
+        file_obj.mime_type, _ = mimetypes.guess_type(fs_path)
+      if file_obj.mime_type is None:
         raise ValueError(
             'Unknown mime type: Could not determine the mimetype for your'
             ' file\n    please set the `mime_type` argument'
         )
 
-    response = {}
     if config_model and config_model.http_options:
       http_options = config_model.http_options
     else:
@@ -1280,29 +1286,31 @@ class AsyncFiles(_api_module.BaseModule):
               'Content-Type': 'application/json',
               'X-Goog-Upload-Protocol': 'resumable',
               'X-Goog-Upload-Command': 'start',
-              'X-Goog-Upload-Header-Content-Length': f'{file.size_bytes}',
-              'X-Goog-Upload-Header-Content-Type': f'{file.mime_type}',
+              'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
+              'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
           },
-          'deprecated_response_payload': response,
       }
-    await self._create(file=file, config={'http_options': http_options})
+    response = await self._create(
+        file=file_obj, config={'http_options': http_options}
+    )
+
     if (
-        'headers' not in response
-        or 'X-Goog-Upload-URL' not in response['headers']
+        response.http_headers is None
+        or 'X-Goog-Upload-URL' not in response.http_headers
     ):
       raise KeyError(
           'Failed to create file. Upload URL did not returned from the create'
           ' file request.'
       )
-    upload_url = response['headers']['X-Goog-Upload-URL']
+    upload_url = response.http_headers['X-Goog-Upload-URL']
 
-    if isinstance(path, io.IOBase):
+    if isinstance(file, io.IOBase):
       return_file = await self._api_client.async_upload_file(
-          path, upload_url, file.size_bytes
+          file, upload_url, file_obj.size_bytes
       )
     else:
       return_file = await self._api_client.async_upload_file(
-          fs_path, upload_url, file.size_bytes
+          fs_path, upload_url, file_obj.size_bytes
       )
 
     return types.File._from_response(

google/genai/live.py

@@ -29,8 +29,10 @@ from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import client
+from . import errors
 from . import types
 from ._api_client import ApiClient
+from ._common import experimental_warning
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .models import _Content_from_mldev
@@ -633,6 +635,9 @@ class AsyncLive(_api_module.BaseModule):
     return_value['setup'].update(to_object)
     return return_value
 
+  @experimental_warning(
+      "The live API is experimental and may change in future versions.",
+  )
   @contextlib.asynccontextmanager
   async def connect(
       self,