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

google/genai/caches.py

@@ -13,6 +13,8 @@
 # limitations under the License.
 #
 
+# Code generated by the Google Gen AI SDK generator DO NOT EDIT.
+
 from typing import Optional, Union
 from urllib.parse import urlencode
 from . import _common
@@ -30,7 +32,7 @@ def _Part_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['video_metadata']):
+  if getv(from_object, ['video_metadata']) is not None:
     raise ValueError('video_metadata parameter is not supported in Google AI.')
 
   if getv(from_object, ['thought']) is not None:
@@ -162,51 +164,51 @@ def _Schema_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['min_items']):
+  if getv(from_object, ['min_items']) is not None:
     raise ValueError('min_items parameter is not supported in Google AI.')
 
-  if getv(from_object, ['example']):
+  if getv(from_object, ['example']) is not None:
     raise ValueError('example parameter is not supported in Google AI.')
 
-  if getv(from_object, ['property_ordering']):
+  if getv(from_object, ['property_ordering']) is not None:
     raise ValueError(
         'property_ordering parameter is not supported in Google AI.'
     )
 
-  if getv(from_object, ['pattern']):
+  if getv(from_object, ['pattern']) is not None:
     raise ValueError('pattern parameter is not supported in Google AI.')
 
-  if getv(from_object, ['minimum']):
+  if getv(from_object, ['minimum']) is not None:
     raise ValueError('minimum parameter is not supported in Google AI.')
 
-  if getv(from_object, ['default']):
+  if getv(from_object, ['default']) is not None:
     raise ValueError('default parameter is not supported in Google AI.')
 
-  if getv(from_object, ['any_of']):
+  if getv(from_object, ['any_of']) is not None:
     raise ValueError('any_of parameter is not supported in Google AI.')
 
-  if getv(from_object, ['max_length']):
+  if getv(from_object, ['max_length']) is not None:
     raise ValueError('max_length parameter is not supported in Google AI.')
 
-  if getv(from_object, ['title']):
+  if getv(from_object, ['title']) is not None:
     raise ValueError('title parameter is not supported in Google AI.')
 
-  if getv(from_object, ['min_length']):
+  if getv(from_object, ['min_length']) is not None:
     raise ValueError('min_length parameter is not supported in Google AI.')
 
-  if getv(from_object, ['min_properties']):
+  if getv(from_object, ['min_properties']) is not None:
     raise ValueError('min_properties parameter is not supported in Google AI.')
 
-  if getv(from_object, ['max_items']):
+  if getv(from_object, ['max_items']) is not None:
     raise ValueError('max_items parameter is not supported in Google AI.')
 
-  if getv(from_object, ['maximum']):
+  if getv(from_object, ['maximum']) is not None:
     raise ValueError('maximum parameter is not supported in Google AI.')
 
-  if getv(from_object, ['nullable']):
+  if getv(from_object, ['nullable']) is not None:
     raise ValueError('nullable parameter is not supported in Google AI.')
 
-  if getv(from_object, ['max_properties']):
+  if getv(from_object, ['max_properties']) is not None:
     raise ValueError('max_properties parameter is not supported in Google AI.')
 
   if getv(from_object, ['type']) is not None:
@@ -318,7 +320,7 @@ def _FunctionDeclaration_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['response']):
+  if getv(from_object, ['response']) is not None:
     raise ValueError('response parameter is not supported in Google AI.')
 
   if getv(from_object, ['description']) is not None:
@@ -474,7 +476,7 @@ def _Tool_to_mldev(
         ],
     )
 
-  if getv(from_object, ['retrieval']):
+  if getv(from_object, ['retrieval']) is not None:
     raise ValueError('retrieval parameter is not supported in Google AI.')
 
   if getv(from_object, ['google_search']) is not None:
@@ -1272,14 +1274,14 @@ class Caches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _CreateCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     else:
       request_dict = _CreateCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1291,19 +1293,21 @@ class Caches(_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:
-      response_dict = _CachedContent_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _CachedContent_from_vertex(
+          self._api_client, response_dict
+      )
     else:
-      response_dict = _CachedContent_from_mldev(self.api_client, response_dict)
+      response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._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(
@@ -1325,14 +1329,14 @@ class Caches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GetCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GetCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1344,19 +1348,21 @@ class Caches(_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 = _CachedContent_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _CachedContent_from_vertex(
+          self._api_client, response_dict
+      )
     else:
-      response_dict = _CachedContent_from_mldev(self.api_client, response_dict)
+      response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._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(
@@ -1380,14 +1386,14 @@ class Caches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _DeleteCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _DeleteCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1399,23 +1405,23 @@ class Caches(_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 = _DeleteCachedContentResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _DeleteCachedContentResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.DeleteCachedContentResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def update(
@@ -1441,14 +1447,14 @@ class Caches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _UpdateCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _UpdateCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1460,19 +1466,21 @@ class Caches(_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(
         'patch', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _CachedContent_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _CachedContent_from_vertex(
+          self._api_client, response_dict
+      )
     else:
-      response_dict = _CachedContent_from_mldev(self.api_client, response_dict)
+      response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def _list(
@@ -1491,14 +1499,14 @@ class Caches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _ListCachedContentsParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     else:
       request_dict = _ListCachedContentsParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1510,23 +1518,23 @@ class Caches(_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 = _ListCachedContentsResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ListCachedContentsResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ListCachedContentsResponse._from_response(
         response_dict, parameter_model
     )
-    self.api_client._verify_response(return_value)
+    self._api_client._verify_response(return_value)
     return return_value
 
   def list(
@@ -1574,14 +1582,14 @@ class AsyncCaches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _CreateCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     else:
       request_dict = _CreateCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1593,19 +1601,21 @@ class AsyncCaches(_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:
-      response_dict = _CachedContent_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _CachedContent_from_vertex(
+          self._api_client, response_dict
+      )
     else:
-      response_dict = _CachedContent_from_mldev(self.api_client, response_dict)
+      response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._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(
@@ -1627,14 +1637,14 @@ class AsyncCaches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _GetCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _GetCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1646,19 +1656,21 @@ class AsyncCaches(_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 = _CachedContent_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _CachedContent_from_vertex(
+          self._api_client, response_dict
+      )
     else:
-      response_dict = _CachedContent_from_mldev(self.api_client, response_dict)
+      response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._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(
@@ -1682,14 +1694,14 @@ class AsyncCaches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _DeleteCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _DeleteCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1701,23 +1713,23 @@ class AsyncCaches(_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 = _DeleteCachedContentResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _DeleteCachedContentResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.DeleteCachedContentResponse._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 update(
@@ -1743,14 +1755,14 @@ class AsyncCaches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _UpdateCachedContentParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     else:
       request_dict = _UpdateCachedContentParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = '{name}'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1762,19 +1774,21 @@ class AsyncCaches(_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(
         'patch', path, request_dict, http_options
     )
 
-    if self.api_client.vertexai:
-      response_dict = _CachedContent_from_vertex(self.api_client, response_dict)
+    if self._api_client.vertexai:
+      response_dict = _CachedContent_from_vertex(
+          self._api_client, response_dict
+      )
     else:
-      response_dict = _CachedContent_from_mldev(self.api_client, response_dict)
+      response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._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 _list(
@@ -1793,14 +1807,14 @@ class AsyncCaches(_common.BaseModule):
         config=config,
     )
 
-    if self.api_client.vertexai:
+    if self._api_client.vertexai:
       request_dict = _ListCachedContentsParameters_to_vertex(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     else:
       request_dict = _ListCachedContentsParameters_to_mldev(
-          self.api_client, parameter_model
+          self._api_client, parameter_model
       )
       path = 'cachedContents'.format_map(request_dict.get('_url'))
     query_params = request_dict.get('_query')
@@ -1812,23 +1826,23 @@ class AsyncCaches(_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 = _ListCachedContentsResponse_from_vertex(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
     else:
       response_dict = _ListCachedContentsResponse_from_mldev(
-          self.api_client, response_dict
+          self._api_client, response_dict
       )
 
     return_value = types.ListCachedContentsResponse._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 list(

google/genai/chats.py

@@ -21,9 +21,7 @@ from .models import AsyncModels, Models
 from .types import Content, ContentDict, GenerateContentConfigOrDict, GenerateContentResponse, Part, PartUnionDict
 
 
-def _validate_response(
-    response: GenerateContentResponse
-) -> bool:
+def _validate_response(response: GenerateContentResponse) -> bool:
   if not response.candidates:
     return False
   if not response.candidates[0].content:
@@ -77,7 +75,7 @@ class Chat(_BaseChat):
       response = chat.send_message('tell me a story')
     """
 
-    input_content = t.t_content(self._modules.api_client, message)
+    input_content = t.t_content(self._modules._api_client, message)
     response = self._modules.generate_content(
         model=self._model,
         contents=self._curated_history + [input_content],
@@ -109,11 +107,11 @@ class Chat(_BaseChat):
     .. code-block:: python
 
       chat = client.chats.create(model='gemini-1.5-flash')
-      for chunk in chat.send_message_stream('tell me a story')
+      for chunk in chat.send_message_stream('tell me a story'):
         print(chunk.text)
     """
 
-    input_content = t.t_content(self._modules.api_client, message)
+    input_content = t.t_content(self._modules._api_client, message)
     output_contents = []
     finish_reason = None
     for chunk in self._modules.generate_content_stream(
@@ -184,7 +182,7 @@ class AsyncChat(_BaseChat):
       response = await chat.send_message('tell me a story')
     """
 
-    input_content = t.t_content(self._modules.api_client, message)
+    input_content = t.t_content(self._modules._api_client, message)
     response = await self._modules.generate_content(
         model=self._model,
         contents=self._curated_history + [input_content],
@@ -215,11 +213,11 @@ class AsyncChat(_BaseChat):
 
     .. code-block:: python
       chat = client.aio.chats.create(model='gemini-1.5-flash')
-      async for chunk in chat.send_message_stream('tell me a story')
+      async for chunk in chat.send_message_stream('tell me a story'):
         print(chunk.text)
     """
 
-    input_content = t.t_content(self._modules.api_client, message)
+    input_content = t.t_content(self._modules._api_client, message)
     output_contents = []
     finish_reason = None
     async for chunk in self._modules.generate_content_stream(
@@ -240,7 +238,6 @@ class AsyncChat(_BaseChat):
 class AsyncChats:
   """A util class to create async chat sessions."""
 
-
   def __init__(self, modules: AsyncModels):
     self._modules = modules
 

google/genai/client.py

@@ -14,12 +14,12 @@
 #
 
 import os
-from typing import Optional
+from typing import Optional, Union
 
 import google.auth
 import pydantic
 
-from ._api_client import ApiClient, HttpOptions
+from ._api_client import ApiClient, HttpOptions, HttpOptionsDict
 from ._replay_api_client import ReplayApiClient
 from .batches import AsyncBatches, Batches
 from .caches import AsyncCaches, Caches
@@ -145,7 +145,7 @@ class Client:
       project: Optional[str] = None,
       location: Optional[str] = None,
       debug_config: Optional[DebugConfig] = None,
-      http_options: Optional[HttpOptions] = None,
+      http_options: Optional[Union[HttpOptions, HttpOptionsDict]] = None,
   ):
     """Initializes the client.
 
@@ -179,6 +179,9 @@ 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. Response_payload can't be
+              set when passing to the client constructor.
     """
 
     self._debug_config = debug_config or DebugConfig()