Fix argument pass #1941

xinyual · 2024-01-29T02:49:32Z

Description

Fix some bug inside chatAgent and flow agent.

If we want to use flow agent from chat agent, need a parse function to parse input from chat agent with key "input"
Replace string.valueof with gson.toJson so we can catch map parameters
A outputToOutputString used here for if output is ModelTensorOutput. It will raise error if we call toJson(output) directly and (String) output will generate the className: ModelTensorOutput instead of true value.

Issues Resolved

#1942

Check List

New functionality includes testing.
- All tests pass
New functionality has been documented.
- New functionality has javadoc added
Commits are signed per the DCO using --signoff

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: xinyual <xinyual@amazon.com>

xinyual · 2024-01-29T03:02:27Z

The issue is #1942

ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/AgentTool.java

codecov · 2024-01-29T03:27:13Z

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (1a436fe) 82.84% compared to head (dea4cf6) 82.84%.
Report is 17 commits behind head on main.

Files	Patch %	Lines
...nsearch/ml/engine/algorithms/agent/AgentUtils.java	85.71%	1 Missing and 1 partial ⚠️
.../ml/engine/algorithms/agent/MLChatAgentRunner.java	88.88%	1 Missing ⚠️

Additional details and impacted files

@@            Coverage Diff            @@
##               main    #1941   +/-   ##
=========================================
  Coverage     82.84%   82.84%           
- Complexity     5444     5452    +8     
=========================================
  Files           522      522           
  Lines         21900    21924   +24     
  Branches       2226     2229    +3     
=========================================
+ Hits          18143    18164   +21     
- Misses         2848     2852    +4     
+ Partials        909      908    -1

Flag	Coverage Δ
ml-commons	`82.84% <91.17%> (+<0.01%)`	⬆️

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.

ylwu-amzn · 2024-02-02T07:30:19Z

ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/AgentTool.java

+        if (parameters.containsKey("input")) {
+            try {
+                Map<String, String> chatParameters = gson.fromJson(parameters.get("input"), Map.class);
+                parameters.putAll(chatParameters);


Why do this ? Looks it's possible to override the original params in parameters if they have same key

ylwu-amzn · 2024-02-02T07:42:07Z

ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/AgentTool.java

@@ -135,4 +138,15 @@ public String getDefaultVersion() {
            return null;
        }
    }
+
+    private void extractFromChatParameters(Map<String, String> parameters) {


Is this for chat only?

Signed-off-by: xinyual <xinyual@amazon.com>

* add logs Signed-off-by: xinyual <xinyual@amazon.com> * option2FixBug Signed-off-by: xinyual <xinyual@amazon.com> * remove useless log Signed-off-by: xinyual <xinyual@amazon.com> * remove useless log Signed-off-by: xinyual <xinyual@amazon.com> * fix spot less Signed-off-by: xinyual <xinyual@amazon.com> * change argument parsing Signed-off-by: xinyual <xinyual@amazon.com> * move common function to utils Signed-off-by: xinyual <xinyual@amazon.com> * checkout for typo Signed-off-by: xinyual <xinyual@amazon.com> * remove useless code Signed-off-by: xinyual <xinyual@amazon.com> * add UTs Signed-off-by: xinyual <xinyual@amazon.com> * apply spotless Signed-off-by: xinyual <xinyual@amazon.com> * add more uts Signed-off-by: xinyual <xinyual@amazon.com> * modify import Signed-off-by: xinyual <xinyual@amazon.com> * protect original parameters Signed-off-by: xinyual <xinyual@amazon.com> --------- Signed-off-by: xinyual <xinyual@amazon.com> (cherry picked from commit 4a6ceba)

* add logs Signed-off-by: xinyual <xinyual@amazon.com> * option2FixBug Signed-off-by: xinyual <xinyual@amazon.com> * remove useless log Signed-off-by: xinyual <xinyual@amazon.com> * remove useless log Signed-off-by: xinyual <xinyual@amazon.com> * fix spot less Signed-off-by: xinyual <xinyual@amazon.com> * change argument parsing Signed-off-by: xinyual <xinyual@amazon.com> * move common function to utils Signed-off-by: xinyual <xinyual@amazon.com> * checkout for typo Signed-off-by: xinyual <xinyual@amazon.com> * remove useless code Signed-off-by: xinyual <xinyual@amazon.com> * add UTs Signed-off-by: xinyual <xinyual@amazon.com> * apply spotless Signed-off-by: xinyual <xinyual@amazon.com> * add more uts Signed-off-by: xinyual <xinyual@amazon.com> * modify import Signed-off-by: xinyual <xinyual@amazon.com> * protect original parameters Signed-off-by: xinyual <xinyual@amazon.com> --------- Signed-off-by: xinyual <xinyual@amazon.com> (cherry picked from commit 4a6ceba) Co-authored-by: xinyual <74362153+xinyual@users.noreply.github.com>

* add logs Signed-off-by: xinyual <xinyual@amazon.com> * option2FixBug Signed-off-by: xinyual <xinyual@amazon.com> * remove useless log Signed-off-by: xinyual <xinyual@amazon.com> * remove useless log Signed-off-by: xinyual <xinyual@amazon.com> * fix spot less Signed-off-by: xinyual <xinyual@amazon.com> * change argument parsing Signed-off-by: xinyual <xinyual@amazon.com> * move common function to utils Signed-off-by: xinyual <xinyual@amazon.com> * checkout for typo Signed-off-by: xinyual <xinyual@amazon.com> * remove useless code Signed-off-by: xinyual <xinyual@amazon.com> * add UTs Signed-off-by: xinyual <xinyual@amazon.com> * apply spotless Signed-off-by: xinyual <xinyual@amazon.com> * add more uts Signed-off-by: xinyual <xinyual@amazon.com> * modify import Signed-off-by: xinyual <xinyual@amazon.com> * protect original parameters Signed-off-by: xinyual <xinyual@amazon.com> --------- Signed-off-by: xinyual <xinyual@amazon.com>

xinyual added 4 commits January 27, 2024 12:19

add logs

97f1199

Signed-off-by: xinyual <xinyual@amazon.com>

option2FixBug

1d9d3b7

Signed-off-by: xinyual <xinyual@amazon.com>

remove useless log

20aa5bb

Signed-off-by: xinyual <xinyual@amazon.com>

remove useless log

70ad223

Signed-off-by: xinyual <xinyual@amazon.com>

xinyual requested review from b4sjoo, dhrubo-os, jngz-es, model-collapse, rbhavna, ylwu-amzn, zane-neo, Zhangxunmt, austintlee and HenryL27 as code owners January 29, 2024 02:49

xinyual had a problem deploying to ml-commons-cicd-env January 29, 2024 02:49 — with GitHub Actions Error

xinyual had a problem deploying to ml-commons-cicd-env January 29, 2024 02:49 — with GitHub Actions Failure

xinyual had a problem deploying to ml-commons-cicd-env January 29, 2024 02:49 — with GitHub Actions Error

fix spot less

e86a863

Signed-off-by: xinyual <xinyual@amazon.com>

xinyual had a problem deploying to ml-commons-cicd-env January 29, 2024 03:01 — with GitHub Actions Failure

xinyual temporarily deployed to ml-commons-cicd-env January 29, 2024 03:01 — with GitHub Actions Inactive

zane-neo reviewed Jan 29, 2024

View reviewed changes

ml-algorithms/src/main/java/org/opensearch/ml/engine/tools/AgentTool.java Outdated Show resolved Hide resolved

xinyual temporarily deployed to ml-commons-cicd-env February 2, 2024 04:01 — with GitHub Actions Inactive

xinyual temporarily deployed to ml-commons-cicd-env February 2, 2024 04:02 — with GitHub Actions Inactive

xinyual had a problem deploying to ml-commons-cicd-env February 2, 2024 04:28 — with GitHub Actions Error

xinyual had a problem deploying to ml-commons-cicd-env February 2, 2024 04:28 — with GitHub Actions Failure

xinyual had a problem deploying to ml-commons-cicd-env February 2, 2024 04:28 — with GitHub Actions Error

ylwu-amzn reviewed Feb 2, 2024

View reviewed changes

protect original parameters

dea4cf6

Signed-off-by: xinyual <xinyual@amazon.com>

xinyual had a problem deploying to ml-commons-cicd-env February 2, 2024 07:55 — with GitHub Actions Failure

xinyual had a problem deploying to ml-commons-cicd-env February 2, 2024 07:55 — with GitHub Actions Error

xinyual temporarily deployed to ml-commons-cicd-env February 2, 2024 07:55 — with GitHub Actions Inactive

xinyual temporarily deployed to ml-commons-cicd-env February 2, 2024 08:23 — with GitHub Actions Inactive

ylwu-amzn approved these changes Feb 2, 2024

View reviewed changes

jngz-es approved these changes Feb 2, 2024

View reviewed changes

jngz-es merged commit 4a6ceba into opensearch-project:main Feb 2, 2024

ylwu-amzn added the backport 2.x label Feb 2, 2024

opensearch-trigger-bot bot mentioned this pull request Feb 2, 2024

[Backport 2.x] Fix argument pass #1993

Merged

dhrubo-os mentioned this pull request Apr 9, 2024

[BUG] Some bug when I try flow agent inside chat agent. #1942

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix argument pass #1941

Fix argument pass #1941

xinyual commented Jan 29, 2024 •

edited

Loading

xinyual commented Jan 29, 2024

codecov bot commented Jan 29, 2024 •

edited

Loading

ylwu-amzn Feb 2, 2024

ylwu-amzn Feb 2, 2024

Fix argument pass #1941

Fix argument pass #1941

Conversation

xinyual commented Jan 29, 2024 • edited Loading

Description

Issues Resolved

Check List

xinyual commented Jan 29, 2024

codecov bot commented Jan 29, 2024 • edited Loading

Codecov Report

ylwu-amzn Feb 2, 2024

Choose a reason for hiding this comment

ylwu-amzn Feb 2, 2024

Choose a reason for hiding this comment

xinyual commented Jan 29, 2024 •

edited

Loading

codecov bot commented Jan 29, 2024 •

edited

Loading