fix: removed none and enforced runtime exlusion

Signed-off-by: Brian <[email protected]>

Author: bmahabirbu

packages/frontend/src/lib/select/InferenceRuntimeSelect.spec.ts

@@ -23,7 +23,7 @@ import InferenceRuntimeSelect from '/@/lib/select/InferenceRuntimeSelect.svelte'
 import { InferenceType } from '@shared/models/IInference';
 
 const getFilteredOptions = (exclude: InferenceType[] = []): InferenceType[] =>
-  Object.values(InferenceType).filter(type => !exclude.includes(type));
+  Object.values(InferenceType).filter(type => type !== InferenceType.NONE && !exclude.includes(type));
 
 beforeEach(() => {
   // mock scrollIntoView

packages/frontend/src/lib/select/InferenceRuntimeSelect.svelte

@@ -10,7 +10,7 @@ interface Props {
 let { value = $bindable(), disabled, exclude = [] }: Props = $props();
 
 // Filter options based on optional exclude list
-const options = Object.values(InferenceType).filter(type => !exclude.includes(type));
+const options = Object.values(InferenceType).filter(type => type !== InferenceType.NONE && !exclude.includes(type));
 
 function handleOnChange(nValue: { value: string } | undefined): void {
   if (nValue) {

packages/frontend/src/pages/PlaygroundCreate.spec.ts

@@ -102,14 +102,32 @@ beforeEach(() => {
   vi.mocked(tasksStore).tasks = tasksList;
 });
 
-test('model should be selected by default', () => {
+test('model should not be selected by default when no runtime is set', () => {
+  const modelsInfoList = writable<ModelInfo[]>([dummyLlamaCppModel]);
+  vi.mocked(modelsInfoStore).modelsInfo = modelsInfoList;
+
+  const { container } = render(PlaygroundCreate);
+
+  // Model should not be displayed because it's filtered out when runtime is undefined
+  const model = within(container).queryByText(dummyLlamaCppModel.name);
+  expect(model).toBeNull();
+});
+
+test('model should be selected by default when runtime is set', async () => {
   const modelsInfoList = writable<ModelInfo[]>([dummyLlamaCppModel]);
   vi.mocked(modelsInfoStore).modelsInfo = modelsInfoList;
 
   vi.mocked(studioClient.requestCreatePlayground).mockRejectedValue('error creating playground');
 
   const { container } = render(PlaygroundCreate);
 
+  // Select our runtime
+  const dropdown = within(container).getByLabelText('Select Inference Runtime');
+  await userEvent.click(dropdown);
+
+  const llamacppOption = within(container).getByText(InferenceType.LLAMA_CPP);
+  await userEvent.click(llamacppOption);
+
   const model = within(container).getByText(dummyLlamaCppModel.name);
   expect(model).toBeInTheDocument();
 });
@@ -152,6 +170,12 @@ test('should display error message if createPlayground fails', async () => {
   const errorMessage = within(container).queryByLabelText('Error Message Content');
   expect(errorMessage).not.toBeInTheDocument();
 
+  //make sure to select model
+  const dropdown = within(container).getByLabelText('Select Model');
+  await userEvent.click(dropdown);
+  const option = within(container).getByText(dummyLlamaCppModel.name);
+  await userEvent.click(option);
+
   const createButton = within(container).getByTitle('Create playground');
   await userEvent.click(createButton);
 

packages/frontend/src/pages/PlaygroundCreate.svelte

@@ -16,12 +16,10 @@ import ModelSelect from '/@/lib/select/ModelSelect.svelte';
 import { InferenceType } from '@shared/models/IInference';
 import InferenceRuntimeSelect from '/@/lib/select/InferenceRuntimeSelect.svelte';
 
-// Preset the runtime selection
 let runtime: InferenceType | undefined = undefined;
-// exlude whisper.cpp from selection
+// exlude certain runtimes from selection
 let exclude: InferenceType[] = [InferenceType.WHISPER_CPP];
 let localModels: ModelInfo[];
-// Special case for "ALL" returns runtimes with optional exclution
 $: localModels = $modelsInfo.filter(
   model => model.file && (!runtime || model.backend === runtime) && !exclude.includes(model.backend as InferenceType),
 );
@@ -38,7 +36,8 @@ let trackingId: string | undefined = undefined;
 // The trackedTasks are the tasks linked to the trackingId
 let trackedTasks: Task[] = [];
 
-$: if (localModels.length > 0) {
+// Preset model selection depending on runtime
+$: if (runtime && localModels.length > 0) {
   model = localModels[0];
 } else {
   model = undefined;
@@ -158,6 +157,7 @@ export function goToUpPage(): void {
             Inference Runtime
           </label>
           <InferenceRuntimeSelect bind:value={runtime} exclude={exclude} />
+
           <!-- model input -->
           <label for="model" class="pt-4 block mb-2 font-bold text-[var(--pd-content-card-header-text)]">Model</label>
           <ModelSelect models={localModels} disabled={submitted} bind:value={model} />