Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tool uses original input #2022

Merged
merged 2 commits into from
Feb 6, 2024
Merged

Conversation

jngz-es
Copy link
Collaborator

@jngz-es jngz-es commented Feb 6, 2024

Description

Conversational agent pass user original question as input to the tool that sets useoriginalinput flag as true.

Issues Resolved

The RAG tool can parse the output from LLM, actually the RAG tool needs user original question to search vector DB.

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: Jing Zhang <jngz@amazon.com>
Copy link

codecov bot commented Feb 6, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (a07dd14) 82.57% compared to head (e405a7e) 82.56%.
Report is 2 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main    #2022      +/-   ##
============================================
- Coverage     82.57%   82.56%   -0.02%     
+ Complexity     5581     5580       -1     
============================================
  Files           540      540              
  Lines         22462    22465       +3     
  Branches       2287     2288       +1     
============================================
- Hits          18549    18548       -1     
- Misses         2980     2984       +4     
  Partials        933      933              
Flag Coverage Δ
ml-commons 82.56% <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.

ylwu-amzn
ylwu-amzn previously approved these changes Feb 6, 2024
Signed-off-by: Jing Zhang <jngz@amazon.com>
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:03 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:03 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:03 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:03 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:03 — with GitHub Actions Inactive
@jngz-es jngz-es requested a review from ylwu-amzn February 6, 2024 10:04
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:04 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:31 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:31 — with GitHub Actions Inactive
@jngz-es jngz-es temporarily deployed to ml-commons-cicd-env February 6, 2024 10:31 — with GitHub Actions Inactive
@b4sjoo b4sjoo merged commit ef90bf0 into opensearch-project:main Feb 6, 2024
13 of 14 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.x 2.x
# Navigate to the new working tree
cd .worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-2022-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ef90bf069bb8ce19857469751982e6888fb9e26e
# Push it to GitHub
git push --set-upstream origin backport/backport-2022-to-2.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.x

Then, create a pull request where the base branch is 2.x and the compare/head branch is backport/backport-2022-to-2.x.

jngz-es added a commit to jngz-es/ml-commons that referenced this pull request Feb 6, 2024
* tool uses original input

Signed-off-by: Jing Zhang <jngz@amazon.com>

* fix tool input in trace

Signed-off-by: Jing Zhang <jngz@amazon.com>

---------

Signed-off-by: Jing Zhang <jngz@amazon.com>
@jngz-es jngz-es mentioned this pull request Feb 6, 2024
5 tasks
jngz-es added a commit that referenced this pull request Feb 6, 2024
* tool uses original input



* fix tool input in trace



---------

Signed-off-by: Jing Zhang <jngz@amazon.com>
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.12 2.12
# Navigate to the new working tree
cd .worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-2022-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ef90bf069bb8ce19857469751982e6888fb9e26e
# Push it to GitHub
git push --set-upstream origin backport/backport-2022-to-2.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-2022-to-2.12.

@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.12 2.12
# Navigate to the new working tree
cd .worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-2022-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ef90bf069bb8ce19857469751982e6888fb9e26e
# Push it to GitHub
git push --set-upstream origin backport/backport-2022-to-2.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-2022-to-2.12.

opensearch-trigger-bot bot pushed a commit that referenced this pull request Feb 9, 2024
* tool uses original input

Signed-off-by: Jing Zhang <jngz@amazon.com>

* fix tool input in trace

Signed-off-by: Jing Zhang <jngz@amazon.com>

---------

Signed-off-by: Jing Zhang <jngz@amazon.com>
(cherry picked from commit ef90bf0)
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.12 failed:

The process '/usr/bin/git' failed with exit code 1

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-2.12 2.12
# Navigate to the new working tree
cd .worktrees/backport-2.12
# Create a new branch
git switch --create backport/backport-2022-to-2.12
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 ef90bf069bb8ce19857469751982e6888fb9e26e
# Push it to GitHub
git push --set-upstream origin backport/backport-2022-to-2.12
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-2.12

Then, create a pull request where the base branch is 2.12 and the compare/head branch is backport/backport-2022-to-2.12.

dhrubo-os pushed a commit that referenced this pull request Feb 9, 2024
* tool uses original input

Signed-off-by: Jing Zhang <jngz@amazon.com>

* fix tool input in trace

Signed-off-by: Jing Zhang <jngz@amazon.com>

---------

Signed-off-by: Jing Zhang <jngz@amazon.com>
(cherry picked from commit ef90bf0)

Co-authored-by: Jing Zhang <jngz@amazon.com>
@jngz-es jngz-es deleted the tool_original_input branch February 21, 2024 17:30
austintlee pushed a commit to austintlee/ml-commons that referenced this pull request Mar 19, 2024
* tool uses original input

Signed-off-by: Jing Zhang <jngz@amazon.com>

* fix tool input in trace

Signed-off-by: Jing Zhang <jngz@amazon.com>

---------

Signed-off-by: Jing Zhang <jngz@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants