Merge branch 'main' into a2a-url

Author: racinmat

.github/workflows/discussion_answering.yml

@@ -0,0 +1,45 @@
+name: ADK Answering Agent for Discussions
+
+on:
+  discussion:
+    types: [created]
+  discussion_comment:
+    types: [created]
+
+jobs:
+  agent-answer-questions:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.11'
+
+      - name: Authenticate to Google Cloud
+        id: auth
+        uses: 'google-github-actions/auth@v2'
+        with:
+          credentials_json: '${{ secrets.ADK_GCP_SA_KEY }}'
+
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install google-adk
+
+      - name: Run Answering Script
+        env:
+          GITHUB_TOKEN: ${{ secrets.ADK_TRIAGE_AGENT }}
+          GOOGLE_CLOUD_PROJECT: ${{ secrets.GOOGLE_CLOUD_PROJECT }}
+          GOOGLE_CLOUD_LOCATION: ${{ secrets.GOOGLE_CLOUD_LOCATION }}
+          VERTEXAI_DATASTORE_ID: ${{ secrets.VERTEXAI_DATASTORE_ID }}
+          GOOGLE_GENAI_USE_VERTEXAI: 1
+          OWNER: 'google'
+          REPO: 'adk-python'
+          INTERACTIVE: 0
+          DISCUSSION_NUMBER: ${{ github.event.discussion.number }}
+          PYTHONPATH: contributing/samples
+        run: python -m adk_answering_agent.main

contributing/samples/a2a_root/agent.py

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from a2a.utils.constants import AGENT_CARD_WELL_KNOWN_PATH
+from google.adk.agents.remote_a2a_agent import AGENT_CARD_WELL_KNOWN_PATH
 from google.adk.agents.remote_a2a_agent import RemoteA2aAgent
 
 root_agent = RemoteA2aAgent(

contributing/samples/adk_answering_agent/agent.py

@@ -247,6 +247,7 @@ def add_label_to_discussion(
       * {APPROVAL_INSTRUCTION}
       * Your response should be based on the information you found in the document store. Do not invent
         information that is not in the document store. Do not invent citations which are not in the document store.
+      * **Be Objective**: your answer should be based on the facts you found in the document store, do not be misled by user's assumptions or user's understanding of ADK.
       * If you can't find the answer or information in the document store, **do not** respond.
       * Include a bolded note (e.g. "Response from ADK Answering Agent") in your comment
         to indicate this comment was added by an ADK Answering Agent.

contributing/samples/live_bidi_streaming_multi_agent/agent.py

@@ -100,8 +100,8 @@ def get_current_weather(location: str):
 
 root_agent = Agent(
     # find supported models here: https://google.github.io/adk-docs/get-started/streaming/quickstart-streaming/
-    # model='gemini-live-2.5-flash-preview-native-audio',  # for Vertex project
-    model="gemini-live-2.5-flash-preview",  # for AI studio key
+    model="gemini-2.0-flash-live-preview-04-09",  # for Vertex project
+    # model="gemini-live-2.5-flash-preview",  # for AI studio key
     name="root_agent",
     instruction="""
       You are a helpful assistant that can check time, roll dice and check if numbers are prime.

contributing/samples/live_bidi_streaming_tools_agent/agent.py

@@ -121,7 +121,9 @@ def stop_streaming(function_name: str):
 
 
 root_agent = Agent(
-    model="gemini-live-2.5-flash-preview",
+    # find supported models here: https://google.github.io/adk-docs/get-started/streaming/quickstart-streaming/
+    model="gemini-2.0-flash-live-preview-04-09",  # for Vertex project
+    # model="gemini-live-2.5-flash-preview",  # for AI studio key
     name="video_streaming_agent",
     instruction="""
       You are a monitoring agent. You can do video monitoring and stock price monitoring

contributing/samples/live_tool_callbacks_agent/agent.py

@@ -217,8 +217,9 @@ async def after_tool_async_callback(
 
 # Create the agent with tool callbacks
 root_agent = Agent(
+    # find supported models here: https://google.github.io/adk-docs/get-started/streaming/quickstart-streaming/
     model="gemini-2.0-flash-live-preview-04-09",  # for Vertex project
-    # model="gemini-2.0-flash-live-001",  # for AI studio key
+    # model="gemini-live-2.5-flash-preview",  # for AI studio key
     name="tool_callbacks_agent",
     description=(
         "Live streaming agent that demonstrates tool callbacks functionality. "

src/google/adk/agents/base_agent.py

@@ -504,20 +504,17 @@ def __set_parent_agent_for_sub_agents(self) -> BaseAgent:
       sub_agent.parent_agent = self
     return self
 
+  @final
   @classmethod
-  @working_in_progress('BaseAgent.from_config is not ready for use.')
   def from_config(
       cls: Type[SelfAgent],
       config: BaseAgentConfig,
       config_abs_path: str,
   ) -> SelfAgent:
     """Creates an agent from a config.
 
-    This method converts fields in a config to the corresponding
-    fields in an agent.
-
-    Child classes should re-implement this method to support loading from their
-    custom config types.
+    If sub-classes uses a custom agent config, override `_from_config_kwargs`
+    method to return an updated kwargs for agent construstor.
 
     Args:
       config: The config to create the agent from.
@@ -527,6 +524,40 @@ def from_config(
     Returns:
       The created agent.
     """
+    kwargs = cls.__create_kwargs(config, config_abs_path)
+    kwargs = cls._parse_config(config, config_abs_path, kwargs)
+    return cls(**kwargs)
+
+  @classmethod
+  def _parse_config(
+      cls: Type[SelfAgent],
+      config: BaseAgentConfig,
+      config_abs_path: str,
+      kwargs: Dict[str, Any],
+  ) -> Dict[str, Any]:
+    """Parses the config and returns updated kwargs to construct the agent.
+
+    Sub-classes should override this method to use a custome agent config class.
+
+    Args:
+      config: The config to parse.
+      config_abs_path: The absolute path to the config file that contains the
+        agent config.
+      kwargs: The keyword arguments used for agent constructor.
+
+    Returns:
+      The updated keyword arguments used for agent constructor.
+    """
+    return kwargs
+
+  @classmethod
+  def __create_kwargs(
+      cls,
+      config: BaseAgentConfig,
+      config_abs_path: str,
+  ) -> Dict[str, Any]:
+    """Creates kwargs for the fields of BaseAgent."""
+
     from .config_agent_utils import resolve_agent_reference
     from .config_agent_utils import resolve_callbacks
 
@@ -549,4 +580,4 @@ def from_config(
       kwargs['after_agent_callback'] = resolve_callbacks(
           config.after_agent_callbacks
       )
-    return cls(**kwargs)
+    return kwargs

src/google/adk/agents/config_agent_utils.py

@@ -69,7 +69,7 @@ def _resolve_agent_class(agent_class: str) -> type[BaseAgent]:
   if "." not in agent_class_name:
     agent_class_name = f"google.adk.agents.{agent_class_name}"
 
-  agent_class = _resolve_fully_qualified_name(agent_class_name)
+  agent_class = resolve_fully_qualified_name(agent_class_name)
   if inspect.isclass(agent_class) and issubclass(agent_class, BaseAgent):
     return agent_class
 
@@ -103,8 +103,8 @@ 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.")
-def _resolve_fully_qualified_name(name: str) -> Any:
+@working_in_progress("resolve_fully_qualified_name is not ready for use.")
+def resolve_fully_qualified_name(name: str) -> Any:
   try:
     module_path, obj_name = name.rsplit(".", 1)
     module = importlib.import_module(module_path)

src/google/adk/agents/invocation_context.py

@@ -20,6 +20,8 @@
 from google.genai import types
 from pydantic import BaseModel
 from pydantic import ConfigDict
+from pydantic import Field
+from pydantic import PrivateAttr
 
 from ..artifacts.base_artifact_service import BaseArtifactService
 from ..auth.credential_service.base_credential_service import BaseCredentialService
@@ -151,13 +153,18 @@ class InvocationContext(BaseModel):
   transcription_cache: Optional[list[TranscriptionEntry]] = None
   """Caches necessary data, audio or contents, that are needed by transcription."""
 
+  live_session_resumption_handle: Optional[str] = None
+  """The handle for live session resumption."""
+
   run_config: Optional[RunConfig] = None
   """Configurations for live agents under this invocation."""
 
-  plugin_manager: PluginManager = PluginManager()
+  plugin_manager: PluginManager = Field(default_factory=PluginManager)
   """The manager for keeping track of plugins in this invocation."""
 
-  _invocation_cost_manager: _InvocationCostManager = _InvocationCostManager()
+  _invocation_cost_manager: _InvocationCostManager = PrivateAttr(
+      default_factory=_InvocationCostManager
+  )
   """A container to keep track of different kinds of costs incurred as a part
   of this invocation.
   """

src/google/adk/agents/llm_agent.py

@@ -17,12 +17,12 @@
 import importlib
 import inspect
 import logging
-import os
 from typing import Any
 from typing import AsyncGenerator
 from typing import Awaitable
 from typing import Callable
 from typing import ClassVar
+from typing import Dict
 from typing import Literal
 from typing import Optional
 from typing import Type
@@ -38,8 +38,6 @@
 
 from ..code_executors.base_code_executor import BaseCodeExecutor
 from ..events.event import Event
-from ..examples.base_example_provider import BaseExampleProvider
-from ..examples.example import Example
 from ..flows.llm_flows.auto_flow import AutoFlow
 from ..flows.llm_flows.base_llm_flow import BaseLlmFlow
 from ..flows.llm_flows.single_flow import SingleFlow
@@ -48,7 +46,6 @@
 from ..models.llm_response import LlmResponse
 from ..models.registry import LLMRegistry
 from ..planners.base_planner import BasePlanner
-from ..tools.agent_tool import AgentTool
 from ..tools.base_tool import BaseTool
 from ..tools.base_tool import ToolConfig
 from ..tools.base_toolset import BaseToolset
@@ -58,7 +55,6 @@
 from .base_agent import BaseAgent
 from .base_agent_config import BaseAgentConfig
 from .callback_context import CallbackContext
-from .common_configs import CodeConfig
 from .invocation_context import InvocationContext
 from .llm_agent_config import LlmAgentConfig
 from .readonly_context import ReadonlyContext
@@ -110,7 +106,6 @@
 ]
 
 ToolUnion: TypeAlias = Union[Callable, BaseTool, BaseToolset]
-ExamplesUnion = Union[list[Example], BaseExampleProvider]
 
 
 async def _convert_tool_union_to_tools(
@@ -589,53 +584,55 @@ def _resolve_tools(
 
     return resolved_tools
 
-  @classmethod
   @override
-  @working_in_progress('LlmAgent.from_config is not ready for use.')
-  def from_config(
+  @classmethod
+  def _parse_config(
       cls: Type[LlmAgent],
       config: LlmAgentConfig,
       config_abs_path: str,
-  ) -> LlmAgent:
+      kwargs: Dict[str, Any],
+  ) -> Dict[str, Any]:
     from .config_agent_utils import resolve_callbacks
     from .config_agent_utils import resolve_code_reference
 
-    agent = super().from_config(config, config_abs_path)
     if config.model:
-      agent.model = config.model
+      kwargs['model'] = config.model
     if config.instruction:
-      agent.instruction = config.instruction
+      kwargs['instruction'] = config.instruction
     if config.disallow_transfer_to_parent:
-      agent.disallow_transfer_to_parent = config.disallow_transfer_to_parent
+      kwargs['disallow_transfer_to_parent'] = config.disallow_transfer_to_parent
     if config.disallow_transfer_to_peers:
-      agent.disallow_transfer_to_peers = config.disallow_transfer_to_peers
+      kwargs['disallow_transfer_to_peers'] = config.disallow_transfer_to_peers
     if config.include_contents != 'default':
-      agent.include_contents = config.include_contents
+      kwargs['include_contents'] = config.include_contents
     if config.input_schema:
-      agent.input_schema = resolve_code_reference(config.input_schema)
+      kwargs['input_schema'] = resolve_code_reference(config.input_schema)
     if config.output_schema:
-      agent.output_schema = resolve_code_reference(config.output_schema)
+      kwargs['output_schema'] = resolve_code_reference(config.output_schema)
     if config.output_key:
-      agent.output_key = config.output_key
+      kwargs['output_key'] = config.output_key
     if config.tools:
-      agent.tools = cls._resolve_tools(config.tools, config_abs_path)
+      kwargs['tools'] = cls._resolve_tools(config.tools, config_abs_path)
     if config.before_model_callbacks:
-      agent.before_model_callback = resolve_callbacks(
+      kwargs['before_model_callback'] = resolve_callbacks(
           config.before_model_callbacks
       )
     if config.after_model_callbacks:
-      agent.after_model_callback = resolve_callbacks(
+      kwargs['after_model_callback'] = resolve_callbacks(
           config.after_model_callbacks
       )
     if config.before_tool_callbacks:
-      agent.before_tool_callback = resolve_callbacks(
+      kwargs['before_tool_callback'] = resolve_callbacks(
           config.before_tool_callbacks
       )
     if config.after_tool_callbacks:
-      agent.after_tool_callback = resolve_callbacks(config.after_tool_callbacks)
+      kwargs['after_tool_callback'] = resolve_callbacks(
+          config.after_tool_callbacks
+      )
     if config.generate_content_config:
-      agent.generate_content_config = config.generate_content_config
-    return agent
+      kwargs['generate_content_config'] = config.generate_content_config
+
+    return kwargs
 
 
 Agent: TypeAlias = LlmAgent