google-genai 1.0.0rc0__py3-none-any.whl → 1.2.0__py3-none-any.whl

google/genai/chats.py

@@ -57,12 +57,16 @@ class Chat(_BaseChat):
   """Chat session."""
 
   def send_message(
-      self, message: Union[list[PartUnionDict], PartUnionDict]
+      self,
+      message: Union[list[PartUnionDict], PartUnionDict],
+      config: Optional[GenerateContentConfigOrDict] = None,
   ) -> GenerateContentResponse:
     """Sends the conversation history with the additional message and returns the model's response.
 
     Args:
       message: The message to send to the model.
+      config:  Optional config to override the default Chat config for this
+        request.
 
     Returns:
       The model's response.
@@ -79,7 +83,7 @@ class Chat(_BaseChat):
     response = self._modules.generate_content(
         model=self._model,
         contents=self._curated_history + [input_content],
-        config=self._config,
+        config=config if config else self._config,
     )
     if _validate_response(response):
       if response.automatic_function_calling_history:
@@ -92,12 +96,16 @@ class Chat(_BaseChat):
     return response
 
   def send_message_stream(
-      self, message: Union[list[PartUnionDict], PartUnionDict]
+      self,
+      message: Union[list[PartUnionDict], PartUnionDict],
+      config: Optional[GenerateContentConfigOrDict] = None,
   ):
     """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.
+      config: Optional config to override the default Chat config for this
+        request.
 
     Yields:
       The model's response in chunks.
@@ -117,7 +125,7 @@ class Chat(_BaseChat):
     for chunk in self._modules.generate_content_stream(
         model=self._model,
         contents=self._curated_history + [input_content],
-        config=self._config,
+        config=config if config else self._config,
     ):
       if _validate_response(chunk):
         output_contents.append(chunk.candidates[0].content)
@@ -164,12 +172,16 @@ class AsyncChat(_BaseChat):
   """Async chat session."""
 
   async def send_message(
-      self, message: Union[list[PartUnionDict], PartUnionDict]
+      self,
+      message: Union[list[PartUnionDict], PartUnionDict],
+      config: Optional[GenerateContentConfigOrDict] = None,
   ) -> GenerateContentResponse:
     """Sends the conversation history with the additional message and returns model's response.
 
     Args:
       message: The message to send to the model.
+      config: Optional config to override the default Chat config for this
+        request.
 
     Returns:
       The model's response.
@@ -186,7 +198,7 @@ class AsyncChat(_BaseChat):
     response = await self._modules.generate_content(
         model=self._model,
         contents=self._curated_history + [input_content],
-        config=self._config,
+        config=config if config else self._config,
     )
     if _validate_response(response):
       if response.automatic_function_calling_history:
@@ -199,12 +211,16 @@ class AsyncChat(_BaseChat):
     return response
 
   async def send_message_stream(
-      self, message: Union[list[PartUnionDict], PartUnionDict]
+      self,
+      message: Union[list[PartUnionDict], PartUnionDict],
+      config: Optional[GenerateContentConfigOrDict] = None,
   ) -> Awaitable[AsyncIterator[GenerateContentResponse]]:
     """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.
+      config: Optional config to override the default Chat config for this
+        request.
 
     Yields:
       The model's response in chunks.
@@ -225,7 +241,7 @@ class AsyncChat(_BaseChat):
       async for chunk in await self._modules.generate_content_stream(
           model=self._model,
           contents=self._curated_history + [input_content],
-          config=self._config,
+          config=config if config else self._config,
       ):
         if _validate_response(chunk):
           output_contents.append(chunk.candidates[0].content)

google/genai/client.py

@@ -94,6 +94,17 @@ class Client:
   Use this client to make a request to the Gemini Developer API or Vertex AI
   API and then wait for the response.
 
+  To initialize the client, provide the required arguments either directly
+  or by using environment variables. Gemini API users and Vertex AI users in
+  express mode can provide API key by providing input argument
+  `api_key="your-api-key"` or by defining `GOOGLE_API_KEY="your-api-key"` as an
+  environment variable
+
+  Vertex AI API users can provide inputs argument as `vertexai=false,
+  project="your-project-id", location="us-central1"` or by defining
+  `GOOGLE_GENAI_USE_VERTEXAI=false`, `GOOGLE_CLOUD_PROJECT` and
+  `GOOGLE_CLOUD_LOCATION` environment variables.
+
   Attributes:
     api_key: The `API key <https://ai.google.dev/gemini-api/docs/api-key>`_ to
       use for authentication. Applies to the Gemini Developer API only.
@@ -173,21 +184,11 @@ 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. The field deprecated_response_payload should not be set
-         in http_options.
+         for the client.
     """
 
     self._debug_config = debug_config or DebugConfig()
 
-    # Throw ValueError if deprecated_response_payload is set in http_options
-    # due to unpredictable behavior when running multiple coroutines through
-    # client.aio.
-    if http_options and 'deprecated_response_payload' in http_options:
-      raise ValueError(
-          'Setting deprecated_response_payload in http_options is not'
-          ' supported.'
-      )
-
     self._api_client = self._get_api_client(
         vertexai=vertexai,
         api_key=api_key,
@@ -272,4 +273,4 @@ class Client:
   @property
   def vertexai(self) -> bool:
     """Returns whether the client is using the Vertex AI API."""
-    return self._api_client.vertexai or False
+    return self._api_client.vertexai or False

google/genai/errors.py

@@ -128,3 +128,7 @@ class FunctionInvocationError(ValueError):
   """Raised when the function cannot be invoked with the given arguments."""
 
   pass
+
+
+class ExperimentalWarning(Warning):
+  """Warning for experimental features."""

google/genai/files.py

@@ -494,6 +494,8 @@ def _CreateFileResponse_from_mldev(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+  if getv(from_object, ['httpHeaders']) is not None:
+    setv(to_object, ['http_headers'], getv(from_object, ['httpHeaders']))
 
   return to_object
 
@@ -504,6 +506,8 @@ def _CreateFileResponse_from_vertex(
     parent_object: dict = None,
 ) -> dict:
   to_object = {}
+  if getv(from_object, ['httpHeaders']) is not None:
+    setv(to_object, ['http_headers'], getv(from_object, ['httpHeaders']))
 
   return to_object
 
@@ -840,7 +844,7 @@ class Files(_api_module.BaseModule):
             'Unknown mime type: Could not determine the mimetype for your'
             ' file\n    please set the `mime_type` argument'
         )
-    response = {}
+
     if config_model and config_model.http_options:
       http_options = config_model.http_options
     else:
@@ -853,19 +857,20 @@ class Files(_api_module.BaseModule):
               'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
               'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
           },
-          'deprecated_response_payload': response,
       }
-    self._create(file=file_obj, config={'http_options': http_options})
+    response = self._create(
+        file=file_obj, config={'http_options': http_options}
+    )
 
     if (
-        'headers' not in response
-        or 'X-Goog-Upload-URL' not in response['headers']
+        response.http_headers is None
+        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['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(
@@ -1272,7 +1277,6 @@ class AsyncFiles(_api_module.BaseModule):
             ' file\n    please set the `mime_type` argument'
         )
 
-    response = {}
     if config_model and config_model.http_options:
       http_options = config_model.http_options
     else:
@@ -1285,18 +1289,20 @@ class AsyncFiles(_api_module.BaseModule):
               'X-Goog-Upload-Header-Content-Length': f'{file_obj.size_bytes}',
               'X-Goog-Upload-Header-Content-Type': f'{file_obj.mime_type}',
           },
-          'deprecated_response_payload': response,
       }
-    await self._create(file=file_obj, config={'http_options': http_options})
+    response = await self._create(
+        file=file_obj, config={'http_options': http_options}
+    )
+
     if (
-        'headers' not in response
-        or 'X-Goog-Upload-URL' not in response['headers']
+        response.http_headers is None
+        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['headers']['X-Goog-Upload-URL']
+    upload_url = response.http_headers['X-Goog-Upload-URL']
 
     if isinstance(file, io.IOBase):
       return_file = await self._api_client.async_upload_file(

google/genai/live.py

@@ -29,8 +29,10 @@ from . import _api_module
 from . import _common
 from . import _transformers as t
 from . import client
+from . import errors
 from . import types
 from ._api_client import ApiClient
+from ._common import experimental_warning
 from ._common import get_value_by_path as getv
 from ._common import set_value_by_path as setv
 from .models import _Content_from_mldev
@@ -633,6 +635,9 @@ class AsyncLive(_api_module.BaseModule):
     return_value['setup'].update(to_object)
     return return_value
 
+  @experimental_warning(
+      "The live API is experimental and may change in future versions.",
+  )
   @contextlib.asynccontextmanager
   async def connect(
       self,