Clean up JSM from MCP #3773

rithin-pullela-aws · 2025-04-24T21:56:29Z

Description

Since Java Security Manager is deprecated form OpenSearch, we can use the MCP SDK as dependency instead of a custom JAR file.
All the permissions previously added are no longer necessary. (Other than FilePermission and SocketPermission other entries in plugin-security.policy are noop)
Thread group created for MCP(ExecutorService) before is no longer necessary since the default thread group created inside the MCP SDK don't need privileged access anymore

Related Issues

Resolves #[Issue number to be closed when this PR is merged]

Check List

New functionality includes testing.
New functionality has been documented.
API changes companion pull request created.
Commits are signed per the DCO using --signoff.
Public documentation issue/PR created.

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.
For more information on following Developer Certificate of Origin and signing off your commits, please check here.

codecov · 2025-04-24T23:04:51Z

Codecov Report

Attention: Patch coverage is 0% with 39 lines in your changes missing coverage. Please review.

Project coverage is 78.02%. Comparing base (088c1a5) to head (5c71403).
Report is 12 commits behind head on main.

Files with missing lines	Patch %	Lines
...engine/algorithms/remote/McpConnectorExecutor.java	0.00%	37 Missing ⚠️
...ava/org/opensearch/ml/engine/tools/McpSseTool.java	0.00%	2 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #3773      +/-   ##
============================================
+ Coverage     78.00%   78.02%   +0.02%     
+ Complexity     7168     7162       -6     
============================================
  Files           631      631              
  Lines         32278    32267      -11     
  Branches       3674     3674              
============================================
- Hits          25179    25177       -2     
+ Misses         5531     5518      -13     
- Partials       1568     1572       +4

Flag	Coverage Δ
ml-commons	`78.02% <0.00%> (+0.02%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Signed-off-by: rithin-pullela-aws <[email protected]>

rithin-pullela-aws · 2025-04-25T05:27:52Z

Hi team, this PR does not have code coverage because my previous PR did not have ant test coverage, I am working on another PR to add test coverage for all this code.

ylwu-amzn · 2025-04-25T19:15:00Z

...lgorithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/McpConnectorExecutor.java

-                    .requestTimeout(readTimeout)
-                    .capabilities(McpSchema.ClientCapabilities.builder().roots(false).build())
-                    .build();
+            Duration connectionTimeout = Duration.ofSeconds(super.getConnectorClientConfig().getConnectionTimeout());


Could this be null ? If yes, should we add default value ?

Also check readTimeout

No, if user does not provide a ConnectorClientConfig, we create an use a default one, so this will not be an issue.

Signed-off-by: rithin-pullela-aws <[email protected]> (cherry picked from commit 89cb24a)

(cherry picked from commit 89cb24a) Signed-off-by: rithin-pullela-aws <[email protected]> Co-authored-by: Rithin Pullela <[email protected]>

* [BUG] Agent Framework: Handle model response when toolUse is not accompanied by text (#3755) * fix: handle model response when toolUse is not accompanied by text Signed-off-by: Pavan Yekbote <[email protected]> * feat: add test case for parseLLMOutput Signed-off-by: Pavan Yekbote <[email protected]> --------- Signed-off-by: Pavan Yekbote <[email protected]> * [BUG] Allow user to control react agent max_interations value to prevent empty response (#3756) * fix: expose max_iteration for react Signed-off-by: Pavan Yekbote <[email protected]> * fix: defaults for agent execution and differentiate between step and step result Signed-off-by: Pavan Yekbote <[email protected]> * fix: return react agent id in agent response to expose more details Signed-off-by: Pavan Yekbote <[email protected]> * spotless Signed-off-by: Pavan Yekbote <[email protected]> * fix: remove test prompt from react system prompt Signed-off-by: Pavan Yekbote <[email protected]> * refactor: rename parameters exposed to user to executor Signed-off-by: Pavan Yekbote <[email protected]> * fix: give user complete control over planner system prompt Signed-off-by: Pavan Yekbote <[email protected]> --------- Signed-off-by: Pavan Yekbote <[email protected]> * Clean up JSM from MCP (#3773) Signed-off-by: rithin-pullela-aws <[email protected]> * [Bug] ListTools call does not return tool attributes (#3785) * initial commit for MCP server in OpenSearch (#3781) * initial commit for MCP server in OpenSearch Signed-off-by: zane-neo <[email protected]> * Make change to support register or remove tools across cluster Signed-off-by: zane-neo <[email protected]> * format code Signed-off-by: zane-neo <[email protected]> * fix UT failure caused by code change Signed-off-by: zane-neo <[email protected]> * format code Signed-off-by: zane-neo <[email protected]> * format code Signed-off-by: zane-neo <[email protected]> * add license header Signed-off-by: zane-neo <[email protected]> * fix notifications initialized not respond issue Signed-off-by: zane-neo <[email protected]> * fix minor issues and add UTs Signed-off-by: zane-neo <[email protected]> * Add more UTs Signed-off-by: zane-neo <[email protected]> --------- Signed-off-by: zane-neo <[email protected]> * Remove beta1 qualifier (#3794) (#3795) (cherry picked from commit 3f503f1) Signed-off-by: Peter Zhu <[email protected]> Co-authored-by: Peter Zhu <[email protected]> * [AUTO] Increment version to 3.1.0-SNAPSHOT (#3789) * Increment version to 3.1.0-SNAPSHOT Signed-off-by: opensearch-ci-bot <[email protected]> * Update build.gradle Signed-off-by: Peter Zhu <[email protected]> --------- Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> Co-authored-by: Peter Zhu <[email protected]> * add release note for 3.0 (#3792) Signed-off-by: Mingshi Liu <[email protected]> * support MCP session management (#3803) * support MCP session management Signed-off-by: zane-neo <[email protected]> * Addressing comments Signed-off-by: zane-neo <[email protected]> * add feature flag for mcp server and renaming mcp connector feature flag Signed-off-by: zane-neo <[email protected]> * Address critical comments in #3781 Signed-off-by: zane-neo <[email protected]> --------- Signed-off-by: zane-neo <[email protected]> * upgrade http client to version align with core (#3809) * upgrade http client to versoin align with core Signed-off-by: zane-neo <[email protected]> * upgrade httpclient-h2 to correct versiono Signed-off-by: zane-neo <[email protected]> * use placeholder approach Signed-off-by: zane-neo <[email protected]> --------- Signed-off-by: zane-neo <[email protected]> * support customized message endpoint and addressing comments (#3810) * support customized message endpoint and addressing comments Signed-off-by: zane-neo <[email protected]> * fix UT failures Signed-off-by: zane-neo <[email protected]> * add files to jacoco exception Signed-off-by: zane-neo <[email protected]> * fix tool name issue and optimize register tool api Signed-off-by: zane-neo <[email protected]> * fix schema not parsed correctly issue and NPE when parameters is null Signed-off-by: zane-neo <[email protected]> * fix failure UT Signed-off-by: zane-neo <[email protected]> --------- Signed-off-by: zane-neo <[email protected]> * excluding circuit breaker for Agent (#3814) Signed-off-by: Dhrubo Saha <[email protected]> * change release note (#3811) * change release note Signed-off-by: zane-neo <[email protected]> * Update opensearch-ml-common.release-notes-3.0.0.0.md * Update opensearch-ml-common.release-notes-3.0.0.0.md * Update opensearch-ml-common.release-notes-3.0.0.0.md --------- Signed-off-by: zane-neo <[email protected]> Co-authored-by: Peter Zhu <[email protected]> * Downgrade MCP version to 0.9 (#3821) Signed-off-by: rithin-pullela-aws <[email protected]> * remove libs folder (#3824) Signed-off-by: Yaliang Wu <[email protected]> * add more logging to deploy/undeploy flows for better debugging (#3825) * add more logging to deploy/undeploy flows for better debugging Signed-off-by: Bhavana Goud Ramaram <[email protected]> * Fix python client not able to connect to MCP server issue (#3822) Signed-off-by: zane-neo <[email protected]> Co-authored-by: Dhrubo Saha <[email protected]> * exclude trusted connector check for hidden model (#3838) Signed-off-by: Dhrubo Saha <[email protected]> * adding tenantId to the connector executor when this is inline connector (#3837) * adding tenantId to the connector executor when this is inline connector Signed-off-by: Dhrubo Saha <[email protected]> * added more unit tests Signed-off-by: Dhrubo Saha <[email protected]> --------- Signed-off-by: Dhrubo Saha <[email protected]> --------- Signed-off-by: Pavan Yekbote <[email protected]> Signed-off-by: rithin-pullela-aws <[email protected]> Signed-off-by: zane-neo <[email protected]> Signed-off-by: Peter Zhu <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Mingshi Liu <[email protected]> Signed-off-by: Dhrubo Saha <[email protected]> Signed-off-by: Yaliang Wu <[email protected]> Signed-off-by: Bhavana Goud Ramaram <[email protected]> Co-authored-by: Pavan Yekbote <[email protected]> Co-authored-by: Rithin Pullela <[email protected]> Co-authored-by: zane-neo <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Peter Zhu <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> Co-authored-by: Mingshi Liu <[email protected]> Co-authored-by: Yaliang Wu <[email protected]> Co-authored-by: Bhavana Goud Ramaram <[email protected]>

Signed-off-by: rithin-pullela-aws <[email protected]> Signed-off-by: Abdul Muneer Kolarkunnu <[email protected]>

rithin-pullela-aws temporarily deployed to ml-commons-cicd-env-require-approval April 24, 2025 21:57 — with GitHub Actions Inactive

rithin-pullela-aws temporarily deployed to ml-commons-cicd-env-require-approval April 24, 2025 23:04 — with GitHub Actions Inactive

rithin-pullela-aws force-pushed the no-custom-mcp-jar branch 2 times, most recently from dc06175 to a93d74e Compare April 25, 2025 00:56

rithin-pullela-aws had a problem deploying to ml-commons-cicd-env-require-approval April 25, 2025 00:57 — with GitHub Actions Failure

Clean up JSM from MCP

5c71403

Signed-off-by: rithin-pullela-aws <[email protected]>

rithin-pullela-aws force-pushed the no-custom-mcp-jar branch from a93d74e to 5c71403 Compare April 25, 2025 00:59

rithin-pullela-aws temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 01:00 — with GitHub Actions Inactive

rithin-pullela-aws temporarily deployed to ml-commons-cicd-env-require-approval April 25, 2025 02:05 — with GitHub Actions Inactive

rithin-pullela-aws marked this pull request as ready for review April 25, 2025 05:25

rithin-pullela-aws requested review from b4sjoo, dhrubo-os, mingshl, jngz-es, model-collapse, rbhavna, ylwu-amzn and zane-neo as code owners April 25, 2025 05:25

rithin-pullela-aws requested review from Zhangxunmt, austintlee, HenryL27 and xinyual as code owners April 25, 2025 05:25

ylwu-amzn reviewed Apr 25, 2025

View reviewed changes

ylwu-amzn approved these changes Apr 25, 2025

View reviewed changes

pyek-bot approved these changes Apr 25, 2025

View reviewed changes

jngz-es approved these changes Apr 26, 2025

View reviewed changes

ylwu-amzn merged commit 89cb24a into opensearch-project:main Apr 26, 2025
12 of 13 checks passed

ylwu-amzn added the backport 3.0 label Apr 29, 2025

opensearch-trigger-bot bot pushed a commit that referenced this pull request Apr 29, 2025

Clean up JSM from MCP (#3773)

0ecc851

Signed-off-by: rithin-pullela-aws <[email protected]> (cherry picked from commit 89cb24a)

opensearch-trigger-bot bot mentioned this pull request Apr 29, 2025

[Backport 3.0] Clean up JSM from MCP #3793

Merged

ylwu-amzn pushed a commit that referenced this pull request Apr 29, 2025

Clean up JSM from MCP (#3773) (#3793)

5cab4a2

(cherry picked from commit 89cb24a) Signed-off-by: rithin-pullela-aws <[email protected]> Co-authored-by: Rithin Pullela <[email protected]>

akolarkunnu pushed a commit to akolarkunnu/ml-commons that referenced this pull request Jun 6, 2025

Clean up JSM from MCP (opensearch-project#3773)

6ef5315

Signed-off-by: rithin-pullela-aws <[email protected]> Signed-off-by: Abdul Muneer Kolarkunnu <[email protected]>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Clean up JSM from MCP #3773

Clean up JSM from MCP #3773

Uh oh!

rithin-pullela-aws commented Apr 24, 2025

Uh oh!

codecov bot commented Apr 24, 2025 •

edited

Loading

Uh oh!

rithin-pullela-aws commented Apr 25, 2025

Uh oh!

ylwu-amzn Apr 25, 2025 •

edited

Loading

Uh oh!

rithin-pullela-aws Apr 25, 2025

Uh oh!

Uh oh!

Uh oh!

Clean up JSM from MCP #3773

Clean up JSM from MCP #3773

Uh oh!

Conversation

rithin-pullela-aws commented Apr 24, 2025

Description

Related Issues

Check List

Uh oh!

codecov bot commented Apr 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

rithin-pullela-aws commented Apr 25, 2025

Uh oh!

ylwu-amzn Apr 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

rithin-pullela-aws Apr 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

codecov bot commented Apr 24, 2025 •

edited

Loading

ylwu-amzn Apr 25, 2025 •

edited

Loading