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

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)