google-genai 1.11.0__py3-none-any.whl → 1.12.1__py3-none-any.whl

google/genai/files.py

@@ -36,9 +36,9 @@ logger = logging.getLogger('google_genai.files')
 
 def _ListFilesConfig_to_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
 
   if getv(from_object, ['page_size']) is not None:
@@ -58,9 +58,9 @@ def _ListFilesConfig_to_mldev(
 
 def _ListFilesParameters_to_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['config']) is not None:
     setv(
@@ -76,9 +76,9 @@ def _ListFilesParameters_to_mldev(
 
 def _FileStatus_to_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['details']) is not None:
     setv(to_object, ['details'], getv(from_object, ['details']))
@@ -94,9 +94,9 @@ def _FileStatus_to_mldev(
 
 def _File_to_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['name']) is not None:
     setv(to_object, ['name'], getv(from_object, ['name']))
@@ -151,9 +151,9 @@ def _File_to_mldev(
 
 def _CreateFileParameters_to_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['file']) is not None:
     setv(
@@ -170,9 +170,9 @@ def _CreateFileParameters_to_mldev(
 
 def _GetFileParameters_to_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['name']) is not None:
     setv(
@@ -189,9 +189,9 @@ def _GetFileParameters_to_mldev(
 
 def _DeleteFileParameters_to_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['name']) is not None:
     setv(
@@ -208,9 +208,9 @@ def _DeleteFileParameters_to_mldev(
 
 def _FileStatus_from_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['details']) is not None:
     setv(to_object, ['details'], getv(from_object, ['details']))
@@ -226,9 +226,9 @@ def _FileStatus_from_mldev(
 
 def _File_from_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['name']) is not None:
     setv(to_object, ['name'], getv(from_object, ['name']))
@@ -283,9 +283,9 @@ def _File_from_mldev(
 
 def _ListFilesResponse_from_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['nextPageToken']) is not None:
     setv(to_object, ['next_page_token'], getv(from_object, ['nextPageToken']))
@@ -305,9 +305,9 @@ def _ListFilesResponse_from_mldev(
 
 def _CreateFileResponse_from_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
   if getv(from_object, ['httpHeaders']) is not None:
     setv(to_object, ['http_headers'], getv(from_object, ['httpHeaders']))
@@ -317,9 +317,9 @@ def _CreateFileResponse_from_mldev(
 
 def _DeleteFileResponse_from_mldev(
     api_client: BaseApiClient,
-    from_object: Union[dict, object],
-    parent_object: Optional[dict] = None,
-) -> dict:
+    from_object: Union[dict[str, Any], object],
+    parent_object: Optional[dict[str, Any]] = None,
+) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
 
   return to_object
@@ -596,7 +596,7 @@ class Files(_api_module.BaseModule):
   def upload(
       self,
       *,
-      file: Union[str, pathlib.Path, os.PathLike, io.IOBase],
+      file: Union[str, pathlib.Path, os.PathLike[str], io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file using a supported file service.
@@ -1068,7 +1068,7 @@ class AsyncFiles(_api_module.BaseModule):
   async def upload(
       self,
       *,
-      file: Union[str, pathlib.Path, os.PathLike, io.IOBase],
+      file: Union[str, pathlib.Path, os.PathLike[str], io.IOBase],
       config: Optional[types.UploadFileConfigOrDict] = None,
   ) -> types.File:
     """Calls the API to upload a file asynchronously using a supported file service.

google/genai/live.py

@@ -35,14 +35,14 @@ from . import types
 from ._api_client import BaseApiClient
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
-from . import live_converters
+from . import _live_converters as live_converters
 from .models import _Content_to_mldev
 from .models import _Content_to_vertex
 
 
 try:
-  from websockets.asyncio.client import ClientConnection  # type: ignore
-  from websockets.asyncio.client import connect  # type: ignore
+  from websockets.asyncio.client import ClientConnection
+  from websockets.asyncio.client import connect
 except ModuleNotFoundError:
   # This try/except is for TAP, mypy complains about it which is why we have the type: ignore
   from websockets.client import ClientConnection  # type: ignore
@@ -60,7 +60,7 @@ class AsyncSession:
   """[Preview] AsyncSession."""
 
   def __init__(
-      self, api_client: client.BaseApiClient, websocket: ClientConnection
+      self, api_client: BaseApiClient, websocket: ClientConnection
   ):
     self._api_client = api_client
     self._ws = websocket
@@ -80,7 +80,7 @@ class AsyncSession:
           ]
       ] = None,
       end_of_turn: Optional[bool] = False,
-  ):
+  ) -> None:
     """[Deprecated] Send input to the model.
 
     > **Warning**: This method is deprecated and will be removed in a future
@@ -127,7 +127,7 @@ class AsyncSession:
           ]
       ] = None,
       turn_complete: bool = True,
-  ):
+  ) -> None:
     """Send non-realtime, turn based content to the model.
 
     There are two ways to send messages to the live API:
@@ -203,8 +203,18 @@ class AsyncSession:
 
     await self._ws.send(json.dumps({'client_content': client_content_dict}))
 
-  async def send_realtime_input(self, *, media: t.BlobUnion):
-    """Send realtime media chunks to the model.
+  async def send_realtime_input(
+      self,
+      *,
+      media: Optional[types.BlobImageUnionDict] = None,
+      audio: Optional[types.BlobOrDict] = None,
+      audio_stream_end: Optional[bool] = None,
+      video: Optional[types.BlobImageUnionDict] = None,
+      text: Optional[str] = None,
+      activity_start: Optional[types.ActivityStartOrDict] = None,
+      activity_end: Optional[types.ActivityEndOrDict] = None,
+  ) -> None:
+    """Send realtime input to the model, only send one argument per call.
 
     Use `send_realtime_input` for realtime audio chunks and video
     frames(images).
@@ -227,7 +237,7 @@ class AsyncSession:
     from google.genai import types
 
     import PIL.Image
-    
+
     import os
 
     if os.environ.get('GOOGLE_GENAI_USE_VERTEXAI'):
@@ -254,9 +264,46 @@ class AsyncSession:
           print(f'{msg.text}')
     ```
     """
-    realtime_input = t.t_realtime_input(media)
-    realtime_input_dict = realtime_input.model_dump(
-        exclude_none=True, mode='json'
+    kwargs:dict[str, Any] = {}
+    if media is not None:
+      kwargs['media'] = media
+    if audio is not None:
+      kwargs['audio'] = audio
+    if audio_stream_end is not None:
+      kwargs['audio_stream_end'] = audio_stream_end
+    if video is not None:
+      kwargs['video'] = video
+    if text is not None:
+      kwargs['text'] = text
+    if activity_start is not None:
+      kwargs['activity_start'] = activity_start
+    if activity_end is not None:
+      kwargs['activity_end'] = activity_end
+
+    if len(kwargs) != 1:
+      raise ValueError(
+          f'Only one argument can be set, got {len(kwargs)}:'
+          f' {list(kwargs.keys())}'
+      )
+    realtime_input = types.LiveSendRealtimeInputParameters.model_validate(
+        kwargs
+    )
+
+    if self._api_client.vertexai:
+      realtime_input_dict = (
+          live_converters._LiveSendRealtimeInputParameters_to_vertex(
+              api_client=self._api_client, from_object=realtime_input
+          )
+      )
+    else:
+      realtime_input_dict = (
+          live_converters._LiveSendRealtimeInputParameters_to_mldev(
+              api_client=self._api_client, from_object=realtime_input
+          )
+      )
+    realtime_input_dict = _common.convert_to_dict(realtime_input_dict)
+    realtime_input_dict = _common.encode_unserializable_types(
+        realtime_input_dict
     )
     await self._ws.send(json.dumps({'realtime_input': realtime_input_dict}))
 
@@ -267,7 +314,7 @@ class AsyncSession:
           types.FunctionResponseOrDict,
           Sequence[types.FunctionResponseOrDict],
       ],
-  ):
+  ) -> None:
     """Send a tool response to the session.
 
     Use `send_tool_response` to reply to `LiveServerToolCall` messages
@@ -337,6 +384,10 @@ class AsyncSession:
       tool_response_dict = live_converters._LiveClientToolResponse_to_mldev(
           api_client=self._api_client, from_object=tool_response
       )
+      for response in tool_response_dict.get('functionResponses', []):
+        if response.get('id') is None:
+          raise ValueError(_FUNCTION_RESPONSE_REQUIRES_ID)
+
     await self._ws.send(json.dumps({'tool_response': tool_response_dict}))
 
   async def receive(self) -> AsyncIterator[types.LiveServerMessage]:
@@ -468,7 +519,7 @@ class AsyncSession:
       data_stream: AsyncIterator[bytes],
       mime_type: str,
       stop_event: asyncio.Event,
-  ):
+  ) -> None:
     async for data in data_stream:
       model_input = types.LiveClientRealtimeInput(
         media_chunks=[types.Blob(data=data, mime_type=mime_type)]
@@ -787,7 +838,6 @@ class AsyncSession:
     await self._ws.close()
 
 
-
 class AsyncLive(_api_module.BaseModule):
   """[Preview] AsyncLive."""
 
@@ -815,6 +865,8 @@ class AsyncLive(_api_module.BaseModule):
           print(message)
     """
     base_url = self._api_client._websocket_base_url()
+    if isinstance(base_url, bytes):
+      base_url = base_url.decode('utf-8')
     transformed_model = t.t_model(self._api_client, model)
 
     parameter_model = _t_live_connect_config(self._api_client, config)
@@ -841,13 +893,13 @@ class AsyncLive(_api_module.BaseModule):
       request = json.dumps(request_dict)
     else:
       # Get bearer token through Application Default Credentials.
-      creds, _ = google.auth.default(
+      creds, _ = google.auth.default(  # type: ignore[no-untyped-call]
           scopes=['https://www.googleapis.com/auth/cloud-platform']
       )
 
       # creds.valid is False, and creds.token is None
       # Need to refresh credentials to populate those
-      auth_req = google.auth.transport.requests.Request()
+      auth_req = google.auth.transport.requests.Request()  # type: ignore[no-untyped-call]
       creds.refresh(auth_req)
       bearer_token = creds.token
       headers = self._api_client._http_options.headers