Merge branch 'main' into fix/uri_params

Author: shovelmn12

README.md

@@ -274,7 +274,7 @@ See the 'Create a client' section above to initialize a client.
 
 ### Generate Content
 
-#### with text content
+#### with text content input (text output)
 
 ```python
 response = client.models.generate_content(
@@ -283,6 +283,28 @@ response = client.models.generate_content(
 print(response.text)
 ```
 
+#### with text content input (image output)
+
+```python
+from google.genai import types
+
+response = client.models.generate_content(
+    model='gemini-2.5-flash-image',
+    contents='A cartoon infographic for flying sneakers',
+    config=types.GenerateContentConfig(
+    response_modalities=["IMAGE"],
+      image_config=types.ImageConfig(
+          aspect_ratio="9:16",
+      ),
+    ),
+)
+
+for part in response.parts:
+  if part.inline_data:
+    generated_image = part.as_image()
+    generated_image.show()
+```
+
 #### with uploaded file (Gemini Developer API only)
 download the file in console.
 

google/genai/_api_client.py

@@ -693,8 +693,15 @@ def __init__(
         self._http_options
     )
     self._async_httpx_client_args = async_client_args
-    self._httpx_client = SyncHttpxClient(**client_args)
-    self._async_httpx_client = AsyncHttpxClient(**async_client_args)
+
+    if self._http_options.httpx_client:
+      self._httpx_client = self._http_options.httpx_client
+    else:
+      self._httpx_client = SyncHttpxClient(**client_args)
+    if self._http_options.httpx_async_client:
+      self._async_httpx_client = self._http_options.httpx_async_client
+    else:
+      self._async_httpx_client = AsyncHttpxClient(**async_client_args)
     if self._use_aiohttp():
       # Do it once at the genai.Client level. Share among all requests.
       self._async_client_session_request_args = self._ensure_aiohttp_ssl_ctx(

google/genai/models.py

@@ -6903,9 +6903,11 @@ async def async_generator(model, contents, config):  # type: ignore[no-untyped-d
         response = await self._generate_content_stream(
             model=model, contents=contents, config=config
         )
-        logger.info(f'AFC remote call {i} is done.')
+        # TODO: b/453739108 - make AFC logic more robust like the other 3 methods.
+        if i > 1:
+          logger.info(f'AFC remote call {i} is done.')
         remaining_remote_calls_afc -= 1
-        if remaining_remote_calls_afc == 0:
+        if i > 1 and remaining_remote_calls_afc == 0:
           logger.info(
               'Reached max remote calls for automatic function calling.'
           )

google/genai/tests/client/test_async_stream.py

@@ -16,8 +16,6 @@
 """Tests for async stream."""
 
 import asyncio
-from collections.abc import Sequence
-import datetime
 from typing import List
 from unittest import mock
 from unittest.mock import AsyncMock
@@ -35,8 +33,6 @@
 import httpx
 
 from ... import _api_client as api_client
-from ... import errors
-from ... import types
 
 
 class MockHTTPXResponse(httpx.Response):

google/genai/tests/client/test_client_close.py

@@ -90,20 +90,6 @@ async def test_async_httpx_client_context_manager():
   assert async_client._api_client._async_httpx_client.is_closed
 
 
-@requires_aiohttp
-@pytest.mark.asyncio
-async def test_aclose_aiohttp_session():
-  """Tests that the aiohttp session is closed when the client is closed."""
-  api_client.has_aiohttp = True
-  async_client = Client(
-      vertexai=True,
-      project='test_project',
-      location='global',
-  ).aio
-  await async_client.aclose()
-  assert async_client._api_client._aiohttp_session is None
-
-
 @requires_aiohttp
 @pytest.fixture
 def mock_request():
@@ -130,6 +116,47 @@ async def _aiohttp_async_response(status: int):
   return response
 
 
+@requires_aiohttp
+@mock.patch.object(aiohttp.ClientSession, 'request', autospec=True)
+def test_aclose_aiohttp_session(mock_request):
+  """Tests that the aiohttp session is closed when the client is closed."""
+  api_client.has_aiohttp = True
+  async def run():
+    mock_request.side_effect = (
+        aiohttp.ClientConnectorError(
+            connection_key=aiohttp.client_reqrep.ConnectionKey(
+                'localhost', 80, False, True, None, None, None
+            ),
+            os_error=OSError,
+        ),
+        _aiohttp_async_response(200),
+    )
+    with _patch_auth_default():
+      async_client = Client(
+          vertexai=True,
+          project='test_project',
+          location='global',
+      ).aio
+      # aiohttp session is created in the first request instead of client
+      # initialization.
+      _ = await async_client._api_client._async_request_once(
+          api_client.HttpRequest(
+              method='GET',
+              url='https://example.com',
+              headers={},
+              data=None,
+              timeout=None,
+          )
+      )
+      assert async_client._api_client._aiohttp_session is not None
+      assert not async_client._api_client._aiohttp_session.closed
+      # Close the client and check that the session is closed.
+      await async_client.aclose()
+      assert async_client._api_client._aiohttp_session.closed
+
+  asyncio.run(run())
+
+
 @requires_aiohttp
 @mock.patch.object(aiohttp.ClientSession, 'request', autospec=True)
 def test_aiohttp_session_context_manager(mock_request):

google/genai/tests/client/test_custom_client.py

@@ -0,0 +1,66 @@
+# Copyright 2025 Google LLC
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+"""Tests for custom clients."""
+import asyncio
+from unittest import mock
+
+from google.oauth2 import credentials
+import httpx
+import pytest
+
+from ... import _api_client as api_client
+from ... import Client
+
+
+try:
+  import aiohttp
+
+  AIOHTTP_NOT_INSTALLED = False
+except ImportError:
+  AIOHTTP_NOT_INSTALLED = True
+  aiohttp = mock.MagicMock()
+
+requires_aiohttp = pytest.mark.skipif(
+    AIOHTTP_NOT_INSTALLED, reason='aiohttp is not installed, skipping test.'
+)
+
+
+# Httpx
+def test_constructor_with_httpx_clients():
+  mldev_http_options = {
+      'httpx_client': httpx.Client(trust_env=False),
+      'httpx_async_client': httpx.AsyncClient(trust_env=False),
+  }
+  vertexai_http_options = {
+      'httpx_client': httpx.Client(trust_env=False),
+      'httpx_async_client': httpx.AsyncClient(trust_env=False),
+  }
+
+  mldev_client = Client(
+      api_key='google_api_key', http_options=mldev_http_options
+  )
+  assert not mldev_client.models._api_client._httpx_client.trust_env
+  assert not mldev_client.models._api_client._async_httpx_client.trust_env
+
+  vertexai_client = Client(
+      vertexai=True,
+      project='fake_project_id',
+      location='fake-location',
+      http_options=vertexai_http_options,
+  )
+  assert not vertexai_client.models._api_client._httpx_client.trust_env
+  assert not vertexai_client.models._api_client._async_httpx_client.trust_env
+

google/genai/tests/client/test_http_options.py

@@ -37,7 +37,9 @@ def test_patch_http_options_with_copies_all_fields():
   http_options_keys = types.HttpOptions.model_fields.keys()
 
   for key in http_options_keys:
-    assert hasattr(patched, key) and getattr(patched, key) is not None
+    assert hasattr(patched, key)
+    if key not in ['httpx_client', 'httpx_async_client', 'aiohttp_client_session']:
+      assert getattr(patched, key) is not None
   assert patched.base_url == 'https://fake-url.com/'
   assert patched.api_version == 'v1'
   assert patched.headers['X-Custom-Header'] == 'custom_value'

google/genai/tests/models/test_generate_content_tools.py

@@ -522,8 +522,6 @@ def divide_floats(a: float, b: float) -> float:
                 ]
             },
         ),
-        # TODO(b/450916996): Remove this once the feature is launched in Gemini.
-        exception_if_mldev='400',
     ),
 ]
 

google/genai/types.py

@@ -89,6 +89,27 @@
   except ImportError:
     yaml = None
 
+_is_httpx_imported = False
+if typing.TYPE_CHECKING:
+  import httpx
+
+  HttpxClient = httpx.Client
+  HttpxAsyncClient = httpx.AsyncClient
+  _is_httpx_imported = True
+else:
+  HttpxClient: typing.Type = Any
+  HttpxAsyncClient: typing.Type = Any
+
+  try:
+    import httpx
+
+    HttpxClient = httpx.Client
+    HttpxAsyncClient = httpx.AsyncClient
+    _is_httpx_imported = True
+  except ImportError:
+    HttpxClient = None
+    HttpxAsyncClient = None
+
 logger = logging.getLogger('google_genai.types')
 
 T = typing.TypeVar('T', bound='GenerateContentResponse')
@@ -1530,6 +1551,15 @@ class HttpOptions(_common.BaseModel):
       default=None, description="""HTTP retry options for the request."""
   )
 
+  httpx_client: Optional['HttpxClient'] = Field(
+      default=None,
+      description="""A custom httpx client to be used for the request.""",
+  )
+  httpx_async_client: Optional['HttpxAsyncClient'] = Field(
+      default=None,
+      description="""A custom httpx async client to be used for the request.""",
+  )
+
 
 class HttpOptionsDict(TypedDict, total=False):
   """HTTP options to be used in each of the requests."""

pyproject.toml

@@ -6,14 +6,13 @@ name = "google-genai"
 version = "1.45.0"
 description = "GenAI Python SDK"
 readme = "README.md"
-license = {text = "Apache-2.0"}
+license = "Apache-2.0"
 requires-python = ">=3.9"
 authors = [
     { name = "Google LLC", email = "googleapis-packages@google.com" },
 ]
 classifiers = [
     "Intended Audience :: Developers",
-    "License :: OSI Approved :: Apache Software License",
     "Operating System :: OS Independent",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
@@ -44,14 +43,9 @@ local-tokenizer = ["sentencepiece>=0.2.0", "protobuf"]
 [project.urls]
 Homepage = "https://github.com/googleapis/python-genai"
 
-[tool.setuptools]
-packages = [
-    "google",
-    "google.genai",
-]
-include-package-data = true
+# [tool.setuptools] settings are in setup.cfg
 
-[tools.setuptools.package_data]
+[tool.setuptools.package-data]
 "google.genai" = ["py.typed"]
 
 [tool.mypy]