-
Notifications
You must be signed in to change notification settings - Fork 553
refactor: updates prompt model parameters UI #2548
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
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| "use client"; | ||
|
|
||
| import { usePromptContext } from "@/components/prompts/context"; | ||
| import { AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"; | ||
| import { cn } from "@/lib/utils"; | ||
| import PromptDeploymentView from "./promptDeploymentView"; | ||
|
|
||
| export type SettingsSidebarSection = "parameters" | "deployments"; | ||
|
|
||
| export function PromptDeploymentsAccordionItem({ | ||
| activeSection, | ||
| }: { | ||
| activeSection: SettingsSidebarSection | undefined; | ||
| }) { | ||
| const { selectedPromptId } = usePromptContext(); | ||
| if (!selectedPromptId) { | ||
| return null; | ||
| } | ||
|
|
||
| const deploymentsOpen = activeSection === "deployments"; | ||
|
|
||
| return ( | ||
| <AccordionItem | ||
| value="deployments" | ||
| className={cn( | ||
| "border-border/60 flex min-h-0 flex-col border-b-0 border-t pt-1", | ||
| deploymentsOpen ? "min-h-0 grow overflow-hidden" : "shrink-0 grow-0", | ||
| )} | ||
| > | ||
| <AccordionTrigger data-testid="prompt-deployments-trigger" className="text-muted-foreground w-full min-w-0 shrink-0 py-3 pr-1 text-xs font-medium uppercase hover:no-underline"> | ||
| <span className="min-w-0 flex-1 text-left">Deployments</span> | ||
| </AccordionTrigger> | ||
| <AccordionContent | ||
| containerClassName="data-[state=open]:flex data-[state=open]:min-h-0 data-[state=open]:flex-1 data-[state=open]:flex-col" | ||
| className="min-h-0 flex-1 overflow-y-auto pb-2 pt-0" | ||
| > | ||
| <PromptDeploymentView omitTitle /> | ||
| </AccordionContent> | ||
| </AccordionItem> | ||
| ); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,18 @@ | ||
| import { Accordion, AccordionContent, AccordionItem, AccordionTrigger } from "@/components/ui/accordion"; | ||
| import { ComboboxSelect } from "@/components/ui/combobox"; | ||
| import ModelParameters from "@/components/ui/custom/modelParameters"; | ||
| import { Label } from "@/components/ui/label"; | ||
| import { ModelMultiselect } from "@/components/ui/modelMultiselect"; | ||
| import { ScrollArea } from "@/components/ui/scrollArea"; | ||
| import { Separator } from "@/components/ui/separator"; | ||
| import { Skeleton } from "@/components/ui/skeleton"; | ||
| import { getProviderLabel } from "@/lib/constants/logs"; | ||
| import { useGetVirtualKeysQuery } from "@/lib/store"; | ||
| import { useGetAllKeysQuery, useGetProvidersQuery } from "@/lib/store/apis/providersApi"; | ||
| import { ModelProviderName } from "@/lib/types/config"; | ||
| import { ModelParams } from "@/lib/types/prompts"; | ||
| import PromptDeploymentView from "@enterprise/components/prompt-deployments/promptDeploymentView"; | ||
| import { useCallback, useMemo } from "react"; | ||
| import { cn } from "@/lib/utils"; | ||
| import { PromptDeploymentsAccordionItem } from "@enterprise/components/prompt-deployments/promptDeploymentsAccordionItem"; | ||
| import { useCallback, useMemo, useState } from "react"; | ||
| import { ApiKeySelectorView } from "../components/apiKeySelectorView"; | ||
| import { VariablesTableView } from "../components/variablesTableView"; | ||
| import { usePromptContext } from "../context"; | ||
|
|
@@ -26,6 +27,9 @@ export function SettingsPanel() { | |
| setModelParams: onModelParamsChange, | ||
| apiKeyId, | ||
| setApiKeyId, | ||
| variables, | ||
| setVariables, | ||
| selectedPromptId, | ||
| } = usePromptContext(); | ||
|
|
||
| const onProviderChange = useCallback( | ||
|
|
@@ -113,6 +117,11 @@ export function SettingsPanel() { | |
| [onModelParamsChange], | ||
| ); | ||
|
|
||
| const hasModel = Boolean(model); | ||
|
|
||
| type SettingsSection = "parameters" | "deployments"; | ||
| const [openSection, setOpenSection] = useState<SettingsSection | undefined>("parameters"); | ||
|
roroghost17 marked this conversation as resolved.
|
||
|
|
||
| if (isInitialLoading) { | ||
| return ( | ||
| <div className="flex h-full flex-col"> | ||
|
|
@@ -131,66 +140,98 @@ export function SettingsPanel() { | |
| } | ||
|
|
||
| return ( | ||
| <div className="flex h-full flex-col"> | ||
| <ScrollArea className="grow overflow-y-auto" viewportClassName="no-table"> | ||
| <div className="space-y-6 p-4"> | ||
| <div className="flex flex-col gap-2" data-testid="settings-provider"> | ||
| <Label className="text-muted-foreground text-xs font-medium uppercase">Provider</Label> | ||
| <ComboboxSelect | ||
| options={providerOptions} | ||
| value={provider} | ||
| onValueChange={(v) => v && onProviderChange(v)} | ||
| placeholder="Select provider" | ||
| hideClear | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="flex flex-col gap-2" data-testid="settings-model"> | ||
| <Label className="text-muted-foreground text-xs font-medium uppercase">Model</Label> | ||
| <ModelMultiselect | ||
| provider={provider} | ||
| keys={filterKeys && filterKeys.length > 0 ? filterKeys : undefined} | ||
| vks={filterVks} | ||
| value={model} | ||
| onChange={(v) => onModelChange(v)} | ||
| isSingleSelect | ||
| unfiltered | ||
| placeholder={!provider ? "Select a provider first" : "Select model"} | ||
| disabled={!provider} | ||
| /> | ||
| </div> | ||
|
|
||
| {(providerKeys.length > 0 || providerVirtualKeys.length > 0) && !!provider && ( | ||
| <ApiKeySelectorView | ||
| providerKeys={providerKeys} | ||
| virtualKeys={providerVirtualKeys} | ||
| value={apiKeyId} | ||
| onValueChange={(v) => onApiKeyIdChange(v ?? "__auto__")} | ||
| disabled={!provider} | ||
| /> | ||
| )} | ||
|
|
||
| {Object.keys(variables).length > 0 && ( | ||
| <> | ||
| <Separator /> | ||
| <VariablesTableView variables={variables} onChange={setVariables} /> | ||
| </> | ||
| )} | ||
|
|
||
| {model && ( | ||
| <> | ||
| <Separator /> | ||
|
|
||
| <div className="flex flex-col gap-4"> | ||
| <Label className="text-muted-foreground text-xs font-medium uppercase">Model Parameters</Label> | ||
| <ModelParameters model={model} config={modelParams} onChange={handleModelParamsChange} hideFields={["promptTools"]} /> | ||
| <div className="flex h-full min-h-0 flex-col"> | ||
| <div className="flex min-h-0 flex-1 flex-col px-4 pb-4 pt-2"> | ||
| <Accordion | ||
| type="single" | ||
| collapsible | ||
| value={openSection ?? ""} | ||
| onValueChange={(v) => { | ||
| if (v === "parameters" || v === "deployments") { | ||
| setOpenSection(v); | ||
| } else { | ||
| setOpenSection(undefined); | ||
| } | ||
| }} | ||
| className="flex min-h-0 flex-1 flex-col" | ||
|
Comment on lines
122
to
+156
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
When the user has the "Deployments" section active ( openSection === "parameters" ? "flex-1" : "shrink-0 overflow-hidden"…it gets Consider resetting useEffect(() => {
if (!selectedPromptId && openSection === "deployments") {
setOpenSection("parameters");
}
}, [selectedPromptId, openSection]); |
||
| > | ||
| <AccordionItem | ||
| value="parameters" | ||
| className={cn( | ||
| "flex min-h-0 flex-col border-b-0", | ||
| openSection === "parameters" ? "flex-1" : "shrink-0 overflow-hidden", | ||
| )} | ||
| > | ||
| <AccordionTrigger data-testid="prompts-configuration-trigger" className="text-muted-foreground shrink-0 py-3 pr-1 text-xs font-medium uppercase hover:no-underline"> | ||
| <span className="min-w-0 flex-1 text-left font-semibold">Configuration</span> | ||
| </AccordionTrigger> | ||
| <AccordionContent | ||
| containerClassName="data-[state=open]:flex data-[state=open]:min-h-0 data-[state=open]:flex-1 data-[state=open]:flex-col" | ||
| className="min-h-0 flex-1 overflow-y-auto pb-2 pt-0" | ||
| > | ||
| <div className="space-y-6"> | ||
| <div className="flex flex-col gap-2" data-testid="settings-provider"> | ||
| <Label className="text-muted-foreground text-xs font-medium uppercase">Provider</Label> | ||
| <ComboboxSelect | ||
| options={providerOptions} | ||
| value={provider} | ||
| onValueChange={(v) => v && onProviderChange(v)} | ||
| placeholder="Select provider" | ||
| hideClear | ||
| /> | ||
| </div> | ||
|
|
||
| <div className="flex flex-col gap-2" data-testid="settings-model"> | ||
| <Label className="text-muted-foreground text-xs font-medium uppercase">Model</Label> | ||
| <ModelMultiselect | ||
| provider={provider} | ||
| keys={filterKeys && filterKeys.length > 0 ? filterKeys : undefined} | ||
| vks={filterVks} | ||
| value={model} | ||
| onChange={(v) => onModelChange(v)} | ||
| isSingleSelect | ||
| placeholder={!provider ? "Select a provider first" : "Select model"} | ||
| disabled={!provider} | ||
| unfiltered={true} | ||
| /> | ||
| </div> | ||
|
|
||
| {(providerKeys.length > 0 || providerVirtualKeys.length > 0) && !!provider && ( | ||
| <ApiKeySelectorView | ||
| providerKeys={providerKeys} | ||
| virtualKeys={providerVirtualKeys} | ||
| value={apiKeyId} | ||
| onValueChange={(v) => onApiKeyIdChange(v ?? "__auto__")} | ||
| disabled={!provider} | ||
| /> | ||
| )} | ||
|
|
||
| {Object.keys(variables).length > 0 && ( | ||
| <> | ||
| <Separator /> | ||
| <VariablesTableView variables={variables} onChange={setVariables} /> | ||
| </> | ||
| )} | ||
|
|
||
| {hasModel && ( | ||
| <> | ||
| <Separator /> | ||
| <div className="flex flex-col gap-4"> | ||
| <ModelParameters | ||
| model={model} | ||
| config={modelParams} | ||
| onChange={handleModelParamsChange} | ||
| hideFields={["promptTools"]} | ||
| /> | ||
| </div> | ||
| </> | ||
| )} | ||
| </div> | ||
| </> | ||
| )} | ||
|
|
||
| <PromptDeploymentView /> | ||
| </div> | ||
| </ScrollArea> | ||
| </AccordionContent> | ||
| </AccordionItem> | ||
| {selectedPromptId && <PromptDeploymentsAccordionItem activeSection={openSection} />} | ||
|
roroghost17 marked this conversation as resolved.
|
||
| </Accordion> | ||
| </div> | ||
| </div> | ||
| ); | ||
| } | ||
Uh oh!
There was an error while loading. Please reload this page.