google-genai 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

google/genai/files.py

@@ -13,8 +13,11 @@
 # limitations under the License.
 #
 
+# Code generated by the Google Gen AI SDK generator DO NOT EDIT.
+
 import mimetypes
 import os
+import pathlib
 from typing import Optional, Union
 from urllib.parse import urlencode
 from . import _common
@@ -615,11 +618,11 @@ class Files(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _ListFilesParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'files'.format_map(request_dict.get('_url'))
 
@@ -632,23 +635,23 @@ class Files(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = self.api_client.request(
+    response_dict = self._api_client.request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _ListFilesResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ListFilesResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ListFilesResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def _create(
@@ -662,11 +665,11 @@ class Files(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _CreateFileParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'upload/v1beta/files'.format_map(request_dict.get('_url'))
 
@@ -679,23 +682,23 @@ class Files(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = self.api_client.request(
+    response_dict = self._api_client.request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _CreateFileResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _CreateFileResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.CreateFileResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def get(
@@ -723,11 +726,11 @@ class Files(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _GetFileParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'files/{file}'.format_map(request_dict.get('_url'))
 
@@ -740,17 +743,17 @@ class Files(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = self.api_client.request(
+    response_dict = self._api_client.request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _File_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _File_from_vertex(self._api_client, response_dict)
     else:
-      response_dict = _File_from_mldev(self.api_client, response_dict)
+      response_dict = _File_from_mldev(self._api_client, response_dict)
 
     return_value = types.File._from_response(response_dict, parameter_model)
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def delete(
@@ -777,11 +780,11 @@ class Files(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _DeleteFileParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'files/{file}'.format_map(request_dict.get('_url'))
 
@@ -794,39 +797,38 @@ class Files(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = self.api_client.request(
+    response_dict = self._api_client.request(
         'delete', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _DeleteFileResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _DeleteFileResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.DeleteFileResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def upload(
       self,
       *,
-      path: str,
+      path: str | pathlib.Path | os.PathLike,
       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 a file-like object (e.g. `BytesIO`) to be
-        uploaded.
+      path: The path or a path-like object points to the file to to be uploaded.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError(
           'Vertex AI does not support creating files. You can upload files to'
           ' GCS files instead.'
@@ -884,12 +886,12 @@ class Files(_common.BaseModule):
       )
     upload_url = response['headers']['X-Goog-Upload-URL']
 
-    return_file = self.api_client.upload_file(
+    return_file = self._api_client.upload_file(
         fs_path, upload_url, file.size_bytes
     )
 
     return types.File._from_response(
-        _File_from_mldev(self.api_client, return_file['file']), None
+        _File_from_mldev(self._api_client, return_file['file']), None
     )
 
   def list(
@@ -929,11 +931,11 @@ class AsyncFiles(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _ListFilesParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'files'.format_map(request_dict.get('_url'))
 
@@ -946,23 +948,23 @@ class AsyncFiles(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = await self.api_client.async_request(
+    response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _ListFilesResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ListFilesResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ListFilesResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def _create(
@@ -976,11 +978,11 @@ class AsyncFiles(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _CreateFileParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'upload/v1beta/files'.format_map(request_dict.get('_url'))
 
@@ -993,23 +995,23 @@ class AsyncFiles(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = await self.api_client.async_request(
+    response_dict = await self._api_client.async_request(
         'post', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _CreateFileResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _CreateFileResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.CreateFileResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def get(
@@ -1037,11 +1039,11 @@ class AsyncFiles(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _GetFileParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'files/{file}'.format_map(request_dict.get('_url'))
 
@@ -1054,17 +1056,17 @@ class AsyncFiles(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = await self.api_client.async_request(
+    response_dict = await self._api_client.async_request(
         'get', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _File_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _File_from_vertex(self._api_client, response_dict)
     else:
-      response_dict = _File_from_mldev(self.api_client, response_dict)
+      response_dict = _File_from_mldev(self._api_client, response_dict)
 
     return_value = types.File._from_response(response_dict, parameter_model)
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def delete(
@@ -1091,11 +1093,11 @@ class AsyncFiles(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError('This method is only supported in the default client.')
     else:
       request_dict = _DeleteFileParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'files/{file}'.format_map(request_dict.get('_url'))
 
@@ -1108,39 +1110,38 @@ class AsyncFiles(_common.BaseModule):
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.apply_base64_encoding(request_dict)
 
-    response_dict = await self.api_client.async_request(
+    response_dict = await self._api_client.async_request(
         'delete', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       response_dict = _DeleteFileResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _DeleteFileResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.DeleteFileResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   async def upload(
       self,
       *,
-      path: str,
+      path: str | pathlib.Path | os.PathLike,
       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 a file-like object (e.g. `BytesIO`) to be
-        uploaded.
+      path:  The path or a path-like object points to the file to be uploaded.
       config: Optional parameters to set `diplay_name`, `mime_type`, and `name`.
     """
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       raise ValueError(
           'Vertex AI does not support creating files. You can upload files to'
           ' GCS files instead.'
@@ -1198,12 +1199,12 @@ class AsyncFiles(_common.BaseModule):
       )
     upload_url = response['headers']['X-Goog-Upload-URL']
 
-    return_file = await self.api_client.async_upload_file(
+    return_file = await self._api_client.async_upload_file(
         fs_path, upload_url, file.size_bytes
     )
 
     return types.File._from_response(
-        _File_from_mldev(self.api_client, return_file['file']), None
+        _File_from_mldev(self._api_client, return_file['file']), None
     )
 
   async def list(

google/genai/live.py

@@ -241,6 +241,8 @@ class AsyncSession:
       )
     if getv(from_object, ['turnComplete']) is not None:
       setv(to_object, ['turn_complete'], getv(from_object, ['turnComplete']))
+    if getv(from_object, ['interrupted']) is not None:
+      setv(to_object, ['interrupted'], getv(from_object, ['interrupted']))
     return to_object
 
   def _LiveToolCall_from_mldev(
@@ -312,6 +314,8 @@ class AsyncSession:
       )
     if getv(from_object, ['turnComplete']) is not None:
       setv(to_object, ['turn_complete'], getv(from_object, ['turnComplete']))
+    if getv(from_object, ['interrupted']) is not None:
+      setv(to_object, ['interrupted'], getv(from_object, ['interrupted']))
     return to_object
 
   def _LiveServerMessage_from_vertex(
@@ -358,7 +362,7 @@ class AsyncSession:
   ) -> dict:
     if isinstance(input, str):
       input = [input]
-    elif (isinstance(input, dict) and 'data' in input):
+    elif isinstance(input, dict) and 'data' in input:
       if isinstance(input['data'], bytes):
         decoded_data = base64.b64encode(input['data']).decode('utf-8')
         input['data'] = decoded_data
@@ -425,7 +429,9 @@ class AsyncSession:
       client_message = {'client_content': input.model_dump(exclude_none=True)}
     elif isinstance(input, types.LiveClientToolResponse):
       # ToolResponse.FunctionResponse
-      if not (self._api_client.vertexai) and not (input.function_responses[0].id):
+      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)}
     elif isinstance(input, types.FunctionResponse):
@@ -477,7 +483,7 @@ class AsyncLive(_common.BaseModule):
           to_object,
           ['generationConfig'],
           _GenerateContentConfig_to_mldev(
-              self.api_client,
+              self._api_client,
               getv(from_object, ['generation_config']),
               to_object,
           ),
@@ -494,17 +500,18 @@ class AsyncLive(_common.BaseModule):
     if getv(from_object, ['speech_config']) is not None:
       if getv(to_object, ['generationConfig']) is not None:
         to_object['generationConfig']['speechConfig'] = _SpeechConfig_to_mldev(
-            self.api_client,
+            self._api_client,
             t.t_speech_config(
-                self.api_client, getv(from_object, ['speech_config'])),
+                self._api_client, getv(from_object, ['speech_config'])
+            ),
             to_object,
         )
       else:
         to_object['generationConfig'] = {
             'speechConfig': _SpeechConfig_to_mldev(
-                self.api_client,
+                self._api_client,
                 t.t_speech_config(
-                    self.api_client, getv(from_object, ['speech_config'])
+                    self._api_client, getv(from_object, ['speech_config'])
                 ),
                 to_object,
             )
@@ -515,9 +522,9 @@ class AsyncLive(_common.BaseModule):
           to_object,
           ['systemInstruction'],
           _Content_to_mldev(
-              self.api_client,
+              self._api_client,
               t.t_content(
-                  self.api_client, getv(from_object, ['system_instruction'])
+                  self._api_client, getv(from_object, ['system_instruction'])
               ),
               to_object,
           ),
@@ -527,7 +534,7 @@ class AsyncLive(_common.BaseModule):
           to_object,
           ['tools'],
           [
-              _Tool_to_mldev(self.api_client, item, to_object)
+              _Tool_to_mldev(self._api_client, item, to_object)
               for item in getv(from_object, ['tools'])
           ],
       )
@@ -551,7 +558,7 @@ class AsyncLive(_common.BaseModule):
           to_object,
           ['generationConfig'],
           _GenerateContentConfig_to_vertex(
-              self.api_client,
+              self._api_client,
               getv(from_object, ['generation_config']),
               to_object,
           ),
@@ -576,17 +583,18 @@ class AsyncLive(_common.BaseModule):
     if getv(from_object, ['speech_config']) is not None:
       if getv(to_object, ['generationConfig']) is not None:
         to_object['generationConfig']['speechConfig'] = _SpeechConfig_to_vertex(
-            self.api_client,
+            self._api_client,
             t.t_speech_config(
-                self.api_client, getv(from_object, ['speech_config'])),
+                self._api_client, getv(from_object, ['speech_config'])
+            ),
             to_object,
         )
       else:
         to_object['generationConfig'] = {
             'speechConfig': _SpeechConfig_to_vertex(
-                self.api_client,
+                self._api_client,
                 t.t_speech_config(
-                    self.api_client, getv(from_object, ['speech_config'])
+                    self._api_client, getv(from_object, ['speech_config'])
                 ),
                 to_object,
             )
@@ -596,9 +604,9 @@ class AsyncLive(_common.BaseModule):
           to_object,
           ['systemInstruction'],
           _Content_to_vertex(
-              self.api_client,
+              self._api_client,
               t.t_content(
-                  self.api_client, getv(from_object, ['system_instruction'])
+                  self._api_client, getv(from_object, ['system_instruction'])
               ),
               to_object,
           ),
@@ -608,7 +616,7 @@ class AsyncLive(_common.BaseModule):
           to_object,
           ['tools'],
           [
-              _Tool_to_vertex(self.api_client, item, to_object)
+              _Tool_to_vertex(self._api_client, item, to_object)
               for item in getv(from_object, ['tools'])
           ],
       )
@@ -637,14 +645,14 @@ class AsyncLive(_common.BaseModule):
         async for message in session.receive():
           print(message)
     """
-    base_url = self.api_client._websocket_base_url()
-    if self.api_client.api_key:
-      api_key = self.api_client.api_key
-      version = self.api_client._http_options['api_version']
+    base_url = self._api_client._websocket_base_url()
+    if self._api_client.api_key:
+      api_key = self._api_client.api_key
+      version = self._api_client._http_options['api_version']
       uri = f'{base_url}/ws/google.ai.generativelanguage.{version}.GenerativeService.BidiGenerateContent?key={api_key}'
-      headers = self.api_client._http_options['headers']
+      headers = self._api_client._http_options['headers']
 
-      transformed_model = t.t_model(self.api_client, model)
+      transformed_model = t.t_model(self._api_client, model)
       request = json.dumps(
           self._LiveSetup_to_mldev(model=transformed_model, config=config)
       )
@@ -663,11 +671,11 @@ class AsyncLive(_common.BaseModule):
           'Content-Type': 'application/json',
           'Authorization': 'Bearer {}'.format(bearer_token),
       }
-      version = self.api_client._http_options['api_version']
+      version = self._api_client._http_options['api_version']
       uri = f'{base_url}/ws/google.cloud.aiplatform.{version}.LlmBidiService/BidiGenerateContent'
-      location = self.api_client.location
-      project = self.api_client.project
-      transformed_model = t.t_model(self.api_client, model)
+      location = self._api_client.location
+      project = self._api_client.project
+      transformed_model = t.t_model(self._api_client, model)
       if transformed_model.startswith('publishers/'):
         transformed_model = (
             f'projects/{project}/locations/{location}/' + transformed_model
@@ -681,4 +689,4 @@ class AsyncLive(_common.BaseModule):
       await ws.send(request)
       logging.info(await ws.recv(decode=False))
 
-      yield AsyncSession(api_client=self.api_client, websocket=ws)
+      yield AsyncSession(api_client=self._api_client, websocket=ws)