Feat/expose mcps streamable http custom httpx factory parameter #2997

mikeedjones · 2025-09-22T17:35:37Z

This PR addresses #3005 and #2963 to allow control over the ssl cert used when connecting to an mcp server by exposing the httpx_client_factory parameter exposed when creating a MCPSessionManager in adk. Overlaps with #2966 but I don't believe that that PR's implementation will work. streamablehttp_client needs a client factory, not a client.

testing plan

Adds test checking that streamablehttp_client uses the custom httpx factory. Could also test that a factory which obeys the McpHttpClientFactory protocol produces valid behavior when the session is opened?

related issues

#2227 and #2881 both request slightly different options to control the ssl certs used internally by adk. I think exposing a httpx factory is a good pattern which could be followed for those issues too.

google-cla · 2025-09-22T17:35:41Z

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

gemini-code-assist · 2025-09-22T17:35:53Z

Summary of Changes

Hello @mikeedjones, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request introduces a significant enhancement to the MCPSessionManager by enabling the injection of a custom httpx_client_factory. This allows developers to fully customize the underlying HTTP client used for interactions with MCP servers, providing flexibility for advanced configurations such as specific SSL certificate management or proxy settings, thereby addressing existing requests for more control over internal ADK HTTP client behavior.

Highlights

Custom HTTP Client Factory Exposure: The MCPSessionManager now exposes an httpx_client_factory parameter, allowing users to provide a custom factory for creating httpx clients.
Enhanced HTTP Client Control: This change provides more granular control over the HTTP client used for connecting to MCP servers, addressing needs like custom SSL certificate handling or other advanced HTTP client configurations.
New Test Coverage: A new test case has been added to ensure that the custom httpx_client_factory is correctly invoked when initializing an MCPSessionManager.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

adk-bot · 2025-09-22T17:36:52Z

Response from ADK Triaging Agent

Hello @mikeedjones, thank you for your contribution!

To help our reviewers, could you please add a testing plan section to your PR description? This section should briefly describe how you've tested the changes.

You can find more details in our contribution guidelines. Thanks!

gemini-code-assist

Code Review

This pull request successfully exposes the httpx_client_factory parameter for StreamableHTTPConnectionParams, allowing for greater control over the internal httpx client. The implementation is clean and the inclusion of a test case is appreciated. I've provided a couple of minor suggestions to improve code style and align the new test with unit testing best practices.

src/google/adk/tools/mcp_tool/mcp_session_manager.py

tests/unittests/tools/mcp_tool/test_mcp_session_manager.py

…nnectionParams

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

…x-factory-parameter

…y attribute

… test_init_with_streamable_http_default_httpx_factory for clarity

…x-factory-parameter

calvinbrown085 · 2025-10-06T12:20:37Z

@mikeedjones Thanks for opening this! I'm going to close mine as this seems like a better implementation.

…x-factory-parameter

wukath

Thanks!

…x-factory-parameter

mikeedjones · 2025-10-29T09:38:38Z

Re-merged primary! If you could re-review please. Thank you!

mikeedjones · 2025-10-29T18:51:42Z

@seanzhou1023 Would it be possible to get this PR reviews and merged please? Cheers!

dongyuj1

LGMT, wait for Sean's approve

wukath · 2025-11-14T22:25:21Z

it seems like some of the unit tests are not passing @mikeedjones, could you check?

…x-factory-parameter

mikeedjones · 2025-11-16T20:56:02Z

Hi @wukath, the unittests are passing locally with the same versions of Python (3.13.9), pytest (9.0.1), and pluggy (1.6.0) as used in the 3.13 workflow and Python 3.11.14, pytest-8.4.2, pluggy-1.6.0 as used in the 3.11 workflow and I've not been able to reproduce the collection error.

It looks like the error was a consequence of the same issue fixed by 7b87056 which was added after the version of main I had merged in. I've merged latest main in too so my branch should also be fixed as well. Thank you!

…x-factory-parameter

mikeedjones · 2025-11-20T09:48:43Z

@wukath This PR was revered by e15e19d - not sure if that was deliberate from maxind@google.com. Have opened #3634

…le#2997) * feat: Add support for custom HTTPX client factory in StreamableHTTPConnectionParams * Update src/google/adk/tools/mcp_tool/mcp_session_manager.py Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> * unit tested mock * provide default - httpx client factory can't be none * feat: Enhance StreamableHTTPConnectionParams with httpx_client_factory attribute * fmt * fmt * refactor: Rename test_init_with_streamable_http_none_httpx_factory to test_init_with_streamable_http_default_httpx_factory for clarity * isort * fmt --------- Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com> Co-authored-by: Kathy Wu <108756731+wukath@users.noreply.github.com>

Merge #3634 Reopen of #2997 after the accepted changes in that PR were reverted by e15e19d --- This PR addresses #3005 and #2963 to allow control over the ssl cert used when connecting to an mcp server by exposing the `httpx_client_factory` parameter exposed when creating a `MCPSessionManager` in adk. Overlaps with #2966 but I don't believe that that PR's implementation will work. `streamablehttp_client` needs a client factory, not a client. ## testing plan Adds test checking that `streamablehttp_client` uses the custom httpx factory. Could also test that a factory which obeys the `McpHttpClientFactory` protocol produces valid behavior when the session is opened? ## related issues #2227 and #2881 both request _slightly different_ options to control the ssl certs used internally by adk. I think exposing a httpx factory is a good pattern which could be followed for those issues too. Co-authored-by: Kathy Wu <wukathy@google.com> COPYBARA_INTEGRATE_REVIEW=#3634 from mikeedjones:feat/expose-mcps-streamable-http-custom-httpx-factory-parameter 1017a98 PiperOrigin-RevId: 852443631

adk-bot added bot triaged mcp [Component] Issues about MCP support labels Sep 22, 2025

adk-bot requested a review from seanzhou1023 September 22, 2025 17:36

gemini-code-assist bot reviewed Sep 22, 2025

View reviewed changes

src/google/adk/tools/mcp_tool/mcp_session_manager.py Outdated Show resolved Hide resolved

tests/unittests/tools/mcp_tool/test_mcp_session_manager.py Outdated Show resolved Hide resolved

mikeedjones force-pushed the feat/expose-mcps-streamable-http-custom-httpx-factory-parameter branch from 5b70475 to 8ab74cc Compare September 22, 2025 17:42

mikeedjones and others added 3 commits September 23, 2025 09:18

feat: Add support for custom HTTPX client factory in StreamableHTTPCo…

eb4c887

…nnectionParams

Update src/google/adk/tools/mcp_tool/mcp_session_manager.py

ee16c0e

Co-authored-by: gemini-code-assist[bot] <176961590+gemini-code-assist[bot]@users.noreply.github.com>

unit tested mock

a1fcb65

mikeedjones force-pushed the feat/expose-mcps-streamable-http-custom-httpx-factory-parameter branch from 8ab74cc to a1fcb65 Compare September 23, 2025 08:19

mikeedjones added 12 commits September 23, 2025 09:34

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

0299573

…x-factory-parameter

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

c67c171

…x-factory-parameter

provide default - httpx client factory can't be none

cdedb04

feat: Enhance StreamableHTTPConnectionParams with httpx_client_factor…

4ce2156

…y attribute

fmt

3d7dd6f

fmt

f5f6a24

refactor: Rename test_init_with_streamable_http_none_httpx_factory to…

bae0d91

… test_init_with_streamable_http_default_httpx_factory for clarity

isort

a1c8f82

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

8c50b94

…x-factory-parameter

fmt

88bdeb8

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

0518965

…x-factory-parameter

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

d169584

…x-factory-parameter

boyangsvl removed the bot triaged label Oct 8, 2025

mikeedjones added 2 commits October 9, 2025 16:26

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

c02bba1

…x-factory-parameter

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

fb4eed3

…x-factory-parameter

wukath approved these changes Oct 28, 2025

View reviewed changes

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

a0489db

…x-factory-parameter

mikeedjones requested a review from wukath October 29, 2025 09:38

wukath approved these changes Oct 29, 2025

View reviewed changes

dongyuj1 approved these changes Oct 31, 2025

View reviewed changes

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

59e93cf

…x-factory-parameter

mikeedjones requested a review from wukath November 16, 2025 21:11

wukath added 2 commits November 17, 2025 16:56

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

e3c9c81

…x-factory-parameter

Merge branch 'main' into feat/expose-mcps-streamable-http-custom-http…

c283fe8

…x-factory-parameter

wukath merged commit 0cc3d6d into google:main Nov 18, 2025
10 checks passed

wukath added the ready to pull [Status] This PR is ready to be importing back to Google label Nov 18, 2025

mikeedjones mentioned this pull request Nov 20, 2025

Feat/expose mcps streamable http custom httpx factory parameter #3634

Closed

wukath mentioned this pull request Jan 14, 2026

Pass Httpx Auth with token provider to MCPSessionManager #2759

Closed

Feat/expose mcps streamable http custom httpx factory parameter #2997

Feat/expose mcps streamable http custom httpx factory parameter #2997

Conversation

mikeedjones commented Sep 22, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

testing plan

related issues

Uh oh!

google-cla bot commented Sep 22, 2025

Uh oh!

gemini-code-assist bot commented Sep 22, 2025

Summary of Changes

Highlights

Footnotes

Uh oh!

adk-bot commented Sep 22, 2025

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

calvinbrown085 commented Oct 6, 2025

Uh oh!

wukath left a comment

Choose a reason for hiding this comment

Uh oh!

mikeedjones commented Oct 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

mikeedjones commented Oct 29, 2025

Uh oh!

dongyuj1 left a comment

Choose a reason for hiding this comment

Uh oh!

wukath commented Nov 14, 2025

Uh oh!

mikeedjones commented Nov 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

mikeedjones commented Nov 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

mikeedjones commented Sep 22, 2025 •

edited

Loading

mikeedjones commented Oct 29, 2025 •

edited

Loading

mikeedjones commented Nov 16, 2025 •

edited

Loading

mikeedjones commented Nov 20, 2025 •

edited

Loading