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

Fix NIM selection issue #3482

Merged

Conversation

andrewballantyne
Copy link
Member

(I'll have to create an issue -- don't think we have it yet)

Description

Fixes the issue where if KServe is the only thing installed, NIM doesn't appear as an option and it auto-selects KServe.

How Has This Been Tested?

Not having MM installed then installing the NIM tile & then creating a new project

Test Impact

Test fixes -- no new tests

Request review criteria:

Self checklist (all need to be checked):

  • The developer has manually tested the changes and verified that the changes work
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has added tests or explained why testing cannot be added (unit or cypress tests for related changes)

If you have UI changes:

  • Included any necessary screenshots or gifs if it was a UI change.
  • Included tags to the UX team if it was a UI/UX change.

After the PR is posted & before it merges:

  • The developer has tested their solution on a cluster by using the image produced by the PR to main

@andrewballantyne
Copy link
Member Author

cc @olavtar

@andrewballantyne andrewballantyne force-pushed the fix-nim-card-support branch 6 times, most recently from 5283004 to a6836d4 Compare November 15, 2024 16:47
Copy link
Contributor

@mturley mturley left a comment

Choose a reason for hiding this comment

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

Mostly LGTM, just a few points of confusion

Copy link

codecov bot commented Nov 15, 2024

Codecov Report

Attention: Patch coverage is 93.33333% with 2 lines in your changes missing coverage. Please review.

Project coverage is 85.39%. Comparing base (142e63f) to head (c7cfd68).
Report is 2 commits behind head on main.

Files with missing lines Patch % Lines
...d/src/pages/modelServing/screens/projects/utils.ts 50.00% 2 Missing ⚠️
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #3482      +/-   ##
==========================================
- Coverage   85.39%   85.39%   -0.01%     
==========================================
  Files        1352     1352              
  Lines       30861    30869       +8     
  Branches     8613     8616       +3     
==========================================
+ Hits        26354    26360       +6     
- Misses       4507     4509       +2     
Files with missing lines Coverage Δ
frontend/src/concepts/areas/const.ts 100.00% <ø> (ø)
.../modelServing/screens/global/EmptyModelServing.tsx 78.57% <100.00%> (-4.77%) ⬇️
...lServing/screens/projects/ModelServingPlatform.tsx 99.11% <100.00%> (+0.03%) ⬆️
...modelServing/screens/projects/useIsNIMAvailable.ts 100.00% <100.00%> (ø)
frontend/src/pages/modelServing/screens/types.ts 100.00% <ø> (ø)
...c/pages/modelServing/useServingPlatformStatuses.ts 100.00% <100.00%> (ø)
...il/overview/serverModels/PlatformSelectSection.tsx 100.00% <100.00%> (ø)
...etail/overview/serverModels/ServeModelsSection.tsx 100.00% <100.00%> (ø)
...verModels/deployedModels/DeployedModelsSection.tsx 94.64% <100.00%> (-0.10%) ⬇️
...d/src/pages/modelServing/screens/projects/utils.ts 93.57% <50.00%> (-0.76%) ⬇️

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 142e63f...c7cfd68. Read the comment docs.

@andrewballantyne
Copy link
Member Author

Rebased on main to get backend support that recently merged.

Copy link
Contributor

@mturley mturley left a comment

Choose a reason for hiding this comment

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

Tested a case that failed: On a cluster with KServe and NIM enabled, in Project Details when you select a platform you get the Change button to un-select it on the Models tab but not on the Overview tab. Looking into why

Edit: this is just because the NIM enabled state takes some extra time to load and I wasn't being patient. Disregard.

Copy link
Contributor

@mturley mturley left a comment

Choose a reason for hiding this comment

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

Tested cases (on dashboard shared cluster kserve-pm):

  • With modelmesh and kserve enabled, I see both platforms available and selectable/unselectable in the Overview and Models tabs of a project, and the Model Serving page correctly directs me to the project to select a platform / deploy a model.
  • With only modelmesh enabled, the Overview and Models tabs of a project both properly autoselect modelmesh, and the Model Serving page correctly directs me to the project to deploy a model.
  • With only kserve enabled, the Overview and Models tabs of a project both properly autoselect kserve, and the Model Serving page correctly allows me to deploy a model.

Tested case (on borrowed cluster ai-dev04.kni.syseng.devcluster.openshift.com):

  • With kserve and NIM enabled, I see both platforms available and selectable/unselectable in the Overview and Models tabs of a project, and the Model Serving page correctly allows me to deploy a model.

Copy link
Contributor

openshift-ci bot commented Nov 15, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mturley

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-bot openshift-merge-bot bot merged commit 41e1fcf into opendatahub-io:main Nov 15, 2024
6 checks passed
andrewballantyne added a commit to andrewballantyne/odh-dashboard that referenced this pull request Nov 15, 2024
* Fix NIM selection issue

* Switch back to using a numerical value
openshift-merge-bot bot pushed a commit that referenced this pull request Nov 15, 2024
* feat: added ability to deploy more than one NIM model. (#3453)

* feat: added ability to deploy more than one NIM model.

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: refactored NIM related logic to nimUtils

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: changes to the error handling

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: changes to the error handling

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: changes .some for .forEach

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: deleting secrets fix

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: deploying the same model pvc fix

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: added a unit test for getNIMResourcesToDelete

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: will add a unit test for getNIMResourcesToDelete later

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

---------

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: Modify NIM enablement process (#3455)

* Modify NIM enablement process

* Clean up code and remove unnecessary manifests

* Add logic to check the conditions of the odh-nim-account CR

* Added more check for enabled integration apps

* If failed to fetch integration app status, should show error on the related tile in the enable application page, should not remove the tile

* check integration app status in explore application page

* Fix lint issue

* Fix lint issue

* add annotations to the secret and the account CR

* Update backend/src/routes/api/integrations/nim/index.ts

Co-authored-by: Andrew Ballantyne <8126518+andrewballantyne@users.noreply.github.com>

* Update backend/src/routes/api/components/list.ts

Co-authored-by: Andrew Ballantyne <8126518+andrewballantyne@users.noreply.github.com>

* clean up

* feat: listing all NIM accounts in the namespace, returning the first one.

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* Avoid mutating object in useWatchIntegrationComponents

* Clean up

* feat: added logic for displaying the tile correctly

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: changes for enabling

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: updated mock component with the new properties.

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: addressed PR comments with updates and improvements

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: backend bug fix

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: Missed change from previous commit

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

* feat: fix for the enabled page and enabled.cy.ts

Signed-off-by: Olga Lavtar <olavtar@redhat.com>

---------

Signed-off-by: Olga Lavtar <olavtar@redhat.com>
Co-authored-by: Andrew Ballantyne <8126518+andrewballantyne@users.noreply.github.com>
Co-authored-by: Olga Lavtar <olavtar@redhat.com>

* Fix NIM selection issue (#3482)

* Fix NIM selection issue

* Switch back to using a numerical value

---------

Signed-off-by: Olga Lavtar <olavtar@redhat.com>
Co-authored-by: olavtar <94576904+olavtar@users.noreply.github.com>
Co-authored-by: yu zhao <yzha@redhat.com>
Co-authored-by: Olga Lavtar <olavtar@redhat.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.

2 participants