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

google/genai/chats.py

@@ -19,7 +19,7 @@ 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, GenerateContentConfigOrDict, GenerateContentResponse, Part, PartUnionDict
+from .types import Content, ContentOrDict, GenerateContentConfigOrDict, GenerateContentResponse, Part, PartUnionDict
 
 
 if sys.version_info >= (3, 10):
@@ -116,14 +116,21 @@ class _BaseChat:
       *,
       model: str,
       config: Optional[GenerateContentConfigOrDict] = None,
-      history: list[Content],
+      history: list[ContentOrDict],
   ):
     self._model = model
     self._config = config
-    self._comprehensive_history = history
+    content_models = []
+    for content in history:
+      if not isinstance(content, Content):
+        content_model = Content.model_validate(content)
+      else:
+        content_model = content
+      content_models.append(content_model)
+    self._comprehensive_history = content_models
     """Comprehensive history is the full history of the chat, including turns of the invalid contents from the model and their associated inputs.
     """
-    self._curated_history = _extract_curated_history(history)
+    self._curated_history = _extract_curated_history(content_models)
     """Curated history is the set of valid turns that will be used in the subsequent send requests.
     """
 
@@ -210,7 +217,7 @@ class Chat(_BaseChat):
       modules: Models,
       model: str,
       config: Optional[GenerateContentConfigOrDict] = None,
-      history: list[Content],
+      history: list[ContentOrDict],
   ):
     self._modules = modules
     super().__init__(
@@ -344,7 +351,7 @@ class Chats:
       *,
       model: str,
       config: Optional[GenerateContentConfigOrDict] = None,
-      history: Optional[list[Content]] = None,
+      history: Optional[list[ContentOrDict]] = None,
   ) -> Chat:
     """Creates a new chat session.
 
@@ -373,7 +380,7 @@ class AsyncChat(_BaseChat):
       modules: AsyncModels,
       model: str,
       config: Optional[GenerateContentConfigOrDict] = None,
-      history: list[Content],
+      history: list[ContentOrDict],
   ):
     self._modules = modules
     super().__init__(
@@ -501,7 +508,7 @@ class AsyncChats:
       *,
       model: str,
       config: Optional[GenerateContentConfigOrDict] = None,
-      history: Optional[list[Content]] = None,
+      history: Optional[list[ContentOrDict]] = None,
   ) -> AsyncChat:
     """Creates a new chat session.
 

google/genai/client.py

@@ -194,6 +194,8 @@ class Client:
     """
 
     self._debug_config = debug_config or DebugConfig()
+    if isinstance(http_options, dict):
+      http_options = HttpOptions(**http_options)
 
     self._api_client = self._get_api_client(
         vertexai=vertexai,
@@ -229,10 +231,10 @@ class Client:
         'auto',
     ]:
       return ReplayApiClient(
-          mode=debug_config.client_mode,
-          replay_id=debug_config.replay_id,
+          mode=debug_config.client_mode,  # type: ignore[arg-type]
+          replay_id=debug_config.replay_id,  # type: ignore[arg-type]
           replays_directory=debug_config.replays_directory,
-          vertexai=vertexai,
+          vertexai=vertexai,  # type: ignore[arg-type]
           api_key=api_key,
           credentials=credentials,
           project=project,

google/genai/errors.py

@@ -35,28 +35,10 @@ class APIError(Exception):
   def __init__(
       self,
       code: int,
-      response: Union['ReplayResponse', httpx.Response],
+      response_json: Any,
+      response: Optional[Union['ReplayResponse', httpx.Response]] = None,
   ):
     self.response = response
-    message = None
-    if isinstance(response, httpx.Response):
-      try:
-        response_json = response.json()
-      except (json.decoder.JSONDecodeError):
-        message = response.text
-        response_json = {
-            'message': message,
-            'status': response.reason_phrase,
-        }
-      except httpx.ResponseNotRead:
-        message = 'Response not read'
-        response_json = {
-            'message': message,
-            'status': response.reason_phrase,
-        }
-    else:
-      response_json = response.body_segments[0].get('error', {})
-
     self.details = response_json
     self.message = self._get_message(response_json)
     self.status = self._get_status(response_json)
@@ -101,13 +83,54 @@ class APIError(Exception):
     if response.status_code == 200:
       return
 
+    if isinstance(response, httpx.Response):
+      try:
+        response.read()
+        response_json = response.json()
+      except json.decoder.JSONDecodeError:
+        message = response.text
+        response_json = {
+            'message': message,
+            'status': response.reason_phrase,
+        }
+    else:
+      response_json = response.body_segments[0].get('error', {})
+
+    status_code = response.status_code
+    if 400 <= status_code < 500:
+      raise ClientError(status_code, response_json, response)
+    elif 500 <= status_code < 600:
+      raise ServerError(status_code, response_json, response)
+    else:
+      raise cls(status_code, response_json, response)
+
+  @classmethod
+  async def raise_for_async_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:
+      return
+    if isinstance(response, httpx.Response):
+      try:
+        await response.aread()
+        response_json = response.json()
+      except json.decoder.JSONDecodeError:
+        message = response.text
+        response_json = {
+            'message': message,
+            'status': response.reason_phrase,
+        }
+    else:
+      response_json = response.body_segments[0].get('error', {})
+
     status_code = response.status_code
     if 400 <= status_code < 500:
-      raise ClientError(status_code, response)
+      raise ClientError(status_code, response_json, response)
     elif 500 <= status_code < 600:
-      raise ServerError(status_code, response)
+      raise ServerError(status_code, response_json, response)
     else:
-      raise cls(status_code, response)
+      raise cls(status_code, response_json, response)
 
 
 class ClientError(APIError):
@@ -137,4 +160,4 @@ class FunctionInvocationError(ValueError):
 
 
 class ExperimentalWarning(Warning):
-  """Warning for experimental features."""
+  """Warning for experimental features."""