google-genai 1.3.0__tar.gz → 1.4.0__tar.gz

google_genai-1.4.0/MANIFEST.in

@@ -0,0 +1,2 @@
+include LICENSE
+include README.md

{google_genai-1.3.0 → google_genai-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: google-genai
-Version: 1.3.0
+Version: 1.4.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License: Apache-2.0
@@ -192,12 +192,18 @@ contents=[
 
 ### System Instructions and Other Configs
 
+The output of the model can be influenced by several optional settings
+available in generate_content's config parameter. For example, the
+variability and length of the output can be influenced by the temperature
+and max_output_tokens respectively.
+
 ```python
 response = client.models.generate_content(
     model='gemini-2.0-flash-001',
     contents='high',
     config=types.GenerateContentConfig(
         system_instruction='I say high, you say low',
+        max_output_tokens=3,
         temperature=0.3,
     ),
 )

{google_genai-1.3.0 → google_genai-1.4.0}/README.md

@@ -163,12 +163,18 @@ contents=[
 
 ### System Instructions and Other Configs
 
+The output of the model can be influenced by several optional settings
+available in generate_content's config parameter. For example, the
+variability and length of the output can be influenced by the temperature
+and max_output_tokens respectively.
+
 ```python
 response = client.models.generate_content(
     model='gemini-2.0-flash-001',
     contents='high',
     config=types.GenerateContentConfig(
         system_instruction='I say high, you say low',
+        max_output_tokens=3,
         temperature=0.3,
     ),
 )

{google_genai-1.3.0 → google_genai-1.4.0}/google/genai/_api_client.py

@@ -14,7 +14,10 @@
 #
 
 
-"""Base client for calling HTTP APIs sending and receiving JSON."""
+"""Base client for calling HTTP APIs sending and receiving JSON.
+
+The BaseApiClient is intended to be a private module and is subject to change.
+"""
 
 import asyncio
 import copy
@@ -65,7 +68,7 @@ def _append_library_version_headers(headers: dict[str, str]) -> None:
 
 
 def _patch_http_options(
-    options: HttpOptionsDict, patch_options: HttpOptionsDict
+    options: HttpOptionsDict, patch_options: dict[str, Any]
 ) -> HttpOptionsDict:
   # use shallow copy so we don't override the original objects.
   copy_option = HttpOptionsDict()
@@ -131,7 +134,7 @@ class HttpRequest:
 # TODO(b/394358912): Update this class to use a SDKResponse class that can be
 # generated and used for all languages.
 class BaseResponse(_common.BaseModel):
-  http_headers: dict[str, str] = Field(
+  http_headers: Optional[dict[str, str]] = Field(
       default=None, description='The http headers of the response.'
   )
 
@@ -224,17 +227,17 @@ class HttpResponse:
       response_payload[attribute] = copy.deepcopy(getattr(self, attribute))
 
 
-class ApiClient:
+class BaseApiClient:
   """Client for calling HTTP APIs sending and receiving JSON."""
 
   def __init__(
       self,
-      vertexai: Union[bool, None] = None,
-      api_key: Union[str, None] = None,
-      credentials: google.auth.credentials.Credentials = None,
-      project: Union[str, None] = None,
-      location: Union[str, None] = None,
-      http_options: HttpOptionsOrDict = None,
+      vertexai: Optional[bool] = None,
+      api_key: Optional[str] = None,
+      credentials: Optional[google.auth.credentials.Credentials] = None,
+      project: Optional[str] = None,
+      location: Optional[str] = None,
+      http_options: Optional[HttpOptionsOrDict] = None,
   ):
     self.vertexai = vertexai
     if self.vertexai is None:
@@ -258,14 +261,15 @@ class ApiClient:
           ' initializer.'
       )
 
-    # Validate http_options if a dict is provided.
+    # Validate http_options if it is provided.
+    validated_http_options: dict[str, Any]
     if isinstance(http_options, dict):
       try:
-        HttpOptions.model_validate(http_options)
+        validated_http_options = HttpOptions.model_validate(http_options).model_dump()
       except ValidationError as e:
         raise ValueError(f'Invalid http_options: {e}')
     elif isinstance(http_options, HttpOptions):
-      http_options = http_options.model_dump()
+      validated_http_options = http_options.model_dump()
 
     # Retrieve implicitly set values from the environment.
     env_project = os.environ.get('GOOGLE_CLOUD_PROJECT', None)
@@ -347,7 +351,7 @@ class ApiClient:
       self._http_options['headers']['x-goog-api-key'] = self.api_key
     # Update the http options with the user provided http options.
     if http_options:
-      self._http_options = _patch_http_options(self._http_options, http_options)
+      self._http_options = _patch_http_options(self._http_options, validated_http_options)
     else:
       _append_library_version_headers(self._http_options['headers'])
 
@@ -386,7 +390,7 @@ class ApiClient:
       http_method: str,
       path: str,
       request_dict: dict[str, object],
-      http_options: HttpOptionsOrDict = None,
+      http_options: Optional[HttpOptionsOrDict] = None,
   ) -> HttpRequest:
     # Remove all special dict keys such as _url and _query.
     keys_to_delete = [key for key in request_dict.keys() if key.startswith('_')]
@@ -424,7 +428,7 @@ class ApiClient:
         patched_http_options['api_version'] + '/' + path,
     )
 
-    timeout_in_seconds = patched_http_options.get('timeout', None)
+    timeout_in_seconds: Optional[Union[float, int]] = patched_http_options.get('timeout', None)
     if timeout_in_seconds:
       timeout_in_seconds = timeout_in_seconds / 1000.0
     else:
@@ -471,7 +475,7 @@ class ApiClient:
       http_request: HttpRequest,
       stream: bool = False,
   ) -> HttpResponse:
-    data = None
+    data: Optional[Union[str, bytes]] = None
     if http_request.data:
       if not isinstance(http_request.data, bytes):
         data = json.dumps(http_request.data)
@@ -507,7 +511,7 @@ class ApiClient:
       httpx_request = httpx.Request(
           method=http_request.method,
           url=http_request.url,
-          data=json.dumps(http_request.data),
+          content=json.dumps(http_request.data),
           headers=http_request.headers,
       )
       aclient = httpx.AsyncClient()
@@ -525,7 +529,7 @@ class ApiClient:
             method=http_request.method,
             url=http_request.url,
             headers=http_request.headers,
-            data=json.dumps(http_request.data) if http_request.data else None,
+            content=json.dumps(http_request.data) if http_request.data else None,
             timeout=http_request.timeout,
         )
         errors.APIError.raise_for_response(response)
@@ -545,7 +549,7 @@ class ApiClient:
       http_method: str,
       path: str,
       request_dict: dict[str, object],
-      http_options: HttpOptionsOrDict = None,
+      http_options: Optional[HttpOptionsOrDict] = None,
   ):
     http_request = self._build_request(
         http_method, path, request_dict, http_options
@@ -563,7 +567,7 @@ class ApiClient:
       http_method: str,
       path: str,
       request_dict: dict[str, object],
-      http_options: HttpOptionsDict = None,
+      http_options: Optional[HttpOptionsDict] = None,
   ):
     http_request = self._build_request(
         http_method, path, request_dict, http_options
@@ -578,7 +582,7 @@ class ApiClient:
       http_method: str,
       path: str,
       request_dict: dict[str, object],
-      http_options: HttpOptionsDict = None,
+      http_options: Optional[HttpOptionsOrDict] = None,
   ) -> dict[str, object]:
     http_request = self._build_request(
         http_method, path, request_dict, http_options
@@ -595,7 +599,7 @@ class ApiClient:
       http_method: str,
       path: str,
       request_dict: dict[str, object],
-      http_options: HttpOptionsDict = None,
+      http_options: Optional[HttpOptionsDict] = None,
   ):
     http_request = self._build_request(
         http_method, path, request_dict, http_options
@@ -704,10 +708,10 @@ class ApiClient:
       self,
       http_request: HttpRequest,
   ) -> HttpResponse:
-    data = None
+    data: str | bytes | None = None
     if http_request.data:
       if not isinstance(http_request.data, bytes):
-        data = json.dumps(http_request.data, cls=RequestJsonEncoder)
+        data = json.dumps(http_request.data)
       else:
         data = http_request.data
 
@@ -792,5 +796,5 @@ class ApiClient:
   # This method does nothing in the real api client. It is used in the
   # replay_api_client to verify the response from the SDK method matches the
   # recorded response.
-  def _verify_response(self, response_model: BaseModel):
+  def _verify_response(self, response_model: _common.BaseModel):
     pass

{google_genai-1.3.0 → google_genai-1.4.0}/google/genai/_api_module.py

@@ -21,7 +21,7 @@ from . import _api_client
 
 class BaseModule:
 
-  def __init__(self, api_client_: _api_client.ApiClient):
+  def __init__(self, api_client_: _api_client.BaseApiClient):
     self._api_client = api_client_
 
   @property

{google_genai-1.3.0 → google_genai-1.4.0}/google/genai/_automatic_function_calling_util.py

@@ -31,12 +31,12 @@ else:
   VersionedUnionType = typing._UnionGenericAlias
 
 _py_builtin_type_to_schema_type = {
-    str: 'STRING',
-    int: 'INTEGER',
-    float: 'NUMBER',
-    bool: 'BOOLEAN',
-    list: 'ARRAY',
-    dict: 'OBJECT',
+    str: types.Type.STRING,
+    int: types.Type.INTEGER,
+    float: types.Type.NUMBER,
+    bool: types.Type.BOOLEAN,
+    list: types.Type.ARRAY,
+    dict: types.Type.OBJECT,
 }
 
 
@@ -145,7 +145,7 @@ def _parse_schema_from_parameter(
           for arg in get_args(param.annotation)
       )
   ):
-    schema.type = 'OBJECT'
+    schema.type = _py_builtin_type_to_schema_type[dict]
     schema.any_of = []
     unique_types = set()
     for arg in get_args(param.annotation):
@@ -183,7 +183,7 @@ def _parse_schema_from_parameter(
     origin = get_origin(param.annotation)
     args = get_args(param.annotation)
     if origin is dict:
-      schema.type = 'OBJECT'
+      schema.type = _py_builtin_type_to_schema_type[dict]
       if param.default is not inspect.Parameter.empty:
         if not _is_default_value_compatible(param.default, param.annotation):
           raise ValueError(default_value_error_msg)
@@ -195,7 +195,7 @@ def _parse_schema_from_parameter(
         raise ValueError(
             f'Literal type {param.annotation} must be a list of strings.'
         )
-      schema.type = 'STRING'
+      schema.type = _py_builtin_type_to_schema_type[str]
       schema.enum = list(args)
       if param.default is not inspect.Parameter.empty:
         if not _is_default_value_compatible(param.default, param.annotation):
@@ -204,7 +204,7 @@ def _parse_schema_from_parameter(
       _raise_if_schema_unsupported(api_option, schema)
       return schema
     if origin is list:
-      schema.type = 'ARRAY'
+      schema.type = _py_builtin_type_to_schema_type[list]
       schema.items = _parse_schema_from_parameter(
           api_option,
           inspect.Parameter(
@@ -222,7 +222,7 @@ def _parse_schema_from_parameter(
       return schema
     if origin is Union:
       schema.any_of = []
-      schema.type = 'OBJECT'
+      schema.type = _py_builtin_type_to_schema_type[dict]
       unique_types = set()
       for arg in args:
         # The first check is for NoneType in Python 3.9, since the __name__
@@ -280,7 +280,7 @@ def _parse_schema_from_parameter(
         and param.default is not None
     ):
       schema.default = param.default
-    schema.type = 'OBJECT'
+    schema.type = _py_builtin_type_to_schema_type[dict]
     schema.properties = {}
     for field_name, field_info in param.annotation.model_fields.items():
       schema.properties[field_name] = _parse_schema_from_parameter(

{google_genai-1.3.0 → google_genai-1.4.0}/google/genai/_common.py

@@ -205,7 +205,7 @@ class BaseModel(pydantic.BaseModel):
 
   @classmethod
   def _from_response(
-      cls, response: dict[str, object], kwargs: dict[str, object]
+      cls, *, response: dict[str, object], kwargs: dict[str, object]
   ) -> 'BaseModel':
     # To maintain forward compatibility, we need to remove extra fields from
     # the response.
@@ -266,7 +266,7 @@ def encode_unserializable_types(data: dict[str, object]) -> dict[str, object]:
     A dictionary with json.dumps() incompatible type (e.g. bytes datetime)
     to compatible type (e.g. base64 encoded string, isoformat date string).
   """
-  processed_data = {}
+  processed_data: dict[str, object] = {}
   if not isinstance(data, dict):
     return data
   for key, value in data.items():

{google_genai-1.3.0 → google_genai-1.4.0}/google/genai/_extra_utils.py

@@ -76,7 +76,7 @@ def get_function_map(
       if config and isinstance(config, dict)
       else config
   )
-  function_map = {}
+  function_map: dict[str, object] = {}
   if not config_model:
     return function_map
   if config_model.tools:
@@ -220,15 +220,16 @@ def get_function_response_parts(
     func_name = part.function_call.name
     func = function_map[func_name]
     args = convert_number_values_for_function_call_args(part.function_call.args)
+    func_response: dict[str, Any]
     try:
-      response = {'result': invoke_function_from_dict_args(args, func)}
+      func_response = {'result': invoke_function_from_dict_args(args, func)}
     except Exception as e:  # pylint: disable=broad-except
-      response = {'error': str(e)}
-    func_response = types.Part.from_function_response(
-        name=func_name, response=response
+      func_response = {'error': str(e)}
+    func_response_part = types.Part.from_function_response(
+        name=func_name, response=func_response
     )
 
-    func_response_parts.append(func_response)
+    func_response_parts.append(func_response_part)
   return func_response_parts
 
 

{google_genai-1.3.0 → google_genai-1.4.0}/google/genai/_replay_api_client.py

@@ -29,7 +29,7 @@ import google.auth
 from requests.exceptions import HTTPError
 
 from . import errors
-from ._api_client import ApiClient
+from ._api_client import BaseApiClient
 from ._api_client import HttpOptions
 from ._api_client import HttpRequest
 from ._api_client import HttpResponse
@@ -179,7 +179,7 @@ class ReplayFile(BaseModel):
   interactions: list[ReplayInteraction]
 
 
-class ReplayApiClient(ApiClient):
+class ReplayApiClient(BaseApiClient):
   """For integration testing, send recorded response or records a response."""
 
   def __init__(
@@ -457,6 +457,7 @@ class ReplayApiClient(ApiClient):
           method='POST', url='', data={'file_path': file_path}, headers={}
       )
     if self._should_call_api():
+      result: Union[str, HttpResponse]
       try:
         result = super().upload_file(file_path, upload_url, upload_size)
       except HTTPError as e:

{google_genai-1.3.0 → google_genai-1.4.0}/google/genai/_test_api_client.py

@@ -17,13 +17,13 @@ import asyncio
 import time
 from unittest.mock import MagicMock, patch
 import pytest
-from .api_client import ApiClient
+from .api_client import BaseApiClient
 
 
-@patch('genai.api_client.ApiClient._build_request')
-@patch('genai.api_client.ApiClient._request')
+@patch('genai.api_client.BaseApiClient._build_request')
+@patch('genai.api_client.BaseApiClient._request')
 def test_request_streamed_non_blocking(mock_request, mock_build_request):
-  api_client = ApiClient(api_key='test_api_key')
+  api_client = BaseApiClient(api_key='test_api_key')
   http_method = 'GET'
   path = 'test/path'
   request_dict = {'key': 'value'}
@@ -56,8 +56,8 @@ def test_request_streamed_non_blocking(mock_request, mock_build_request):
   assert end_time - start_time > 0.3
 
 
-@patch('genai.api_client.ApiClient._build_request')
-@patch('genai.api_client.ApiClient._async_request')
+@patch('genai.api_client.BaseApiClient._build_request')
+@patch('genai.api_client.BaseApiClient._async_request')
 @pytest.mark.asyncio
 async def test_async_request(mock_async_request, mock_build_request):
   api_client = ApiClient(api_key='test_api_key')
@@ -99,8 +99,8 @@ async def test_async_request(mock_async_request, mock_build_request):
   assert 0.1 <= end_time - start_time < 0.15
 
 
-@patch('genai.api_client.ApiClient._build_request')
-@patch('genai.api_client.ApiClient._async_request')
+@patch('genai.api_client.BaseApiClient._build_request')
+@patch('genai.api_client.BaseApiClient._async_request')
 @pytest.mark.asyncio
 async def test_async_request_streamed_non_blocking(
     mock_async_request, mock_build_request