google-genai 0.6.0__py3-none-any.whl → 0.7.0__py3-none-any.whl

google/genai/caches.py

@@ -17,6 +17,7 @@
 
 from typing import Optional, Union
 from urllib.parse import urlencode
+from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import types
@@ -33,7 +34,7 @@ def _Part_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['video_metadata']) is not None:
-    raise ValueError('video_metadata parameter is not supported in Google AI.')
+    raise ValueError('video_metadata parameter is not supported in Gemini API.')
 
   if getv(from_object, ['thought']) is not None:
     setv(to_object, ['thought'], getv(from_object, ['thought']))
@@ -165,51 +166,51 @@ def _Schema_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['min_items']) is not None:
-    raise ValueError('min_items parameter is not supported in Google AI.')
+    raise ValueError('min_items parameter is not supported in Gemini API.')
 
   if getv(from_object, ['example']) is not None:
-    raise ValueError('example parameter is not supported in Google AI.')
+    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 Google AI.'
+        'property_ordering parameter is not supported in Gemini API.'
     )
 
   if getv(from_object, ['pattern']) is not None:
-    raise ValueError('pattern parameter is not supported in Google AI.')
+    raise ValueError('pattern parameter is not supported in Gemini API.')
 
   if getv(from_object, ['minimum']) is not None:
-    raise ValueError('minimum parameter is not supported in Google AI.')
+    raise ValueError('minimum parameter is not supported in Gemini API.')
 
   if getv(from_object, ['default']) is not None:
-    raise ValueError('default parameter is not supported in Google AI.')
+    raise ValueError('default parameter is not supported in Gemini API.')
 
   if getv(from_object, ['any_of']) is not None:
-    raise ValueError('any_of parameter is not supported in Google AI.')
+    raise ValueError('any_of parameter is not supported in Gemini API.')
 
   if getv(from_object, ['max_length']) is not None:
-    raise ValueError('max_length parameter is not supported in Google AI.')
+    raise ValueError('max_length parameter is not supported in Gemini API.')
 
   if getv(from_object, ['title']) is not None:
-    raise ValueError('title parameter is not supported in Google AI.')
+    raise ValueError('title parameter is not supported in Gemini API.')
 
   if getv(from_object, ['min_length']) is not None:
-    raise ValueError('min_length parameter is not supported in Google AI.')
+    raise ValueError('min_length parameter is not supported in Gemini API.')
 
   if getv(from_object, ['min_properties']) is not None:
-    raise ValueError('min_properties parameter is not supported in Google AI.')
+    raise ValueError('min_properties parameter is not supported in Gemini API.')
 
   if getv(from_object, ['max_items']) is not None:
-    raise ValueError('max_items parameter is not supported in Google AI.')
+    raise ValueError('max_items parameter is not supported in Gemini API.')
 
   if getv(from_object, ['maximum']) is not None:
-    raise ValueError('maximum parameter is not supported in Google AI.')
+    raise ValueError('maximum parameter is not supported in Gemini API.')
 
   if getv(from_object, ['nullable']) is not None:
-    raise ValueError('nullable parameter is not supported in Google AI.')
+    raise ValueError('nullable parameter is not supported in Gemini API.')
 
   if getv(from_object, ['max_properties']) is not None:
-    raise ValueError('max_properties parameter is not supported in Google AI.')
+    raise ValueError('max_properties parameter is not supported in Gemini API.')
 
   if getv(from_object, ['type']) is not None:
     setv(to_object, ['type'], getv(from_object, ['type']))
@@ -321,7 +322,7 @@ def _FunctionDeclaration_to_mldev(
 ) -> dict:
   to_object = {}
   if getv(from_object, ['response']) is not None:
-    raise ValueError('response parameter is not supported in Google AI.')
+    raise ValueError('response parameter is not supported in Gemini API.')
 
   if getv(from_object, ['description']) is not None:
     setv(to_object, ['description'], getv(from_object, ['description']))
@@ -477,7 +478,7 @@ def _Tool_to_mldev(
     )
 
   if getv(from_object, ['retrieval']) is not None:
-    raise ValueError('retrieval parameter is not supported in Google AI.')
+    raise ValueError('retrieval parameter is not supported in Gemini API.')
 
   if getv(from_object, ['google_search']) is not None:
     setv(
@@ -634,8 +635,6 @@ def _CreateCachedContentConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['ttl']) is not None:
     setv(parent_object, ['ttl'], getv(from_object, ['ttl']))
@@ -697,8 +696,6 @@ def _CreateCachedContentConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['ttl']) is not None:
     setv(parent_object, ['ttl'], getv(from_object, ['ttl']))
@@ -804,30 +801,6 @@ def _CreateCachedContentParameters_to_vertex(
   return to_object
 
 
-def _GetCachedContentConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _GetCachedContentConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
 def _GetCachedContentParameters_to_mldev(
     api_client: ApiClient,
     from_object: Union[dict, object],
@@ -842,13 +815,7 @@ def _GetCachedContentParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _GetCachedContentConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -867,37 +834,7 @@ def _GetCachedContentParameters_to_vertex(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _GetCachedContentConfig_to_vertex(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
-
-  return to_object
-
-
-def _DeleteCachedContentConfig_to_mldev(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
-
-  return to_object
-
-
-def _DeleteCachedContentConfig_to_vertex(
-    api_client: ApiClient,
-    from_object: Union[dict, object],
-    parent_object: dict = None,
-) -> dict:
-  to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -916,13 +853,7 @@ def _DeleteCachedContentParameters_to_mldev(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _DeleteCachedContentConfig_to_mldev(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -941,13 +872,7 @@ def _DeleteCachedContentParameters_to_vertex(
     )
 
   if getv(from_object, ['config']) is not None:
-    setv(
-        to_object,
-        ['config'],
-        _DeleteCachedContentConfig_to_vertex(
-            api_client, getv(from_object, ['config']), to_object
-        ),
-    )
+    setv(to_object, ['config'], getv(from_object, ['config']))
 
   return to_object
 
@@ -958,8 +883,6 @@ def _UpdateCachedContentConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['ttl']) is not None:
     setv(parent_object, ['ttl'], getv(from_object, ['ttl']))
@@ -976,8 +899,6 @@ def _UpdateCachedContentConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['http_options']) is not None:
-    setv(to_object, ['httpOptions'], getv(from_object, ['http_options']))
 
   if getv(from_object, ['ttl']) is not None:
     setv(parent_object, ['ttl'], getv(from_object, ['ttl']))
@@ -1044,6 +965,7 @@ def _ListCachedContentsConfig_to_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+
   if getv(from_object, ['page_size']) is not None:
     setv(
         parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
@@ -1065,6 +987,7 @@ def _ListCachedContentsConfig_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+
   if getv(from_object, ['page_size']) is not None:
     setv(
         parent_object, ['_query', 'pageSize'], getv(from_object, ['page_size'])
@@ -1240,7 +1163,7 @@ def _ListCachedContentsResponse_from_vertex(
   return to_object
 
 
-class Caches(_common.BaseModule):
+class Caches(_api_module.BaseModule):
 
   def create(
       self,
@@ -1288,8 +1211,14 @@ class Caches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1305,7 +1234,7 @@ class Caches(_common.BaseModule):
       response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1343,8 +1272,14 @@ class Caches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1360,7 +1295,7 @@ class Caches(_common.BaseModule):
       response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1400,8 +1335,14 @@ class Caches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1419,7 +1360,7 @@ class Caches(_common.BaseModule):
       )
 
     return_value = types.DeleteCachedContentResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1461,8 +1402,14 @@ class Caches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1478,7 +1425,7 @@ class Caches(_common.BaseModule):
       response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1513,8 +1460,14 @@ class Caches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1532,7 +1485,7 @@ class Caches(_common.BaseModule):
       )
 
     return_value = types.ListCachedContentsResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1548,7 +1501,7 @@ class Caches(_common.BaseModule):
     )
 
 
-class AsyncCaches(_common.BaseModule):
+class AsyncCaches(_api_module.BaseModule):
 
   async def create(
       self,
@@ -1596,8 +1549,14 @@ class AsyncCaches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1613,7 +1572,7 @@ class AsyncCaches(_common.BaseModule):
       response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1651,8 +1610,14 @@ class AsyncCaches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1668,7 +1633,7 @@ class AsyncCaches(_common.BaseModule):
       response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1708,8 +1673,14 @@ class AsyncCaches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1727,7 +1698,7 @@ class AsyncCaches(_common.BaseModule):
       )
 
     return_value = types.DeleteCachedContentResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1769,8 +1740,14 @@ class AsyncCaches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1786,7 +1763,7 @@ class AsyncCaches(_common.BaseModule):
       response_dict = _CachedContent_from_mldev(self._api_client, response_dict)
 
     return_value = types.CachedContent._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value
@@ -1821,8 +1798,14 @@ class AsyncCaches(_common.BaseModule):
     if query_params:
       path = f'{path}?{urlencode(query_params)}'
     # TODO: remove the hack that pops config.
-    config = request_dict.pop('config', None)
-    http_options = config.pop('httpOptions', None) if config else None
+    request_dict.pop('config', None)
+
+    http_options = None
+    if isinstance(config, dict):
+      http_options = config.get('http_options', None)
+    elif hasattr(config, 'http_options'):
+      http_options = config.http_options
+
     request_dict = _common.convert_to_dict(request_dict)
     request_dict = _common.encode_unserializable_types(request_dict)
 
@@ -1840,7 +1823,7 @@ class AsyncCaches(_common.BaseModule):
       )
 
     return_value = types.ListCachedContentsResponse._from_response(
-        response_dict, parameter_model
+        response=response_dict, kwargs=parameter_model
     )
     self._api_client._verify_response(return_value)
     return return_value

google/genai/chats.py

@@ -13,7 +13,7 @@
 # limitations under the License.
 #
 
-from typing import Optional
+from typing import AsyncIterator, Awaitable, Optional
 from typing import Union
 
 from . import _transformers as t
@@ -200,7 +200,7 @@ class AsyncChat(_BaseChat):
 
   async def send_message_stream(
       self, message: Union[list[PartUnionDict], PartUnionDict]
-  ):
+  ) -> Awaitable[AsyncIterator[GenerateContentResponse]]:
     """Sends the conversation history with the additional message and yields the model's response in chunks.
 
     Args:
@@ -213,26 +213,30 @@ 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 await chat.send_message_stream('tell me a story'):
         print(chunk.text)
     """
 
     input_content = t.t_content(self._modules._api_client, message)
-    output_contents = []
-    finish_reason = None
-    async for chunk in self._modules.generate_content_stream(
-        model=self._model,
-        contents=self._curated_history + [input_content],
-        config=self._config,
-    ):
-      if _validate_response(chunk):
-        output_contents.append(chunk.candidates[0].content)
-      if chunk.candidates and chunk.candidates[0].finish_reason:
-        finish_reason = chunk.candidates[0].finish_reason
-      yield chunk
-    if output_contents and finish_reason:
-      self._curated_history.append(input_content)
-      self._curated_history.extend(output_contents)
+
+    async def async_generator():
+      output_contents = []
+      finish_reason = None
+      async for chunk in await self._modules.generate_content_stream(
+          model=self._model,
+          contents=self._curated_history + [input_content],
+          config=self._config,
+      ):
+        if _validate_response(chunk):
+          output_contents.append(chunk.candidates[0].content)
+        if chunk.candidates and chunk.candidates[0].finish_reason:
+          finish_reason = chunk.candidates[0].finish_reason
+        yield chunk
+
+      if output_contents and finish_reason:
+        self._curated_history.append(input_content)
+        self._curated_history.extend(output_contents)
+    return async_generator()
 
 
 class AsyncChats: