Skip to content

Commit 4db348f

Browse files
IvanLHcopybara-github
IvanLH
authored and
copybara-github
committed
chore: Internal Cleanup
PiperOrigin-RevId: 871594063
1 parent e0f3378 commit 4db348f

5 files changed

Lines changed: 86 additions & 135 deletions

File tree

‎google/genai/_interactions/types/__init__.py‎

Lines changed: 71 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -17,92 +17,91 @@
1717

1818
from __future__ import annotations
1919

20-
from .tool import Tool as Tool
21-
from .turn import Turn as Turn
22-
from .model import Model as Model
23-
from .usage import Usage as Usage
24-
from .content import Content as Content
25-
from .function import Function as Function
26-
from .annotation import Annotation as Annotation
27-
from .tool_param import ToolParam as ToolParam
28-
from .turn_param import TurnParam as TurnParam
29-
from .error_event import ErrorEvent as ErrorEvent
30-
from .interaction import Interaction as Interaction
31-
from .model_param import ModelParam as ModelParam
32-
from .tool_choice import ToolChoice as ToolChoice
33-
from .usage_param import UsageParam as UsageParam
34-
from .content_stop import ContentStop as ContentStop
35-
from .image_config import ImageConfig as ImageConfig
36-
from .text_content import TextContent as TextContent
3720
from .allowed_tools import AllowedTools as AllowedTools
21+
from .allowed_tools_param import AllowedToolsParam as AllowedToolsParam
22+
from .annotation import Annotation as Annotation
23+
from .annotation_param import AnnotationParam as AnnotationParam
3824
from .audio_content import AudioContent as AudioContent
25+
from .audio_content_param import AudioContentParam as AudioContentParam
26+
from .code_execution_call_arguments import CodeExecutionCallArguments as CodeExecutionCallArguments
27+
from .code_execution_call_arguments_param import CodeExecutionCallArgumentsParam as CodeExecutionCallArgumentsParam
28+
from .code_execution_call_content import CodeExecutionCallContent as CodeExecutionCallContent
29+
from .code_execution_call_content_param import CodeExecutionCallContentParam as CodeExecutionCallContentParam
30+
from .code_execution_result_content import CodeExecutionResultContent as CodeExecutionResultContent
31+
from .code_execution_result_content_param import CodeExecutionResultContentParam as CodeExecutionResultContentParam
32+
from .content import Content as Content
3933
from .content_delta import ContentDelta as ContentDelta
4034
from .content_param import ContentParam as ContentParam
4135
from .content_start import ContentStart as ContentStart
42-
from .image_content import ImageContent as ImageContent
43-
from .speech_config import SpeechConfig as SpeechConfig
44-
from .video_content import VideoContent as VideoContent
45-
from .function_param import FunctionParam as FunctionParam
46-
from .thinking_level import ThinkingLevel as ThinkingLevel
47-
from .thought_content import ThoughtContent as ThoughtContent
48-
from .annotation_param import AnnotationParam as AnnotationParam
36+
from .content_stop import ContentStop as ContentStop
37+
from .deep_research_agent_config import DeepResearchAgentConfig as DeepResearchAgentConfig
38+
from .deep_research_agent_config_param import DeepResearchAgentConfigParam as DeepResearchAgentConfigParam
4939
from .document_content import DocumentContent as DocumentContent
50-
from .tool_choice_type import ToolChoiceType as ToolChoiceType
51-
from .generation_config import GenerationConfig as GenerationConfig
52-
from .tool_choice_param import ToolChoiceParam as ToolChoiceParam
53-
from .image_config_param import ImageConfigParam as ImageConfigParam
54-
from .text_content_param import TextContentParam as TextContentParam
55-
from .tool_choice_config import ToolChoiceConfig as ToolChoiceConfig
56-
from .url_context_result import URLContextResult as URLContextResult
57-
from .allowed_tools_param import AllowedToolsParam as AllowedToolsParam
58-
from .audio_content_param import AudioContentParam as AudioContentParam
59-
from .image_content_param import ImageContentParam as ImageContentParam
60-
from .speech_config_param import SpeechConfigParam as SpeechConfigParam
61-
from .video_content_param import VideoContentParam as VideoContentParam
40+
from .document_content_param import DocumentContentParam as DocumentContentParam
6241
from .dynamic_agent_config import DynamicAgentConfig as DynamicAgentConfig
63-
from .google_search_result import GoogleSearchResult as GoogleSearchResult
42+
from .dynamic_agent_config_param import DynamicAgentConfigParam as DynamicAgentConfigParam
43+
from .error_event import ErrorEvent as ErrorEvent
44+
from .file_search_call_content import FileSearchCallContent as FileSearchCallContent
45+
from .file_search_call_content_param import FileSearchCallContentParam as FileSearchCallContentParam
46+
from .file_search_result_content import FileSearchResultContent as FileSearchResultContent
47+
from .file_search_result_content_param import FileSearchResultContentParam as FileSearchResultContentParam
48+
from .function import Function as Function
6449
from .function_call_content import FunctionCallContent as FunctionCallContent
65-
from .interaction_sse_event import InteractionSSEEvent as InteractionSSEEvent
66-
from .thought_content_param import ThoughtContentParam as ThoughtContentParam
67-
from .document_content_param import DocumentContentParam as DocumentContentParam
68-
from .interaction_get_params import InteractionGetParams as InteractionGetParams
50+
from .function_call_content_param import FunctionCallContentParam as FunctionCallContentParam
51+
from .function_param import FunctionParam as FunctionParam
6952
from .function_result_content import FunctionResultContent as FunctionResultContent
53+
from .function_result_content_param import FunctionResultContentParam as FunctionResultContentParam
54+
from .generation_config import GenerationConfig as GenerationConfig
7055
from .generation_config_param import GenerationConfigParam as GenerationConfigParam
71-
from .interaction_start_event import InteractionStartEvent as InteractionStartEvent
72-
from .file_search_call_content import FileSearchCallContent as FileSearchCallContent
73-
from .tool_choice_config_param import ToolChoiceConfigParam as ToolChoiceConfigParam
74-
from .url_context_call_content import URLContextCallContent as URLContextCallContent
75-
from .url_context_result_param import URLContextResultParam as URLContextResultParam
76-
from .interaction_create_params import InteractionCreateParams as InteractionCreateParams
77-
from .interaction_status_update import InteractionStatusUpdate as InteractionStatusUpdate
78-
from .deep_research_agent_config import DeepResearchAgentConfig as DeepResearchAgentConfig
79-
from .dynamic_agent_config_param import DynamicAgentConfigParam as DynamicAgentConfigParam
80-
from .file_search_result_content import FileSearchResultContent as FileSearchResultContent
56+
from .google_search_call_arguments import GoogleSearchCallArguments as GoogleSearchCallArguments
57+
from .google_search_call_arguments_param import GoogleSearchCallArgumentsParam as GoogleSearchCallArgumentsParam
8158
from .google_search_call_content import GoogleSearchCallContent as GoogleSearchCallContent
59+
from .google_search_call_content_param import GoogleSearchCallContentParam as GoogleSearchCallContentParam
60+
from .google_search_result import GoogleSearchResult as GoogleSearchResult
61+
from .google_search_result_content import GoogleSearchResultContent as GoogleSearchResultContent
62+
from .google_search_result_content_param import GoogleSearchResultContentParam as GoogleSearchResultContentParam
8263
from .google_search_result_param import GoogleSearchResultParam as GoogleSearchResultParam
64+
from .image_config import ImageConfig as ImageConfig
65+
from .image_config_param import ImageConfigParam as ImageConfigParam
66+
from .image_content import ImageContent as ImageContent
67+
from .image_content_param import ImageContentParam as ImageContentParam
68+
from .interaction import Interaction as Interaction
8369
from .interaction_complete_event import InteractionCompleteEvent as InteractionCompleteEvent
84-
from .url_context_call_arguments import URLContextCallArguments as URLContextCallArguments
85-
from .url_context_result_content import URLContextResultContent as URLContextResultContent
86-
from .code_execution_call_content import CodeExecutionCallContent as CodeExecutionCallContent
87-
from .function_call_content_param import FunctionCallContentParam as FunctionCallContentParam
88-
from .google_search_call_arguments import GoogleSearchCallArguments as GoogleSearchCallArguments
89-
from .google_search_result_content import GoogleSearchResultContent as GoogleSearchResultContent
70+
from .interaction_create_params import InteractionCreateParams as InteractionCreateParams
71+
from .interaction_get_params import InteractionGetParams as InteractionGetParams
72+
from .interaction_sse_event import InteractionSSEEvent as InteractionSSEEvent
73+
from .interaction_start_event import InteractionStartEvent as InteractionStartEvent
74+
from .interaction_status_update import InteractionStatusUpdate as InteractionStatusUpdate
9075
from .mcp_server_tool_call_content import MCPServerToolCallContent as MCPServerToolCallContent
91-
from .code_execution_call_arguments import CodeExecutionCallArguments as CodeExecutionCallArguments
92-
from .code_execution_result_content import CodeExecutionResultContent as CodeExecutionResultContent
93-
from .function_result_content_param import FunctionResultContentParam as FunctionResultContentParam
94-
from .file_search_call_content_param import FileSearchCallContentParam as FileSearchCallContentParam
76+
from .mcp_server_tool_call_content_param import MCPServerToolCallContentParam as MCPServerToolCallContentParam
9577
from .mcp_server_tool_result_content import MCPServerToolResultContent as MCPServerToolResultContent
96-
from .url_context_call_content_param import URLContextCallContentParam as URLContextCallContentParam
97-
from .deep_research_agent_config_param import DeepResearchAgentConfigParam as DeepResearchAgentConfigParam
98-
from .file_search_result_content_param import FileSearchResultContentParam as FileSearchResultContentParam
99-
from .google_search_call_content_param import GoogleSearchCallContentParam as GoogleSearchCallContentParam
78+
from .mcp_server_tool_result_content_param import MCPServerToolResultContentParam as MCPServerToolResultContentParam
79+
from .model import Model as Model
80+
from .model_param import ModelParam as ModelParam
81+
from .speech_config import SpeechConfig as SpeechConfig
82+
from .speech_config_param import SpeechConfigParam as SpeechConfigParam
83+
from .text_content import TextContent as TextContent
84+
from .text_content_param import TextContentParam as TextContentParam
85+
from .thinking_level import ThinkingLevel as ThinkingLevel
86+
from .thought_content import ThoughtContent as ThoughtContent
87+
from .thought_content_param import ThoughtContentParam as ThoughtContentParam
88+
from .tool import Tool as Tool
89+
from .tool_choice_config import ToolChoiceConfig as ToolChoiceConfig
90+
from .tool_choice_config_param import ToolChoiceConfigParam as ToolChoiceConfigParam
91+
from .tool_choice_param import ToolChoiceParam as ToolChoiceParam
92+
from .tool_choice_type import ToolChoiceType as ToolChoiceType
93+
from .tool_param import ToolParam as ToolParam
94+
from .turn import Turn as Turn
95+
from .turn_param import TurnParam as TurnParam
96+
from .url_context_call_arguments import URLContextCallArguments as URLContextCallArguments
10097
from .url_context_call_arguments_param import URLContextCallArgumentsParam as URLContextCallArgumentsParam
98+
from .url_context_call_content import URLContextCallContent as URLContextCallContent
99+
from .url_context_call_content_param import URLContextCallContentParam as URLContextCallContentParam
100+
from .url_context_result import URLContextResult as URLContextResult
101+
from .url_context_result_content import URLContextResultContent as URLContextResultContent
101102
from .url_context_result_content_param import URLContextResultContentParam as URLContextResultContentParam
102-
from .code_execution_call_content_param import CodeExecutionCallContentParam as CodeExecutionCallContentParam
103-
from .google_search_call_arguments_param import GoogleSearchCallArgumentsParam as GoogleSearchCallArgumentsParam
104-
from .google_search_result_content_param import GoogleSearchResultContentParam as GoogleSearchResultContentParam
105-
from .mcp_server_tool_call_content_param import MCPServerToolCallContentParam as MCPServerToolCallContentParam
106-
from .code_execution_call_arguments_param import CodeExecutionCallArgumentsParam as CodeExecutionCallArgumentsParam
107-
from .code_execution_result_content_param import CodeExecutionResultContentParam as CodeExecutionResultContentParam
108-
from .mcp_server_tool_result_content_param import MCPServerToolResultContentParam as MCPServerToolResultContentParam
103+
from .url_context_result_param import URLContextResultParam as URLContextResultParam
104+
from .usage import Usage as Usage
105+
from .usage_param import UsageParam as UsageParam
106+
from .video_content import VideoContent as VideoContent
107+
from .video_content_param import VideoContentParam as VideoContentParam

‎google/genai/_interactions/types/generation_config.py‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,19 @@
1515

1616
# File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
1717

18-
from typing import List, Optional
19-
from typing_extensions import Literal
18+
from typing import List, Union, Optional
19+
from typing_extensions import Literal, TypeAlias
2020

2121
from .._models import BaseModel
22-
from .tool_choice import ToolChoice
2322
from .image_config import ImageConfig
2423
from .speech_config import SpeechConfig
2524
from .thinking_level import ThinkingLevel
25+
from .tool_choice_type import ToolChoiceType
26+
from .tool_choice_config import ToolChoiceConfig
2627

27-
__all__ = ["GenerationConfig"]
28+
__all__ = ["GenerationConfig", "ToolChoice"]
29+
30+
ToolChoice: TypeAlias = Union[ToolChoiceType, ToolChoiceConfig]
2831

2932

3033
class GenerationConfig(BaseModel):

‎google/genai/_interactions/types/generation_config_param.py‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,19 @@
1717

1818
from __future__ import annotations
1919

20-
from typing import Iterable
21-
from typing_extensions import Literal, TypedDict
20+
from typing import Union, Iterable
21+
from typing_extensions import Literal, TypeAlias, TypedDict
2222

2323
from .._types import SequenceNotStr
2424
from .thinking_level import ThinkingLevel
25-
from .tool_choice_param import ToolChoiceParam
25+
from .tool_choice_type import ToolChoiceType
2626
from .image_config_param import ImageConfigParam
2727
from .speech_config_param import SpeechConfigParam
28+
from .tool_choice_config_param import ToolChoiceConfigParam
2829

29-
__all__ = ["GenerationConfigParam"]
30+
__all__ = ["GenerationConfigParam", "ToolChoice"]
31+
32+
ToolChoice: TypeAlias = Union[ToolChoiceType, ToolChoiceConfigParam]
3033

3134

3235
class GenerationConfigParam(TypedDict, total=False):
@@ -56,7 +59,7 @@ class GenerationConfigParam(TypedDict, total=False):
5659
thinking_summaries: Literal["auto", "none"]
5760
"""Whether to include thought summaries in the response."""
5861

59-
tool_choice: ToolChoiceParam
62+
tool_choice: ToolChoice
6063
"""The tool choice for the interaction."""
6164

6265
top_p: float

‎google/genai/_interactions/types/tool_choice.py‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎google/genai/_interactions/types/tool_choice_param.py‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)