Merge branch 'main' into ejfn/bugfix-app-object-endpoints

Author: ejfn

CHANGELOG.md

@@ -1,5 +1,65 @@
 # Changelog
 
+## [1.16.0](https://github.com/google/adk-python/compare/v1.15.1...v1.16.0) (2025-10-08)
+
+### Features
+
+* **[Core]**
+  * Implementation of LLM context compaction ([e0dd06f](https://github.com/google/adk-python/commit/e0dd06ff04f9d3c2f022873ce145aaae2de02f45))
+  * Support pause and resume an invocation in ADK ([ce9c39f](https://github.com/google/adk-python/commit/ce9c39f5a85ed12c22009693b5e6bc65f4641633),
+    [2f1040f](https://github.com/google/adk-python/commit/2f1040f296db365080b62d6372474d90196ce0d6),
+    [1ee01cc](https://github.com/google/adk-python/commit/1ee01cc05add44ce460d2cfd3726dceb0c76dceb),
+    [f005414](https://github.com/google/adk-python/commit/f005414895a57befe880fd58c0d778e499a20d8e),
+    [fbf7576](https://github.com/google/adk-python/commit/fbf75761bb8d89a70b32c43bbd3fa2f48b81d67c))
+* **[Models]**
+  * Add `citation_metadata` to `LlmResponse` ([3f28e30](https://github.com/google/adk-python/commit/3f28e30c6da192e90a8100f270274cb9a55a5348))
+  * Add support for gemma model via gemini api ([2b5acb9](https://github.com/google/adk-python/commit/2b5acb98f577f5349e788bcf9910c8d7107e63b3))
+* **[Tools]**
+  * Add `dry_run` functionality to BigQuery `execute_sql` tool ([960eda3](https://github.com/google/adk-python/commit/960eda3d1f2f46dc93a365eb3de03dc3483fe9bb))
+  * Add BigQuery analyze_contribution tool ([4bb089d](https://github.com/google/adk-python/commit/4bb089d386d4e8133e9aadbba5c42d31ff281cf6))
+  * Spanner ADK toolset supports customizable template SQL and parameterized SQL ([da62700](https://github.com/google/adk-python/commit/da62700d739cb505149554962a8bcfb30f9428cc))
+  * Support Oauth2 client credentials grant type ([5c6cdcd](https://github.com/google/adk-python/commit/5c6cdcd197a6780fc86d9183fa208f78c8a975d9))
+  * Add `ReflectRetryToolPlugin` to reflect from errors and retry with different arguments when tool errors ([e55b894](https://github.com/google/adk-python/commit/e55b8946d6a2e01aaf018d6a79d11d13c5286152))
+  * Support using `VertexAiSearchTool` built-in tool with other tools in the same agent ([4485379](https://github.com/google/adk-python/commit/4485379a049a5c84583a43c85d444ea1f1ba6f12))
+  * Support using google search built-in tool with other tools in the same agent ([d3148da](https://github.com/google/adk-python/commit/d3148dacc97f0a9a39b6d7a9640f7b7b0d6f9a6c))
+* **[Evals]**
+  * Add HallucinationsV1 evaluation metric ([8c73d29](https://github.com/google/adk-python/commit/8c73d29c7557a75d64917ac503da519361d1d762))
+  * Add Rubric based tool use metric ([c984b9e](https://github.com/google/adk-python/commit/c984b9e5529b48fff64865a8b805e7e93942ea53))
+* **[UI]**
+  * Adds `adk web` options for custom logo ([822efe0](https://github.com/google/adk-python/commit/822efe00659607bad2d19ec9a2d14c649fca2d8d))
+* **[Observability]**
+  * **otel:** Switch CloudTraceSpanExporter to telemetry.googleapis.com ([bd76b46](https://github.com/google/adk-python/commit/bd76b46ce296409d929ae69c5c43347c73e7b365))
+
+### Bug Fixes
+
+* Adapt to new computer use tool name in genai sdk 1.41.0 ([c6dd444](https://github.com/google/adk-python/commit/c6dd444fc947571d089b784fde3a81e17b10cf28))
+* Add AuthConfig json serialization in vertex ai session service ([636def3](https://github.com/google/adk-python/commit/636def3687a85e274e3ab44d906f6d92d49e84c0))
+* Added more agent instructions for doc content changes ([7459962](https://github.com/google/adk-python/commit/745996212db156878554386be34f58658482e687))
+* Convert argument to pydantic model when tool declares it accepts pydantic model as argument ([571c802](https://github.com/google/adk-python/commit/571c802fbaa80b3e65f9ce2db772b9db5a13dbc4))
+* Do not re-create `App` object when loader returns an `App` ([d5c46e4](https://github.com/google/adk-python/commit/d5c46e496009eb55d78637f47162df7fcaf3a7ac))
+* Fix compaction logic ([3f2b457](https://github.com/google/adk-python/commit/3f2b457efd27ed47160811705e30efa6dd09d7c0))
+* Fix the instruction in workflow_triage example agent ([8f3ca03](https://github.com/google/adk-python/commit/8f3ca0359e5b1306c1395770759a74aa48a52347))
+* Fixes a bug that causes intermittent `pydantic` validation errors when uploading files ([e680063](https://github.com/google/adk-python/commit/e68006386fdd0da98feb9c3dce9322e44a9c914d))
+* Handle A2A Task Status Update Event when streaming in remote_a2a_agent ([a5cf80b](https://github.com/google/adk-python/commit/a5cf80b952887c07bb1d56b7bdec28808edcc4a9))
+* Make compactor optional in Events Compaction Config and add a default ([3f4bd67](https://github.com/google/adk-python/commit/3f4bd67b49cd60e6a2e43ccd5192efe450a6e009))
+* Rename SlidingWindowCompactor to LlmEventSummarizer and refine its docstring ([f1abdb1](https://github.com/google/adk-python/commit/f1abdb1938e474564a3a76279a1a0a511f74a750))
+* Rollback compaction handling from _get_contents ([84f2f41](https://github.com/google/adk-python/commit/84f2f417f77ead3748c5bbeac7f144164b9a9416))
+* Set `max_output_tokens` for the agent builder ([2e2d61b](https://github.com/google/adk-python/commit/2e2d61b6fecb90cd474d6f51255678ff74b67a9b))
+* Set default response modality to AUDIO in run_session ([68402bd](https://github.com/google/adk-python/commit/68402bda49083f2d56f8e8488fe13aa58b3bc18c))
+* Update remote_a2a_agent to better handle streaming events and avoid duplicate responses ([8e5f361](https://github.com/google/adk-python/commit/8e5f36126498f751171bb2639c7f5a9e7dca2558))
+* Update the load_artifacts tool so that the model can reliably call it for follow up questions about the same artifact ([238472d](https://github.com/google/adk-python/commit/238472d083b5aa67551bde733fc47826ff062679))
+* Fix VertexAiSessionService base_url override to preserve initialized http_options ([8110e41](https://github.com/google/adk-python/commit/8110e41b36cceddb8b92ba17cffaacf701706b36), [c51ea0b](https://github.com/google/adk-python/commit/c51ea0b52e63de8e43d3dccb24f9d20987784aa5))
+
+### Improvements
+
+* Migrate VertexAiSessionService to use Agent Engine SDK ([90d4c19](https://github.com/google/adk-python/commit/90d4c19c5115c7af361effa8e12c248225ccf6ab))
+* Migrate VertexAiMemoryBankService to use Agent Engine SDK ([d1efc84](https://github.com/google/adk-python/commit/d1efc8461e82fc31df940b701f1d1b5422214296), [97b950b](https://github.com/google/adk-python/commit/97b950b36b9c16467f0f42216b2dc8395346d7fe), [83fd045](https://github.com/google/adk-python/commit/83fd0457188decdabeae58b4e8be25daa89f2943))
+* Add support for resolving $ref and $defs in OpenAPI schemas ([a239716](https://github.com/google/adk-python/commit/a239716930c72a0dbd2ccabeea69be46110ca48d))
+
+### Documentation
+
+* Update BigQuery samples README ([3021266](https://github.com/google/adk-python/commit/30212669ff61f3cbd6603c3dceadfbcc4cec42f8))
+
 ## [1.15.1](https://github.com/google/adk-python/compare/v1.15.0...v1.15.1) (2025-09-26)
 
 ### Bug Fixes
@@ -10,11 +70,11 @@
 
 ### Features
 
-* [Core]
+* **[Core]**
   * Adding the ContextFilterPlugin ([a06bf27](https://github.com/google/adk-python/commit/a06bf278cbc89f521c187ed51b032d82ffdafe2d))
   * Adds plugin to save artifacts for issue [#2176](https://github.com/google/adk-python/issues/2176) ([657369c](https://github.com/google/adk-python/commit/657369cffe142ef3745cd5950d0d24a49f42f7fd))
   * Expose log probs of candidates in LlmResponse ([f7bd3c1](https://github.com/google/adk-python/commit/f7bd3c111c211e880d7c1954dd4508b952704c68))
-* [Context Caching]
+* **[Context Caching]**
   * Support context caching ([c66245a](https://github.com/google/adk-python/commit/c66245a3b80192c16cb67ee3194f82c9a7c901e5))
     - Support explicit context caching auto creation and lifecycle management.
 
@@ -29,21 +89,21 @@
 
       Usage:
       `LlmAgent(model=...,static_instruction =types.Content(parts=...), ... )`
-* [Telemetry]
+* **[Observability]**
   * Add --otel_to_cloud experimental support ([1ae0b82](https://github.com/google/adk-python/commit/1ae0b82f5602a57ad1ca975ca0b7c85003d1a28a), [b131268](https://github.com/google/adk-python/commit/b1312680f4ea9f21c3246a1d24392619643d71f5), [7870480](https://github.com/google/adk-python/commit/7870480c63bb4fc08cfb3cabc0e1f0458f0e85bd))
   * Add GenAI Instrumentation if --otel_to_cloud is enabled ([cee365a](https://github.com/google/adk-python/commit/cee365a13d0d1b1f2be046c1cc29e24a8d1fdbcc))
   * Support standard OTel env variables for exporter endpoints ([f157b2e](https://github.com/google/adk-python/commit/f157b2ee4caf4055e78f4657254e45913895f5de))
   * Temporarily disable Cloud Monitoring integration in --otel_to_cloud ([3b80337](https://github.com/google/adk-python/commit/3b80337faf427460e4743e25dbb92578f823513f))
-* [Services]
+* **[Services]**
   * Add endpoint to generate memory from session ([2595824](https://github.com/google/adk-python/commit/25958242db890b4d2aac8612f7f7cfbb561727fa))
-* [Tools]
+* **[Tools]**
   * Add Google Maps Grounding Tool to ADK ([6b49391](https://github.com/google/adk-python/commit/6b493915469ecb42068e24818ab547b0856e4709))
   * **MCP:** Initialize tool_name_prefix in MCPToolse ([86dea5b](https://github.com/google/adk-python/commit/86dea5b53ac305367283b7e353b60d0f4515be3b))
-* [Evals]
+* **[Evals]**
   * Data model for storing App Details and data model for steps ([01923a9](https://github.com/google/adk-python/commit/01923a9227895906ca8ae32712d65b178e2cd7d5))
   * Adds Rubric based final response evaluator ([5a485b0](https://github.com/google/adk-python/commit/5a485b01cd64cb49735e13ebd5e7fa3da02cd85f))
   * Populate AppDetails to each Invocation ([d486795](https://github.com/google/adk-python/commit/d48679582de91050ca9c5106402319be9a8ae7e8))
-* [Samples]
+* **[Samples]**
   * Make the bigquery sample agent run with ADC out-of-the-box ([10cf377](https://github.com/google/adk-python/commit/10cf37749417856e394e62896231e41b13420f18))
 
 ### Bug Fixes
@@ -71,22 +131,22 @@
 
 ### Features
 
-* [A2A]
+* **[A2A]**
   * Allow users to pass their own agent card to to_a2a method [a1679da](https://github.com/google/adk-python/commit/a1679dae3fef70f1231afba3e97d45b59c314ae3)
   * Allow custom part converters in A2A classes [b05fef9](https://github.com/google/adk-python/commit/b05fef9ba71f95ab2658eb4eb5608c141d49f82f)
-* [Tools]
+* **[Tools]**
   * Allow setting agent/application name and compute project for BigQuery tools [11a2ffe](https://github.com/google/adk-python/commit/11a2ffe35adbae977b49ceccf0e76e20c6dc90b6)
   * Add BigQuery forecast tool [0935a40](https://github.com/google/adk-python/commit/0935a40011a3276ee7f7fa3b91678b4d63f22ba5)
   * Add GkeCodeExecutor for sandboxed code execution on GKE [72ff9c6](https://github.com/google/adk-python/commit/72ff9c64a291aebb50b07446378f375e58882c4e)
   * Add a tool confirmation flow that can guard tool execution with explicit confirmation and custom input [a17bcbb](https://github.com/google/adk-python/commit/a17bcbb2aa0f5c6aca460db96ed1cb7dd86fef84)
   * Add audience and prompt as configurable for OAuth flows [edda922](https://github.com/google/adk-python/commit/edda922791f15ac37830ed95ebf76b9f836d9db4)
   * Allow user specify embedding model for file retrieval [67f23df](https://github.com/google/adk-python/commit/67f23df25ad47aff3cb36d0fc9ce2c9b97bde09b)
-* [Core]
+* **[Core]**
   * Allow all possible values for `agent_class` field in all Agent Configs [3bc2d77](https://github.com/google/adk-python/commit/3bc2d77b4d180e9c42b30d4d1ce580aa75abe501)
   * Allow agent loader to load built-in agents from special directories in adk folder [578fad7](https://github.com/google/adk-python/commit/578fad7034a7b369a490ad0afa4dd2820463c22d)
   * Upgrade ADK runner to use App in addition to root_agent [4df79dd](https://github.com/google/adk-python/commit/4df79dd5c92d96096d031b26470458d0bca79a79)
   * Allow inject artifact into instructions [bb4cfde](https://github.com/google/adk-python/commit/bb4cfdec12370955d4038d6d8c86e04691f2308e)
-* [Misc] Create an initial ADK release analyzer agent to find the doc updates needed between releases [e3422c6](https://github.com/google/adk-python/commit/e3422c616d18ec3850454ee83f2ef286198543ec)
+* **[Misc]** Create an initial ADK release analyzer agent to find the doc updates needed between releases [e3422c6](https://github.com/google/adk-python/commit/e3422c616d18ec3850454ee83f2ef286198543ec)
 
 ### Bug Fixes
 

contributing/samples/adk_agent_builder_assistant/agent_builder_assistant.py

@@ -34,7 +34,6 @@
 from .tools.explore_project import explore_project
 from .tools.read_config_files import read_config_files
 from .tools.read_files import read_files
-from .tools.resolve_root_directory import resolve_root_directory
 from .tools.search_adk_source import search_adk_source
 from .tools.write_config_files import write_config_files
 from .tools.write_files import write_files
@@ -60,9 +59,7 @@ def create_agent(
       Configured LlmAgent with embedded ADK AgentConfig schema
     """
     # Load full ADK AgentConfig schema directly into instruction context
-    instruction = AgentBuilderAssistant._load_instruction_with_schema(
-        model, working_directory
-    )
+    instruction = AgentBuilderAssistant._load_instruction_with_schema(model)
 
     # TOOL ARCHITECTURE: Hybrid approach using both AgentTools and FunctionTools
     #
@@ -95,8 +92,6 @@ def create_agent(
             write_config_files
         ),  # Write/validate multiple YAML configs
         FunctionTool(explore_project),  # Analyze project structure
-        # Working directory context tools
-        FunctionTool(resolve_root_directory),
         # File management tools (multi-file support)
         FunctionTool(read_files),  # Read multiple files
         FunctionTool(write_files),  # Write multiple files
@@ -135,7 +130,6 @@ def _load_schema() -> str:
     # ADK AgentConfig schema loading with caching and error handling.
     schema_content = load_agent_config_schema(
         raw_format=True,  # Get as JSON string
-        escape_braces=True,  # Escape braces for template embedding
     )
 
     # Format as indented code block for instruction embedding
@@ -157,7 +151,6 @@ def _load_schema() -> str:
   @staticmethod
   def _load_instruction_with_schema(
       model: Union[str, BaseLlm],
-      working_directory: Optional[str] = None,
   ) -> Callable[[ReadonlyContext], str]:
     """Load instruction template and embed ADK AgentConfig schema content."""
     instruction_template = (
@@ -172,19 +165,43 @@ def _load_instruction_with_schema(
         else getattr(model, "model_name", str(model))
     )
 
-    # Fill the instruction template with ADK AgentConfig schema content and default model
-    instruction_text = instruction_template.format(
-        schema_content=schema_content, default_model=model_str
-    )
-
     # Return a function that accepts ReadonlyContext and returns the instruction
     def instruction_provider(context: ReadonlyContext) -> str:
-      return AgentBuilderAssistant._compile_instruction_with_context(
-          instruction_text, context, working_directory
+      # Extract project folder name from session state
+      project_folder_name = AgentBuilderAssistant._extract_project_folder_name(
+          context
       )
 
+      # Fill the instruction template with all variables
+      instruction_text = instruction_template.format(
+          schema_content=schema_content,
+          default_model=model_str,
+          project_folder_name=project_folder_name,
+      )
+      return instruction_text
+
     return instruction_provider
 
+  @staticmethod
+  def _extract_project_folder_name(context: ReadonlyContext) -> str:
+    """Extract project folder name from session state using resolve_file_path."""
+    from .utils.resolve_root_directory import resolve_file_path
+
+    session_state = context._invocation_context.session.state
+
+    # Use resolve_file_path to get the full resolved path for "."
+    # This handles all the root_directory resolution logic consistently
+    resolved_path = resolve_file_path(".", session_state)
+
+    # Extract the project folder name from the resolved path
+    project_folder_name = resolved_path.name
+
+    # Fallback to "project" if we somehow get an empty name
+    if not project_folder_name:
+      project_folder_name = "project"
+
+    return project_folder_name
+
   @staticmethod
   def _load_embedded_schema_instruction_template() -> str:
     """Load instruction template for embedded ADK AgentConfig schema mode."""
@@ -197,70 +214,3 @@ def _load_embedded_schema_instruction_template() -> str:
 
     with open(template_path, "r", encoding="utf-8") as f:
       return f.read()
-
-  @staticmethod
-  def _compile_instruction_with_context(
-      instruction_text: str,
-      context: ReadonlyContext,
-      working_directory: Optional[str] = None,
-  ) -> str:
-    """Compile instruction with session context and working directory information.
-
-    This method enhances instructions with:
-    1. Working directory information for path resolution
-    2. Session-based root directory binding if available
-
-    Args:
-      instruction_text: Base instruction text
-      context: ReadonlyContext from the agent session
-      working_directory: Optional working directory for path resolution
-
-    Returns:
-      Enhanced instruction text with context information
-    """
-    import os
-
-    # Get working directory (use provided or current working directory)
-    actual_working_dir = working_directory or os.getcwd()
-
-    # Check for existing root directory in session state
-    session_root_directory = context._invocation_context.session.state.get(
-        "root_directory"
-    )
-
-    # Compile additional context information
-    context_info = f"""
-
-## SESSION CONTEXT
-
-**Working Directory**: `{actual_working_dir}`
-- Use this as the base directory for path resolution when calling resolve_root_directory
-- Pass this as the working_directory parameter to resolve_root_directory tool
-
-"""
-
-    if session_root_directory:
-      context_info += f"""**Established Root Directory**: `{session_root_directory}`
-- This session is bound to root directory: {session_root_directory}
-- DO NOT ask the user for root directory - use this established path
-- All agent building should happen within this root directory
-- If user wants to work in a different directory, ask them to start a new chat session
-
-"""
-    else:
-      context_info += f"""**Root Directory**: Not yet established
-- You MUST ask the user for their desired root directory first
-- Use resolve_root_directory tool to validate the path
-- Once confirmed, this session will be bound to that root directory
-
-"""
-
-    context_info += """**Session Binding Rules**:
-- Each chat session is bound to ONE root directory
-- Once established, work only within that root directory
-- To switch directories, user must start a new chat session
-- Always verify paths using resolve_root_directory tool before creating files
-
-"""
-
-    return instruction_text + context_info