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

Add source field to distinguish local and external model #239

Merged
merged 3 commits into from
Aug 2, 2023
Merged

Add source field to distinguish local and external model #239

merged 3 commits into from
Aug 2, 2023

Conversation

wanglam
Copy link
Collaborator

@wanglam wanglam commented Aug 2, 2023

Description

  1. Rollback filter out REMOTE models
  2. Add source field to distinguish local and external model

Issues Resolved

List any issues this PR will resolve, e.g. Closes [...].

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.

wanglam added 2 commits August 2, 2023 15:59
@wanglam
Revert "feat: exclude remote model for admin UI (opensearch-project#225…
2fcf7d4 
…)"

This reverts commit ba01d34.

Signed-off-by: Lin Wang <wonglam@amazon.com>
@wanglam
feat: add source field to distinguish local and external model
38634fa 
Signed-off-by: Lin Wang <wonglam@amazon.com>
@wanglam wanglam force-pushed the feature/add-source-field branch from 5aa7ad8 to 38634fa Compare August 2, 2023 08:00
@wanglam wanglam changed the title Feature/add source field Add source field to distinguish local and external model Aug 2, 2023
@codecov
Copy link

codecov bot commented Aug 2, 2023 •
edited
Loading

Codecov Report

Merging #239 (45008f4) into main (02e80a9) will increase coverage by 0.05%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #239      +/-   ##
==========================================
+ Coverage   78.32%   78.38%   +0.05%     
==========================================
  Files          20       20              
  Lines         383      384       +1     
  Branches       75       76       +1     
==========================================
+ Hits          300      301       +1     
  Misses         60       60              
  Partials       23       23

see 4 files with indirect coverage changes

@wanglam wanglam marked this pull request as ready for review August 2, 2023 08:20
ruanyl
ruanyl reviewed Aug 2, 2023
View reviewed changes
public/components/monitoring/tests/model_deployment_table.test.tsx Outdated
@@ -122,11 +125,26 @@ describe('<DeployedModelTable />', () => {
expect(within(cells[2] as HTMLElement).getByText('on 3 of 3 nodes')).toBeInTheDocument();
});

it('should render Model ID at third column and copy to clipboard after text clicked', async () => {
it('should source name at third column', () => {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
it('should source name at third column', () => {
it('should display source name at third column', () => {

@wanglam
feat: add miss display words
45008f4 
Signed-off-by: Lin Wang <wonglam@amazon.com>
@wanglam wanglam merged commit 63c7a5a into opensearch-project:main Aug 2, 2023
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 2, 2023
@wanglam @github-actions
Add source field to distinguish local and external model (#239)
9566494 
* Revert "feat: exclude remote model for admin UI (#225)"

This reverts commit ba01d34.

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add source field to distinguish local and external model

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add miss display words

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 63c7a5a)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Aug 2, 2023
Merged
opensearch-trigger-bot bot pushed a commit that referenced this pull request Aug 2, 2023
@wanglam @github-actions
Add source field to distinguish local and external model (#239)
75b7b31 
* Revert "feat: exclude remote model for admin UI (#225)"

This reverts commit ba01d34.

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add source field to distinguish local and external model

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add miss display words

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 63c7a5a)
@opensearch-trigger-bot opensearch-trigger-bot bot mentioned this pull request Aug 2, 2023
Merged
wanglam added a commit that referenced this pull request Aug 2, 2023
@opensearch-trigger-bot @wanglam
Add source field to distinguish local and external model (#239) (#241)
ec30768 
* Revert "feat: exclude remote model for admin UI (#225)"

This reverts commit ba01d34.

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add source field to distinguish local and external model

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add miss display words

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 63c7a5a)

Co-authored-by: Lin Wang <wonglam@amazon.com>
wanglam added a commit that referenced this pull request Aug 2, 2023
@opensearch-trigger-bot @wanglam
Add source field to distinguish local and external model (#239) (#240)
5fc14a6 
* Revert "feat: exclude remote model for admin UI (#225)"

This reverts commit ba01d34.

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add source field to distinguish local and external model

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add miss display words

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 63c7a5a)

Co-authored-by: Lin Wang <wonglam@amazon.com>
@wanglam wanglam mentioned this pull request Sep 4, 2023
Merged
wanglam added a commit that referenced this pull request Nov 16, 2023
@wanglam @opensearch-trigger-bot
@opensearch-ci-bot @raintygao @peterzhuamazon
Merge 2.x to model registry (#289)
54f8603 
* Increment version to 2.8.0.0 (#169)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* chore: update husky to 8.0.3 to avoid use execa (#160) (#189)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 6a3faee)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* doc: add release notes for 2.8.0 (#190) (#191)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit f2b701b)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* feat: remove experiment warning banner (#194) (#195)

* feat: remove experiment warning banner

Signed-off-by: Lin Wang <wonglam@amazon.com>

* doc: update release notes for remove experiment banner

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 0ef4753)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* feat: enable ml-commons-dashboards plugin by default (#200) (#201)

* feat: enable ml-commons-dashboards plugin by default

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: update release notes for enable plugin by default

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit a1cb7de)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Revert remove experiment banner and enable by default (#203) (#204)

* Revert "feat: enable ml-commons-dashboards plugin by default (#200)"

This reverts commit a1cb7de.

Signed-off-by: Lin Wang <wonglam@amazon.com>

* Revert "feat: remove experiment warning banner (#194)"

This reverts commit 0ef4753.

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 31df7d4)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* remove background for dark mode to fix #206 (#209) (#212)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 2bc3f38)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Fix ml document link address (#210) (#213)

* update to correct machine learning document address to fix #208

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: update link in deployment table empty screen

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 7a33d01)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* feat: open external link in blank page (#211) (#214)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit e2825c4)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Increment version to 2.9.0.0 (#222)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* feat: exclude remote model for admin UI (#225) (#228)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit ba01d34)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Revert "Revert remove experiment banner and enable by default (#203)" (#229) (#231)

* Revert "Revert remove experiment banner and enable by default (#203)"

This reverts commit 31df7d4.

Signed-off-by: Lin Wang <wonglam@amazon.com>

* doc: remove release update for 2.8.0

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 2caf020)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* doc: add release notes for 2.9.0 (#232) (#233)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 02e80a9)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Add source field to distinguish local and external model (#239) (#240)

* Revert "feat: exclude remote model for admin UI (#225)"

This reverts commit ba01d34.

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add source field to distinguish local and external model

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: add miss display words

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 63c7a5a)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Fix no model show up when search a model (#238) (#242)

* fix: reset to page 1 after name or state search

Signed-off-by: Lin Wang <wonglam@amazon.com>

* refactor: remove unnecessary act call

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 24aa9df)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Feat mitigate to oui style variables (#227) (#246)

* feat: remove customized font size and font weight

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: update color to $ouiLinkColor

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: remove white background for refresh interval

Signed-off-by: Lin Wang <wonglam@amazon.com>

* remove ace theme

Signed-off-by: Lin Wang <wonglam@amazon.com>

* refactor: update <b> to <strong>

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit 3aa8eaf)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* feat: support external models in deployed model list (#248) (#251)

* feat: support external models in deployed model list

Signed-off-by: Lin Wang <wonglam@amazon.com>

* refactor: update name to required

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: connector index not found

Signed-off-by: Lin Wang <wonglam@amazon.com>

* refactor: update options filter with normal string[] value

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: hits not defined

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: update wording

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: connector id not exists in all connectors

Signed-off-by: Lin Wang <wonglam@amazon.com>

* fix: show models when failed to load all external connectors

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: update deployed models title to models

Signed-off-by: Lin Wang <wonglam@amazon.com>

* refactor: remove unused code in model connector filter

Signed-off-by: Lin Wang <wonglam@amazon.com>

* feat: address PR comments

Signed-off-by: Lin Wang <wonglam@amazon.com>

---------

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit cc3810b)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* update preview panel for external models (#252) (#253)

* feat: update preview panel for external models

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

* feat: update preview panel for external models

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

---------

Signed-off-by: tygao <tygao@amazon.com>
(cherry picked from commit 9bbd25f)

Co-authored-by: raintygao <tygao@amazon.com>

* Increment version to 2.10.0.0 (#237)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* feat: update ui component and use fallback (#254) (#256)

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

* feat: replace dash with em dash (#255) (#257)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit b817d98)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* doc: add release notes for 2.10 (#258) (#259)

* doc: add release notes for 2.10

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

* doc: append prs

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

* doc: separate prs

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

---------

Signed-off-by: tygao <tygao@amazon.com>
(cherry picked from commit db0003d)

Co-authored-by: tygao <tygao@amazon.com>

* Increment version to 2.11.0.0 (#265)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

* doc: add release notes for 2.11.0.0 (#276) (#277)

Signed-off-by: Lin Wang <wonglam@amazon.com>
(cherry picked from commit cc2d58e)

Co-authored-by: Lin Wang <wonglam@amazon.com>

* Onboard jenkins build docker image to ml-commons-dashboards github ci checks 2.x (#281)

Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>

* Increment version to 2.12.0.0 (#279)

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>

---------

Signed-off-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Signed-off-by: tygao <tygao@amazon.com>
Signed-off-by: Peter Zhu <zhujiaxi@amazon.com>
Signed-off-by: Lin Wang <wonglam@amazon.com>
Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Co-authored-by: opensearch-ci-bot <opensearch-infra@amazon.com>
Co-authored-by: raintygao <tygao@amazon.com>
Co-authored-by: Peter Zhu <zhujiaxi@amazon.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ruanyl ruanyl ruanyl approved these changes

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

Assignees
No one assigned
Labels
backport 2.x backport 2.9 v2.10.0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@wanglam @ruanyl @raintygao