Merge branch 'main' into fix/mcp-boolean-additional-properties

Author: pragnyanramtha

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## [2.4.0](https://github.com/googleapis/python-genai/compare/v2.3.0...v2.4.0) (2026-05-17)
+
+
+### Features
+
+* Support Agent and Environment APIs. ([ef20d6b](https://github.com/googleapis/python-genai/commit/ef20d6ba54a183280c046a4346c125168d5f8a95))
+
+
+### Bug Fixes
+
+* Output_text for turns that don't end with text. ([2afdeff](https://github.com/googleapis/python-genai/commit/2afdefff90f3fb4f98075a18c99d44b9e722dde6))
+* Pass max_line_length to readline() to prevent LineTooLong on large SSE lines with MTLS. ([0e8f7bb](https://github.com/googleapis/python-genai/commit/0e8f7bbe1a6b9700f6cd6265851114c315a4a72a))
+
 ## [2.3.0](https://github.com/googleapis/python-genai/compare/v2.2.0...v2.3.0) (2026-05-15)
 
 

google/genai/_interactions/_client.py

@@ -49,7 +49,8 @@
 from ._client_adapter import GeminiNextGenAPIClientAdapter, AsyncGeminiNextGenAPIClientAdapter
 
 if TYPE_CHECKING:
-    from .resources import webhooks, interactions
+    from .resources import agents, webhooks, interactions
+    from .resources.agents import AgentsResource, AsyncAgentsResource
     from .resources.webhooks import WebhooksResource, AsyncWebhooksResource
     from .resources.interactions import InteractionsResource, AsyncInteractionsResource
 
@@ -140,6 +141,12 @@ def webhooks(self) -> WebhooksResource:
 
         return WebhooksResource(self)
 
+    @cached_property
+    def agents(self) -> AgentsResource:
+        from .resources.agents import AgentsResource
+
+        return AgentsResource(self)
+
     @cached_property
     def with_raw_response(self) -> GeminiNextGenAPIClientWithRawResponse:
         return GeminiNextGenAPIClientWithRawResponse(self)
@@ -368,6 +375,12 @@ def webhooks(self) -> AsyncWebhooksResource:
 
         return AsyncWebhooksResource(self)
 
+    @cached_property
+    def agents(self) -> AsyncAgentsResource:
+        from .resources.agents import AsyncAgentsResource
+
+        return AsyncAgentsResource(self)
+
     @cached_property
     def with_raw_response(self) -> AsyncGeminiNextGenAPIClientWithRawResponse:
         return AsyncGeminiNextGenAPIClientWithRawResponse(self)
@@ -539,6 +552,12 @@ def webhooks(self) -> webhooks.WebhooksResourceWithRawResponse:
 
         return WebhooksResourceWithRawResponse(self._client.webhooks)
 
+    @cached_property
+    def agents(self) -> agents.AgentsResourceWithRawResponse:
+        from .resources.agents import AgentsResourceWithRawResponse
+
+        return AgentsResourceWithRawResponse(self._client.agents)
+
 
 class AsyncGeminiNextGenAPIClientWithRawResponse:
     _client: AsyncGeminiNextGenAPIClient
@@ -558,6 +577,12 @@ def webhooks(self) -> webhooks.AsyncWebhooksResourceWithRawResponse:
 
         return AsyncWebhooksResourceWithRawResponse(self._client.webhooks)
 
+    @cached_property
+    def agents(self) -> agents.AsyncAgentsResourceWithRawResponse:
+        from .resources.agents import AsyncAgentsResourceWithRawResponse
+
+        return AsyncAgentsResourceWithRawResponse(self._client.agents)
+
 
 class GeminiNextGenAPIClientWithStreamedResponse:
     _client: GeminiNextGenAPIClient
@@ -577,6 +602,12 @@ def webhooks(self) -> webhooks.WebhooksResourceWithStreamingResponse:
 
         return WebhooksResourceWithStreamingResponse(self._client.webhooks)
 
+    @cached_property
+    def agents(self) -> agents.AgentsResourceWithStreamingResponse:
+        from .resources.agents import AgentsResourceWithStreamingResponse
+
+        return AgentsResourceWithStreamingResponse(self._client.agents)
+
 
 class AsyncGeminiNextGenAPIClientWithStreamedResponse:
     _client: AsyncGeminiNextGenAPIClient
@@ -596,6 +627,12 @@ def webhooks(self) -> webhooks.AsyncWebhooksResourceWithStreamingResponse:
 
         return AsyncWebhooksResourceWithStreamingResponse(self._client.webhooks)
 
+    @cached_property
+    def agents(self) -> agents.AsyncAgentsResourceWithStreamingResponse:
+        from .resources.agents import AsyncAgentsResourceWithStreamingResponse
+
+        return AsyncAgentsResourceWithStreamingResponse(self._client.agents)
+
 
 Client = GeminiNextGenAPIClient
 

google/genai/_interactions/_exceptions.py

@@ -88,8 +88,7 @@ def __init__(self, *, message: str = "Connection error.", request: httpx.Request
 
 class APITimeoutError(APIConnectionError):
     def __init__(self, request: httpx.Request) -> None:
-        super().__init__(message="Request timed out.", request=request)
-
+        super().__init__(message="Request timed out. This is a client-side timeout. You can increase the timeout by setting the `timeout` argument on your request or in the client http options.", request=request)
 
 class BadRequestError(APIStatusError):
     status_code: Literal[400] = 400  # pyright: ignore[reportIncompatibleVariableOverride]

google/genai/_interactions/resources/__init__.py

@@ -15,6 +15,14 @@
 
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+from .agents import (
+    AgentsResource,
+    AsyncAgentsResource,
+    AgentsResourceWithRawResponse,
+    AsyncAgentsResourceWithRawResponse,
+    AgentsResourceWithStreamingResponse,
+    AsyncAgentsResourceWithStreamingResponse,
+)
 from .webhooks import (
     WebhooksResource,
     AsyncWebhooksResource,
@@ -45,4 +53,10 @@
     "AsyncWebhooksResourceWithRawResponse",
     "WebhooksResourceWithStreamingResponse",
     "AsyncWebhooksResourceWithStreamingResponse",
+    "AgentsResource",
+    "AsyncAgentsResource",
+    "AgentsResourceWithRawResponse",
+    "AsyncAgentsResourceWithRawResponse",
+    "AgentsResourceWithStreamingResponse",
+    "AsyncAgentsResourceWithStreamingResponse",
 ]