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

pragnyanramtha · web-flow · commit 2645ee4b5b85 · 2026-05-19T12:47:36.000+05:30
diff --git a/google/genai/_interactions/types/agent.py b/google/genai/_interactions/types/agent.py
@@ -33,7 +33,7 @@
     "ToolMCPServer",
 ]
 
-BaseEnvironment: TypeAlias = Union[str, Environment]
+BaseEnvironment: TypeAlias = Union[Environment, str]
 
 
 class ToolCodeExecution(BaseModel):
diff --git a/google/genai/_interactions/types/agent_create_params.py b/google/genai/_interactions/types/agent_create_params.py
@@ -56,7 +56,7 @@ class AgentCreateParams(TypedDict, total=False):
     """The tools available to the agent."""
 
 
-BaseEnvironment: TypeAlias = Union[str, EnvironmentParam]
+BaseEnvironment: TypeAlias = Union[EnvironmentParam, str]
 
 
 class ToolCodeExecution(TypedDict, total=False):

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@`
`33`	`33`	`"ToolMCPServer",`
`34`	`34`	`]`
`35`	`35`
`36`		`-BaseEnvironment: TypeAlias = Union[str, Environment]`
	`36`	`+BaseEnvironment: TypeAlias = Union[Environment, str]`
`37`	`37`
`38`	`38`
`39`	`39`	`class ToolCodeExecution(BaseModel):`