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

google/genai/client.py

@@ -149,49 +149,43 @@ class Client:
   ):
     """Initializes the client.
 
-       Args:
-          vertexai (bool):
-              Indicates whether the client should use the Vertex AI
-              API endpoints. Defaults to False (uses Gemini Developer API
-              endpoints). Applies to the Vertex AI API only.
-          api_key (str):
-              The `API key
-              <https://ai.google.dev/gemini-api/docs/api-key>`_ to use for
-              authentication. Applies to the Gemini Developer API only.
-          credentials (google.auth.credentials.Credentials):
-              The credentials to
-              use for authentication when calling the Vertex AI APIs. Credentials
-              can be obtained from environment variables and default credentials.
-              For more information, see `Set up Application Default Credentials
-              <https://cloud.google.com/docs/authentication/provide-credentials-adc>`_.
-              Applies to the Vertex AI API only.
-          project (str):
-              The `Google Cloud project ID
-              <https://cloud.google.com/vertex-ai/docs/start/cloud-environment>`_ to
-              use for quota. Can be obtained from environment variables (for
-              example, ``GOOGLE_CLOUD_PROJECT``). Applies to the Vertex AI API only.
-          location (str):
-              The `location
-              <https://cloud.google.com/vertex-ai/generative-ai/docs/learn/locations>`_
-              to send API requests to (for example, ``us-central1``). Can be
-              obtained from environment variables. Applies to the Vertex AI API
-              only.
-          debug_config (DebugConfig):
-              Config settings that control network
-              behavior of the client. This is typically used when running test code.
-          http_options (Union[HttpOptions, HttpOptionsDict]):
-              Http options to use for the client. Response_payload can't be
-              set when passing to the client constructor.
+    Args:
+       vertexai (bool): Indicates whether the client should use the Vertex AI
+         API endpoints. Defaults to False (uses Gemini Developer API endpoints).
+         Applies to the Vertex AI API only.
+       api_key (str): The `API key
+         <https://ai.google.dev/gemini-api/docs/api-key>`_ to use for
+         authentication. Applies to the Gemini Developer API only.
+       credentials (google.auth.credentials.Credentials): The credentials to use
+         for authentication when calling the Vertex AI APIs. Credentials can be
+         obtained from environment variables and default credentials. For more
+         information, see `Set up Application Default Credentials
+         <https://cloud.google.com/docs/authentication/provide-credentials-adc>`_.
+         Applies to the Vertex AI API only.
+       project (str): The `Google Cloud project ID
+         <https://cloud.google.com/vertex-ai/docs/start/cloud-environment>`_ to
+         use for quota. Can be obtained from environment variables (for example,
+         ``GOOGLE_CLOUD_PROJECT``). Applies to the Vertex AI API only.
+       location (str): The `location
+         <https://cloud.google.com/vertex-ai/generative-ai/docs/learn/locations>`_
+         to send API requests to (for example, ``us-central1``). Can be obtained
+         from environment variables. Applies to the Vertex AI API only.
+       debug_config (DebugConfig): Config settings that control network behavior
+         of the client. This is typically used when running test code.
+       http_options (Union[HttpOptions, HttpOptionsDict]): Http options to use
+         for the client. The field deprecated_response_payload should not be set
+         in http_options.
     """
 
     self._debug_config = debug_config or DebugConfig()
 
-    # Throw ValueError if response_payload is set in http_options due to
-    # unpredictable behavior when running multiple coroutines through
+    # Throw ValueError if deprecated_response_payload is set in http_options
+    # due to unpredictable behavior when running multiple coroutines through
     # client.aio.
-    if http_options and 'response_payload' in http_options:
+    if http_options and 'deprecated_response_payload' in http_options:
       raise ValueError(
-          'Setting response_payload in http_options is not supported.'
+          'Setting deprecated_response_payload in http_options is not'
+          ' supported.'
       )
 
     self._api_client = self._get_api_client(

google/genai/files.py

@@ -21,6 +21,7 @@ import os
 import pathlib
 from typing import Optional, Union
 from urllib.parse import urlencode
+from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import types
@@ -36,8 +37,6 @@ def _ListFilesConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['page_size']) is not None:
     setv(
@@ -60,8 +59,6 @@ def _ListFilesConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['page_size']) is not None:
     setv(
@@ -252,30 +249,6 @@ def _File_to_vertex(
   return to_object
 
 
-def _CreateFileConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _CreateFileConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _CreateFileParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -290,13 +263,7 @@ def _CreateFileParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _CreateFileConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -316,30 +283,6 @@ def _CreateFileParameters_to_vertex(
   return to_object
 
 
-def _GetFileConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _GetFileConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _GetFileParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -354,13 +297,7 @@ def _GetFileParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _GetFileConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -380,30 +317,6 @@ def _GetFileParameters_to_vertex(
   return to_object
 
 
-def _DeleteFileConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _DeleteFileConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _DeleteFileParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -418,13 +331,7 @@ def _DeleteFileParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _DeleteFileConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -444,6 +351,16 @@ def _DeleteFileParameters_to_vertex(
   return to_object
 
 
+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):
+  if enum_value in set(['SOURCE_UNSPECIFIED', 'UPLOADED', 'GENERATED']):
+    raise ValueError(f'{enum_value} enum value is not supported in Vertex AI.')
+
+
 def _FileStatus_from_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -611,7 +528,7 @@ def _DeleteFileResponse_from_vertex(
   return to_object
 
 
-class Files(_common.BaseModule):
+class Files(_api_module.BaseModule):
 
   def _list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
@@ -649,8 +566,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -668,7 +591,7 @@ class Files(_common.BaseModule):
       )
 
     return_value = types.ListFilesResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -696,8 +619,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -715,7 +644,7 @@ class Files(_common.BaseModule):
       )
 
     return_value = types.CreateFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -757,8 +686,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -771,7 +706,9 @@ class Files(_common.BaseModule):
     else:
       response_dict = _File_from_mldev(self._api_client, response_dict)
 
-    return_value = types.File._from_response(response_dict, parameter_model)
+    return_value = types.File._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
@@ -811,8 +748,14 @@ class Files(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -830,7 +773,7 @@ class Files(_common.BaseModule):
       )
 
     return_value = types.DeleteFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -909,7 +852,7 @@ class Files(_common.BaseModule):
               'X-Goog-Upload-Header-Content-Length': f'{file.size_bytes}',
               'X-Goog-Upload-Header-Content-Type': f'{file.mime_type}',
           },
-          'response_payload': response,
+          'deprecated_response_payload': response,
       }
     self._create(file=file, config={'http_options': http_options})
 
@@ -1015,7 +958,7 @@ class Files(_common.BaseModule):
     return data
 
 
-class AsyncFiles(_common.BaseModule):
+class AsyncFiles(_api_module.BaseModule):
 
   async def _list(
       self, *, config: Optional[types.ListFilesConfigOrDict] = None
@@ -1053,8 +996,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1072,7 +1021,7 @@ class AsyncFiles(_common.BaseModule):
       )
 
     return_value = types.ListFilesResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1100,8 +1049,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1119,7 +1074,7 @@ class AsyncFiles(_common.BaseModule):
       )
 
     return_value = types.CreateFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1161,8 +1116,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1175,7 +1136,9 @@ class AsyncFiles(_common.BaseModule):
     else:
       response_dict = _File_from_mldev(self._api_client, response_dict)
 
-    return_value = types.File._from_response(response_dict, parameter_model)
+    return_value = types.File._from_response(
+        response=response_dict, kwargs=parameter_model
+    )
     self._api_client._verify_response(return_value)
     return return_value
 
@@ -1215,8 +1178,14 @@ class AsyncFiles(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1234,7 +1203,7 @@ class AsyncFiles(_common.BaseModule):
       )
 
     return_value = types.DeleteFileResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1314,7 +1283,7 @@ class AsyncFiles(_common.BaseModule):
               'X-Goog-Upload-Header-Content-Length': f'{file.size_bytes}',
               'X-Goog-Upload-Header-Content-Type': f'{file.mime_type}',
           },
-          'response_payload': response,
+          'deprecated_response_payload': response,
       }
     await self._create(file=file, config={'http_options': http_options})
     if (

google/genai/live.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-"""Live client."""
+"""Live client. The live module is experimental."""
 
 import asyncio
 import base64
@@ -25,6 +25,7 @@ from typing import AsyncIterator, Optional, Sequence, Union
 import google.auth
 from websockets import ConnectionClosed
 
+from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import client
@@ -60,7 +61,7 @@ _FUNCTION_RESPONSE_REQUIRES_ID = (
 
 
 class AsyncSession:
-  """AsyncSession."""
+  """AsyncSession. The live module is experimental."""
 
   def __init__(self, api_client: client.ApiClient, websocket: ClientConnection):
     self._api_client = api_client
@@ -74,7 +75,6 @@ class AsyncSession:
           types.ContentListUnionDict,
           types.LiveClientContentOrDict,
           types.LiveClientRealtimeInputOrDict,
-          types.LiveClientRealtimeInputOrDict,
           types.LiveClientToolResponseOrDict,
           types.FunctionResponseOrDict,
           Sequence[types.FunctionResponseOrDict],
@@ -111,6 +111,8 @@ class AsyncSession:
     is function call, user must call `send` with the function response to
     continue the turn.
 
+    The live module is experimental.
+
     Yields:
       The model responses from the server.
 
@@ -142,6 +144,8 @@ class AsyncSession:
     input stream to the model and the other task will be used to receive the
     responses from the model.
 
+    The live module is experimental.
+
     Args:
       stream: An iterator that yields the model response.
       mime_type: The MIME type of the data in the stream.
@@ -470,8 +474,8 @@ class AsyncSession:
     await self._ws.close()
 
 
-class AsyncLive(_common.BaseModule):
-  """AsyncLive."""
+class AsyncLive(_api_module.BaseModule):
+  """AsyncLive. The live module is experimental."""
 
   def _LiveSetup_to_mldev(
       self, model: str, config: Optional[types.LiveConnectConfigOrDict] = None
@@ -638,6 +642,8 @@ class AsyncLive(_common.BaseModule):
   ) -> AsyncSession:
     """Connect to the live server.
 
+    The live module is experimental.
+
     Usage:
 
     .. code-block:: python