forked from containers/podman-desktop-extension-ai-lab
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: service creation form (containers#529)
* feat: creating service creation form Signed-off-by: axel7083 <[email protected]> * fix: hide service name Signed-off-by: axel7083 <[email protected]> * fix: equal check missing Signed-off-by: axel7083 <[email protected]> * feat: adding loading animation Signed-off-by: axel7083 <[email protected]> * test: ensuring ModelColumnAction works as expected Signed-off-by: axel7083 <[email protected]> * test: ensuring CreateService works as expected Signed-off-by: axel7083 <[email protected]> * fix: linter&prettier Signed-off-by: axel7083 <[email protected]> * feat: using getHostFreePort() Signed-off-by: axel7083 <[email protected]> * fix: tests Signed-off-by: axel7083 <[email protected]> * fix: remove name and container image input Signed-off-by: axel7083 <[email protected]> * fix: unit tests Signed-off-by: axel7083 <[email protected]> --------- Signed-off-by: axel7083 <[email protected]>
- Loading branch information
Showing
6 changed files
with
273 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,100 @@ | ||
| /********************************************************************** | ||
| * Copyright (C) 2024 Red Hat, Inc. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| * | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| ***********************************************************************/ | ||
|
|
||
| import { vi, beforeEach, test, expect } from 'vitest'; | ||
| import { studioClient } from '/@/utils/client'; | ||
| import { render, screen, fireEvent } from '@testing-library/svelte'; | ||
| import CreateService from '/@/pages/CreateService.svelte'; | ||
|
|
||
| const mocks = vi.hoisted(() => { | ||
| return { | ||
| modelsInfoSubscribeMock: vi.fn(), | ||
| modelsInfoQueriesMock: { | ||
| subscribe: (f: (msg: any) => void) => { | ||
| f(mocks.modelsInfoSubscribeMock()); | ||
| return () => {}; | ||
| }, | ||
| }, | ||
| }; | ||
| }); | ||
|
|
||
| vi.mock('../stores/modelsInfo', async () => { | ||
| return { | ||
| modelsInfo: mocks.modelsInfoQueriesMock, | ||
| }; | ||
| }); | ||
|
|
||
| vi.mock('../utils/client', async () => ({ | ||
| studioClient: { | ||
| createInferenceServer: vi.fn(), | ||
| getHostFreePort: vi.fn(), | ||
| }, | ||
| })); | ||
|
|
||
| beforeEach(() => { | ||
| vi.resetAllMocks(); | ||
| mocks.modelsInfoSubscribeMock.mockReturnValue([]); | ||
| vi.mocked(studioClient.createInferenceServer).mockResolvedValue(undefined); | ||
| vi.mocked(studioClient.getHostFreePort).mockResolvedValue(8888); | ||
| }); | ||
|
|
||
| test('create button should be disabled when no model id provided', async () => { | ||
| render(CreateService); | ||
|
|
||
| await vi.waitFor(() => { | ||
| const createBtn = screen.getByTitle('Create service'); | ||
| expect(createBtn).toBeDefined(); | ||
| expect(createBtn.attributes.getNamedItem('disabled')).toBeTruthy(); | ||
| }); | ||
| }); | ||
|
|
||
| test('expect error message to be displayed when no model locally', async () => { | ||
| render(CreateService); | ||
|
|
||
| await vi.waitFor(() => { | ||
| const alert = screen.getByRole('alert'); | ||
| expect(alert).toBeDefined(); | ||
| }); | ||
| }); | ||
|
|
||
| test('expect error message to be hidden when models locally', () => { | ||
| mocks.modelsInfoSubscribeMock.mockReturnValue([{ id: 'random', file: true }]); | ||
| render(CreateService); | ||
|
|
||
| const alert = screen.queryByRole('alert'); | ||
| expect(alert).toBeNull(); | ||
| }); | ||
|
|
||
| test('button click should call createInferenceServer', async () => { | ||
| mocks.modelsInfoSubscribeMock.mockReturnValue([{ id: 'random', file: true }]); | ||
| render(CreateService); | ||
|
|
||
| let createBtn: HTMLElement | undefined = undefined; | ||
| await vi.waitFor(() => { | ||
| createBtn = screen.getByTitle('Create service'); | ||
| expect(createBtn).toBeDefined(); | ||
| }); | ||
|
|
||
| if (createBtn === undefined) throw new Error('createBtn undefined'); | ||
|
|
||
| await fireEvent.click(createBtn); | ||
| expect(vi.mocked(studioClient.createInferenceServer)).toHaveBeenCalledWith({ | ||
| modelsInfo: [{ id: 'random', file: true }], | ||
| port: 8888, | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| <script lang="ts"> | ||
| import NavPage from '/@/lib/NavPage.svelte'; | ||
| import Button from '/@/lib/button/Button.svelte'; | ||
| import { faExclamationCircle, faPlus, faPlusCircle } from '@fortawesome/free-solid-svg-icons'; | ||
| import { modelsInfo } from '/@/stores/modelsInfo'; | ||
| import type { ModelInfo } from '@shared/src/models/IModelInfo'; | ||
| import Fa from 'svelte-fa'; | ||
| import { router } from 'tinro'; | ||
| import { onMount } from 'svelte'; | ||
| import { studioClient } from '/@/utils/client'; | ||
| let submitting: boolean = false; | ||
| let localModels: ModelInfo[]; | ||
| $: localModels = $modelsInfo.filter(model => model.file); | ||
| let containerPort: number | undefined = undefined; | ||
| let modelId: string | undefined = undefined; | ||
| const onContainerPortInput = (event: Event): void => { | ||
| const raw = (event.target as HTMLInputElement).value; | ||
| try { | ||
| containerPort = parseInt(raw); | ||
| } catch (e: unknown) { | ||
| console.warn('invalid value for container port', e); | ||
| containerPort = 8888; | ||
| } | ||
| }; | ||
| const submit = () => { | ||
| const model: ModelInfo | undefined = localModels.find(model => model.id === modelId); | ||
| if (model === undefined) throw new Error('model id not valid.'); | ||
| if (containerPort === undefined) throw new Error('invalid container port'); | ||
| // disable submit button | ||
| submitting = true; | ||
| studioClient | ||
| .createInferenceServer({ | ||
| modelsInfo: [model], | ||
| port: containerPort, | ||
| }) | ||
| .catch(err => { | ||
| console.error('Something wrong while trying to create the inference server.', err); | ||
| }) | ||
| .finally(() => { | ||
| submitting = false; | ||
| router.goto('/services'); | ||
| }); | ||
| }; | ||
| const openModelsPage = () => { | ||
| router.goto(`/models`); | ||
| }; | ||
| onMount(async () => { | ||
| containerPort = await studioClient.getHostFreePort(); | ||
| const queryModelId = router.location.query.get('model-id'); | ||
| if (queryModelId !== undefined && typeof queryModelId === 'string') { | ||
| modelId = queryModelId; | ||
| } | ||
| }); | ||
| </script> | ||
|
|
||
| <NavPage icon="{faPlus}" title="Creating Model service" searchEnabled="{false}" loading="{containerPort === undefined}"> | ||
| <svelte:fragment slot="content"> | ||
| <div class="bg-charcoal-800 m-5 pt-5 space-y-6 px-8 sm:pb-6 xl:pb-8 rounded-lg w-full h-fit"> | ||
| <div class="w-full"> | ||
| <!-- model input --> | ||
| <label for="model" class="pt-4 block mb-2 text-sm font-bold text-gray-400">Model</label> | ||
| <select | ||
| required | ||
| bind:value="{modelId}" | ||
| id="providerChoice" | ||
| class="border text-sm rounded-lg w-full focus:ring-purple-500 focus:border-purple-500 block p-2.5 bg-charcoal-900 border-charcoal-900 placeholder-gray-700 text-white" | ||
| name="providerChoice"> | ||
| {#each localModels as model} | ||
| <option class="my-1" value="{model.id}">{model.name}</option> | ||
| {/each} | ||
| </select> | ||
| {#if localModels.length === 0} | ||
| <div class="text-red-500 p-1 flex flex-row items-center"> | ||
| <Fa size="1.1x" class="cursor-pointer text-red-500" icon="{faExclamationCircle}" /> | ||
| <div role="alert" aria-label="Error Message Content" class="ml-2"> | ||
| You don't have any models downloaded. You can download them in <a | ||
| href="{'javascript:void(0);'}" | ||
| class="underline" | ||
| title="Models page" | ||
| on:click="{openModelsPage}">models page</a | ||
| >. | ||
| </div> | ||
| </div> | ||
| {/if} | ||
| <!-- container port input --> | ||
| <label for="containerPort" class="pt-4 block mb-2 text-sm font-bold text-gray-400">Container port</label> | ||
| <input | ||
| type="number" | ||
| bind:value="{containerPort}" | ||
| on:input="{onContainerPortInput}" | ||
| class="w-full p-2 outline-none text-sm bg-charcoal-600 rounded-sm text-gray-700 placeholder-gray-700" | ||
| placeholder="8888" | ||
| name="containerPort" | ||
| required /> | ||
| </div> | ||
| <footer> | ||
| <div class="w-full flex flex-col"> | ||
| <Button | ||
| title="Create service" | ||
| inProgress="{submitting}" | ||
| on:click="{submit}" | ||
| disabled="{!modelId}" | ||
| icon="{faPlusCircle}"> | ||
| Create service | ||
| </Button> | ||
| </div> | ||
| </footer> | ||
| </div> | ||
| </svelte:fragment> | ||
| </NavPage> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters