google-genai 1.56.0__tar.gz → 1.57.0__tar.gz

{google_genai-1.56.0/google_genai.egg-info → google_genai-1.57.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: google-genai
-Version: 1.56.0
+Version: 1.57.0
 Summary: GenAI Python SDK
 Author-email: Google LLC <googleapis-packages@google.com>
 License-Expression: Apache-2.0
@@ -20,7 +20,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: anyio<5.0.0,>=4.8.0
-Requires-Dist: google-auth[requests]<3.0.0,>=2.45.0
+Requires-Dist: google-auth[requests]<3.0.0,>=2.46.0
 Requires-Dist: httpx<1.0.0,>=0.28.1
 Requires-Dist: pydantic<3.0.0,>=2.9.0
 Requires-Dist: requests<3.0.0,>=2.28.1

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_api_client.py

@@ -984,12 +984,7 @@ class BaseApiClient:
           self.project = project
 
       if self._credentials:
-        if self._credentials.expired or not self._credentials.token:
-          # Only refresh when it needs to. Default expiration is 3600 seconds.
-          refresh_auth(self._credentials)
-        if not self._credentials.token:
-          raise RuntimeError('Could not resolve API token from the environment')
-        return self._credentials.token  # type: ignore[no-any-return]
+        return get_token_from_credentials(self, self._credentials)  # type: ignore[no-any-return]
       else:
         raise RuntimeError('Could not resolve API token from the environment')
 
@@ -1034,18 +1029,10 @@ class BaseApiClient:
             self.project = project
 
     if self._credentials:
-      if self._credentials.expired or not self._credentials.token:
-        # Only refresh when it needs to. Default expiration is 3600 seconds.
-        async_auth_lock = await self._get_async_auth_lock()
-        async with async_auth_lock:
-          if self._credentials.expired or not self._credentials.token:
-            # Double check that the credentials expired before refreshing.
-            await asyncio.to_thread(refresh_auth, self._credentials)
-
-      if not self._credentials.token:
-        raise RuntimeError('Could not resolve API token from the environment')
-
-      return self._credentials.token
+      return await async_get_token_from_credentials(
+          self,
+          self._credentials
+      )  # type: ignore[no-any-return]
     else:
       raise RuntimeError('Could not resolve API token from the environment')
 
@@ -1925,3 +1912,35 @@ class BaseApiClient:
       asyncio.get_running_loop().create_task(self.aclose())
     except Exception:  # pylint: disable=broad-except
       pass
+
+def get_token_from_credentials(
+    client: 'BaseApiClient',
+    credentials: google.auth.credentials.Credentials
+) -> str:
+  """Refreshes the authentication token for the given credentials."""
+  if credentials.expired or not credentials.token:
+    # Only refresh when it needs to. Default expiration is 3600 seconds.
+    refresh_auth(credentials)
+  if not credentials.token:
+    raise RuntimeError('Could not resolve API token from the environment')
+  return credentials.token  # type: ignore[no-any-return]
+
+async def async_get_token_from_credentials(
+    client: 'BaseApiClient',
+    credentials: google.auth.credentials.Credentials
+) -> str:
+  """Refreshes the authentication token for the given credentials."""
+  if credentials.expired or not credentials.token:
+    # Only refresh when it needs to. Default expiration is 3600 seconds.
+    async_auth_lock = await client._get_async_auth_lock()
+    async with async_auth_lock:
+      if credentials.expired or not credentials.token:
+        # Double check that the credentials expired before refreshing.
+        await asyncio.to_thread(refresh_auth, credentials)
+
+  if not credentials.token:
+    raise RuntimeError('Could not resolve API token from the environment')
+
+  return credentials.token    # type: ignore[no-any-return]
+
+

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/_base_client.py

@@ -1798,7 +1798,7 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
         options: RequestOptions = {},
     ) -> ResponseT:
         opts = FinalRequestOptions.construct(
-            method="patch", url=path, json_data=body, files=to_httpx_files(files), **options
+            method="patch", url=path, json_data=body, files=await async_to_httpx_files(files), **options
         )
         return await self.request(cast_to, opts)
 

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/types/__init__.py

@@ -21,6 +21,7 @@ from .tool import Tool as Tool
 from .turn import Turn as Turn
 from .model import Model as Model
 from .usage import Usage as Usage
+from .content import Content as Content
 from .function import Function as Function
 from .annotation import Annotation as Annotation
 from .tool_param import ToolParam as ToolParam
@@ -35,6 +36,7 @@ from .text_content import TextContent as TextContent
 from .allowed_tools import AllowedTools as AllowedTools
 from .audio_content import AudioContent as AudioContent
 from .content_delta import ContentDelta as ContentDelta
+from .content_param import ContentParam as ContentParam
 from .content_start import ContentStart as ContentStart
 from .image_content import ImageContent as ImageContent
 from .speech_config import SpeechConfig as SpeechConfig

google_genai-1.56.0/google/genai/_interactions/types/turn.py → google_genai-1.57.0/google/genai/_interactions/types/content.py

@@ -15,11 +15,10 @@
 
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import List, Union, Optional
+from typing import Union
 from typing_extensions import Annotated, TypeAlias
 
 from .._utils import PropertyInfo
-from .._models import BaseModel
 from .text_content import TextContent
 from .audio_content import AudioContent
 from .image_content import ImageContent
@@ -38,9 +37,9 @@ from .mcp_server_tool_call_content import MCPServerToolCallContent
 from .code_execution_result_content import CodeExecutionResultContent
 from .mcp_server_tool_result_content import MCPServerToolResultContent
 
-__all__ = ["Turn", "ContentUnionMember1"]
+__all__ = ["Content"]
 
-ContentUnionMember1: TypeAlias = Annotated[
+Content: TypeAlias = Annotated[
     Union[
         TextContent,
         ImageContent,
@@ -62,15 +61,3 @@ ContentUnionMember1: TypeAlias = Annotated[
     ],
     PropertyInfo(discriminator="type"),
 ]
-
-
-class Turn(BaseModel):
-    content: Union[str, List[ContentUnionMember1], None] = None
-    """The content of the turn."""
-
-    role: Optional[str] = None
-    """The originator of this turn.
-
-    Must be user for input or model for
-    model output.
-    """

google_genai-1.56.0/google/genai/_interactions/types/turn_param.py → google_genai-1.57.0/google/genai/_interactions/types/content_param.py

@@ -17,8 +17,8 @@
 
 from __future__ import annotations
 
-from typing import Union, Iterable
-from typing_extensions import TypeAlias, TypedDict
+from typing import Union
+from typing_extensions import TypeAlias
 
 from .text_content_param import TextContentParam
 from .audio_content_param import AudioContentParam
@@ -38,9 +38,9 @@ from .mcp_server_tool_call_content_param import MCPServerToolCallContentParam
 from .code_execution_result_content_param import CodeExecutionResultContentParam
 from .mcp_server_tool_result_content_param import MCPServerToolResultContentParam
 
-__all__ = ["TurnParam", "ContentUnionMember1"]
+__all__ = ["ContentParam"]
 
-ContentUnionMember1: TypeAlias = Union[
+ContentParam: TypeAlias = Union[
     TextContentParam,
     ImageContentParam,
     AudioContentParam,
@@ -59,15 +59,3 @@ ContentUnionMember1: TypeAlias = Union[
     MCPServerToolResultContentParam,
     FileSearchResultContentParam,
 ]
-
-
-class TurnParam(TypedDict, total=False):
-    content: Union[str, Iterable[ContentUnionMember1]]
-    """The content of the turn."""
-
-    role: str
-    """The originator of this turn.
-
-    Must be user for input or model for
-    model output.
-    """

google_genai-1.57.0/google/genai/_interactions/types/content_start.py

@@ -0,0 +1,39 @@
+# 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.
+#
+
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import Optional
+from typing_extensions import Literal
+
+from .content import Content
+from .._models import BaseModel
+
+__all__ = ["ContentStart"]
+
+
+class ContentStart(BaseModel):
+    content: Optional[Content] = None
+    """The content of the response."""
+
+    event_id: Optional[str] = None
+    """
+    The event_id token to be used to resume the interaction stream, from
+    this event.
+    """
+
+    event_type: Optional[Literal["content.start"]] = None
+
+    index: Optional[int] = None

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/types/interaction.py

@@ -23,6 +23,7 @@ from .turn import Turn
 from .model import Model
 from .usage import Usage
 from .._utils import PropertyInfo
+from .content import Content
 from .._models import BaseModel
 from .text_content import TextContent
 from .audio_content import AudioContent
@@ -44,38 +45,15 @@ from .mcp_server_tool_call_content import MCPServerToolCallContent
 from .code_execution_result_content import CodeExecutionResultContent
 from .mcp_server_tool_result_content import MCPServerToolResultContent
 
-__all__ = ["Interaction", "AgentConfig", "Input", "InputContentList", "Output"]
+__all__ = ["Interaction", "AgentConfig", "Input"]
 
 AgentConfig: TypeAlias = Annotated[
     Union[DynamicAgentConfig, DeepResearchAgentConfig], PropertyInfo(discriminator="type")
 ]
 
-InputContentList: TypeAlias = Annotated[
-    Union[
-        TextContent,
-        ImageContent,
-        AudioContent,
-        DocumentContent,
-        VideoContent,
-        ThoughtContent,
-        FunctionCallContent,
-        FunctionResultContent,
-        CodeExecutionCallContent,
-        CodeExecutionResultContent,
-        URLContextCallContent,
-        URLContextResultContent,
-        GoogleSearchCallContent,
-        GoogleSearchResultContent,
-        MCPServerToolCallContent,
-        MCPServerToolResultContent,
-        FileSearchResultContent,
-    ],
-    PropertyInfo(discriminator="type"),
-]
-
 Input: TypeAlias = Union[
     str,
-    List[InputContentList],
+    List[Content],
     List[Turn],
     TextContent,
     ImageContent,
@@ -96,29 +74,6 @@ Input: TypeAlias = Union[
     FileSearchResultContent,
 ]
 
-Output: TypeAlias = Annotated[
-    Union[
-        TextContent,
-        ImageContent,
-        AudioContent,
-        DocumentContent,
-        VideoContent,
-        ThoughtContent,
-        FunctionCallContent,
-        FunctionResultContent,
-        CodeExecutionCallContent,
-        CodeExecutionResultContent,
-        URLContextCallContent,
-        URLContextResultContent,
-        GoogleSearchCallContent,
-        GoogleSearchResultContent,
-        MCPServerToolCallContent,
-        MCPServerToolResultContent,
-        FileSearchResultContent,
-    ],
-    PropertyInfo(discriminator="type"),
-]
-
 
 class Interaction(BaseModel):
     """The Interaction resource."""
@@ -142,10 +97,7 @@ class Interaction(BaseModel):
     model: Optional[Model] = None
     """The name of the `Model` used for generating the interaction."""
 
-    object: Optional[Literal["interaction"]] = None
-    """Output only. The object type of the interaction. Always set to `interaction`."""
-
-    outputs: Optional[List[Output]] = None
+    outputs: Optional[List[Content]] = None
     """Output only. Responses from the model."""
 
     previous_interaction_id: Optional[str] = None

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/types/interaction_create_params.py

@@ -23,6 +23,7 @@ from typing_extensions import Literal, Required, TypeAlias, TypedDict
 from .tool_param import ToolParam
 from .turn_param import TurnParam
 from .model_param import ModelParam
+from .content_param import ContentParam
 from .text_content_param import TextContentParam
 from .audio_content_param import AudioContentParam
 from .image_content_param import ImageContentParam
@@ -47,7 +48,6 @@ from .mcp_server_tool_result_content_param import MCPServerToolResultContentPara
 __all__ = [
     "BaseCreateModelInteractionParams",
     "Input",
-    "ContentList",
     "BaseCreateAgentInteractionParams",
     "AgentConfig",
     "CreateModelInteractionParamsNonStreaming",
@@ -97,29 +97,9 @@ class BaseCreateModelInteractionParams(TypedDict, total=False):
     """A list of tool declarations the model may call during interaction."""
 
 
-ContentList: TypeAlias = Union[
-    TextContentParam,
-    ImageContentParam,
-    AudioContentParam,
-    DocumentContentParam,
-    VideoContentParam,
-    ThoughtContentParam,
-    FunctionCallContentParam,
-    FunctionResultContentParam,
-    CodeExecutionCallContentParam,
-    CodeExecutionResultContentParam,
-    URLContextCallContentParam,
-    URLContextResultContentParam,
-    GoogleSearchCallContentParam,
-    GoogleSearchResultContentParam,
-    MCPServerToolCallContentParam,
-    MCPServerToolResultContentParam,
-    FileSearchResultContentParam,
-]
-
 Input: TypeAlias = Union[
     str,
-    Iterable[ContentList],
+    Iterable[ContentParam],
     Iterable[TurnParam],
     TextContentParam,
     ImageContentParam,

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/types/model.py

@@ -31,6 +31,7 @@ Model: TypeAlias = Union[
         "gemini-2.5-flash-image-preview",
         "gemini-2.5-pro-preview-tts",
         "gemini-3-pro-preview",
+        "gemini-3-flash-preview",
     ],
     str,
 ]

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/types/model_param.py

@@ -33,6 +33,7 @@ ModelParam: TypeAlias = Union[
         "gemini-2.5-flash-image-preview",
         "gemini-2.5-pro-preview-tts",
         "gemini-3-pro-preview",
+        "gemini-3-flash-preview",
     ],
     str,
 ]

google_genai-1.57.0/google/genai/_interactions/types/turn.py

@@ -0,0 +1,35 @@
+# 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.
+#
+
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from typing import List, Union, Optional
+
+from .content import Content
+from .._models import BaseModel
+
+__all__ = ["Turn"]
+
+
+class Turn(BaseModel):
+    content: Union[str, List[Content], None] = None
+    """The content of the turn."""
+
+    role: Optional[str] = None
+    """The originator of this turn.
+
+    Must be user for input or model for
+    model output.
+    """

google_genai-1.57.0/google/genai/_interactions/types/turn_param.py

@@ -0,0 +1,37 @@
+# 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.
+#
+
+# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+from __future__ import annotations
+
+from typing import Union, Iterable
+from typing_extensions import TypedDict
+
+from .content_param import ContentParam
+
+__all__ = ["TurnParam"]
+
+
+class TurnParam(TypedDict, total=False):
+    content: Union[str, Iterable[ContentParam]]
+    """The content of the turn."""
+
+    role: str
+    """The originator of this turn.
+
+    Must be user for input or model for
+    model output.
+    """

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/types/usage.py

@@ -93,7 +93,7 @@ class Usage(BaseModel):
     total_output_tokens: Optional[int] = None
     """Total number of tokens across all the generated responses."""
 
-    total_reasoning_tokens: Optional[int] = None
+    total_thought_tokens: Optional[int] = None
     """Number of tokens of thoughts for thinking models."""
 
     total_tokens: Optional[int] = None

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_interactions/types/usage_param.py

@@ -93,7 +93,7 @@ class UsageParam(TypedDict, total=False):
     total_output_tokens: int
     """Total number of tokens across all the generated responses."""
 
-    total_reasoning_tokens: int
+    total_thought_tokens: int
     """Number of tokens of thoughts for thinking models."""
 
     total_tokens: int

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/_local_tokenizer_loader.py

@@ -44,6 +44,7 @@ _GEMINI_STABLE_MODELS_TO_TOKENIZER_NAMES = {
     "gemini-2.5-flash-lite-preview-06-17": "gemma3",
     "gemini-2.0-flash-001": "gemma3",
     "gemini-2.0-flash-lite-001": "gemma3",
+    "gemini-3-pro-preview": "gemma3",
 }
 
 

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/batches.py

@@ -824,9 +824,6 @@ def _FunctionCallingConfig_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['mode']) is not None:
-    setv(to_object, ['mode'], getv(from_object, ['mode']))
-
   if getv(from_object, ['allowed_function_names']) is not None:
     setv(
         to_object,
@@ -834,6 +831,9 @@ def _FunctionCallingConfig_to_mldev(
         getv(from_object, ['allowed_function_names']),
     )
 
+  if getv(from_object, ['mode']) is not None:
+    setv(to_object, ['mode'], getv(from_object, ['mode']))
+
   if getv(from_object, ['stream_function_call_arguments']) is not None:
     raise ValueError(
         'stream_function_call_arguments parameter is not supported in Gemini'
@@ -1131,6 +1131,11 @@ def _ImageConfig_to_mldev(
   if getv(from_object, ['image_size']) is not None:
     setv(to_object, ['imageSize'], getv(from_object, ['image_size']))
 
+  if getv(from_object, ['person_generation']) is not None:
+    raise ValueError(
+        'person_generation parameter is not supported in Gemini API.'
+    )
+
   if getv(from_object, ['output_mime_type']) is not None:
     raise ValueError(
         'output_mime_type parameter is not supported in Gemini API.'
@@ -1415,6 +1420,11 @@ def _ToolConfig_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
+  if getv(from_object, ['retrieval_config']) is not None:
+    setv(
+        to_object, ['retrievalConfig'], getv(from_object, ['retrieval_config'])
+    )
+
   if getv(from_object, ['function_calling_config']) is not None:
     setv(
         to_object,
@@ -1424,11 +1434,6 @@ def _ToolConfig_to_mldev(
         ),
     )
 
-  if getv(from_object, ['retrieval_config']) is not None:
-    setv(
-        to_object, ['retrievalConfig'], getv(from_object, ['retrieval_config'])
-    )
-
   return to_object
 
 
@@ -1437,23 +1442,9 @@ def _Tool_to_mldev(
     parent_object: Optional[dict[str, Any]] = None,
 ) -> dict[str, Any]:
   to_object: dict[str, Any] = {}
-  if getv(from_object, ['function_declarations']) is not None:
-    setv(
-        to_object,
-        ['functionDeclarations'],
-        [item for item in getv(from_object, ['function_declarations'])],
-    )
-
   if getv(from_object, ['retrieval']) is not None:
     raise ValueError('retrieval parameter is not supported in Gemini API.')
 
-  if getv(from_object, ['google_search_retrieval']) is not None:
-    setv(
-        to_object,
-        ['googleSearchRetrieval'],
-        getv(from_object, ['google_search_retrieval']),
-    )
-
   if getv(from_object, ['computer_use']) is not None:
     setv(to_object, ['computerUse'], getv(from_object, ['computer_use']))
 
@@ -1468,6 +1459,13 @@ def _Tool_to_mldev(
         'enterprise_web_search parameter is not supported in Gemini API.'
     )
 
+  if getv(from_object, ['function_declarations']) is not None:
+    setv(
+        to_object,
+        ['functionDeclarations'],
+        [item for item in getv(from_object, ['function_declarations'])],
+    )
+
   if getv(from_object, ['google_maps']) is not None:
     setv(
         to_object,
@@ -1482,6 +1480,13 @@ def _Tool_to_mldev(
         _GoogleSearch_to_mldev(getv(from_object, ['google_search']), to_object),
     )
 
+  if getv(from_object, ['google_search_retrieval']) is not None:
+    setv(
+        to_object,
+        ['googleSearchRetrieval'],
+        getv(from_object, ['google_search_retrieval']),
+    )
+
   if getv(from_object, ['url_context']) is not None:
     setv(to_object, ['urlContext'], getv(from_object, ['url_context']))
 

{google_genai-1.56.0 → google_genai-1.57.0}/google/genai/chats.py

@@ -35,8 +35,6 @@ def _validate_content(content: Content) -> bool:
   for part in content.parts:
     if part == Part():
       return False
-    if part.text is not None and part.text == "":
-      return False
   return True