feat: support external models in deployed model list #248

wanglam · 2023-08-25T04:33:43Z

Description

Support external models in the deployed model list

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.

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

codecov · 2023-08-25T04:42:35Z

Codecov Report

Merging #248 (284d431) into main (3aa8eaf) will increase coverage by 1.46%.
The diff coverage is n/a.

@@            Coverage Diff             @@
##             main     #248      +/-   ##
==========================================
+ Coverage   78.53%   80.00%   +1.46%     
==========================================
  Files          20       25       +5     
  Lines         382      470      +88     
  Branches       75      101      +26     
==========================================
+ Hits          300      376      +76     
- Misses         60       67       +7     
- Partials       22       27       +5

see 11 files with indirect coverage changes

raintygao · 2023-08-28T02:17:50Z

public/components/preview_panel/index.tsx

+    id?: string;
+    name?: string;
+    description?: string;
+  };


Should the params passed be
connector?: { id?: string; name: string; description?: string; }; ?
Or in the case of external, the name may also be empty?

Sure, let me check if we can modify this name to required.

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

ruanyl · 2023-08-25T06:29:28Z

public/components/common/options_filter/options_filter.tsx

+  const handleFilterItemClick = useCallback((clickItemValue: T) => {
+    onChangeRef.current(
+      valueRef.current.includes(clickItemValue)
+        ? valueRef.current.filter((item) => item !== clickItemValue)


I don't hold a strong opinion, but just want to discuss this with you. I kinda feel it's a bit over-optimize to assign the props to a ref, like onChangeRef and valueRef. I understand using ref could avoid a few re-renders. Personally, I'd do optimization when facing the actual performance problem instead of optimize the code too early.

ruanyl · 2023-08-25T06:30:55Z

public/components/common/options_filter/options_filter.tsx

+
+  return (
+    <EuiPopover
+      id="popoverExampleMultiSelect"


Maybe we should give it a more appropriate name instead calling it some "example"

This component was copy from the feature/model-registry branch, forget to remove id. Will leave an id property and pass different value from outside.

ruanyl · 2023-08-29T05:55:50Z

public/components/monitoring/model_connector_filter.tsx

+
+  for (const connectorName of internalConnectorNames) {
+    if (!uniqueExternalConnectors[connectorName]) {
+      uniqueExternalConnectors[connectorName] = [];


Could you leave a comment to elaborate why set it to []?

#We don't need these codes after filter refactor, forget to removed.

ruanyl · 2023-08-29T06:04:48Z

public/components/monitoring/model_source_filter.tsx

+
+type SourceOptionValue = 'local' | 'external';
+
+const sourceOptions = [


better to name it as SOURCE_OPTIONS

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

* 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)

* 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>

* 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>

feat: support external models in deployed model list

a64b980

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

wanglam added the backport 2.x label Aug 25, 2023

wanglam marked this pull request as ready for review August 25, 2023 05:11

wanglam requested review from ruanyl and raintygao as code owners August 25, 2023 05:11

raintygao reviewed Aug 28, 2023

View reviewed changes

wanglam added 8 commits August 28, 2023 14:30

refactor: update name to required

f9ad013

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

fix: connector index not found

9b10990

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

refactor: update options filter with normal string[] value

afbb1f3

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

fix: hits not defined

eddca71

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

fix: update wording

3382ea5

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

fix: connector id not exists in all connectors

ddbfa82

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

fix: show models when failed to load all external connectors

77f9063

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

feat: update deployed models title to models

500f3e6

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

raintygao approved these changes Aug 29, 2023

View reviewed changes

ruanyl reviewed Aug 29, 2023

View reviewed changes

wanglam added 2 commits August 29, 2023 16:16

refactor: remove unused code in model connector filter

fb05e7e

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

feat: address PR comments

284d431

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

wanglam requested a review from ruanyl August 29, 2023 08:17

ruanyl approved these changes Aug 29, 2023

View reviewed changes

wanglam merged commit cc3810b into opensearch-project:main Aug 29, 2023

opensearch-trigger-bot bot mentioned this pull request Aug 29, 2023

[Backport 2.x] feat: support external models in deployed model list #251

Merged

raintygao added the v2.10.0 label Sep 4, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support external models in deployed model list #248

feat: support external models in deployed model list #248

wanglam commented Aug 25, 2023

codecov bot commented Aug 25, 2023 •

edited

Loading

raintygao Aug 28, 2023 •

edited

Loading

wanglam Aug 28, 2023

ruanyl Aug 25, 2023

ruanyl Aug 25, 2023

wanglam Aug 29, 2023

ruanyl Aug 29, 2023

wanglam Aug 29, 2023

ruanyl Aug 29, 2023


		type SourceOptionValue = 'local' \| 'external';

		const sourceOptions = [

feat: support external models in deployed model list #248

feat: support external models in deployed model list #248

Conversation

wanglam commented Aug 25, 2023

Description

Issues Resolved

codecov bot commented Aug 25, 2023 • edited Loading

Codecov Report

raintygao Aug 28, 2023 • edited Loading

Choose a reason for hiding this comment

wanglam Aug 28, 2023

Choose a reason for hiding this comment

ruanyl Aug 25, 2023

Choose a reason for hiding this comment

ruanyl Aug 25, 2023

Choose a reason for hiding this comment

wanglam Aug 29, 2023

Choose a reason for hiding this comment

ruanyl Aug 29, 2023

Choose a reason for hiding this comment

wanglam Aug 29, 2023

Choose a reason for hiding this comment

ruanyl Aug 29, 2023

Choose a reason for hiding this comment

codecov bot commented Aug 25, 2023 •

edited

Loading

raintygao Aug 28, 2023 •

edited

Loading