google-genai 1.5.0__py3-none-any.whl → 1.7.0__py3-none-any.whl

google/genai/chats.py

@@ -13,12 +13,19 @@
 # limitations under the License.
 #
 
-from typing import AsyncIterator, Awaitable, Optional
-from typing import Union
+import sys
+from typing import AsyncIterator, Awaitable, Optional, Union, get_args
 
 from . import _transformers as t
+from . import types
 from .models import AsyncModels, Models
-from .types import Content, ContentDict, GenerateContentConfigOrDict, GenerateContentResponse, Part, PartUnionDict
+from .types import Content, GenerateContentConfigOrDict, GenerateContentResponse, Part, PartUnionDict
+
+
+if sys.version_info >= (3, 10):
+  from typing import TypeGuard
+else:
+  from typing_extensions import TypeGuard
 
 
 def _validate_content(content: Content) -> bool:
@@ -81,8 +88,7 @@ def _extract_curated_history(
   while i < length:
     if comprehensive_history[i].role not in ["user", "model"]:
       raise ValueError(
-          "Role must be user or model, but got"
-          f" {comprehensive_history[i].role}"
+          f"Role must be user or model, but got {comprehensive_history[i].role}"
       )
 
     if comprehensive_history[i].role == "user":
@@ -108,12 +114,10 @@ class _BaseChat:
   def __init__(
       self,
       *,
-      modules: Union[Models, AsyncModels],
       model: str,
       config: Optional[GenerateContentConfigOrDict] = None,
       history: list[Content],
   ):
-    self._modules = modules
     self._model = model
     self._config = config
     self._comprehensive_history = history
@@ -123,27 +127,32 @@ class _BaseChat:
     """Curated history is the set of valid turns that will be used in the subsequent send requests.
     """
 
-
-  def record_history(self, user_input: Content,
-                     model_output: list[Content],
-                     automatic_function_calling_history: list[Content],
-                     is_valid: bool):
+  def record_history(
+      self,
+      user_input: Content,
+      model_output: list[Content],
+      automatic_function_calling_history: list[Content],
+      is_valid: bool,
+  ):
     """Records the chat history.
 
     Maintaining both comprehensive and curated histories.
 
     Args:
       user_input: The user's input content.
-      model_output: A list of `Content` from the model's response.
-        This can be an empty list if the model produced no output.
-      automatic_function_calling_history: A list of `Content` representing
-        the history of automatic function calls, including the user input as
-        the first entry.
+      model_output: A list of `Content` from the model's response. This can be
+        an empty list if the model produced no output.
+      automatic_function_calling_history: A list of `Content` representing the
+        history of automatic function calls, including the user input as the
+        first entry.
       is_valid: A boolean flag indicating whether the current model output is
         considered valid.
     """
     input_contents = (
-        automatic_function_calling_history
+        # Because the AFC input contains the entire curated chat history in
+        # addition to the new user input, we need to truncate the AFC history
+        # to deduplicate the existing chat history.
+        automatic_function_calling_history[len(self._curated_history):]
         if automatic_function_calling_history
         else [user_input]
     )
@@ -158,14 +167,13 @@ class _BaseChat:
       self._curated_history.extend(input_contents)
       self._curated_history.extend(output_contents)
 
-
   def get_history(self, curated: bool = False) -> list[Content]:
     """Returns the chat history.
 
     Args:
-        curated: A boolean flag indicating whether to return the curated
-            (valid) history or the comprehensive (all turns) history.
-            Defaults to False (returns the comprehensive history).
+        curated: A boolean flag indicating whether to return the curated (valid)
+          history or the comprehensive (all turns) history. Defaults to False
+          (returns the comprehensive history).
 
     Returns:
         A list of `Content` objects representing the chat history.
@@ -176,9 +184,41 @@ class _BaseChat:
       return self._comprehensive_history
 
 
+def _is_part_type(
+    contents: Union[list[PartUnionDict], PartUnionDict],
+) -> TypeGuard[t.ContentType]:
+  if isinstance(contents, list):
+    return all(_is_part_type(part) for part in contents)
+  else:
+    allowed_part_types = get_args(types.PartUnion)
+    if type(contents) in allowed_part_types:
+      return True
+    else:
+      # Some images don't pass isinstance(item, PIL.Image.Image)
+      # For example <class 'PIL.JpegImagePlugin.JpegImageFile'>
+      if types.PIL_Image is not None and isinstance(contents, types.PIL_Image):
+        return True
+    return False
+
+
 class Chat(_BaseChat):
   """Chat session."""
 
+  def __init__(
+      self,
+      *,
+      modules: Models,
+      model: str,
+      config: Optional[GenerateContentConfigOrDict] = None,
+      history: list[Content],
+  ):
+    self._modules = modules
+    super().__init__(
+        model=model,
+        config=config,
+        history=history,
+    )
+
   def send_message(
       self,
       message: Union[list[PartUnionDict], PartUnionDict],
@@ -202,10 +242,15 @@ class Chat(_BaseChat):
       response = chat.send_message('tell me a story')
     """
 
+    if not _is_part_type(message):
+      raise ValueError(
+          f"Message must be a valid part type: {types.PartUnion} or"
+          f" {types.PartUnionDict}, got {type(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],
+        contents=self._curated_history + [input_content],  # type: ignore[arg-type]
         config=config if config else self._config,
     )
     model_output = (
@@ -213,10 +258,15 @@ class Chat(_BaseChat):
         if response.candidates and response.candidates[0].content
         else []
     )
+    automatic_function_calling_history = (
+        response.automatic_function_calling_history
+        if response.automatic_function_calling_history
+        else []
+    )
     self.record_history(
         user_input=input_content,
         model_output=model_output,
-        automatic_function_calling_history=response.automatic_function_calling_history,
+        automatic_function_calling_history=automatic_function_calling_history,
         is_valid=_validate_response(response),
     )
     return response
@@ -245,29 +295,42 @@ class Chat(_BaseChat):
         print(chunk.text)
     """
 
+    if not _is_part_type(message):
+      raise ValueError(
+          f"Message must be a valid part type: {types.PartUnion} or"
+          f" {types.PartUnionDict}, got {type(message)}"
+      )
     input_content = t.t_content(self._modules._api_client, message)
     output_contents = []
     finish_reason = None
     is_valid = True
     chunk = None
-    for chunk in self._modules.generate_content_stream(
-        model=self._model,
-        contents=self._curated_history + [input_content],
-        config=config if config else self._config,
-    ):
-      if not _validate_response(chunk):
-        is_valid = False
-      if chunk.candidates and chunk.candidates[0].content:
-        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
-    self.record_history(
-        user_input=input_content,
-        model_output=output_contents,
-        automatic_function_calling_history=chunk.automatic_function_calling_history,
-        is_valid=is_valid and output_contents and finish_reason,
-    )
+    if isinstance(self._modules, Models):
+      for chunk in self._modules.generate_content_stream(
+          model=self._model,
+          contents=self._curated_history + [input_content],  # type: ignore[arg-type]
+          config=config if config else self._config,
+      ):
+        if not _validate_response(chunk):
+          is_valid = False
+        if chunk.candidates and chunk.candidates[0].content:
+          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
+      automatic_function_calling_history = (
+          chunk.automatic_function_calling_history
+          if chunk.automatic_function_calling_history
+          else []
+      )
+      self.record_history(
+          user_input=input_content,
+          model_output=output_contents,
+          automatic_function_calling_history=automatic_function_calling_history,
+          is_valid=is_valid
+          and output_contents is not None
+          and finish_reason is not None,
+      )
 
 
 class Chats:
@@ -304,6 +367,21 @@ class Chats:
 class AsyncChat(_BaseChat):
   """Async chat session."""
 
+  def __init__(
+      self,
+      *,
+      modules: AsyncModels,
+      model: str,
+      config: Optional[GenerateContentConfigOrDict] = None,
+      history: list[Content],
+  ):
+    self._modules = modules
+    super().__init__(
+        model=model,
+        config=config,
+        history=history,
+    )
+
   async def send_message(
       self,
       message: Union[list[PartUnionDict], PartUnionDict],
@@ -326,11 +404,15 @@ class AsyncChat(_BaseChat):
       chat = client.aio.chats.create(model='gemini-1.5-flash')
       response = await chat.send_message('tell me a story')
     """
-
+    if not _is_part_type(message):
+      raise ValueError(
+          f"Message must be a valid part type: {types.PartUnion} or"
+          f" {types.PartUnionDict}, got {type(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],
+        contents=self._curated_history + [input_content],  # type: ignore[arg-type]
         config=config if config else self._config,
     )
     model_output = (
@@ -338,10 +420,15 @@ class AsyncChat(_BaseChat):
         if response.candidates and response.candidates[0].content
         else []
     )
+    automatic_function_calling_history = (
+        response.automatic_function_calling_history
+        if response.automatic_function_calling_history
+        else []
+    )
     self.record_history(
         user_input=input_content,
         model_output=model_output,
-        automatic_function_calling_history=response.automatic_function_calling_history,
+        automatic_function_calling_history=automatic_function_calling_history,
         is_valid=_validate_response(response),
     )
     return response
@@ -369,6 +456,11 @@ class AsyncChat(_BaseChat):
         print(chunk.text)
     """
 
+    if not _is_part_type(message):
+      raise ValueError(
+          f"Message must be a valid part type: {types.PartUnion} or"
+          f" {types.PartUnionDict}, got {type(message)}"
+      )
     input_content = t.t_content(self._modules._api_client, message)
 
     async def async_generator():
@@ -394,7 +486,6 @@ class AsyncChat(_BaseChat):
           model_output=output_contents,
           automatic_function_calling_history=chunk.automatic_function_calling_history,
           is_valid=is_valid and output_contents and finish_reason,
-
       )
     return async_generator()
 

google/genai/client.py

@@ -130,8 +130,9 @@ class Client:
       from environment variables. Applies to the Vertex AI API only.
     debug_config: Config settings that control network behavior of the client.
       This is typically used when running test code.
-    http_options: Http options to use for the client. Response_payload can't be
-      set when passing to the client constructor.
+    http_options: Http options to use for the client. These options will be
+      applied to all requests made by the client. Example usage:
+      `client = genai.Client(http_options=types.HttpOptions(api_version='v1'))`.
 
   Usage for the Gemini Developer API:
 

google/genai/errors.py

@@ -18,7 +18,6 @@
 from typing import Any, Optional, TYPE_CHECKING, Union
 import httpx
 import json
-import requests
 
 
 if TYPE_CHECKING:
@@ -28,7 +27,7 @@ if TYPE_CHECKING:
 class APIError(Exception):
   """General errors raised by the GenAI API."""
   code: int
-  response: Union[requests.Response, 'ReplayResponse', httpx.Response]
+  response: Union['ReplayResponse', httpx.Response]
 
   status: Optional[str] = None
   message: Optional[str] = None
@@ -36,28 +35,21 @@ class APIError(Exception):
   def __init__(
       self,
       code: int,
-      response: Union[requests.Response, 'ReplayResponse', httpx.Response],
+      response: Union['ReplayResponse', httpx.Response],
   ):
     self.response = response
-
-    if isinstance(response, requests.Response):
+    message = None
+    if isinstance(response, httpx.Response):
       try:
-        # do not do any extra muanipulation on the response.
-        # return the raw response json as is.
         response_json = response.json()
-      except requests.exceptions.JSONDecodeError:
+      except (json.decoder.JSONDecodeError):
+        message = response.text
         response_json = {
-            'message': response.text,
-            'status': response.reason,
+            'message': message,
+            'status': response.reason_phrase,
         }
-    elif isinstance(response, httpx.Response):
-      try:
-        response_json = response.json()
-      except (json.decoder.JSONDecodeError, httpx.ResponseNotRead):
-        try:
-          message = response.text
-        except httpx.ResponseNotRead:
-          message = None
+      except httpx.ResponseNotRead:
+        message = 'Response not read'
         response_json = {
             'message': message,
             'status': response.reason_phrase,
@@ -103,7 +95,7 @@ class APIError(Exception):
 
   @classmethod
   def raise_for_response(
-      cls, response: Union[requests.Response, 'ReplayResponse', httpx.Response]
+      cls, response: Union['ReplayResponse', httpx.Response]
   ):
     """Raises an error with detailed error message if the response has an error status."""
     if response.status_code == 200:

google/genai/files.py

@@ -826,7 +826,7 @@ class Files(_api_module.BaseModule):
           'Vertex AI does not support creating files. You can upload files to'
           ' GCS files instead.'
       )
-    config_model = None
+    config_model = types.UploadFileConfig()
     if config:
       if isinstance(config, dict):
         config_model = types.UploadFileConfig(**config)
@@ -888,13 +888,13 @@ class Files(_api_module.BaseModule):
 
     if (
         response.http_headers is None
-        or 'X-Goog-Upload-URL' not in response.http_headers
+        or 'x-goog-upload-url' not in response.http_headers
     ):
       raise KeyError(
           'Failed to create file. Upload URL did not returned from the create'
           ' file request.'
       )
-    upload_url = response.http_headers['X-Goog-Upload-URL']
+    upload_url = response.http_headers['x-goog-upload-url']
 
     if isinstance(file, io.IOBase):
       return_file = self._api_client.upload_file(
@@ -907,7 +907,7 @@ class Files(_api_module.BaseModule):
 
     return types.File._from_response(
         response=_File_from_mldev(self._api_client, return_file['file']),
-        kwargs=None,
+        kwargs=config_model.model_dump() if config else {},
     )
 
   def list(
@@ -979,7 +979,7 @@ class Files(_api_module.BaseModule):
           'downloaded. You can tell which files are downloadable by checking '
           'the `source` or `download_uri` property.'
       )
-    name = t.t_file_name(self, file)
+    name = t.t_file_name(self._api_client, file)
 
     path = f'files/{name}:download'
 
@@ -996,7 +996,7 @@ class Files(_api_module.BaseModule):
 
     if isinstance(file, types.Video):
       file.video_bytes = data
-    elif isinstance(file, types.GeneratedVideo):
+    elif isinstance(file, types.GeneratedVideo) and file.video is not None:
       file.video.video_bytes = data
 
     return data
@@ -1293,7 +1293,7 @@ class AsyncFiles(_api_module.BaseModule):
           'Vertex AI does not support creating files. You can upload files to'
           ' GCS files instead.'
       )
-    config_model = None
+    config_model = types.UploadFileConfig()
     if config:
       if isinstance(config, dict):
         config_model = types.UploadFileConfig(**config)
@@ -1373,7 +1373,7 @@ class AsyncFiles(_api_module.BaseModule):
 
     return types.File._from_response(
         response=_File_from_mldev(self._api_client, return_file['file']),
-        kwargs=None,
+        kwargs=config_model.model_dump() if config else {},
     )
 
   async def list(
@@ -1433,7 +1433,7 @@ class AsyncFiles(_api_module.BaseModule):
       else:
         config_model = config
 
-    name = t.t_file_name(self, file)
+    name = t.t_file_name(self._api_client, file)
 
     path = f'files/{name}:download'