google-genai 1.51.0__py3-none-any.whl → 1.52.0__py3-none-any.whl

google/genai/_api_client.py

@@ -37,6 +37,7 @@ import time
 from typing import Any, AsyncIterator, Iterator, Optional, Tuple, TYPE_CHECKING, Union
 from urllib.parse import urlparse
 from urllib.parse import urlunparse
+import warnings
 
 import anyio
 import certifi
@@ -55,6 +56,7 @@ from .types import HttpOptions
 from .types import HttpOptionsOrDict
 from .types import HttpResponse as SdkHttpResponse
 from .types import HttpRetryOptions
+from .types import ResourceScope
 
 
 try:
@@ -578,6 +580,12 @@ class BaseApiClient:
     elif isinstance(http_options, HttpOptions):
       validated_http_options = http_options
 
+    if validated_http_options.base_url_resource_scope and not validated_http_options.base_url:
+      # base_url_resource_scope is only valid when base_url is set.
+      raise ValueError(
+          'base_url must be set when base_url_resource_scope is set.'
+      )
+
     # Retrieve implicitly set values from the environment.
     env_project = os.environ.get('GOOGLE_CLOUD_PROJECT', None)
     env_location = os.environ.get('GOOGLE_CLOUD_LOCATION', None)
@@ -727,10 +735,44 @@ class BaseApiClient:
 
   async def _get_aiohttp_session(self) -> 'aiohttp.ClientSession':
     """Returns the aiohttp client session."""
-    if self._aiohttp_session is None or self._aiohttp_session.closed:
+    if (
+        self._aiohttp_session is None
+        or self._aiohttp_session.closed
+        or self._aiohttp_session._loop.is_closed()  # pylint: disable=protected-access
+    ):
       # Initialize the aiohttp client session if it's not set up or closed.
-      self._aiohttp_session = aiohttp.ClientSession(
-          connector=aiohttp.TCPConnector(limit=0),
+      class AiohttpClientSession(aiohttp.ClientSession):  # type: ignore[misc]
+
+        def __del__(self, _warnings: Any = warnings) -> None:
+          if not self.closed:
+            context = {
+                'client_session': self,
+                'message': 'Unclosed client session',
+            }
+            if self._source_traceback is not None:
+              context['source_traceback'] = self._source_traceback
+            # Remove this self._loop.call_exception_handler(context)
+
+      class AiohttpTCPConnector(aiohttp.TCPConnector):  # type: ignore[misc]
+
+        def __del__(self, _warnings: Any = warnings) -> None:
+          if self._closed:
+            return
+          if not self._conns:
+            return
+          conns = [repr(c) for c in self._conns.values()]
+          # After v3.13.2, it may change to self._close_immediately()
+          self._close()
+          context = {
+              'connector': self,
+              'connections': conns,
+              'message': 'Unclosed connector',
+          }
+          if self._source_traceback is not None:
+            context['source_traceback'] = self._source_traceback
+          # Remove this self._loop.call_exception_handler(context)
+      self._aiohttp_session = AiohttpClientSession(
+          connector=AiohttpTCPConnector(limit=0),
           trust_env=True,
           read_bufsize=READ_BUFFER_SIZE,
       )
@@ -1044,6 +1086,11 @@ class BaseApiClient:
         and not path.startswith('projects/')
         and not query_vertex_base_models
         and (self.project or self.location)
+        and not (
+            self.custom_base_url
+            and patched_http_options.base_url_resource_scope
+            == ResourceScope.COLLECTION
+        )
     ):
       path = f'projects/{self.project}/locations/{self.location}/' + path
 
@@ -1073,10 +1120,21 @@ class BaseApiClient:
         or (self.project and self.location)
         or self.api_key
     ):
-      url = join_url_path(
-          base_url,
-          versioned_path,
-      )
+      if (
+          patched_http_options.base_url_resource_scope
+          == ResourceScope.COLLECTION
+      ):
+        url = join_url_path(base_url, path)
+      else:
+        url = join_url_path(
+            base_url,
+            versioned_path,
+        )
+    elif(
+        self.custom_base_url
+        and patched_http_options.base_url_resource_scope == ResourceScope.COLLECTION
+    ):
+      url = join_url_path(base_url, path)
 
     if self.api_key and self.api_key.startswith('auth_tokens/'):
       raise EphemeralTokenAPIKeyError(

google/genai/_common.py

@@ -588,6 +588,7 @@ class BaseModel(pydantic.BaseModel):
           expected_type = non_none_types[0]
 
       if (isinstance(expected_type, type) and
+          get_origin(expected_type) is None and
           issubclass(expected_type, pydantic.BaseModel) and
           isinstance(value, pydantic.BaseModel) and
           not isinstance(value, expected_type)):

google/genai/types.py

@@ -575,6 +575,17 @@ class PartMediaResolutionLevel(_common.CaseInSensitiveEnum):
   """Media resolution set to high."""
 
 
+class ResourceScope(_common.CaseInSensitiveEnum):
+  """Resource scope."""
+
+  COLLECTION = 'COLLECTION'
+  """When setting base_url, this value configures resource scope to be the collection.
+      The resource name will not include api version, project, or location.
+      For example, if base_url is set to "https://aiplatform.googleapis.com",
+      then the resource name for a Model would be
+      "https://aiplatform.googleapis.com/publishers/google/models/gemini-3-pro-preview"""
+
+
 class JSONSchemaType(Enum):
   """The type of the data supported by JSON Schema.
 
@@ -1863,6 +1874,10 @@ class HttpOptions(_common.BaseModel):
       default=None,
       description="""The base URL for the AI platform service endpoint.""",
   )
+  base_url_resource_scope: Optional[ResourceScope] = Field(
+      default=None,
+      description="""The resource scope used to constructing the resource name when base_url is set""",
+  )
   api_version: Optional[str] = Field(
       default=None, description="""Specifies the version of the API to use."""
   )
@@ -1906,6 +1921,9 @@ class HttpOptionsDict(TypedDict, total=False):
   base_url: Optional[str]
   """The base URL for the AI platform service endpoint."""
 
+  base_url_resource_scope: Optional[ResourceScope]
+  """The resource scope used to constructing the resource name when base_url is set"""
+
   api_version: Optional[str]
   """Specifies the version of the API to use."""
 

google/genai/version.py

@@ -13,4 +13,4 @@
 # limitations under the License.
 #
 
-__version__ = '1.51.0' # x-release-please-version
+__version__ = '1.52.0' # x-release-please-version

{google_genai-1.51.0.dist-info → google_genai-1.52.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.51.0
+Version: 1.52.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License-Expression: Apache-2.0
@@ -28,7 +28,7 @@ Requires-Dist: tenacity<9.2.0,>=8.2.3
 Requires-Dist: websockets<15.1.0,>=13.0.0
 Requires-Dist: typing-extensions<5.0.0,>=4.11.0
 Provides-Extra: aiohttp
-Requires-Dist: aiohttp<4.0.0; extra == "aiohttp"
+Requires-Dist: aiohttp<3.13.3; extra == "aiohttp"
 Provides-Extra: local-tokenizer
 Requires-Dist: sentencepiece>=0.2.0; extra == "local-tokenizer"
 Requires-Dist: protobuf; extra == "local-tokenizer"

{google_genai-1.51.0.dist-info → google_genai-1.52.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 google/genai/__init__.py,sha256=SKz_9WQKA3R4OpJIDJlgssVfizLNDG2tuWtOD9pxrPE,729
 google/genai/_adapters.py,sha256=Kok38miNYJff2n--l0zEK_hbq0y2rWOH7k75J7SMYbQ,1744
-google/genai/_api_client.py,sha256=HB7TPN_H-rGnpy3Ainz91To7SaGr0lr0hlYZopJ8ZXc,65082
+google/genai/_api_client.py,sha256=xZTh53LjzEnNLvGRjSm8FgEq0Sgg4Dy3Iuc-EejpQeg,67228
 google/genai/_api_module.py,sha256=lj8eUWx8_LBGBz-49qz6_ywWm3GYp3d8Bg5JoOHbtbI,902
 google/genai/_automatic_function_calling_util.py,sha256=xXNkJR-pzSMkeSXMz3Jw-kMHFbTJEiRJ3wocuwtWW4I,11627
 google/genai/_base_transformers.py,sha256=wljA6m4tLl4XLGlBC2DNOls5N9-X9tffBq0M7i8jgpw,1034
 google/genai/_base_url.py,sha256=E5H4dew14Y16qfnB3XRnjSCi19cJVlkaMNoM_8ip-PM,1597
-google/genai/_common.py,sha256=eq3mvCbq_XZvMbIRwONU_VgfTdNdBDP-5l9ZJtFZZAg,25373
+google/genai/_common.py,sha256=9HOP8GtEnTGTF-5A92hQdcPWeaCS6ig3vgnmm-8jiTY,25421
 google/genai/_extra_utils.py,sha256=GXsUfyKAPZaW9_ySvdzSAXThvuzaKwXcAmdHW_hoHpY,25309
 google/genai/_live_converters.py,sha256=sn18ntVlaWsM8sRVXE5oLLnHNY3LjJyStXHFCxFokAE,43721
 google/genai/_local_tokenizer_loader.py,sha256=7yvJfEkWIpw2ueY4ZmoOAamJD-G7bm_9g44glD6bVwM,7147
@@ -32,10 +32,10 @@ google/genai/pagers.py,sha256=1i8NXDuKuQznFin5H5-I0hmj6H5YMTYsEJP7S0ITSbY,7158
 google/genai/py.typed,sha256=RsMFoLwBkAvY05t6izop4UHZtqOPLiKp3GkIEizzmQY,40
 google/genai/tokens.py,sha256=4BPW0gGWFeFVk3INkuY2tfREnsrvzQDhouvRI6_F9Q8,12235
 google/genai/tunings.py,sha256=8JTTXCwrmzS6gGorMhOmgXJKy8VjEw83gtrymPpPYkQ,73623
-google/genai/types.py,sha256=7dy5x4yiaT_1pjkWp89NUkhkji-NXe2mO3TmJLTt6OA,642865
-google/genai/version.py,sha256=T6wmItNBkQEhP7HT6ii4ENcN1_4rr9ShX8OU57PDzDs,627
-google_genai-1.51.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
-google_genai-1.51.0.dist-info/METADATA,sha256=yVW7WChOLpIYKnf2EmKGZxnkSz0WyzvR5w2KzLxISrU,46808
-google_genai-1.51.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-google_genai-1.51.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
-google_genai-1.51.0.dist-info/RECORD,,
+google/genai/types.py,sha256=5vGYQvYYDkFDLTVv07g2bowv9K9X_A-3btO_XEZgjeI,643678
+google/genai/version.py,sha256=JH1tQnbCVjInbmLbF5ZTx2SPw1T8BXZF1T6Uo547tpE,627
+google_genai-1.52.0.dist-info/licenses/LICENSE,sha256=z8d0m5b2O9McPEK1xHG_dWgUBT6EfBDz6wA0F7xSPTA,11358
+google_genai-1.52.0.dist-info/METADATA,sha256=EXGEv-8tXP-UfLMpjfMU3vI2ykqVzmKxOIIX5dpg4lQ,46809
+google_genai-1.52.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+google_genai-1.52.0.dist-info/top_level.txt,sha256=_1QvSJIhFAGfxb79D6DhB7SUw2X6T4rwnz_LLrbcD3c,7
+google_genai-1.52.0.dist-info/RECORD,,