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

Add optional config field to tool step #899

Merged
merged 2 commits into from
Oct 21, 2024

Conversation

dbwiddis
Copy link
Member

@dbwiddis dbwiddis commented Oct 3, 2024

Description

Adds the optional config map to the ToolStep

Related Issues

Resolves #878

Draft, pending merge:

Check List

  • New functionality includes testing.
  • New functionality has been documented.
  • 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.

@github-actions github-actions bot added the backport 2.x backport PRs to 2.x branch label Oct 3, 2024
Copy link

codecov bot commented Oct 3, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 78.09%. Comparing base (389d680) to head (ee9e545).
Report is 1 commits behind head on main.

Additional details and impacted files
@@             Coverage Diff              @@
##               main     #899      +/-   ##
============================================
+ Coverage     78.07%   78.09%   +0.01%     
  Complexity      995      995              
============================================
  Files            99       99              
  Lines          4621     4624       +3     
  Branches        431      431              
============================================
+ Hits           3608     3611       +3     
  Misses          833      833              
  Partials        180      180              

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

Copy link
Member

@amitgalitz amitgalitz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, but as mentioned should be merged only after ml commons PR is merged and we can then uncomment the lines in ToolStep and ToolStepTests

Copy link
Member

@joshpalis joshpalis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm, approved to unblock

@dbwiddis dbwiddis merged commit 6a4bed8 into opensearch-project:main Oct 21, 2024
20 checks passed
@opensearch-trigger-bot
Copy link
Contributor

The backport to 2.x failed:

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

To backport manually, run these commands in your terminal:

# Navigate to the root of your repository
cd $(git rev-parse --show-toplevel)
# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/flow-framework/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/flow-framework/backport-2.x
# Create a new branch
git switch --create backport/backport-899-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 6a4bed82d6b86438762f02a1eb600cff20d9c8ca
# Push it to GitHub
git push --set-upstream origin backport/backport-899-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/flow-framework/backport-2.x

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

@dbwiddis dbwiddis deleted the tool-step-config branch October 21, 2024 22:51
dbwiddis added a commit to dbwiddis/flow-framework that referenced this pull request Oct 21, 2024
* Add optional config field to tool step

Signed-off-by: Daniel Widdis <[email protected]>

* Complete TODOs now that upstream is merged

Signed-off-by: Daniel Widdis <[email protected]>

---------

Signed-off-by: Daniel Widdis <[email protected]>
dbwiddis added a commit that referenced this pull request Oct 21, 2024
Add optional config field to tool step (#899)

* Add optional config field to tool step



* Complete TODOs now that upstream is merged



---------

Signed-off-by: Daniel Widdis <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[FEATURE] Ml-commons plugin introducing a new optional field "config" in MLTooSpec
3 participants