adding tenantId to the connector executor when this is inline connector by dhrubo-os · Pull Request #3837 · opensearch-project/ml-commons

dhrubo-os · 2025-05-06T23:25:30Z

Description

[adding tenantId to the connector executor when this is inline connector]

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.

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

codecov · 2025-05-07T00:29:29Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 77.98%. Comparing base (0cba0ed) to head (d2973ff).
Report is 2 commits behind head on main.

Additional details and impacted files

@@             Coverage Diff              @@
##               main    #3837      +/-   ##
============================================
- Coverage     77.99%   77.98%   -0.02%     
- Complexity     7316     7318       +2     
============================================
  Files           655      655              
  Lines         33032    33037       +5     
  Branches       3706     3708       +2     
============================================
- Hits          25764    25763       -1     
- Misses         5681     5687       +6     
  Partials       1587     1587

Flag	Coverage Δ
ml-commons	`77.98% <100.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.

jngz-es · 2025-05-07T01:12:28Z

ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/RemoteModel.java

                .decrypt(PREDICT.name(), (credential, tenantId) -> encryptor.decrypt(credential, model.getTenantId()), model.getTenantId());
+            // This situation can only happen for inline connector where we don't provide tenant id.
+            if (connector.getTenantId() == null && model.getTenantId() != null) {
+                connector.setTenantId(model.getTenantId());


I am wondering why we don't set tenantId for the inline connector when registering the model which can make a consistent connector to use anywhere. Now the cloned connector and connectorExecutor has the tenantId but the original connector doesn't has it. If we want to use model.getConnector in code to reference, we have to check tenantId again.

Model already has the tenantId information. So in the same entity to have the tenant id twice seems like redundant to me.

Yeah, it's pros and cons. I am OK to merge it for now, we can have more discussion later.

Zhangxunmt · 2025-05-07T03:26:59Z

ml-algorithms/src/main/java/org/opensearch/ml/engine/algorithms/remote/RemoteModel.java

            connector
                .decrypt(PREDICT.name(), (credential, tenantId) -> encryptor.decrypt(credential, model.getTenantId()), model.getTenantId());
+            // This situation can only happen for inline connector where we don't provide tenant id.
+            if (connector.getTenantId() == null && model.getTenantId() != null) {


if model.getTenantId == null, this code won't do anything. But if that is an edge case to avoid in serverLess, you should check it and throw an exception.

If both are null, that means this is a single tenant environment, so we don't need this anyway.

Zhangxunmt

Approved due to time constrain. From the Code coverage it shows 50.00000% with 1 line in your changes missing coverage.

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

* [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 <pybot@amazon.com> * feat: add test case for parseLLMOutput Signed-off-by: Pavan Yekbote <pybot@amazon.com> --------- Signed-off-by: Pavan Yekbote <pybot@amazon.com> * [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 <pybot@amazon.com> * fix: defaults for agent execution and differentiate between step and step result Signed-off-by: Pavan Yekbote <pybot@amazon.com> * fix: return react agent id in agent response to expose more details Signed-off-by: Pavan Yekbote <pybot@amazon.com> * spotless Signed-off-by: Pavan Yekbote <pybot@amazon.com> * fix: remove test prompt from react system prompt Signed-off-by: Pavan Yekbote <pybot@amazon.com> * refactor: rename parameters exposed to user to executor Signed-off-by: Pavan Yekbote <pybot@amazon.com> * fix: give user complete control over planner system prompt Signed-off-by: Pavan Yekbote <pybot@amazon.com> --------- Signed-off-by: Pavan Yekbote <pybot@amazon.com> * Clean up JSM from MCP (#3773) Signed-off-by: rithin-pullela-aws <rithinp@amazon.com> * [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 <zaniu@amazon.com> * Make change to support register or remove tools across cluster Signed-off-by: zane-neo <zaniu@amazon.com> * format code Signed-off-by: zane-neo <zaniu@amazon.com> * fix UT failure caused by code change Signed-off-by: zane-neo <zaniu@amazon.com> * format code Signed-off-by: zane-neo <zaniu@amazon.com> * format code Signed-off-by: zane-neo <zaniu@amazon.com> * add license header Signed-off-by: zane-neo <zaniu@amazon.com> * fix notifications initialized not respond issue Signed-off-by: zane-neo <zaniu@amazon.com> * fix minor issues and add UTs Signed-off-by: zane-neo <zaniu@amazon.com> * Add more UTs Signed-off-by: zane-neo <zaniu@amazon.com> --------- Signed-off-by: zane-neo <zaniu@amazon.com> * Remove beta1 qualifier (#3794) (#3795) (cherry picked from commit 3f503f1) Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> * [AUTO] Increment version to 3.1.0-SNAPSHOT (#3789) * Increment version to 3.1.0-SNAPSHOT Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> * Update build.gradle Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> --------- Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> * add release note for 3.0 (#3792) Signed-off-by: Mingshi Liu <mingshl@amazon.com> * support MCP session management (#3803) * support MCP session management Signed-off-by: zane-neo <zaniu@amazon.com> * Addressing comments Signed-off-by: zane-neo <zaniu@amazon.com> * add feature flag for mcp server and renaming mcp connector feature flag Signed-off-by: zane-neo <zaniu@amazon.com> * Address critical comments in #3781 Signed-off-by: zane-neo <zaniu@amazon.com> --------- Signed-off-by: zane-neo <zaniu@amazon.com> * upgrade http client to version align with core (#3809) * upgrade http client to versoin align with core Signed-off-by: zane-neo <zaniu@amazon.com> * upgrade httpclient-h2 to correct versiono Signed-off-by: zane-neo <zaniu@amazon.com> * use placeholder approach Signed-off-by: zane-neo <zaniu@amazon.com> --------- Signed-off-by: zane-neo <zaniu@amazon.com> * support customized message endpoint and addressing comments (#3810) * support customized message endpoint and addressing comments Signed-off-by: zane-neo <zaniu@amazon.com> * fix UT failures Signed-off-by: zane-neo <zaniu@amazon.com> * add files to jacoco exception Signed-off-by: zane-neo <zaniu@amazon.com> * fix tool name issue and optimize register tool api Signed-off-by: zane-neo <zaniu@amazon.com> * fix schema not parsed correctly issue and NPE when parameters is null Signed-off-by: zane-neo <zaniu@amazon.com> * fix failure UT Signed-off-by: zane-neo <zaniu@amazon.com> --------- Signed-off-by: zane-neo <zaniu@amazon.com> * excluding circuit breaker for Agent (#3814) Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * change release note (#3811) * change release note Signed-off-by: zane-neo <zaniu@amazon.com> * 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 <zaniu@amazon.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> * Downgrade MCP version to 0.9 (#3821) Signed-off-by: rithin-pullela-aws <rithinp@amazon.com> * remove libs folder (#3824) Signed-off-by: Yaliang Wu <ylwu@amazon.com> * 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 <rbhavna@amazon.com> * Fix python client not able to connect to MCP server issue (#3822) Signed-off-by: zane-neo <zaniu@amazon.com> Co-authored-by: Dhrubo Saha <dhrubo@amazon.com> * exclude trusted connector check for hidden model (#3838) Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * 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 <dhrubo@amazon.com> * added more unit tests Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> --------- Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> --------- Signed-off-by: Pavan Yekbote <pybot@amazon.com> Signed-off-by: rithin-pullela-aws <rithinp@amazon.com> Signed-off-by: zane-neo <zaniu@amazon.com> Signed-off-by: Peter Zhu <zhujiaxi@amazon.com> Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com> Signed-off-by: Mingshi Liu <mingshl@amazon.com> Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> Signed-off-by: Yaliang Wu <ylwu@amazon.com> Signed-off-by: Bhavana Goud Ramaram <rbhavna@amazon.com> Co-authored-by: Pavan Yekbote <pybot@amazon.com> Co-authored-by: Rithin Pullela <rithinp@amazon.com> Co-authored-by: zane-neo <zaniu@amazon.com> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: Peter Zhu <zhujiaxi@amazon.com> Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com> Co-authored-by: Mingshi Liu <mingshl@amazon.com> Co-authored-by: Yaliang Wu <ylwu@amazon.com> Co-authored-by: Bhavana Goud Ramaram <rbhavna@amazon.com>

…or (opensearch-project#3837) * adding tenantId to the connector executor when this is inline connector Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> * added more unit tests Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> --------- Signed-off-by: Dhrubo Saha <dhrubo@amazon.com> Signed-off-by: Abdul Muneer Kolarkunnu <muneer.kolarkunnu@netapp.com>

adding tenantId to the connector executor when this is inline connector

fadbdcc

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

dhrubo-os requested review from HenryL27, Zhangxunmt, austintlee, b4sjoo, jngz-es, mingshl, model-collapse, rbhavna, xinyual, ylwu-amzn and zane-neo as code owners May 6, 2025 23:25

dhrubo-os temporarily deployed to ml-commons-cicd-env May 6, 2025 23:27 — with GitHub Actions Inactive

arjunkumargiri approved these changes May 6, 2025

View reviewed changes

dhrubo-os temporarily deployed to ml-commons-cicd-env May 7, 2025 00:29 — with GitHub Actions Inactive

jngz-es reviewed May 7, 2025

View reviewed changes

Zhangxunmt reviewed May 7, 2025

View reviewed changes

Zhangxunmt previously approved these changes May 7, 2025

View reviewed changes

added more unit tests

f71d879

Signed-off-by: Dhrubo Saha <dhrubo@amazon.com>

dhrubo-os dismissed Zhangxunmt’s stale review via f71d879 May 7, 2025 17:42

dhrubo-os temporarily deployed to ml-commons-cicd-env May 7, 2025 17:43 — with GitHub Actions Inactive

dhrubo-os temporarily deployed to ml-commons-cicd-env May 7, 2025 17:44 — with GitHub Actions Inactive

jngz-es approved these changes May 7, 2025

View reviewed changes

Zhangxunmt approved these changes May 7, 2025

View reviewed changes

dhrubo-os temporarily deployed to ml-commons-cicd-env May 7, 2025 18:47 — with GitHub Actions Inactive

Merge branch 'main' into main

d2973ff

dhrubo-os had a problem deploying to ml-commons-cicd-env May 7, 2025 19:02 — with GitHub Actions Failure

dhrubo-os temporarily deployed to ml-commons-cicd-env May 7, 2025 19:02 — with GitHub Actions Inactive

dhrubo-os had a problem deploying to ml-commons-cicd-env May 7, 2025 19:02 — with GitHub Actions Error

dhrubo-os temporarily deployed to ml-commons-cicd-env May 7, 2025 19:02 — with GitHub Actions Inactive

dhrubo-os temporarily deployed to ml-commons-cicd-env May 7, 2025 20:05 — with GitHub Actions Inactive

dhrubo-os merged commit 71e6365 into opensearch-project:main May 7, 2025
10 of 13 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

adding tenantId to the connector executor when this is inline connector#3837

adding tenantId to the connector executor when this is inline connector#3837
dhrubo-os merged 3 commits intoopensearch-project:mainfrom
dhrubo-os:main

dhrubo-os commented May 6, 2025

Uh oh!

codecov bot commented May 7, 2025 •

edited

Loading

Uh oh!

jngz-es May 7, 2025

Uh oh!

dhrubo-os May 7, 2025

Uh oh!

jngz-es May 7, 2025

Uh oh!

Zhangxunmt May 7, 2025

Uh oh!

dhrubo-os May 7, 2025

Uh oh!

Zhangxunmt left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

dhrubo-os commented May 6, 2025

Description

Related Issues

Check List

Uh oh!

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

Uh oh!

Codecov Report

Uh oh!

jngz-es May 7, 2025

Choose a reason for hiding this comment

Uh oh!

dhrubo-os May 7, 2025

Choose a reason for hiding this comment

Uh oh!

jngz-es May 7, 2025

Choose a reason for hiding this comment

Uh oh!

Zhangxunmt May 7, 2025

Choose a reason for hiding this comment

Uh oh!

dhrubo-os May 7, 2025

Choose a reason for hiding this comment

Uh oh!

Zhangxunmt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

codecov bot commented May 7, 2025 •

edited

Loading