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

feat(frontend): Improve models input UI/UX in settings #3530

Merged
merged 22 commits into from
Aug 23, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Improve keys without providers
  • Loading branch information
amanape committed Aug 21, 2024
commit b30e7d905d63746720a1635bcbf4ca37c77f0626
68 changes: 36 additions & 32 deletions frontend/src/components/modals/settings/ModelSelector.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,41 +27,45 @@ export function ModelSelector({ models, onModelChange }: ModelSelectorProps) {
};

return (
<div>
<span data-testid="model-id">{litellmId || "No model selected"}</span>
<div className="flex flex-col gap-2">
<span className="text-center italic text-gray-500" data-testid="model-id">
{litellmId?.replace("other", "") || "No model selected"}
</span>

<Autocomplete
label="Provider"
onSelectionChange={(e) => {
if (e?.toString()) handleChangeProvider(e.toString());
}}
>
{Object.keys(models).map((provider) => (
<AutocompleteItem key={provider} value={provider}>
{provider}
</AutocompleteItem>
))}
</Autocomplete>
<div className="flex flex-col gap-3">
<Autocomplete
label="Provider"
onSelectionChange={(e) => {
if (e?.toString()) handleChangeProvider(e.toString());
}}
>
{Object.keys(models).map((provider) => (
<AutocompleteItem key={provider} value={provider}>
{provider}
</AutocompleteItem>
))}
</Autocomplete>

<Autocomplete
label="Model"
onSelectionChange={(e) => {
if (e?.toString()) handleChangeModel(e.toString());
}}
isDisabled={!selectedProvider}
>
{selectedProvider ? (
models[selectedProvider].models.map((model) => (
<AutocompleteItem key={model} value={model}>
{model}
<Autocomplete
label="Model"
onSelectionChange={(e) => {
if (e?.toString()) handleChangeModel(e.toString());
}}
isDisabled={!selectedProvider}
>
{selectedProvider ? (
models[selectedProvider].models.map((model) => (
<AutocompleteItem key={model} value={model}>
{model}
</AutocompleteItem>
))
) : (
<AutocompleteItem key="" value="">
Select a model
</AutocompleteItem>
))
) : (
<AutocompleteItem key="" value="">
Select a model
</AutocompleteItem>
)}
</Autocomplete>
)}
</Autocomplete>
</div>
</div>
);
}
5 changes: 5 additions & 0 deletions frontend/src/components/modals/settings/SettingsModal.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import toast from "#/utils/toast";
import BaseModal from "../base-modal/BaseModal";
import SettingsForm from "./SettingsForm";
import { organizeModelsAndProviders } from "#/utils/organizeModelsAndProviders";
import { ModelSelector } from "./ModelSelector";

interface SettingsProps {
isOpen: boolean;
Expand Down Expand Up @@ -184,6 +185,10 @@ function SettingsModal({ isOpen, onOpenChange }: SettingsProps) {
},
]}
>
<ModelSelector
models={organizeModelsAndProviders(models)}
onModelChange={handleModelChange}
/>
{loading && <Spinner />}
{!loading && (
<SettingsForm
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/utils/organizeModelsAndProviders.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ test("organizeModelsAndProviders", () => {
separator: "/",
models: ["@cf/mistral/mistral-7b-instruct-v0.1"],
},
"": {
other: {
separator: "",
models: ["gpt-4o", "together-ai-21.1b-41b", "gpt-3.5-turbo"],
},
Expand Down
7 changes: 4 additions & 3 deletions frontend/src/utils/organizeModelsAndProviders.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,11 @@ export const organizeModelsAndProviders = (models: string[]) => {
provider,
model: modelId,
} = extractModelAndProvider(model);
if (!object[provider]) {
object[provider] = { separator, models: [] };
const key = provider || "other";
if (!object[key]) {
object[key] = { separator, models: [] };
}
object[provider].models.push(modelId);
object[key].models.push(modelId);
});
return object;
};