Skip to content

upstream merge#3

Merged
Sandeep-BA merged 50 commits into
redbus-labs:mainfrom
google:main
Jan 24, 2026
Merged

upstream merge#3
Sandeep-BA merged 50 commits into
redbus-labs:mainfrom
google:main

Conversation

@Sandeep-BA
Copy link
Copy Markdown

@Sandeep-BA Sandeep-BA commented Jan 23, 2026

Please ensure you have read the contribution guide before creating a pull request.

Link to Issue or Description of Change

1. Link to an existing issue (if applicable):

  • Closes: #issue_number
  • Related: #issue_number

2. Or, if no issue exists, describe the change:

If applicable, please follow the issue templates to provide as much detail as
possible.

Problem:
A clear and concise description of what the problem is.

Solution:
A clear and concise description of what you want to happen and why you choose
this solution.

Testing Plan

Please describe the tests that you ran to verify your changes. This is required
for all PRs that are not small documentation or typo fixes.

Unit Tests:

  • I have added or updated unit tests for my change.
  • All unit tests pass locally.

Please include a summary of passed pytest results.

Manual End-to-End (E2E) Tests:

Please provide instructions on how to manually test your changes, including any
necessary setup or configuration. Please provide logs or screenshots to help
reviewers better understand the fix.

Checklist

  • I have read the CONTRIBUTING.md document.
  • I have performed a self-review of my own code.
  • I have commented my code, particularly in hard-to-understand areas.
  • I have added tests that prove my fix is effective or that my feature works.
  • New and existing unit tests pass locally with my changes.
  • I have manually tested my changes end-to-end.
  • Any dependent changes have been merged and published in downstream modules.

Additional context

Add any other context or screenshots about the feature request here.

google-genai-bot and others added 30 commits January 16, 2026 08:27
@google-genai-bot @copybara-github
feat: migrate ToolboxToolset to use toolbox-adk and align validation
7dc6adf 
### Description of Change

**Problem:**
The `ToolboxToolset` was relying on the legacy `toolbox-core` package. Users wanting to use the Toolbox features were forced to install the heavy `[extensions]` group, lacking a granular installation option. Additionally, `ToolboxToolset` had a validation check enforcing either `toolset_name` or `tool_names` to be present, preventing the default behavior of loading all tools (which `toolbox-adk` supports).

**Solution:**
* Refactored `ToolboxToolset` to delegate to `toolbox-adk`.
* Added a new `toolbox` optional dependency group in `pyproject.toml`.
  * Users can now run `pip install google-adk[toolbox]` to install only the necessary dependencies.
* Updated the `extensions` dependency group to replace `toolbox-core` with `toolbox-adk`.
  * This ensures existing users of `[extensions]` are not broken upon upgrade.
* Removed the restrictive validation check to allow default loading of all tools.
* Updated the `ImportError` message to guide users toward the new granular installation command.

### Testing Plan

**Unit Tests:**
- [x] I have added or updated unit tests for my change.
- [x] All unit tests pass locally.

**Manual End-to-End (E2E) Tests:**
- Verified that the sample agent runs correctly with `toolbox-adk` locally.
- Verified that `ToolboxToolset` can now be instantiated without arguments to load all tools.

### Checklist

- [x] I have read the [CONTRIBUTING.md](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) document.
- [x] I have performed a self-review of my own code.
- [x] I have commented my code, particularly in hard-to-understand areas.
- [x] I have added tests that prove my fix is effective or that my feature works.
- [x] New and existing unit tests pass locally with my changes.
- [x] I have manually tested my changes end-to-end.
- [x] Any dependent changes have been merged and published in downstream modules.

PiperOrigin-RevId: 857171811
@google-genai-bot @copybara-github
fix: Make all parts of a thought event be marked as thought
f92d4e3 
PiperOrigin-RevId: 857218905
@peterkaplan @copybara-github
feat: Add is_computer_use field to agent information in adk-web server
5923da7 
PiperOrigin-RevId: 857218915
@jcpagadora737 @copybara-github
feat: Update adk eval cli to consume custom metrics by adding CustomM…
ea0934b 
…etricEvaluator

Co-authored-by: Joseph Pagadora <jcpagadora@google.com>
PiperOrigin-RevId: 857229167
@ankursharmas @copybara-github
chore: Making the regex to catch cli reference strict by adding word …
c222a45 
…boundary anchor

Right now the regex is over-matching and is returning true for references like these:
from ..utils._client_labels_utils import EVAL_CLIENT_LABEL

Co-authored-by: Ankur Sharma <ankusharma@google.com>
PiperOrigin-RevId: 857255767
@ShaharKatz @ankursharmas
Handle None inferences in eval results for issue #2729 (#3805)
7d4326c 
* fixed CR comments

* formatted via isort

---------

Co-authored-by: Ankur <ankusharma@google.com>
@google-genai-bot @copybara-github
fix: Remove custom metadata from A2A response events
81eaeb5 
PiperOrigin-RevId: 857331378
@seanzhougoogle @copybara-github
chore: Update sample live streaming tools agent to use latest live mo…
3dd7e3f 
…dels

Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com>
PiperOrigin-RevId: 858001541
@wuliang229 @copybara-github
fix: Handle async driver URLs in migration tool
4b29d15 
The migration tool uses synchronous SQLAlchemy engines but users often provide async driver URLs (e.g., postgresql+asyncpg://) since that's what ADK requires at runtime.

This fix:
- Makes `to_sync_url()` public in `_schema_check_utils.py` for reuse
- Updates `migrate_from_sqlalchemy_pickle.py` to convert async URLs
- Updates `migrate_from_sqlalchemy_sqlite.py` to convert async URLs
- Adds comprehensive unit tests for `to_sync_url()` function
- Adds integration test for migration with async driver URLs

Fixes #4176

Co-authored-by: Liang Wu <wuliang@google.com>
PiperOrigin-RevId: 858359061
@xuanyang15 @copybara-github
feat: Use json schema for base_retrieval_tool, `load_artifacts_tool…
69ad605 
…`, and `load_memory_tool` declaration when feature enabled

Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 858435881
@wikaaaaa @copybara-github
feat(cli): add otel_to_cloud flag to adk deploy agent_engine command
21f63f6 
Co-authored-by: Wiktoria Walczak <wwalczak@google.com>
PiperOrigin-RevId: 858546581
@xuanyang15 @copybara-github
feat: Add --disable_features CLI option to ADK CLI
53b67ce 
This flag can be used to override default feature enable state.

Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 858659818
@GWeale @copybara-github
fix: Redact sensitive information from URIs in logs
5257869 
This change introduces a helper function `_redact_uri_for_log` to sanitize URIs before logging. It removes user credentials from the netloc and redacts the values of query parameters, ensuring that sensitive information like passwords is not exposed in log outputs. The function is applied to all log statements and error messages that include service URIs for session, memory, and artifact services

Co-authored-by: George Weale <gweale@google.com>
PiperOrigin-RevId: 858703465
@lushasummer @copybara-github
feat: Remove @experimental decorator from AgentEngineSandboxCodeExecutor
135f763 
Co-authored-by: Lusha Wang <lusha@google.com>
PiperOrigin-RevId: 858706929
@GWeale @copybara-github
fix: Set LITELLM_MODE to PRODUCTION before importing LiteLLM
215c2f5 
LiteLLM defaults to DEV mode, which automatically loads environment variables from a local `.env` file. This change sets LITELLM_MODE to PRODUCTION to prevent LiteLLM from implicitly loading `.env` files when used within ADK.

Co-authored-by: George Weale <gweale@google.com>
PiperOrigin-RevId: 858723362
@GWeale @copybara-github
fix: Update dependency versions in pyproject.toml
7955177 
Bump authlib to >=1.6.6 and mcp to >=1.23.0.

Co-authored-by: George Weale <gweale@google.com>
PiperOrigin-RevId: 858728187
@didier-durand @copybara-github
chore: fixing various typos
a8f2ddd 
Merge #4175

### Link to Issue or Description of Change

**1. Link to an existing issue (if applicable):**

N/A: just fixing typos discovered while reading the repo

**2. Or, if no issue exists, describe the change:**

No code change, just typo fixes: see commit diffs for all details

**Problem:**

Trying to improve overall repo quality

**Solution:**

Fixing typos as they get discovered

### Testing Plan

N/A

**Unit Tests:**

N/A

**Manual End-to-End (E2E) Tests:**

N/A

### Checklist

- [X] I have read the [CONTRIBUTING.md](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) document.
- [X] I have performed a self-review of my own code.
- [ ] I have commented my code, particularly in hard-to-understand areas.
- [ ] I have added tests that prove my fix is effective or that my feature works.
- [X] New and existing unit tests pass locally with my changes.
- [ ] I have manually tested my changes end-to-end.
- [ ] Any dependent changes have been merged and published in downstream modules.

COPYBARA_INTEGRATE_REVIEW=#4175 from didier-durand:fix-typos-c 16e93ed
PiperOrigin-RevId: 858751240
@GWeale @copybara-github
chore: Upgrade to headers to 2026
2367901 
Co-authored-by: George Weale <gweale@google.com>
PiperOrigin-RevId: 858763407
@seanzhougoogle @copybara-github
chore: Update the comments of request confirmation preprocessor
1699b09 
Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com>
PiperOrigin-RevId: 858816547
@Jacksunwei @copybara-github
docs: Switches to gemini 2.5 flash for two samples
645bd0e 
Co-authored-by: Wei Sun (Jack) <weisun@google.com>
PiperOrigin-RevId: 858826742
@google-genai-bot @copybara-github
refactor(plugins)!: use OpenTelemetry for BigQuery plugin tracing
ab89d12 
This refactors the BigQueryAgentAnalyticsPlugin to use the standard OpenTelemetry API for trace and span ID generation and propagation, replacing the custom ContextVar implementation.

Key changes:
- Utilizes `opentelemetry.trace` for starting/ending spans.
- Correctly uses `opentelemetry.context` for context attachment and detachment.
- Span information is now derived from the OpenTelemetry context when available.
- Added a fallback mechanism to ensure span_id and parent_span_id are still populated if the OpenTelemetry SDK is not initialized.

To get standard OpenTelemetry trace information in BigQuery logs, users should install `opentelemetry-sdk` and initialize a global `TracerProvider` in their application *before* initializing ADK components.

Example minimal initialization:
```python
# Install: pip install opentelemetry-sdk
from opentelemetry import trace
from opentelemetry.sdk.trace import TracerProvider
trace.set_tracer_provider(TracerProvider())
```

PiperOrigin-RevId: 858965562
@wukath @copybara-github
docs: Update to gemini-2.5-flash for api registry and mcp sample agents
910f654 
Co-authored-by: Kathy Wu <wukathy@google.com>
PiperOrigin-RevId: 859151854
@google-genai-bot @copybara-github
fix(runner): Yield buffered function_call/function_response events du…
7b25b8f 
…ring live streaming

Bug: In live streaming mode, when function_call and function_response events
arrive during active transcription, they are correctly buffered but never
yielded to the caller. This causes callers to miss these events even though
they are saved to the session.

Fix: Add yield buffered_event after appending buffered events to the session
when transcription ends.

Testing:
- Added unit test: test_live_streaming_buffered_function_call_yielded_during_transcription
- Test verifies buffered events are yielded by:
  1. Simulating partial transcription (triggers buffering)
  2. Sending function_call during transcription (gets buffered)
  3. Ending transcription (should yield buffered events)
  4. Asserting both function_call and function_response are in yielded events

Test results:
- With fix: PASSED
- Without fix (yield commented out): FAILED with "Buffered function_call event was not yielded"
- Example event flow after fix:
EVENT: partial=True, input_transcription="Show me the weather"
EVENT: function_call=get_weather, args={'location': 'NYC'} <- Now yielded
EVENT: function_response=get_weather, response={...} <- Now yielded
EVENT: partial=False, input_transcription="Show me the weather for today"
PiperOrigin-RevId: 859158546
@xuanyang15 @copybara-github
chore: Always skip executing partial function calls
d62f9c8 
Related: #4159

Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 859184844
@seanzhougoogle @copybara-github
feat: Support authentication for MCP tool listing
e3d542a 
Currently only tool calling supports MCP auth. This refactors the auth logic into a auth_utils file and uses it for tool listing as well. Fixes #2168.

Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com>
PiperOrigin-RevId: 859201722
@didier-durand @copybara-github
docs: Fix various typos
5d94146 
Merge #4186

COPYBARA_INTEGRATE_REVIEW=#4186 from didier-durand:main f8a52b5
PiperOrigin-RevId: 859203551
@seanzhougoogle @copybara-github
feat: Persist user input content to session in live mode
a04828d 
Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com>
PiperOrigin-RevId: 859207592
@wuliang229 @copybara-github
chore: Pin litellm dependency to versions below 1.81.0
3e3566b 
Update the litellm version constraint in both project dependencies and dev dependencies to exclude versions 1.81.0 and higher because unit test breakages in GitHub actions introduced by it.

This is a stopgap before the actual fix is added. Close #4225

Co-authored-by: Liang Wu <wuliang@google.com>
PiperOrigin-RevId: 859239880
@google-genai-bot @copybara-github
feat(plugins): Add flush mechanism to BigQueryAgentAnalyticsPlugin
9579bea 
This change introduces a `flush` method to the `BigQueryAgentAnalyticsPlugin`. This ensures that all pending log events are written to BigQuery before the agent's run completes.

Key changes:

- Added `flush()` method to `BigQueryAgentAnalyticsPlugin` to force write of pending events.

PiperOrigin-RevId: 859263853
@lwangverizon @wukath @copybara-github
feat: Allow google search tool to set different model
b57a3d4 
Merge #4136

**Please ensure you have read the [contribution guide](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) before creating a pull request.**

### Link to Issue or Description of Change

**1. Link to an existing issue (if applicable):**

Allow google search tool to set different model #4135

**2. Or, if no issue exists, describe the change:**

_If applicable, please follow the issue templates to provide as much detail as
possible._

**Problem:**
Currently, the Google Search tool inherits and uses the same LLM model set from the parent agent for processing and summarizing search results. This creates a limitation for users who wish to decouple the agent's reasoning model from the model used for search summarization (e.g., for cost optimization or using a lightweight model for simpler summarization tasks).

**Solution:**
I have updated the Google Search tool to accept an optional LLM model parameter.
Custom Model: Users can now explicitly specify which model should be used for processing search results.
Default Behavior: If no model is specified, the tool defaults to the parent agent's model, ensuring backward compatibility.

```
    # If a custom model is specified, use it instead of the original model
    if self.model is not None:
      llm_request.model = self.model
```

### Testing Plan

Added a new test case test_process_llm_request_with_custom_model in [test_google_search_tool.py] that verifies:

When a custom model parameter is provided to GoogleSearchTool, it overrides the model from the incoming llm_request during process_llm_request
The tool correctly uses the custom model for LLM calls while maintaining other request parameters

**Unit Tests:**

- [X] I have added or updated unit tests for my change.
- [X] All unit tests pass locally.

(base) wanglu2:adk-python/ (feature/allow-google-search-tool-set-different-llm✗) $ uv run pytest ./tests/unittests/tools/test_google_search_tool.py       [22:07:32]
======================================================================== test session starts ========================================================================
platform darwin -- Python 3.13.1, pytest-9.0.2, pluggy-1.6.0
rootdir: /Users/wanglu2/Documents/Git/adk-python
configfile: pyproject.toml
plugins: mock-3.15.1, anyio-4.12.0, xdist-3.8.0, asyncio-1.3.0, langsmith-0.6.0
asyncio: mode=Mode.AUTO, debug=False, asyncio_default_fixture_loop_scope=function, asyncio_default_test_loop_scope=function
collected 21 items

tests/unittests/tools/test_google_search_tool.py .....................                                                                                        [100%]

======================================================================== 21 passed in 7.91s =========================================================================

### Checklist

- [X] I have read the [CONTRIBUTING.md](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) document.
- [X] I have performed a self-review of my own code.
- [X] I have commented my code, particularly in hard-to-understand areas.
- [X] I have added tests that prove my fix is effective or that my feature works.
- [X] New and existing unit tests pass locally with my changes.
- [X] I have manually tested my changes end-to-end.
- [ ] Any dependent changes have been merged and published in downstream modules.

### Additional context

Co-authored-by: Kathy Wu <wukathy@google.com>
COPYBARA_INTEGRATE_REVIEW=#4136 from lwangverizon:feature/allow-google-search-tool-set-different-llm 239ea95
PiperOrigin-RevId: 859265757
DeanChensj and others added 20 commits January 21, 2026 16:55
@DeanChensj @copybara-github
chore: Filter out adk_request_input event from content list
295b345 
Co-authored-by: Shangjie Chen <deanchen@google.com>
PiperOrigin-RevId: 859321034
@didier-durand @copybara-github
docs: fixing multiple typos
91ec80c 
Merge #4221

### Link to Issue or Description of Change

N/A

**2. Or, if no issue exists, describe the change:**

Fixing various typos in .py files to improve quality: see commit diffs for details

**Problem:**

See above

**Solution:**
Fixing the typos

### Testing Plan

N/A

**Unit Tests:**

N/A

**Manual End-to-End (E2E) Tests:**

N/A

### Checklist

- [X] I have read the [CONTRIBUTING.md](https://github.com/google/adk-python/blob/main/CONTRIBUTING.md) document.
- [X] I have performed a self-review of my own code.
- [N/A] I have commented my code, particularly in hard-to-understand areas.
- [N/A ] I have added tests that prove my fix is effective or that my feature works.
- [N/A] New and existing unit tests pass locally with my changes.
- [N/A] I have manually tested my changes end-to-end.
- [N/A ] Any dependent changes have been merged and published in downstream modules.

### Additional context

N/A

COPYBARA_INTEGRATE_REVIEW=#4221 from didier-durand:fix-typos-e 1bcc8e0
PiperOrigin-RevId: 859332402
@wuliang229 @copybara-github
chore: Pin litellm dependency to versions below 1.80.17
3d96b78 
This is a stopgap before the actual fix is added for 1.80.17+.

Co-authored-by: Liang Wu <wuliang@google.com>
PiperOrigin-RevId: 859351463
@xuanyang15 @copybara-github
fix: recursively extract input/output schema for AgentTool
bf2b56d 
Fixes: #4154

Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 859440231
@google-genai-bot @copybara-github
feat: add new conversational analytics api tool set
82fa10b 
PiperOrigin-RevId: 859449435
@RKest @copybara-github
feat(otel): add minimal generate_content {model.name} spans and log…
935c279 
…s for non-gemini inference and when `opentelemetry-inference-google-genai` dependency is missing

Co-authored-by: Max Ind <maxind@google.com>
PiperOrigin-RevId: 859667045
@xuanyang15 @copybara-github
chore: minor fix for DebugLoggingPlugin example
3f1b0d0 
Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 859762221
@wukath @copybara-github
chore: Bumps version to v1.23.0 and updates CHANGELOG.md
7cf1e44 
Co-authored-by: Kathy Wu <wukathy@google.com>
PiperOrigin-RevId: 859790616
@RKest @copybara-github
fix: remove print debugging artifact
0d38a36 
Co-authored-by: Max Ind <maxind@google.com>
PiperOrigin-RevId: 860038888
@google-genai-bot @copybara-github
docs: update data agent README to match the behavior
7edfb27 
PiperOrigin-RevId: 860180180
@DeanChensj @copybara-github
fix: Add pypika>=0.50.0 to project.toml since crewai depends on it an…
e8f7aa3 
…d the default version does not work with py 3.12+

Co-authored-by: Shangjie Chen <deanchen@google.com>
PiperOrigin-RevId: 860181604
@xuanyang15 @copybara-github
docs: Fix ADK release analyzer agent for large releases
83c24d2 
Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 860187312
@wukath @copybara-github
docs: Move mcp session feature out of breaking changes
316463b 
Co-authored-by: Kathy Wu <wukathy@google.com>
PiperOrigin-RevId: 860199237
@google-genai-bot @copybara-github
feat: Refine Feature Request Issue Template
2380afd 
This change updates the feature request issue template to include required and recommended sections. New questions are added to gather more details on the problem, impact, willingness to contribute, and potential API/implementation ideas. Existing questions are rephrased for clarity

PiperOrigin-RevId: 860199885
@seanzhougoogle @copybara-github
refactor: Extract helper function for llm request building and respon…
753084f 
…se processing

Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com>
PiperOrigin-RevId: 860212868
@wuliang229 @copybara-github
chore: Add unittests.sh script and update CONTRIBUTING.md
025b42c 
This change introduces a new `unittests.sh` script to simplify running unit tests. The script automatically sets up a minimal test environment, runs `pytest`, and then restores the previous development environment. The CONTRIBUTING.md has been updated to include instructions on using this new script.

Co-authored-by: Liang Wu <wuliang@google.com>
PiperOrigin-RevId: 860222798
@GWeale @copybara-github
fix: fix agent config path handling in generated deployment script
8012339 
The generated agent deployment script now uses os.path.join and os.path.dirname(__file__) to construct the path to root_agent.yaml. This prevents issues where backslashes in Windows paths could be misinterpreted as Python escape sequences within the f-string, leading to syntax error

Close #4223

Co-authored-by: George Weale <gweale@google.com>
PiperOrigin-RevId: 860236820
@seanzhougoogle @copybara-github
feat: Support run tools in separate thread for live mode
714c3ad 
Co-authored-by: Xiang (Sean) Zhou <seanzhougoogle@google.com>
PiperOrigin-RevId: 860242861
@xuanyang15 @copybara-github
fix: Do not treat FCs and FRs as invisible when marked as thoughts
853a3b0 
Related: #4159

Co-authored-by: Xuan Yang <xygoogle@google.com>
PiperOrigin-RevId: 860254198
@google-genai-bot @copybara-github
feat: This change restructures the bug report template as per intake …
324796b 
…process

PiperOrigin-RevId: 860304319
@Sandeep-BA Sandeep-BA merged commit 6e45e77 into redbus-labs:main Jan 24, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.