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

google/genai/caches.py

@@ -30,9 +30,12 @@ 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:
+    setv(to_object, ['thought'], getv(from_object, ['thought']))
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -74,6 +77,9 @@ def _Part_to_vertex(
   if getv(from_object, ['video_metadata']) is not None:
     setv(to_object, ['videoMetadata'], getv(from_object, ['video_metadata']))
 
+  if getv(from_object, ['thought']) is not None:
+    setv(to_object, ['thought'], getv(from_object, ['thought']))
+
   if getv(from_object, ['code_execution_result']) is not None:
     setv(
         to_object,
@@ -156,51 +162,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:
@@ -312,7 +318,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:
@@ -468,7 +474,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:
@@ -638,6 +644,18 @@ def _CreateCachedContentConfig_to_mldev(
   if getv(from_object, ['display_name']) is not None:
     setv(parent_object, ['displayName'], getv(from_object, ['display_name']))
 
+  if getv(from_object, ['contents']) is not None:
+    setv(
+        parent_object,
+        ['contents'],
+        [
+            _Content_to_mldev(api_client, item, to_object)
+            for item in t.t_contents(
+                api_client, getv(from_object, ['contents'])
+            )
+        ],
+    )
+
   if getv(from_object, ['system_instruction']) is not None:
     setv(
         parent_object,
@@ -689,6 +707,18 @@ def _CreateCachedContentConfig_to_vertex(
   if getv(from_object, ['display_name']) is not None:
     setv(parent_object, ['displayName'], getv(from_object, ['display_name']))
 
+  if getv(from_object, ['contents']) is not None:
+    setv(
+        parent_object,
+        ['contents'],
+        [
+            _Content_to_vertex(api_client, item, to_object)
+            for item in t.t_contents(
+                api_client, getv(from_object, ['contents'])
+            )
+        ],
+    )
+
   if getv(from_object, ['system_instruction']) is not None:
     setv(
         parent_object,
@@ -735,18 +765,6 @@ def _CreateCachedContentParameters_to_mldev(
         t.t_caches_model(api_client, getv(from_object, ['model'])),
     )
 
-  if getv(from_object, ['contents']) is not None:
-    setv(
-        to_object,
-        ['contents'],
-        [
-            _Content_to_mldev(api_client, item, to_object)
-            for item in t.t_contents(
-                api_client, getv(from_object, ['contents'])
-            )
-        ],
-    )
-
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -772,18 +790,6 @@ def _CreateCachedContentParameters_to_vertex(
         t.t_caches_model(api_client, getv(from_object, ['model'])),
     )
 
-  if getv(from_object, ['contents']) is not None:
-    setv(
-        to_object,
-        ['contents'],
-        [
-            _Content_to_vertex(api_client, item, to_object)
-            for item in t.t_contents(
-                api_client, getv(from_object, ['contents'])
-            )
-        ],
-    )
-
   if getv(from_object, ['config']) is not None:
     setv(
         to_object,
@@ -1238,7 +1244,6 @@ class Caches(_common.BaseModule):
       self,
       *,
       model: str,
-      contents: Union[types.ContentListUnion, types.ContentListUnionDict],
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
     """Creates cached content, this call will initialize the cached
@@ -1264,7 +1269,6 @@ class Caches(_common.BaseModule):
 
     parameter_model = types._CreateCachedContentParameters(
         model=model,
-        contents=contents,
         config=config,
     )
 
@@ -1542,7 +1546,6 @@ class AsyncCaches(_common.BaseModule):
       self,
       *,
       model: str,
-      contents: Union[types.ContentListUnion, types.ContentListUnionDict],
       config: Optional[types.CreateCachedContentConfigOrDict] = None,
   ) -> types.CachedContent:
     """Creates cached content, this call will initialize the cached
@@ -1568,7 +1571,6 @@ class AsyncCaches(_common.BaseModule):
 
     parameter_model = types._CreateCachedContentParameters(
         model=model,
-        contents=contents,
         config=config,
     )
 

google/genai/chats.py

@@ -18,7 +18,25 @@ from typing import Union
 
 from . import _transformers as t
 from .models import AsyncModels, Models
-from .types import Content, ContentDict, GenerateContentConfigOrDict, GenerateContentResponse, PartUnionDict
+from .types import Content, ContentDict, GenerateContentConfigOrDict, GenerateContentResponse, Part, PartUnionDict
+
+
+def _validate_response(
+    response: GenerateContentResponse
+) -> bool:
+  if not response.candidates:
+    return False
+  if not response.candidates[0].content:
+    return False
+  if not response.candidates[0].content.parts:
+    return False
+  for part in response.candidates[0].content.parts:
+    if part == Part():
+      return False
+    if part.text is not None and part.text == "":
+      return False
+  return True
+
 
 class _BaseChat:
   """Base chat session."""
@@ -65,7 +83,7 @@ class Chat(_BaseChat):
         contents=self._curated_history + [input_content],
         config=self._config,
     )
-    if response.candidates and response.candidates[0].content:
+    if _validate_response(response):
       if response.automatic_function_calling_history:
         self._curated_history.extend(
             response.automatic_function_calling_history
@@ -75,14 +93,42 @@ class Chat(_BaseChat):
       self._curated_history.append(response.candidates[0].content)
     return response
 
-  def _send_message_stream(self, message: Union[list[ContentDict], str]):
-    for content in t.t_contents(self._modules.api_client, message):
-      self._curated_history.append(content)
+  def send_message_stream(
+      self, message: Union[list[PartUnionDict], PartUnionDict]
+  ):
+    """Sends the conversation history with the additional message and yields the model's response in chunks.
+
+    Args:
+      message: The message to send to the model.
+
+    Yields:
+      The model's response in chunks.
+
+    Usage:
+
+    .. code-block:: python
+
+      chat = client.chats.create(model='gemini-1.5-flash')
+      for chunk in 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
     for chunk in self._modules.generate_content_stream(
-        model=self._model, contents=self._curated_history, config=self._config
+        model=self._model,
+        contents=self._curated_history + [input_content],
+        config=self._config,
     ):
-      # TODO(b/381089069): add successful response to history
+      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)
 
 
 class Chats:
@@ -134,8 +180,8 @@ class AsyncChat(_BaseChat):
 
     .. code-block:: python
 
-      chat = client.chats.create(model='gemini-1.5-flash')
-      response = chat.send_message('tell me a story')
+      chat = client.aio.chats.create(model='gemini-1.5-flash')
+      response = await chat.send_message('tell me a story')
     """
 
     input_content = t.t_content(self._modules.api_client, message)
@@ -144,7 +190,7 @@ class AsyncChat(_BaseChat):
         contents=self._curated_history + [input_content],
         config=self._config,
     )
-    if response.candidates and response.candidates[0].content:
+    if _validate_response(response):
       if response.automatic_function_calling_history:
         self._curated_history.extend(
             response.automatic_function_calling_history
@@ -154,14 +200,41 @@ class AsyncChat(_BaseChat):
       self._curated_history.append(response.candidates[0].content)
     return response
 
-  async def _send_message_stream(self, message: Union[list[ContentDict], str]):
-    for content in t.t_contents(self._modules.api_client, message):
-      self._curated_history.append(content)
+  async def send_message_stream(
+      self, message: Union[list[PartUnionDict], PartUnionDict]
+  ):
+    """Sends the conversation history with the additional message and yields the model's response in chunks.
+
+    Args:
+      message: The message to send to the model.
+
+    Yields:
+      The model's response in chunks.
+
+    Usage:
+
+    .. 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'):
+        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, config=self._config
+        model=self._model,
+        contents=self._curated_history + [input_content],
+        config=self._config,
     ):
-      # TODO(b/381089069): add successful response to history
+      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)
 
 
 class AsyncChats:

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()

google/genai/files.py

@@ -98,7 +98,7 @@ def _ListFilesParameters_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['config']):
+  if getv(from_object, ['config']) is not None:
     raise ValueError('config parameter is not supported in Vertex AI.')
 
   return to_object
@@ -128,13 +128,13 @@ def _FileStatus_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['details']):
+  if getv(from_object, ['details']) is not None:
     raise ValueError('details parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['message']):
+  if getv(from_object, ['message']) is not None:
     raise ValueError('message parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['code']):
+  if getv(from_object, ['code']) is not None:
     raise ValueError('code parameter is not supported in Vertex AI.')
 
   return to_object
@@ -197,40 +197,40 @@ def _File_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['name']):
+  if getv(from_object, ['name']) is not None:
     raise ValueError('name parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['display_name']):
+  if getv(from_object, ['display_name']) is not None:
     raise ValueError('display_name parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['mime_type']):
+  if getv(from_object, ['mime_type']) is not None:
     raise ValueError('mime_type parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['size_bytes']):
+  if getv(from_object, ['size_bytes']) is not None:
     raise ValueError('size_bytes parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['create_time']):
+  if getv(from_object, ['create_time']) is not None:
     raise ValueError('create_time parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['expiration_time']):
+  if getv(from_object, ['expiration_time']) is not None:
     raise ValueError('expiration_time parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['update_time']):
+  if getv(from_object, ['update_time']) is not None:
     raise ValueError('update_time parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['sha256_hash']):
+  if getv(from_object, ['sha256_hash']) is not None:
     raise ValueError('sha256_hash parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['uri']):
+  if getv(from_object, ['uri']) is not None:
     raise ValueError('uri parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['state']):
+  if getv(from_object, ['state']) is not None:
     raise ValueError('state parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['video_metadata']):
+  if getv(from_object, ['video_metadata']) is not None:
     raise ValueError('video_metadata parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['error']):
+  if getv(from_object, ['error']) is not None:
     raise ValueError('error parameter is not supported in Vertex AI.')
 
   return to_object
@@ -291,10 +291,10 @@ def _CreateFileParameters_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['file']):
+  if getv(from_object, ['file']) is not None:
     raise ValueError('file parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['config']):
+  if getv(from_object, ['config']) is not None:
     raise ValueError('config parameter is not supported in Vertex AI.')
 
   return to_object
@@ -355,10 +355,10 @@ def _GetFileParameters_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['name']):
+  if getv(from_object, ['name']) is not None:
     raise ValueError('name parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['config']):
+  if getv(from_object, ['config']) is not None:
     raise ValueError('config parameter is not supported in Vertex AI.')
 
   return to_object
@@ -419,10 +419,10 @@ def _DeleteFileParameters_to_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
-  if getv(from_object, ['name']):
+  if getv(from_object, ['name']) is not None:
     raise ValueError('name parameter is not supported in Vertex AI.')
 
-  if getv(from_object, ['config']):
+  if getv(from_object, ['config']) is not None:
     raise ValueError('config parameter is not supported in Vertex AI.')
 
   return to_object

google/genai/live.py

@@ -68,6 +68,7 @@ class AsyncSession:
 
   async def send(
       self,
+      *,
       input: Union[
           types.ContentListUnion,
           types.ContentListUnionDict,
@@ -80,6 +81,25 @@ class AsyncSession:
       ],
       end_of_turn: Optional[bool] = False,
   ):
+    """Send input to the model.
+
+    The method will send the input request to the server.
+
+    Args:
+      input: The input request to the model.
+      end_of_turn: Whether the input is the last message in a turn.
+
+    Example usage:
+
+    .. code-block:: python
+
+      client = genai.Client(api_key=API_KEY)
+
+      async with client.aio.live.connect(model='...') as session:
+        await session.send(input='Hello world!', end_of_turn=True)
+        async for message in session.receive():
+          print(message)
+    """
     client_message = self._parse_client_message(input, end_of_turn)
     await self._ws.send(json.dumps(client_message))
 
@@ -113,7 +133,7 @@ class AsyncSession:
       yield result
 
   async def start_stream(
-      self, stream: AsyncIterator[bytes], mime_type: str
+      self, *, stream: AsyncIterator[bytes], mime_type: str
   ) -> AsyncIterator[types.LiveServerMessage]:
     """start a live session from a data stream.
 
@@ -199,7 +219,7 @@ class AsyncSession:
   ):
     async for data in data_stream:
       input = {'data': data, 'mimeType': mime_type}
-      await self.send(input)
+      await self.send(input=input)
       # Give a chance for the receive loop to process responses.
       await asyncio.sleep(10**-12)
     # Give a chance for the receiver to process the last response.
@@ -599,7 +619,10 @@ class AsyncLive(_common.BaseModule):
 
   @contextlib.asynccontextmanager
   async def connect(
-      self, model: str, config: Optional[types.LiveConnectConfigOrDict] = None
+      self,
+      *,
+      model: str,
+      config: Optional[types.LiveConnectConfigOrDict] = None,
   ) -> AsyncSession:
     """Connect to the live server.
 
@@ -609,9 +632,9 @@ class AsyncLive(_common.BaseModule):
 
       client = genai.Client(api_key=API_KEY)
       config = {}
-      async with client.aio.live.connect(model='gemini-1.0-pro-002', config=config) as session:
+      async with client.aio.live.connect(model='...', config=config) as session:
         await session.send(input='Hello world!', end_of_turn=True)
-        async for message in session:
+        async for message in session.receive():
           print(message)
     """
     base_url = self.api_client._websocket_base_url()