Merge branch 'google:main' into main

Author: question429

src/google/adk/agents/agent_config.py

@@ -20,7 +20,7 @@
 from pydantic import Discriminator
 from pydantic import RootModel
 
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 from .base_agent import BaseAgentConfig
 from .llm_agent_config import LlmAgentConfig
 from .loop_agent_config import LoopAgentConfig
@@ -55,7 +55,7 @@ def agent_config_discriminator(v: Any):
 
 # Use a RootModel to represent the agent directly at the top level.
 # The `discriminator` is applied to the union within the RootModel.
-@working_in_progress("AgentConfig is not ready for use.")
+@experimental
 class AgentConfig(RootModel[ConfigsUnion]):
   """The config for the YAML schema to create an agent."""
 

src/google/adk/agents/base_agent.py

@@ -39,7 +39,7 @@
 from typing_extensions import TypeAlias
 
 from ..events.event import Event
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 from .base_agent_config import BaseAgentConfig
 from .callback_context import CallbackContext
 from .common_configs import AgentRefConfig
@@ -506,6 +506,7 @@ def __set_parent_agent_for_sub_agents(self) -> BaseAgent:
 
   @final
   @classmethod
+  @experimental
   def from_config(
       cls: Type[SelfAgent],
       config: BaseAgentConfig,
@@ -529,6 +530,7 @@ def from_config(
     return cls(**kwargs)
 
   @classmethod
+  @experimental
   def _parse_config(
       cls: Type[SelfAgent],
       config: BaseAgentConfig,

src/google/adk/agents/base_agent_config.py

@@ -14,46 +14,25 @@
 
 from __future__ import annotations
 
-import inspect
-from typing import Any
-from typing import AsyncGenerator
-from typing import Awaitable
-from typing import Callable
-from typing import Dict
-from typing import final
 from typing import List
 from typing import Literal
-from typing import Mapping
 from typing import Optional
 from typing import Type
 from typing import TYPE_CHECKING
 from typing import TypeVar
 from typing import Union
 
-from google.genai import types
-from opentelemetry import trace
 from pydantic import BaseModel
 from pydantic import ConfigDict
-from pydantic import Field
-from pydantic import field_validator
-from pydantic import model_validator
-from typing_extensions import override
-from typing_extensions import TypeAlias
-
-from ..events.event import Event
-from ..utils.feature_decorator import working_in_progress
-from .callback_context import CallbackContext
+
+from ..utils.feature_decorator import experimental
 from .common_configs import AgentRefConfig
 from .common_configs import CodeConfig
 
-if TYPE_CHECKING:
-  from .invocation_context import InvocationContext
-
-
 TBaseAgentConfig = TypeVar('TBaseAgentConfig', bound='BaseAgentConfig')
 
 
-@working_in_progress('BaseAgentConfig is not ready for use.')
+@experimental
 class BaseAgentConfig(BaseModel):
   """The config for the YAML schema of a BaseAgent.
 

src/google/adk/agents/common_configs.py

@@ -23,10 +23,10 @@
 from pydantic import ConfigDict
 from pydantic import model_validator
 
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 
 
-@working_in_progress("ArgumentConfig is not ready for use.")
+@experimental
 class ArgumentConfig(BaseModel):
   """An argument passed to a function or a class's constructor."""
 
@@ -42,7 +42,7 @@ class ArgumentConfig(BaseModel):
   """The argument value."""
 
 
-@working_in_progress("CodeConfig is not ready for use.")
+@experimental
 class CodeConfig(BaseModel):
   """Code reference config for a variable, a function, or a class.
 
@@ -80,6 +80,7 @@ class CodeConfig(BaseModel):
   """
 
 
+@experimental
 class AgentRefConfig(BaseModel):
   """The config for the reference to another agent."""
 

src/google/adk/agents/config_agent_utils.py

@@ -22,15 +22,15 @@
 
 import yaml
 
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 from .agent_config import AgentConfig
 from .base_agent import BaseAgent
 from .base_agent_config import BaseAgentConfig
 from .common_configs import AgentRefConfig
 from .common_configs import CodeConfig
 
 
-@working_in_progress("from_config is not ready for use.")
+@experimental
 def from_config(config_path: str) -> BaseAgent:
   """Build agent from a configfile path.
 
@@ -79,7 +79,6 @@ def _resolve_agent_class(agent_class: str) -> type[BaseAgent]:
   )
 
 
-@working_in_progress("_load_config_from_path is not ready for use.")
 def _load_config_from_path(config_path: str) -> AgentConfig:
   """Load an agent's configuration from a YAML file.
 
@@ -103,7 +102,7 @@ def _load_config_from_path(config_path: str) -> AgentConfig:
   return AgentConfig.model_validate(config_data)
 
 
-@working_in_progress("resolve_fully_qualified_name is not ready for use.")
+@experimental
 def resolve_fully_qualified_name(name: str) -> Any:
   try:
     module_path, obj_name = name.rsplit(".", 1)
@@ -113,7 +112,7 @@ def resolve_fully_qualified_name(name: str) -> Any:
     raise ValueError(f"Invalid fully qualified name: {name}") from e
 
 
-@working_in_progress("resolve_agent_reference is not ready for use.")
+@experimental
 def resolve_agent_reference(
     ref_config: AgentRefConfig, referencing_agent_config_abs_path: str
 ) -> BaseAgent:
@@ -143,7 +142,6 @@ def resolve_agent_reference(
     raise ValueError("AgentRefConfig must have either 'code' or 'config_path'")
 
 
-@working_in_progress("_resolve_agent_code_reference is not ready for use.")
 def _resolve_agent_code_reference(code: str) -> Any:
   """Resolve a code reference to an actual agent instance.
 
@@ -172,7 +170,7 @@ def _resolve_agent_code_reference(code: str) -> Any:
   return obj
 
 
-@working_in_progress("resolve_code_reference is not ready for use.")
+@experimental
 def resolve_code_reference(code_config: CodeConfig) -> Any:
   """Resolve a code reference to actual Python object.
 
@@ -201,7 +199,7 @@ def resolve_code_reference(code_config: CodeConfig) -> Any:
     return obj
 
 
-@working_in_progress("resolve_callbacks is not ready for use.")
+@experimental
 def resolve_callbacks(callbacks_config: List[CodeConfig]) -> Any:
   """Resolve callbacks from configuration.
 

src/google/adk/agents/llm_agent.py

@@ -51,7 +51,7 @@
 from ..tools.function_tool import FunctionTool
 from ..tools.tool_configs import ToolConfig
 from ..tools.tool_context import ToolContext
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 from .base_agent import BaseAgent
 from .base_agent_config import BaseAgentConfig
 from .callback_context import CallbackContext
@@ -521,7 +521,7 @@ def __validate_generate_content_config(
     return generate_content_config
 
   @classmethod
-  @working_in_progress('LlmAgent._resolve_tools is not ready for use.')
+  @experimental
   def _resolve_tools(
       cls, tool_configs: list[ToolConfig], config_abs_path: str
   ) -> list[Any]:
@@ -580,6 +580,7 @@ def _resolve_tools(
 
   @override
   @classmethod
+  @experimental
   def _parse_config(
       cls: Type[LlmAgent],
       config: LlmAgentConfig,

src/google/adk/agents/loop_agent.py

@@ -27,7 +27,7 @@
 
 from ..agents.invocation_context import InvocationContext
 from ..events.event import Event
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 from .base_agent import BaseAgent
 from .base_agent_config import BaseAgentConfig
 from .loop_agent_config import LoopAgentConfig
@@ -78,6 +78,7 @@ async def _run_live_impl(
 
   @override
   @classmethod
+  @experimental
   def _parse_config(
       cls: type[LoopAgent],
       config: LoopAgentConfig,

src/google/adk/agents/loop_agent_config.py

@@ -21,11 +21,11 @@
 
 from pydantic import ConfigDict
 
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 from .base_agent_config import BaseAgentConfig
 
 
-@working_in_progress('LoopAgentConfig is not ready for use.')
+@experimental
 class LoopAgentConfig(BaseAgentConfig):
   """The config for the YAML schema of a LoopAgent."""
 

src/google/adk/agents/parallel_agent.py

@@ -26,7 +26,6 @@
 from typing_extensions import override
 
 from ..events.event import Event
-from ..utils.feature_decorator import working_in_progress
 from .base_agent import BaseAgent
 from .base_agent_config import BaseAgentConfig
 from .invocation_context import InvocationContext

src/google/adk/agents/parallel_agent_config.py

@@ -20,11 +20,11 @@
 
 from pydantic import ConfigDict
 
-from ..utils.feature_decorator import working_in_progress
+from ..utils.feature_decorator import experimental
 from .base_agent_config import BaseAgentConfig
 
 
-@working_in_progress('ParallelAgentConfig is not ready for use.')
+@experimental
 class ParallelAgentConfig(BaseAgentConfig):
   """The config for the YAML schema of a ParallelAgent."""