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.

Sign up for GitHub

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

Jump to bottom

Adds Register and Deploy Model Step for remote model #52

Merged
merged 13 commits into from
Oct 12, 2023
Merged

Adds Register and Deploy Model Step for remote model #52

merged 13 commits into from
Oct 12, 2023

Conversation

owaiskazi19
Copy link
Member

@owaiskazi19 owaiskazi19 commented Sep 23, 2023 •
edited
Loading

Description

Adds Register, Deploy Model Step for the remote model.

Also, adds GetTask step for the future work of registering a local model.
TODO:

  1. Figure out a way to handle the verify method call in the tests.

Issues Resolved

Part of #21 and fixes #86

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 Sep 23, 2023
This was referenced Sep 25, 2023
Closed
Merged
@owaiskazi19 owaiskazi19 force-pushed the upload-model branch 3 times, most recently from 4404633 to 353a322 Compare October 4, 2023 21:31
@owaiskazi19 owaiskazi19 marked this pull request as ready for review October 4, 2023 22:29
@owaiskazi19 owaiskazi19 changed the title Adds Register Model Step to the worklow Adds Register and Deploy Model Step for remote model Oct 4, 2023
@owaiskazi19 owaiskazi19 force-pushed the upload-model branch 2 times, most recently from fe03b92 to 0dc6655 Compare October 4, 2023 22:34
@codecov
Copy link

codecov bot commented Oct 4, 2023 •
edited
Loading

Codecov Report

Merging #52 (e0cd1cf) into main (446c32d) will increase coverage by 81.74%.
The diff coverage is 60.82%.

@@             Coverage Diff             @@
##             main      #52       +/-   ##
===========================================
+ Coverage        0   81.74%   +81.74%     
- Complexity      0      211      +211     
===========================================
  Files           0       21       +21     
  Lines           0      838      +838     
  Branches        0       96       +96     
===========================================
+ Hits            0      685      +685     
- Misses          0      119      +119     
- Partials        0       34       +34
Files Coverage Δ
.../org/opensearch/flowframework/client/MLClient.java 100.00% <100.00%> (ø)
...g/opensearch/flowframework/common/CommonValue.java 66.66% <ø> (ø)
...ch/flowframework/workflow/WorkflowStepFactory.java 68.42% <100.00%> (ø)
...search/flowframework/workflow/DeployModelStep.java 65.21% <65.21%> (ø)
...org/opensearch/flowframework/workflow/GetTask.java 0.00% <0.00%> (ø)
...arch/flowframework/workflow/RegisterModelStep.java 73.21% <73.21%> (ø)

... and 15 files with indirect coverage changes

joshpalis
joshpalis reviewed Oct 4, 2023
View reviewed changes
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.

Initial pass, still need to go over the test cases

src/main/java/org/opensearch/flowframework/FlowFrameworkPlugin.java Outdated Show resolved Hide resolved
src/main/java/org/opensearch/flowframework/workflow/DeployModelStep.java Outdated Show resolved Hide resolved
src/main/java/org/opensearch/flowframework/workflow/DeployModelStep.java Outdated Show resolved Hide resolved
src/main/java/org/opensearch/flowframework/workflow/DeployModelStep.java Outdated Show resolved Hide resolved
src/main/java/org/opensearch/flowframework/workflow/RegisterModelStep.java Outdated Show resolved Hide resolved
src/main/java/org/opensearch/flowframework/workflow/RegisterModelStep.java Outdated Show resolved Hide resolved
@owaiskazi19 owaiskazi19 force-pushed the upload-model branch 5 times, most recently from 751bc0f to 995db1e Compare October 10, 2023 19:52
@owaiskazi19 owaiskazi19 mentioned this pull request Oct 10, 2023
Merged
@owaiskazi19 owaiskazi19 force-pushed the upload-model branch 2 times, most recently from 119f4a7 to 0246a4c Compare October 10, 2023 21:47
joshpalis
joshpalis approved these changes Oct 10, 2023
View reviewed changes
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.

Looks good to me, just added a few suggestions regarding testing

src/test/java/org/opensearch/flowframework/workflow/DeployModelStepTests.java Show resolved Hide resolved
src/test/java/org/opensearch/flowframework/workflow/RegisterModelStepTests.java Show resolved Hide resolved
@owaiskazi19
Integrated deploy model
a389c87 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Separated Register and Deploy Steps
3bcbc6a 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Added tests
022da95 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Added NodeClient
49078d7 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Added javadocs
570173e 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Addressed PR comments
d59087f 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Addressed PR comments
58c3f7a 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Addressed PR comments - 2
4313878 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Fixed test failure
0d894bb 
Signed-off-by: Owais Kazi <[email protected]>
@owaiskazi19
Addressed PR comments
e0cd1cf 
Signed-off-by: Owais Kazi <[email protected]>
jackiehanyang
jackiehanyang approved these changes Oct 12, 2023
View reviewed changes
Copy link
Collaborator

@jackiehanyang jackiehanyang left a comment

Choose a reason for hiding this comment

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

overall lgtm! I'm also ok if you want to address the model_id might remains null when calling deploy action in the following pr as well :)

src/main/java/org/opensearch/flowframework/workflow/DeployModelStep.java Show resolved Hide resolved
@owaiskazi19 owaiskazi19 merged commit 9b10b23 into opensearch-project:main Oct 12, 2023
9 of 10 checks passed
opensearch-trigger-bot bot pushed a commit that referenced this pull request Oct 12, 2023
@github-actions
Adds Register and Deploy Model Step for remote model (#52)
5e2af53 
* Initial UploadModel integration

Signed-off-by: Owais Kazi <[email protected]>

* Implemented Register Model Step

Signed-off-by: Owais Kazi <[email protected]>

* Integrated register for remote model

Signed-off-by: Owais Kazi <[email protected]>

* Integrated deploy model

Signed-off-by: Owais Kazi <[email protected]>

* Separated Register and Deploy Steps

Signed-off-by: Owais Kazi <[email protected]>

* Added tests

Signed-off-by: Owais Kazi <[email protected]>

* Added NodeClient

Signed-off-by: Owais Kazi <[email protected]>

* Added javadocs

Signed-off-by: Owais Kazi <[email protected]>

* Addressed PR comments

Signed-off-by: Owais Kazi <[email protected]>

* Addressed PR comments

Signed-off-by: Owais Kazi <[email protected]>

* Addressed PR comments - 2

Signed-off-by: Owais Kazi <[email protected]>

* Fixed test failure

Signed-off-by: Owais Kazi <[email protected]>

* Addressed PR comments

Signed-off-by: Owais Kazi <[email protected]>

---------

Signed-off-by: Owais Kazi <[email protected]>
(cherry picked from commit 9b10b23)
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Oct 12, 2023
Merged
owaiskazi19 pushed a commit that referenced this pull request Oct 13, 2023
@opensearch-trigger-bot @github-actions
[Backport 2.x] Adds Register and Deploy Model Step for remote model (#85
654065c 
)

Adds Register and Deploy Model Step for remote model (#52)

* Initial UploadModel integration



* Implemented Register Model Step



* Integrated register for remote model



* Integrated deploy model



* Separated Register and Deploy Steps



* Added tests



* Added NodeClient



* Added javadocs



* Addressed PR comments



* Addressed PR comments



* Addressed PR comments - 2



* Fixed test failure



* Addressed PR comments



---------


(cherry picked from commit 9b10b23)

Signed-off-by: Owais Kazi <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@joshpalis joshpalis joshpalis approved these changes

@jackiehanyang jackiehanyang jackiehanyang approved these changes

@dbwiddis dbwiddis Awaiting requested review from dbwiddis dbwiddis is a code owner

@ohltyler ohltyler Awaiting requested review from ohltyler ohltyler is a code owner

@amitgalitz amitgalitz Awaiting requested review from amitgalitz amitgalitz is a code owner

Assignees
No one assigned
Labels
backport 2.x backport PRs to 2.x branch
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEATURE] Register and Deploy remote model
4 participants
@owaiskazi19 @dbwiddis @jackiehanyang @joshpalis