google-genai 1.1.0__py3-none-any.whl → 1.3.0__py3-none-any.whl

google/genai/caches.py

@@ -15,6 +15,7 @@
 
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
+import logging
 from typing import Optional, Union
 from urllib.parse import urlencode
 from . import _api_module
@@ -26,6 +27,8 @@ from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
 
+logger = logging.getLogger('google_genai.caches')
+
 
 def _Part_to_mldev(
     api_client: ApiClient,
@@ -172,8 +175,10 @@ def _Schema_to_mldev(
     raise ValueError('example parameter is not supported in Gemini API.')
 
   if getv(from_object, ['property_ordering']) is not None:
-    raise ValueError(
-        'property_ordering parameter is not supported in Gemini API.'
+    setv(
+        to_object,
+        ['propertyOrdering'],
+        getv(from_object, ['property_ordering']),
     )
 
   if getv(from_object, ['pattern']) is not None:
@@ -1181,7 +1186,7 @@ class Caches(_api_module.BaseModule):
     .. code-block:: python
 
       contents = ... // Initialize the content to cache.
-      response = await client.aio.caches.create(
+      response = client.caches.create(
           model= ... // The publisher model id
           contents=contents,
           config={
@@ -1249,8 +1254,7 @@ class Caches(_api_module.BaseModule):
 
     .. code-block:: python
 
-      await client.aio.caches.get(name= ... ) // The server-generated resource
-      name.
+      client.caches.get(name= ... ) // The server-generated resource name.
     """
 
     parameter_model = types._GetCachedContentParameters(
@@ -1312,8 +1316,7 @@ class Caches(_api_module.BaseModule):
 
     .. code-block:: python
 
-      await client.aio.caches.delete(name= ... ) // The server-generated
-      resource name.
+      client.caches.delete(name= ... ) // The server-generated resource name.
     """
 
     parameter_model = types._DeleteCachedContentParameters(
@@ -1375,7 +1378,7 @@ class Caches(_api_module.BaseModule):
 
     .. code-block:: python
 
-      response = await client.aio.caches.update(
+      response = client.caches.update(
           name= ... // The server-generated resource name.
           config={
               'ttl': '7600s',
@@ -1437,8 +1440,8 @@ class Caches(_api_module.BaseModule):
 
     .. code-block:: python
 
-      cached_contents = await client.aio.caches.list(config={'page_size': 2})
-      async for cached_content in cached_contents:
+      cached_contents = client.caches.list(config={'page_size': 2})
+      for cached_content in cached_contents:
         print(cached_content)
     """
 

google/genai/client.py

@@ -27,6 +27,7 @@ from .chats import AsyncChats, Chats
 from .files import AsyncFiles, Files
 from .live import AsyncLive
 from .models import AsyncModels, Models
+from .operations import AsyncOperations, Operations
 from .tunings import AsyncTunings, Tunings
 
 
@@ -42,6 +43,7 @@ class AsyncClient:
     self._batches = AsyncBatches(self._api_client)
     self._files = AsyncFiles(self._api_client)
     self._live = AsyncLive(self._api_client)
+    self._operations = AsyncOperations(self._api_client)
 
   @property
   def models(self) -> AsyncModels:
@@ -71,6 +73,9 @@ class AsyncClient:
   def live(self) -> AsyncLive:
     return self._live
 
+  @property
+  def operations(self) -> AsyncOperations:
+    return self._operations
 
 class DebugConfig(pydantic.BaseModel):
   """Configuration options that change client network behavior when testing."""
@@ -94,6 +99,17 @@ class Client:
   Use this client to make a request to the Gemini Developer API or Vertex AI
   API and then wait for the response.
 
+  To initialize the client, provide the required arguments either directly
+  or by using environment variables. Gemini API users and Vertex AI users in
+  express mode can provide API key by providing input argument
+  `api_key="your-api-key"` or by defining `GOOGLE_API_KEY="your-api-key"` as an
+  environment variable
+
+  Vertex AI API users can provide inputs argument as `vertexai=True,
+  project="your-project-id", location="us-central1"` or by defining
+  `GOOGLE_GENAI_USE_VERTEXAI=true`, `GOOGLE_CLOUD_PROJECT` and
+  `GOOGLE_CLOUD_LOCATION` environment variables.
+
   Attributes:
     api_key: The `API key <https://ai.google.dev/gemini-api/docs/api-key>`_ to
       use for authentication. Applies to the Gemini Developer API only.
@@ -173,21 +189,11 @@ class Client:
        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.
+         for the client.
     """
 
     self._debug_config = debug_config or DebugConfig()
 
-    # 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 'deprecated_response_payload' in http_options:
-      raise ValueError(
-          'Setting deprecated_response_payload in http_options is not'
-          ' supported.'
-      )
-
     self._api_client = self._get_api_client(
         vertexai=vertexai,
         api_key=api_key,
@@ -204,6 +210,7 @@ class Client:
     self._caches = Caches(self._api_client)
     self._batches = Batches(self._api_client)
     self._files = Files(self._api_client)
+    self._operations = Operations(self._api_client)
 
   @staticmethod
   def _get_api_client(
@@ -269,6 +276,10 @@ class Client:
   def files(self) -> Files:
     return self._files
 
+  @property
+  def operations(self) -> Operations:
+    return self._operations
+
   @property
   def vertexai(self) -> bool:
     """Returns whether the client is using the Vertex AI API."""

google/genai/errors.py

@@ -16,7 +16,8 @@
 """Error classes for the GenAI SDK."""
 
 from typing import Any, Optional, TYPE_CHECKING, Union
-
+import httpx
+import json
 import requests
 
 
@@ -34,7 +35,9 @@ class APIError(Exception):
   response: Optional[Any] = None
 
   def __init__(
-      self, code: int, response: Union[requests.Response, 'ReplayResponse']
+      self,
+      code: int,
+      response: Union[requests.Response, 'ReplayResponse', httpx.Response],
   ):
     self.response = response
 
@@ -48,6 +51,18 @@ class APIError(Exception):
             'message': response.text,
             'status': response.reason,
         }
+    elif isinstance(response, httpx.Response):
+      try:
+        response_json = response.json()
+      except (json.decoder.JSONDecodeError, httpx.ResponseNotRead):
+        try:
+          message = response.text
+        except httpx.ResponseNotRead:
+          message = None
+        response_json = {
+            'message': message,
+            'status': response.reason_phrase,
+        }
     else:
       response_json = response.body_segments[0].get('error', {})
 
@@ -89,7 +104,7 @@ class APIError(Exception):
 
   @classmethod
   def raise_for_response(
-      cls, response: Union[requests.Response, 'ReplayResponse']
+      cls, response: Union[requests.Response, 'ReplayResponse', httpx.Response]
   ):
     """Raises an error with detailed error message if the response has an error status."""
     if response.status_code == 200:

google/genai/files.py

@@ -16,6 +16,7 @@
 # Code generated by the Google Gen AI SDK generator DO NOT EDIT.
 
 import io
+import logging
 import mimetypes
 import os
 import pathlib
@@ -30,6 +31,8 @@ from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .pagers import AsyncPager, Pager
 
+logger = logging.getLogger('google_genai.files')
+
 
 def _ListFilesConfig_to_mldev(
     api_client: ApiClient,
@@ -981,7 +984,7 @@ class AsyncFiles(_api_module.BaseModule):
 
     .. code-block:: python
 
-      pager = client.files.list(config={'page_size': 10})
+      pager = await client.aio.files.list(config={'page_size': 10})
       for file in pager.page:
         print(file.name)
     """
@@ -1101,7 +1104,7 @@ class AsyncFiles(_api_module.BaseModule):
 
     .. code-block:: python
 
-      file = client.files.get(name='files/...')
+      file = await client.aio.files.get(name='files/...')
       print(file.uri)
     """
 
@@ -1164,7 +1167,7 @@ class AsyncFiles(_api_module.BaseModule):
 
     .. code-block:: python
 
-      client.files.delete(name='files/...')
+      await client.aio.files.delete(name='files/...')
     """
 
     parameter_model = types._DeleteFileParameters(
@@ -1296,13 +1299,13 @@ class AsyncFiles(_api_module.BaseModule):
 
     if (
         response.http_headers is None
-        or 'X-Goog-Upload-URL' not in response.http_headers
+        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.http_headers['X-Goog-Upload-URL']
+    upload_url = response.http_headers['x-goog-upload-url']
 
     if isinstance(file, io.IOBase):
       return_file = await self._api_client.async_upload_file(

google/genai/live.py

@@ -20,7 +20,7 @@ import base64
 import contextlib
 import json
 import logging
-from typing import AsyncIterator, Optional, Sequence, Union
+from typing import Any, AsyncIterator, Dict, Optional, Sequence, Union
 
 import google.auth
 from websockets import ConnectionClosed
@@ -55,6 +55,7 @@ except ModuleNotFoundError:
   from websockets.client import ClientConnection
   from websockets.client import connect
 
+logger = logging.getLogger('google_genai.live')
 
 _FUNCTION_RESPONSE_REQUIRES_ID = (
     'FunctionResponse request must have an `id` field from the'
@@ -72,15 +73,17 @@ class AsyncSession:
   async def send(
       self,
       *,
-      input: Union[
-          types.ContentListUnion,
-          types.ContentListUnionDict,
-          types.LiveClientContentOrDict,
-          types.LiveClientRealtimeInputOrDict,
-          types.LiveClientToolResponseOrDict,
-          types.FunctionResponseOrDict,
-          Sequence[types.FunctionResponseOrDict],
-      ],
+      input: Optional[
+          Union[
+              types.ContentListUnion,
+              types.ContentListUnionDict,
+              types.LiveClientContentOrDict,
+              types.LiveClientRealtimeInputOrDict,
+              types.LiveClientToolResponseOrDict,
+              types.FunctionResponseOrDict,
+              Sequence[types.FunctionResponseOrDict],
+          ]
+      ] = None,
       end_of_turn: Optional[bool] = False,
   ):
     """Send input to the model.
@@ -234,7 +237,7 @@ class AsyncSession:
   def _LiveServerContent_from_mldev(
       self,
       from_object: Union[dict, object],
-  ) -> dict:
+  ) -> Dict[str, Any]:
     to_object = {}
     if getv(from_object, ['modelTurn']) is not None:
       setv(
@@ -254,7 +257,7 @@ class AsyncSession:
   def _LiveToolCall_from_mldev(
       self,
       from_object: Union[dict, object],
-  ) -> dict:
+  ) -> Dict[str, Any]:
     to_object = {}
     if getv(from_object, ['functionCalls']) is not None:
       setv(
@@ -267,7 +270,7 @@ class AsyncSession:
   def _LiveToolCall_from_vertex(
       self,
       from_object: Union[dict, object],
-  ) -> dict:
+  ) -> Dict[str, Any]:
     to_object = {}
     if getv(from_object, ['functionCalls']) is not None:
       setv(
@@ -280,7 +283,7 @@ class AsyncSession:
   def _LiveServerMessage_from_mldev(
       self,
       from_object: Union[dict, object],
-  ) -> dict:
+  ) -> Dict[str, Any]:
     to_object = {}
     if getv(from_object, ['serverContent']) is not None:
       setv(
@@ -307,7 +310,7 @@ class AsyncSession:
   def _LiveServerContent_from_vertex(
       self,
       from_object: Union[dict, object],
-  ) -> dict:
+  ) -> Dict[str, Any]:
     to_object = {}
     if getv(from_object, ['modelTurn']) is not None:
       setv(
@@ -327,7 +330,7 @@ class AsyncSession:
   def _LiveServerMessage_from_vertex(
       self,
       from_object: Union[dict, object],
-  ) -> dict:
+  ) -> Dict[str, Any]:
     to_object = {}
     if getv(from_object, ['serverContent']) is not None:
       setv(
@@ -354,18 +357,23 @@ class AsyncSession:
 
   def _parse_client_message(
       self,
-      input: Union[
-          types.ContentListUnion,
-          types.ContentListUnionDict,
-          types.LiveClientContentOrDict,
-          types.LiveClientRealtimeInputOrDict,
-          types.LiveClientRealtimeInputOrDict,
-          types.LiveClientToolResponseOrDict,
-          types.FunctionResponseOrDict,
-          Sequence[types.FunctionResponseOrDict],
-      ],
+      input: Optional[
+          Union[
+              types.ContentListUnion,
+              types.ContentListUnionDict,
+              types.LiveClientContentOrDict,
+              types.LiveClientRealtimeInputOrDict,
+              types.LiveClientToolResponseOrDict,
+              types.FunctionResponseOrDict,
+              Sequence[types.FunctionResponseOrDict],
+          ]
+      ] = None,
       end_of_turn: Optional[bool] = False,
-  ) -> dict:
+  ) -> Dict[str, Any]:
+
+    if not input:
+      logging.info('No input provided. Assume it is the end of turn.')
+      return {'client_content': {'turn_complete': True}}
     if isinstance(input, str):
       input = [input]
     elif isinstance(input, dict) and 'data' in input:
@@ -374,7 +382,6 @@ class AsyncSession:
         input['data'] = decoded_data
       input = [input]
     elif isinstance(input, types.Blob):
-      input.data = base64.b64encode(input.data).decode('utf-8')
       input = [input]
     elif isinstance(input, dict) and 'name' in input and 'response' in input:
       # ToolResponse.FunctionResponse
@@ -411,7 +418,7 @@ class AsyncSession:
       if any((isinstance(b, dict) and 'data' in b) for b in input):
         pass
       elif any(isinstance(b, types.Blob) for b in input):
-        input = [b.model_dump(exclude_none=True) for b in input]
+        input = [b.model_dump(exclude_none=True, mode='json') for b in input]
       else:
         raise ValueError(
             f'Unsupported input type "{type(input)}" or input content "{input}"'
@@ -419,11 +426,21 @@ class AsyncSession:
 
       client_message = {'realtime_input': {'media_chunks': input}}
 
-    elif isinstance(input, dict) and 'content' in input:
-      # TODO(b/365983264) Add validation checks for content_update input_dict.
-      client_message = {'client_content': input}
+    elif isinstance(input, dict):
+      if 'content' in input or 'turns' in input:
+        # TODO(b/365983264) Add validation checks for content_update input_dict.
+        client_message = {'client_content': input}
+      elif 'media_chunks' in input:
+        client_message = {'realtime_input': input}
+      elif 'function_responses' in input:
+        client_message = {'tool_response': input}
+      else:
+        raise ValueError(
+          f'Unsupported input type "{type(input)}" or input content "{input}"')
     elif isinstance(input, types.LiveClientRealtimeInput):
-      client_message = {'realtime_input': input.model_dump(exclude_none=True)}
+      client_message = {
+          'realtime_input': input.model_dump(exclude_none=True, mode='json')
+      }
       if isinstance(
           client_message['realtime_input']['media_chunks'][0]['data'], bytes
       ):
@@ -436,20 +453,26 @@ class AsyncSession:
         ]
 
     elif isinstance(input, types.LiveClientContent):
-      client_message = {'client_content': input.model_dump(exclude_none=True)}
+      client_message = {
+          'client_content': input.model_dump(exclude_none=True, mode='json')
+      }
     elif isinstance(input, types.LiveClientToolResponse):
       # ToolResponse.FunctionResponse
       if not (self._api_client.vertexai) and not (
           input.function_responses[0].id
       ):
         raise ValueError(_FUNCTION_RESPONSE_REQUIRES_ID)
-      client_message = {'tool_response': input.model_dump(exclude_none=True)}
+      client_message = {
+          'tool_response': input.model_dump(exclude_none=True, mode='json')
+      }
     elif isinstance(input, types.FunctionResponse):
       if not (self._api_client.vertexai) and not (input.id):
         raise ValueError(_FUNCTION_RESPONSE_REQUIRES_ID)
       client_message = {
           'tool_response': {
-              'function_responses': [input.model_dump(exclude_none=True)]
+              'function_responses': [
+                  input.model_dump(exclude_none=True, mode='json')
+              ]
           }
       }
     elif isinstance(input, Sequence) and isinstance(
@@ -460,7 +483,7 @@ class AsyncSession:
       client_message = {
           'tool_response': {
               'function_responses': [
-                  c.model_dump(exclude_none=True) for c in input
+                  c.model_dump(exclude_none=True, mode='json') for c in input
               ]
           }
       }
@@ -682,10 +705,10 @@ class AsyncLive(_api_module.BaseModule):
       auth_req = google.auth.transport.requests.Request()
       creds.refresh(auth_req)
       bearer_token = creds.token
-      headers = {
-          'Content-Type': 'application/json',
+      headers = self._api_client._http_options['headers']
+      headers.update({
           'Authorization': 'Bearer {}'.format(bearer_token),
-      }
+      })
       version = self._api_client._http_options['api_version']
       uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
       location = self._api_client.location
@@ -702,6 +725,6 @@ class AsyncLive(_api_module.BaseModule):
 
     async with connect(uri, additional_headers=headers) as ws:
       await ws.send(request)
-      logging.info(await ws.recv(decode=False))
+      logger.info(await ws.recv(decode=False))
 
       yield AsyncSession(api_client=self._api_client, websocket=ws)