google-genai 1.55.0__py3-none-any.whl → 1.57.0__py3-none-any.whl

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/_interactions/_base_client.py

@@ -1271,9 +1271,12 @@ class SyncAPIClient(BaseClient[httpx.Client, Stream[Any]]):
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        files: RequestFiles | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
-        opts = FinalRequestOptions.construct(method="patch", url=path, json_data=body, **options)
+        opts = FinalRequestOptions.construct(
+            method="patch", url=path, json_data=body, files=to_httpx_files(files), **options
+        )
         return self.request(cast_to, opts)
 
     def put(
@@ -1791,9 +1794,12 @@ class AsyncAPIClient(BaseClient[httpx.AsyncClient, AsyncStream[Any]]):
         *,
         cast_to: Type[ResponseT],
         body: Body | None = None,
+        files: RequestFiles | None = None,
         options: RequestOptions = {},
     ) -> ResponseT:
-        opts = FinalRequestOptions.construct(method="patch", url=path, json_data=body, **options)
+        opts = FinalRequestOptions.construct(
+            method="patch", url=path, json_data=body, files=await async_to_httpx_files(files), **options
+        )
         return await self.request(cast_to, opts)
 
     async def put(

google/genai/_interactions/resources/interactions.py

@@ -475,7 +475,7 @@ class InteractionsResource(SyncAPIResource):
         if not api_version:
             raise ValueError(f"Expected a non-empty value for `api_version` but received {api_version!r}")
         return self._delete(
-            f"/{api_version}/interactions/{id}",
+            self._client._build_maybe_vertex_path(api_version=api_version, path=f'interactions/{id}'),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -514,7 +514,7 @@ class InteractionsResource(SyncAPIResource):
         if not api_version:
             raise ValueError(f"Expected a non-empty value for `api_version` but received {api_version!r}")
         return self._post(
-            f"/{api_version}/interactions/{id}/cancel",
+            self._client._build_maybe_vertex_path(api_version=api_version, path=f'interactions/{id}/cancel'),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -641,7 +641,7 @@ class InteractionsResource(SyncAPIResource):
         if not api_version:
             raise ValueError(f"Expected a non-empty value for `api_version` but received {api_version!r}")
         return self._get(
-            f"/{api_version}/interactions/{id}",
+            self._client._build_maybe_vertex_path(api_version=api_version, path=f'interactions/{id}'),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,
@@ -1092,7 +1092,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
         if not api_version:
             raise ValueError(f"Expected a non-empty value for `api_version` but received {api_version!r}")
         return await self._delete(
-            f"/{api_version}/interactions/{id}",
+            self._client._build_maybe_vertex_path(api_version=api_version, path=f'interactions/{id}'),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -1131,7 +1131,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
         if not api_version:
             raise ValueError(f"Expected a non-empty value for `api_version` but received {api_version!r}")
         return await self._post(
-            f"/{api_version}/interactions/{id}/cancel",
+            self._client._build_maybe_vertex_path(api_version=api_version, path=f'interactions/{id}/cancel'),
             options=make_request_options(
                 extra_headers=extra_headers, extra_query=extra_query, extra_body=extra_body, timeout=timeout
             ),
@@ -1258,7 +1258,7 @@ class AsyncInteractionsResource(AsyncAPIResource):
         if not api_version:
             raise ValueError(f"Expected a non-empty value for `api_version` but received {api_version!r}")
         return await self._get(
-            f"/{api_version}/interactions/{id}",
+            self._client._build_maybe_vertex_path(api_version=api_version, path=f'interactions/{id}'),
             options=make_request_options(
                 extra_headers=extra_headers,
                 extra_query=extra_query,

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
@@ -51,6 +53,7 @@ from .tool_choice_type import ToolChoiceType as ToolChoiceType
 from .generation_config import GenerationConfig as GenerationConfig
 from .interaction_event import InteractionEvent as InteractionEvent
 from .tool_choice_param import ToolChoiceParam as ToolChoiceParam
+from .document_mime_type import DocumentMimeType as DocumentMimeType
 from .text_content_param import TextContentParam as TextContentParam
 from .tool_choice_config import ToolChoiceConfig as ToolChoiceConfig
 from .url_context_result import URLContextResult as URLContextResult
@@ -71,6 +74,7 @@ from .document_content_param import DocumentContentParam as DocumentContentParam
 from .interaction_get_params import InteractionGetParams as InteractionGetParams
 from .function_result_content import FunctionResultContent as FunctionResultContent
 from .generation_config_param import GenerationConfigParam as GenerationConfigParam
+from .document_mime_type_param import DocumentMimeTypeParam as DocumentMimeTypeParam
 from .tool_choice_config_param import ToolChoiceConfigParam as ToolChoiceConfigParam
 from .url_context_call_content import URLContextCallContent as URLContextCallContent
 from .url_context_result_param import URLContextResultParam as URLContextResultParam

google/genai/_interactions/types/audio_content.py

@@ -28,7 +28,6 @@ class AudioContent(BaseModel):
     """An audio content block."""
 
     type: Literal["audio"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Optional[str] = None
 

google/genai/_interactions/types/audio_content_param.py

@@ -32,7 +32,6 @@ class AudioContentParam(TypedDict, total=False):
     """An audio content block."""
 
     type: Required[Literal["audio"]]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Annotated[Union[str, Base64FileInput], PropertyInfo(format="base64")]
 

google/genai/_interactions/types/code_execution_call_content.py

@@ -28,7 +28,6 @@ class CodeExecutionCallContent(BaseModel):
     """Code execution content."""
 
     type: Literal["code_execution_call"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     id: Optional[str] = None
     """A unique ID for this specific tool call."""

google/genai/_interactions/types/code_execution_call_content_param.py

@@ -28,7 +28,6 @@ class CodeExecutionCallContentParam(TypedDict, total=False):
     """Code execution content."""
 
     type: Required[Literal["code_execution_call"]]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     id: str
     """A unique ID for this specific tool call."""

google/genai/_interactions/types/code_execution_result_content.py

@@ -27,7 +27,6 @@ class CodeExecutionResultContent(BaseModel):
     """Code execution result content."""
 
     type: Literal["code_execution_result"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     call_id: Optional[str] = None
     """ID to match the ID from the code execution call block."""

google/genai/_interactions/types/code_execution_result_content_param.py

@@ -26,7 +26,6 @@ class CodeExecutionResultContentParam(TypedDict, total=False):
     """Code execution result content."""
 
     type: Required[Literal["code_execution_result"]]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     call_id: str
     """ID to match the ID from the code execution call block."""

google/genai/_interactions/types/content.py

@@ -0,0 +1,63 @@
+# 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 Union
+from typing_extensions import Annotated, TypeAlias
+
+from .._utils import PropertyInfo
+from .text_content import TextContent
+from .audio_content import AudioContent
+from .image_content import ImageContent
+from .video_content import VideoContent
+from .thought_content import ThoughtContent
+from .document_content import DocumentContent
+from .function_call_content import FunctionCallContent
+from .function_result_content import FunctionResultContent
+from .url_context_call_content import URLContextCallContent
+from .file_search_result_content import FileSearchResultContent
+from .google_search_call_content import GoogleSearchCallContent
+from .url_context_result_content import URLContextResultContent
+from .code_execution_call_content import CodeExecutionCallContent
+from .google_search_result_content import GoogleSearchResultContent
+from .mcp_server_tool_call_content import MCPServerToolCallContent
+from .code_execution_result_content import CodeExecutionResultContent
+from .mcp_server_tool_result_content import MCPServerToolResultContent
+
+__all__ = ["Content"]
+
+Content: TypeAlias = Annotated[
+    Union[
+        TextContent,
+        ImageContent,
+        AudioContent,
+        DocumentContent,
+        VideoContent,
+        ThoughtContent,
+        FunctionCallContent,
+        FunctionResultContent,
+        CodeExecutionCallContent,
+        CodeExecutionResultContent,
+        URLContextCallContent,
+        URLContextResultContent,
+        GoogleSearchCallContent,
+        GoogleSearchResultContent,
+        MCPServerToolCallContent,
+        MCPServerToolResultContent,
+        FileSearchResultContent,
+    ],
+    PropertyInfo(discriminator="type"),
+]

google/genai/_interactions/types/content_delta.py

@@ -26,6 +26,7 @@ from .image_content import ImageContent
 from .audio_mime_type import AudioMimeType
 from .image_mime_type import ImageMimeType
 from .video_mime_type import VideoMimeType
+from .document_mime_type import DocumentMimeType
 from .url_context_result import URLContextResult
 from .google_search_result import GoogleSearchResult
 from .url_context_call_arguments import URLContextCallArguments
@@ -66,7 +67,6 @@ __all__ = [
 
 class DeltaTextDelta(BaseModel):
     type: Literal["text"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     annotations: Optional[List[Annotation]] = None
     """Citation information for model-generated content."""
@@ -76,14 +76,13 @@ class DeltaTextDelta(BaseModel):
 
 class DeltaImageDelta(BaseModel):
     type: Literal["image"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Optional[str] = None
 
     mime_type: Optional[ImageMimeType] = None
     """The mime type of the image."""
 
-    resolution: Optional[Literal["low", "medium", "high"]] = None
+    resolution: Optional[Literal["low", "medium", "high", "ultra_high"]] = None
     """The resolution of the media."""
 
     uri: Optional[str] = None
@@ -91,7 +90,6 @@ class DeltaImageDelta(BaseModel):
 
 class DeltaAudioDelta(BaseModel):
     type: Literal["audio"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Optional[str] = None
 
@@ -103,25 +101,24 @@ class DeltaAudioDelta(BaseModel):
 
 class DeltaDocumentDelta(BaseModel):
     type: Literal["document"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Optional[str] = None
 
-    mime_type: Optional[str] = None
+    mime_type: Optional[DocumentMimeType] = None
+    """The mime type of the document."""
 
     uri: Optional[str] = None
 
 
 class DeltaVideoDelta(BaseModel):
     type: Literal["video"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Optional[str] = None
 
     mime_type: Optional[VideoMimeType] = None
     """The mime type of the video."""
 
-    resolution: Optional[Literal["low", "medium", "high"]] = None
+    resolution: Optional[Literal["low", "medium", "high", "ultra_high"]] = None
     """The resolution of the media."""
 
     uri: Optional[str] = None
@@ -134,7 +131,6 @@ DeltaThoughtSummaryDeltaContent: TypeAlias = Annotated[
 
 class DeltaThoughtSummaryDelta(BaseModel):
     type: Literal["thought_summary"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     content: Optional[DeltaThoughtSummaryDeltaContent] = None
     """A text content block."""
@@ -142,7 +138,6 @@ class DeltaThoughtSummaryDelta(BaseModel):
 
 class DeltaThoughtSignatureDelta(BaseModel):
     type: Literal["thought_signature"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     signature: Optional[str] = None
     """Signature to match the backend source to be part of the generation."""
@@ -150,7 +145,6 @@ class DeltaThoughtSignatureDelta(BaseModel):
 
 class DeltaFunctionCallDelta(BaseModel):
     type: Literal["function_call"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     id: Optional[str] = None
     """A unique ID for this specific tool call."""
@@ -160,7 +154,7 @@ class DeltaFunctionCallDelta(BaseModel):
     name: Optional[str] = None
 
 
-DeltaFunctionResultDeltaResultItemsItem: TypeAlias = Union[str, ImageContent]
+DeltaFunctionResultDeltaResultItemsItem: TypeAlias = Union[str, ImageContent, object]
 
 
 class DeltaFunctionResultDeltaResultItems(BaseModel):
@@ -172,7 +166,6 @@ DeltaFunctionResultDeltaResult: TypeAlias = Union[DeltaFunctionResultDeltaResult
 
 class DeltaFunctionResultDelta(BaseModel):
     type: Literal["function_result"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     call_id: Optional[str] = None
     """ID to match the ID from the function call block."""
@@ -187,7 +180,6 @@ class DeltaFunctionResultDelta(BaseModel):
 
 class DeltaCodeExecutionCallDelta(BaseModel):
     type: Literal["code_execution_call"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     id: Optional[str] = None
     """A unique ID for this specific tool call."""
@@ -198,7 +190,6 @@ class DeltaCodeExecutionCallDelta(BaseModel):
 
 class DeltaCodeExecutionResultDelta(BaseModel):
     type: Literal["code_execution_result"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     call_id: Optional[str] = None
     """ID to match the ID from the function call block."""
@@ -212,7 +203,6 @@ class DeltaCodeExecutionResultDelta(BaseModel):
 
 class DeltaURLContextCallDelta(BaseModel):
     type: Literal["url_context_call"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     id: Optional[str] = None
     """A unique ID for this specific tool call."""
@@ -223,7 +213,6 @@ class DeltaURLContextCallDelta(BaseModel):
 
 class DeltaURLContextResultDelta(BaseModel):
     type: Literal["url_context_result"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     call_id: Optional[str] = None
     """ID to match the ID from the function call block."""
@@ -237,7 +226,6 @@ class DeltaURLContextResultDelta(BaseModel):
 
 class DeltaGoogleSearchCallDelta(BaseModel):
     type: Literal["google_search_call"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     id: Optional[str] = None
     """A unique ID for this specific tool call."""
@@ -248,7 +236,6 @@ class DeltaGoogleSearchCallDelta(BaseModel):
 
 class DeltaGoogleSearchResultDelta(BaseModel):
     type: Literal["google_search_result"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     call_id: Optional[str] = None
     """ID to match the ID from the function call block."""
@@ -262,7 +249,6 @@ class DeltaGoogleSearchResultDelta(BaseModel):
 
 class DeltaMCPServerToolCallDelta(BaseModel):
     type: Literal["mcp_server_tool_call"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     id: Optional[str] = None
     """A unique ID for this specific tool call."""
@@ -274,7 +260,7 @@ class DeltaMCPServerToolCallDelta(BaseModel):
     server_name: Optional[str] = None
 
 
-DeltaMCPServerToolResultDeltaResultItemsItem: TypeAlias = Union[str, ImageContent]
+DeltaMCPServerToolResultDeltaResultItemsItem: TypeAlias = Union[str, ImageContent, object]
 
 
 class DeltaMCPServerToolResultDeltaResultItems(BaseModel):
@@ -286,7 +272,6 @@ DeltaMCPServerToolResultDeltaResult: TypeAlias = Union[DeltaMCPServerToolResultD
 
 class DeltaMCPServerToolResultDelta(BaseModel):
     type: Literal["mcp_server_tool_result"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     call_id: Optional[str] = None
     """ID to match the ID from the function call block."""
@@ -314,7 +299,6 @@ class DeltaFileSearchResultDeltaResult(BaseModel):
 
 class DeltaFileSearchResultDelta(BaseModel):
     type: Literal["file_search_result"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     result: Optional[List[DeltaFileSearchResultDeltaResult]] = None
 

google/genai/_interactions/types/content_param.py

@@ -0,0 +1,61 @@
+# 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
+from typing_extensions import TypeAlias
+
+from .text_content_param import TextContentParam
+from .audio_content_param import AudioContentParam
+from .image_content_param import ImageContentParam
+from .video_content_param import VideoContentParam
+from .thought_content_param import ThoughtContentParam
+from .document_content_param import DocumentContentParam
+from .function_call_content_param import FunctionCallContentParam
+from .function_result_content_param import FunctionResultContentParam
+from .url_context_call_content_param import URLContextCallContentParam
+from .file_search_result_content_param import FileSearchResultContentParam
+from .google_search_call_content_param import GoogleSearchCallContentParam
+from .url_context_result_content_param import URLContextResultContentParam
+from .code_execution_call_content_param import CodeExecutionCallContentParam
+from .google_search_result_content_param import GoogleSearchResultContentParam
+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__ = ["ContentParam"]
+
+ContentParam: TypeAlias = Union[
+    TextContentParam,
+    ImageContentParam,
+    AudioContentParam,
+    DocumentContentParam,
+    VideoContentParam,
+    ThoughtContentParam,
+    FunctionCallContentParam,
+    FunctionResultContentParam,
+    CodeExecutionCallContentParam,
+    CodeExecutionResultContentParam,
+    URLContextCallContentParam,
+    URLContextResultContentParam,
+    GoogleSearchCallContentParam,
+    GoogleSearchResultContentParam,
+    MCPServerToolCallContentParam,
+    MCPServerToolResultContentParam,
+    FileSearchResultContentParam,
+]

google/genai/_interactions/types/content_start.py

@@ -15,53 +15,13 @@
 
 # File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-from typing import Union, Optional
-from typing_extensions import Literal, Annotated, TypeAlias
+from typing import Optional
+from typing_extensions import Literal
 
-from .._utils import PropertyInfo
+from .content import Content
 from .._models import BaseModel
-from .text_content import TextContent
-from .audio_content import AudioContent
-from .image_content import ImageContent
-from .video_content import VideoContent
-from .thought_content import ThoughtContent
-from .document_content import DocumentContent
-from .function_call_content import FunctionCallContent
-from .function_result_content import FunctionResultContent
-from .url_context_call_content import URLContextCallContent
-from .file_search_result_content import FileSearchResultContent
-from .google_search_call_content import GoogleSearchCallContent
-from .url_context_result_content import URLContextResultContent
-from .code_execution_call_content import CodeExecutionCallContent
-from .google_search_result_content import GoogleSearchResultContent
-from .mcp_server_tool_call_content import MCPServerToolCallContent
-from .code_execution_result_content import CodeExecutionResultContent
-from .mcp_server_tool_result_content import MCPServerToolResultContent
 
-__all__ = ["ContentStart", "Content"]
-
-Content: TypeAlias = Annotated[
-    Union[
-        TextContent,
-        ImageContent,
-        AudioContent,
-        DocumentContent,
-        VideoContent,
-        ThoughtContent,
-        FunctionCallContent,
-        FunctionResultContent,
-        CodeExecutionCallContent,
-        CodeExecutionResultContent,
-        URLContextCallContent,
-        URLContextResultContent,
-        GoogleSearchCallContent,
-        GoogleSearchResultContent,
-        MCPServerToolCallContent,
-        MCPServerToolResultContent,
-        FileSearchResultContent,
-    ],
-    PropertyInfo(discriminator="type"),
-]
+__all__ = ["ContentStart"]
 
 
 class ContentStart(BaseModel):

google/genai/_interactions/types/deep_research_agent_config.py

@@ -30,4 +30,3 @@ class DeepResearchAgentConfig(BaseModel):
     """Whether to include thought summaries in the response."""
 
     type: Optional[Literal["deep-research"]] = None
-    """Used as the OpenAPI type discriminator for the content oneof."""

google/genai/_interactions/types/deep_research_agent_config_param.py

@@ -29,4 +29,3 @@ class DeepResearchAgentConfigParam(TypedDict, total=False):
     """Whether to include thought summaries in the response."""
 
     type: Literal["deep-research"]
-    """Used as the OpenAPI type discriminator for the content oneof."""

google/genai/_interactions/types/document_content.py

@@ -19,6 +19,7 @@ from typing import Optional
 from typing_extensions import Literal
 
 from .._models import BaseModel
+from .document_mime_type import DocumentMimeType
 
 __all__ = ["DocumentContent"]
 
@@ -27,10 +28,10 @@ class DocumentContent(BaseModel):
     """A document content block."""
 
     type: Literal["document"]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Optional[str] = None
 
-    mime_type: Optional[str] = None
+    mime_type: Optional[DocumentMimeType] = None
+    """The mime type of the document."""
 
     uri: Optional[str] = None

google/genai/_interactions/types/document_content_param.py

@@ -23,6 +23,7 @@ from typing_extensions import Literal, Required, Annotated, TypedDict
 from .._types import Base64FileInput
 from .._utils import PropertyInfo
 from .._models import set_pydantic_config
+from .document_mime_type_param import DocumentMimeTypeParam
 
 __all__ = ["DocumentContentParam"]
 
@@ -31,11 +32,11 @@ class DocumentContentParam(TypedDict, total=False):
     """A document content block."""
 
     type: Required[Literal["document"]]
-    """Used as the OpenAPI type discriminator for the content oneof."""
 
     data: Annotated[Union[str, Base64FileInput], PropertyInfo(format="base64")]
 
-    mime_type: str
+    mime_type: DocumentMimeTypeParam
+    """The mime type of the document."""
 
     uri: str