Merge branch 'main' into feat/add-user-agent

Author: rcsantana777

CHANGELOG.md

@@ -1,5 +1,53 @@
 # Changelog
 
+## 1.12.0 (2025-08-21)
+
+### Features
+
+**[Agent Config]** 🌟 **NEW FEATURE**: Support using config file (YAML) to author agents in addition to python code. See the [documentation](https://google.github.io/adk-docs/agents/config/) for details.
+* [Agent Config] Support deploying config agent to Agent Engine in CLI ([b3b7003](https://github.com/google/adk-python/commit/b3b70035c432670a5f0b5cdd1e9467f43b80495c))
+* [Tools] Add a dedicated Bigtable toolset to provide an easier, integrated way to interact
+with Bigtable for building AI Agent applications(experimental feature) ([a953807](https://github.com/google/adk-python/commit/a953807cce341425ba23e3f0a85eae58d6b0630f))
+* [Tools] Support custom tool_name_prefix in auto-generated GoogleApiToolset ([a2832d5](https://github.com/google/adk-python/commit/a2832d5ac7ba5264ee91f6d5a6a0058cfe4c9e8a)) See [oauth_calendar_agent](https://github.com/google/adk-python/tree/main/contributing/samples/oauth_calendar_agent) as an example.
+* [CLI] Add `build_image` option for `adk deploy cloud_run` CLI ([c843503](https://github.com/google/adk-python/commit/c84350345af0ea6a232e0818b20c4262b228b103))
+* [Services] Add setdefault method to the ADK State object ([77ed1f5](https://github.com/google/adk-python/commit/77ed1f5f15ed3f009547ed0e20f86d949de12ec2))
+
+
+### Bug Fixes
+
+* Lazy load VertexAiCodeExecutor and ContainerCodeExecutor ([018db79](https://github.com/google/adk-python/commit/018db79d1354f93b8328abb8416f63070b25f9f1))
+* Fix the path for agent card in A2A demo ([fa64545](https://github.com/google/adk-python/commit/fa64545a9de216312a69f93126cfd37f1016c14b))
+* Fix the path for agent card in A2A demo ([a117cf0](https://github.com/google/adk-python/commit/a117cf0af335c5e316ae9d61336a433052316462))
+* litellm-test due to breaking change in dep library of extension extra ([004a0a0](https://github.com/google/adk-python/commit/004a0a0f2d9a4f7ae6bff42a7cad96c11a99acaf))
+* Using base event's invocation id when merge multiple function response event ([279e4fe](https://github.com/google/adk-python/commit/279e4fedd0b1c0d1499c0f9a4454357af7da490e))
+* Avoid crash when there is no candidates_token_count, which is Optional ([22f34e9](https://github.com/google/adk-python/commit/22f34e9d2c552fbcfa15a672ef6ff0c36fa32619))
+* Fix the packaging version comparison logic in adk cli ([a2b7909](https://github.com/google/adk-python/commit/a2b7909fc36e7786a721f28e2bf75a1e86ad230d))
+* Add Spanner admin scope to Spanner tool default Oauth scopes ([b66054d](https://github.com/google/adk-python/commit/b66054dd0d8c5b3d6f6ad58ac1fbd8128d1da614))
+* Fixes SequentialAgent.config_type type hint ([8a9a271](https://github.com/google/adk-python/commit/8a9a271141678996c9b84b8c55d4b539d011391c))
+* Fixes the host in the ansi bracket of adk web ([cd357bf](https://github.com/google/adk-python/commit/cd357bf5aeb01f1a6ae2a72349a73700ca9f1ed2))
+* Add spanner tool name prefix ([a27927d](https://github.com/google/adk-python/commit/a27927dc8197c391c80acb8b2c23d610fba2f887))
+
+### Improvements
+
+* Support `ADK_SUPPRESS_EXPERIMENTAL_FEATURE_WARNINGS` as environment variable to suppress experimental warnings ([4afc9b2](https://github.com/google/adk-python/commit/4afc9b2f33d63381583cea328f97c02213611529))
+* Uses pydantic `Field` for Agent configs, so that the generated AgentConfig.json json schema can carry field description ([5b999ed](https://github.com/google/adk-python/commit/5b999ed6fd23a0fc1da56ccff4c09621f433846b))
+* Update `openai` dependency version, based on correct OPENAI release ([bb8ebd1](https://github.com/google/adk-python/commit/bb8ebd15f90768b518cd0e21a59b269e30d6d944))
+* Add the missing license header for core_callback_config init file ([f8fd6a4](https://github.com/google/adk-python/commit/f8fd6a4f09ab520b8ecdbd8f9fe48228dbff7ebe))
+* Creates yaml_utils.py in utils to allow adk dump yaml in the same style ([1fd58cb](https://github.com/google/adk-python/commit/1fd58cb3633992cd88fa7e09ca6eda0f9b34236f))
+* Return explict None type for DELETE endpoints ([f03f167](https://github.com/google/adk-python/commit/f03f1677790c0a9e59b6ba6f46010d0b7b64be50))
+* Add _config suffix to all yaml-based agent examples ([43f302c](https://github.com/google/adk-python/commit/43f302ce1ab53077ee8f1486d5294540678921e6))
+* Rename run related method and request to align with the conventions ([ecaa7b4](https://github.com/google/adk-python/commit/ecaa7b4c9847b478c7cdc37185b1525f733bb403))
+* Update models in samples/ folder to be gemini 2.0+ ([6c217ba](https://github.com/google/adk-python/commit/6c217bad828edf62b41ec06b168f8a6cb7ece2ed))
+* Remove the "one commit" requirement from the contributing guide ([c32cb6e](https://github.com/google/adk-python/commit/c32cb6eef9ce320ea5a1f3845fc57b83762c237e))
+* Bump version to 1.11.0 ([8005270](https://github.com/google/adk-python/commit/80052700f6cee947322080ae6c415d3a428b6c91))
+
+### Documentation
+
+* Add contributing bigtable sample ([fef5318](https://github.com/google/adk-python/commit/fef5318a22f3dcaadb7ecb858725eb61a0350140))
+* Fix core_callback example ([ba6e85e](https://github.com/google/adk-python/commit/ba6e85eb3fb06f58ce9077574eac193298e18bea))
+* Adds a minimal sample to demo how to use Agent Config to create a multi-agent setup ([1328e6e](https://github.com/google/adk-python/commit/1328e6ef62e9e6260048c0078579edb85a0440bc))
+
+
 ## [1.11.0](https://github.com/google/adk-python/compare/v1.10.0...v1.11.0) (2025-08-14)
 
 ### Features

README.md

@@ -27,6 +27,11 @@ Agent Development Kit (ADK) is a flexible and modular framework for developing a
 
 ---
 
+## ✨ What's new
+
+- **Agent Config**: Build agents without code. Check out the
+  [Agent Config](https://google.github.io/adk-docs/agents/config/) feature.
+
 ## ✨ Key Features
 
 - **Rich Tool Ecosystem**: Utilize pre-built tools, custom functions,

contributing/samples/spanner/README.md

@@ -23,7 +23,7 @@ distributed via the `google.adk.tools.spanner` module. These tools include:
 
 1. `get_table_schema`
 
-  Fetches Spanner database table schema.
+  Fetches Spanner database table schema and metadata information.
 
 1. `execute_sql`
 

pyproject.toml

@@ -25,38 +25,38 @@ classifiers = [ # List of https://pypi.org/classifiers/
 ]
 dependencies = [
   # go/keep-sorted start
-  "PyYAML>=6.0.2, <7.0.0",                          # For APIHubToolset.
-  "absolufy-imports>=0.3.1, <1.0.0",                # For Agent Engine deployment.
-  "anyio>=4.9.0, <5.0.0;python_version>='3.10'",    # For MCP Session Manager
-  "authlib>=1.5.1, <2.0.0",                         # For RestAPI Tool
-  "click>=8.1.8, <9.0.0",                           # For CLI tools
-  "fastapi>=0.115.0, <1.0.0",                       # FastAPI framework
-  "google-api-python-client>=2.157.0, <3.0.0",      # Google API client discovery
-  "google-cloud-bigtable>=2.32.0",                  # For Bigtable database
+  "PyYAML>=6.0.2, <7.0.0",                                  # For APIHubToolset.
+  "absolufy-imports>=0.3.1, <1.0.0",                        # For Agent Engine deployment.
+  "anyio>=4.9.0, <5.0.0;python_version>='3.10'",            # For MCP Session Manager
+  "authlib>=1.5.1, <2.0.0",                                 # For RestAPI Tool
+  "click>=8.1.8, <9.0.0",                                   # For CLI tools
+  "fastapi>=0.115.0, <1.0.0",                               # FastAPI framework
+  "google-api-python-client>=2.157.0, <3.0.0",              # Google API client discovery
+  "google-cloud-bigtable>=2.32.0",                          # For Bigtable database
   "google-cloud-aiplatform[agent_engines]>=1.95.1, <2.0.0", # For VertexAI integrations, e.g. example store.
-  "google-cloud-secret-manager>=2.22.0, <3.0.0",    # Fetching secrets in RestAPI Tool
-  "google-cloud-spanner>=3.56.0, <4.0.0",           # For Spanner database
-  "google-cloud-speech>=2.30.0, <3.0.0",            # For Audio Transcription
-  "google-cloud-storage>=2.18.0, <3.0.0",           # For GCS Artifact service
-  "google-genai>=1.21.1, <2.0.0",                   # Google GenAI SDK
-  "graphviz>=0.20.2, <1.0.0",                       # Graphviz for graph rendering
-  "mcp>=1.8.0, <2.0.0;python_version>='3.10'",      # For MCP Toolset
-  "opentelemetry-api>=1.31.0, <2.0.0",              # OpenTelemetry
+  "google-cloud-secret-manager>=2.22.0, <3.0.0",            # Fetching secrets in RestAPI Tool
+  "google-cloud-spanner>=3.56.0, <4.0.0",                   # For Spanner database
+  "google-cloud-speech>=2.30.0, <3.0.0",                    # For Audio Transcription
+  "google-cloud-storage>=2.18.0, <3.0.0",                   # For GCS Artifact service
+  "google-genai>=1.21.1, <2.0.0",                           # Google GenAI SDK
+  "graphviz>=0.20.2, <1.0.0",                               # Graphviz for graph rendering
+  "mcp>=1.8.0, <2.0.0;python_version>='3.10'",              # For MCP Toolset
+  "opentelemetry-api>=1.31.0, <2.0.0",                      # OpenTelemetry
   "opentelemetry-exporter-gcp-trace>=1.9.0, <2.0.0",
   "opentelemetry-sdk>=1.31.0, <2.0.0",
-  "pydantic>=2.0, <3.0.0",                          # For data validation/models
-  "python-dateutil>=2.9.0.post0, <3.0.0",           # For Vertext AI Session Service
-  "python-dotenv>=1.0.0, <2.0.0",                   # To manage environment variables
+  "pydantic>=2.0, <3.0.0",                                  # For data validation/models
+  "python-dateutil>=2.9.0.post0, <3.0.0",                   # For Vertext AI Session Service
+  "python-dotenv>=1.0.0, <2.0.0",                           # To manage environment variables
   "requests>=2.32.4, <3.0.0",
-  "sqlalchemy-spanner>=1.14.0",                     # Spanner database session service
-  "sqlalchemy>=2.0, <3.0.0",                        # SQL database ORM
-  "starlette>=0.46.2, <1.0.0",                      # For FastAPI CLI
-  "tenacity>=8.0.0, <9.0.0",                        # For Retry management
+  "sqlalchemy-spanner>=1.14.0",                             # Spanner database session service
+  "sqlalchemy>=2.0, <3.0.0",                                # SQL database ORM
+  "starlette>=0.46.2, <1.0.0",                              # For FastAPI CLI
+  "tenacity>=8.0.0, <9.0.0",                                # For Retry management
   "typing-extensions>=4.5, <5",
-  "tzlocal>=5.3, <6.0",                             # Time zone utilities
-  "uvicorn>=0.34.0, <1.0.0",                        # ASGI server for FastAPI
-  "watchdog>=6.0.0, <7.0.0",                        # For file change detection and hot reload
-  "websockets>=15.0.1, <16.0.0",                    # For BaseLlmFlow
+  "tzlocal>=5.3, <6.0",                                     # Time zone utilities
+  "uvicorn>=0.34.0, <1.0.0",                                # ASGI server for FastAPI
+  "watchdog>=6.0.0, <7.0.0",                                # For file change detection and hot reload
+  "websockets>=15.0.1, <16.0.0",                            # For BaseLlmFlow
   # go/keep-sorted end
 ]
 dynamic = ["version"]
@@ -99,18 +99,20 @@ eval = [
 
 test = [
   # go/keep-sorted start
-  "anthropic>=0.43.0",               # For anthropic model tests
+  "a2a-sdk>=0.3.0,<0.4.0;python_version>='3.10'",
+  "anthropic>=0.43.0",                            # For anthropic model tests
   "langchain-community>=0.3.17",
-  # langgraph 0.5 removed langgraph.graph.graph which we depend on
-  "langgraph>=0.2.60, <= 0.4.10",    # For LangGraphAgent
-  "litellm>=1.75.5, <2.0.0",                 # For LiteLLM tests
-  "llama-index-readers-file>=0.4.0", # For retrieval tests
-  "openai>=1.100.2", # For LiteLLM
+  "langgraph>=0.2.60, <= 0.4.10",                 # For LangGraphAgent
+  "litellm>=1.75.5, <2.0.0",                      # For LiteLLM tests
+  "llama-index-readers-file>=0.4.0",              # For retrieval tests
+  "openai>=1.100.2",                              # For LiteLLM
   "pytest-asyncio>=0.25.0",
   "pytest-mock>=3.14.0",
   "pytest-xdist>=3.6.1",
   "pytest>=8.3.4",
   "python-multipart>=0.0.9",
+  "rouge-score>=0.1.2",
+  "tabulate>=0.9.0",
   # go/keep-sorted end
 ]
 

src/google/adk/a2a/utils/agent_to_a2a.py

@@ -39,25 +39,32 @@
 from ...runners import Runner
 from ...sessions.in_memory_session_service import InMemorySessionService
 from ..executor.a2a_agent_executor import A2aAgentExecutor
+from ..experimental import a2a_experimental
 from .agent_card_builder import AgentCardBuilder
 
 
+@a2a_experimental
 def to_a2a(
-    agent: BaseAgent, *, host: str = "localhost", port: int = 8000
+    agent: BaseAgent,
+    *,
+    host: str = "localhost",
+    port: int = 8000,
+    protocol: str = "http",
 ) -> Starlette:
   """Convert an ADK agent to a A2A Starlette application.
 
   Args:
       agent: The ADK agent to convert
       host: The host for the A2A RPC URL (default: "localhost")
       port: The port for the A2A RPC URL (default: 8000)
+      protocol: The protocol for the A2A RPC URL (default: "http")
 
   Returns:
       A Starlette application that can be run with uvicorn
 
   Example:
       agent = MyAgent()
-      app = to_a2a(agent, host="localhost", port=8000)
+      app = to_a2a(agent, host="localhost", port=8000, protocol="http")
       # Then run with: uvicorn module:app --host localhost --port 8000
   """
   # Set up ADK logging to ensure logs are visible when using uvicorn directly
@@ -87,7 +94,7 @@ async def create_runner() -> Runner:
   )
 
   # Build agent card
-  rpc_url = f"http://{host}:{port}/"
+  rpc_url = f"{protocol}://{host}:{port}/"
   card_builder = AgentCardBuilder(
       agent=agent,
       rpc_url=rpc_url,

src/google/adk/agents/base_agent.py

@@ -181,6 +181,18 @@ def clone(
 
     cloned_agent = self.model_copy(update=update)
 
+    # If any field is stored as list and not provided in the update, need to
+    # shallow copy it for the cloned agent to avoid sharing the same list object
+    # with the original agent.
+    for field_name in cloned_agent.__class__.model_fields:
+      if field_name == 'sub_agents':
+        continue
+      if update is not None and field_name in update:
+        continue
+      field = getattr(cloned_agent, field_name)
+      if isinstance(field, list):
+        setattr(cloned_agent, field_name, field.copy())
+
     if update is None or 'sub_agents' not in update:
       # If `sub_agents` is not provided in the update, need to recursively clone
       # the sub-agents to avoid sharing the sub-agents with the original agent.

src/google/adk/agents/base_agent_config.py

@@ -79,12 +79,3 @@ class BaseAgentConfig(BaseModel):
       default=None,
       description='Optional. The after_agent_callbacks of the agent.',
   )
-
-  def to_agent_config(
-      self, custom_agent_config_cls: Type[TBaseAgentConfig]
-  ) -> TBaseAgentConfig:
-    """Converts this config to the concrete agent config type.
-
-    NOTE: this is for ADK framework use only.
-    """
-    return custom_agent_config_cls.model_validate(self.model_dump())