mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-08-02 09:02:15 +03:00
Settings UI tweaks (#22547)
* fix genai settings ui - add roles widget to select roles for genai providers - add dropdown in semantic search to allow selection of embeddings genai provider * tweak grouping to prioritize fieldOrder before groups previously, groups were always rendered first. now fieldOrder is respected, and any fields in a group will cause the group and all the fields in that group to be rendered in order. this allows moving the enabled switches to the top of the section * mobile tweaks stack buttons, add more space on profiles pane, and move the overridden badge beneath the description * language consistency * prevent camera config sections from being regenerated for profiles * conditionally import axengine module to match other detectors * i18n * update vscode launch.json for new integrated browser * formatting
This commit is contained in:
@@ -0,0 +1,109 @@
|
||||
import type { WidgetProps } from "@rjsf/utils";
|
||||
import { useMemo } from "react";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Switch } from "@/components/ui/switch";
|
||||
import type { ConfigFormContext } from "@/types/configForm";
|
||||
|
||||
const GENAI_ROLES = ["embeddings", "vision", "tools"] as const;
|
||||
|
||||
function normalizeValue(value: unknown): string[] {
|
||||
if (Array.isArray(value)) {
|
||||
return value.filter((item): item is string => typeof item === "string");
|
||||
}
|
||||
|
||||
if (typeof value === "string" && value.trim()) {
|
||||
return [value.trim()];
|
||||
}
|
||||
|
||||
return [];
|
||||
}
|
||||
|
||||
function getProviderKey(widgetId: string): string | undefined {
|
||||
const prefix = "root_";
|
||||
const suffix = "_roles";
|
||||
|
||||
if (!widgetId.startsWith(prefix) || !widgetId.endsWith(suffix)) {
|
||||
return undefined;
|
||||
}
|
||||
|
||||
return widgetId.slice(prefix.length, -suffix.length) || undefined;
|
||||
}
|
||||
|
||||
export function GenAIRolesWidget(props: WidgetProps) {
|
||||
const { id, value, disabled, readonly, onChange, registry } = props;
|
||||
const { t } = useTranslation(["views/settings"]);
|
||||
|
||||
const formContext = registry?.formContext as ConfigFormContext | undefined;
|
||||
const selectedRoles = useMemo(() => normalizeValue(value), [value]);
|
||||
const providerKey = useMemo(() => getProviderKey(id), [id]);
|
||||
|
||||
// Compute occupied roles directly from formData. The computation is
|
||||
// trivially cheap (iterate providers × 3 roles max) so we skip an
|
||||
// intermediate memoization layer whose formData dependency would
|
||||
// never produce a cache hit (new object reference on every change).
|
||||
const occupiedRoles = useMemo(() => {
|
||||
const occupied = new Set<string>();
|
||||
const fd = formContext?.formData;
|
||||
|
||||
if (!fd || typeof fd !== "object") return occupied;
|
||||
|
||||
for (const [provider, config] of Object.entries(
|
||||
fd as Record<string, unknown>,
|
||||
)) {
|
||||
if (provider === providerKey) continue;
|
||||
if (!config || typeof config !== "object" || Array.isArray(config))
|
||||
continue;
|
||||
|
||||
for (const role of normalizeValue(
|
||||
(config as Record<string, unknown>).roles,
|
||||
)) {
|
||||
occupied.add(role);
|
||||
}
|
||||
}
|
||||
|
||||
return occupied;
|
||||
}, [formContext?.formData, providerKey]);
|
||||
|
||||
const toggleRole = (role: string, enabled: boolean) => {
|
||||
if (enabled) {
|
||||
if (!selectedRoles.includes(role)) {
|
||||
onChange([...selectedRoles, role]);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
onChange(selectedRoles.filter((item) => item !== role));
|
||||
};
|
||||
|
||||
return (
|
||||
<div className="rounded-lg border border-secondary-highlight bg-background_alt p-2 pr-0 md:max-w-md">
|
||||
<div className="grid gap-2">
|
||||
{GENAI_ROLES.map((role) => {
|
||||
const checked = selectedRoles.includes(role);
|
||||
const roleDisabled = !checked && occupiedRoles.has(role);
|
||||
const label = t(`configForm.genaiRoles.options.${role}`, {
|
||||
ns: "views/settings",
|
||||
defaultValue: role,
|
||||
});
|
||||
|
||||
return (
|
||||
<div
|
||||
key={role}
|
||||
className="flex items-center justify-between rounded-md px-3 py-0"
|
||||
>
|
||||
<label htmlFor={`${id}-${role}`} className="text-sm">
|
||||
{label}
|
||||
</label>
|
||||
<Switch
|
||||
id={`${id}-${role}`}
|
||||
checked={checked}
|
||||
disabled={disabled || readonly || roleDisabled}
|
||||
onCheckedChange={(enabled) => toggleRole(role, !!enabled)}
|
||||
/>
|
||||
</div>
|
||||
);
|
||||
})}
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,159 @@
|
||||
// Combobox widget for semantic_search.model field.
|
||||
// Shows built-in model enum values and GenAI providers with the embeddings role.
|
||||
import { useState, useMemo } from "react";
|
||||
import type { WidgetProps } from "@rjsf/utils";
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { Check, ChevronsUpDown } from "lucide-react";
|
||||
import { cn } from "@/lib/utils";
|
||||
import { Button } from "@/components/ui/button";
|
||||
import {
|
||||
Command,
|
||||
CommandGroup,
|
||||
CommandItem,
|
||||
CommandList,
|
||||
} from "@/components/ui/command";
|
||||
import {
|
||||
Popover,
|
||||
PopoverContent,
|
||||
PopoverTrigger,
|
||||
} from "@/components/ui/popover";
|
||||
import type { ConfigFormContext } from "@/types/configForm";
|
||||
import { getSizedFieldClassName } from "../utils";
|
||||
|
||||
interface ProviderOption {
|
||||
value: string;
|
||||
label: string;
|
||||
}
|
||||
|
||||
export function SemanticSearchModelWidget(props: WidgetProps) {
|
||||
const { id, value, disabled, readonly, onChange, schema, registry, options } =
|
||||
props;
|
||||
const { t } = useTranslation(["views/settings"]);
|
||||
const [open, setOpen] = useState(false);
|
||||
|
||||
const formContext = registry?.formContext as ConfigFormContext | undefined;
|
||||
const fieldClassName = getSizedFieldClassName(options, "sm");
|
||||
|
||||
// Built-in model options from schema.examples (populated by transformer
|
||||
// collapsing the anyOf enum+string union)
|
||||
const builtInModels: ProviderOption[] = useMemo(() => {
|
||||
const examples = (schema as Record<string, unknown>).examples;
|
||||
if (!Array.isArray(examples)) return [];
|
||||
return examples
|
||||
.filter((v): v is string => typeof v === "string")
|
||||
.map((v) => ({ value: v, label: v }));
|
||||
}, [schema]);
|
||||
|
||||
// GenAI providers that have the "embeddings" role
|
||||
const embeddingsProviders: ProviderOption[] = useMemo(() => {
|
||||
const genai = (
|
||||
formContext?.fullConfig as Record<string, unknown> | undefined
|
||||
)?.genai;
|
||||
if (!genai || typeof genai !== "object" || Array.isArray(genai)) return [];
|
||||
|
||||
const providers: ProviderOption[] = [];
|
||||
for (const [key, config] of Object.entries(
|
||||
genai as Record<string, unknown>,
|
||||
)) {
|
||||
if (!config || typeof config !== "object" || Array.isArray(config))
|
||||
continue;
|
||||
const roles = (config as Record<string, unknown>).roles;
|
||||
if (Array.isArray(roles) && roles.includes("embeddings")) {
|
||||
providers.push({ value: key, label: key });
|
||||
}
|
||||
}
|
||||
return providers;
|
||||
}, [formContext?.fullConfig]);
|
||||
|
||||
const currentLabel =
|
||||
builtInModels.find((m) => m.value === value)?.label ??
|
||||
embeddingsProviders.find((p) => p.value === value)?.label ??
|
||||
(typeof value === "string" && value ? value : undefined);
|
||||
|
||||
return (
|
||||
<Popover open={open} onOpenChange={setOpen}>
|
||||
<PopoverTrigger asChild>
|
||||
<Button
|
||||
id={id}
|
||||
type="button"
|
||||
variant="outline"
|
||||
role="combobox"
|
||||
aria-expanded={open}
|
||||
disabled={disabled || readonly}
|
||||
className={cn(
|
||||
"justify-between font-normal",
|
||||
!currentLabel && "text-muted-foreground",
|
||||
fieldClassName,
|
||||
)}
|
||||
>
|
||||
{currentLabel ??
|
||||
t("configForm.semanticSearchModel.placeholder", {
|
||||
ns: "views/settings",
|
||||
defaultValue: "Select model…",
|
||||
})}
|
||||
<ChevronsUpDown className="ml-2 h-4 w-4 shrink-0 opacity-50" />
|
||||
</Button>
|
||||
</PopoverTrigger>
|
||||
<PopoverContent className="w-[--radix-popover-trigger-width] p-0">
|
||||
<Command>
|
||||
<CommandList>
|
||||
{builtInModels.length > 0 && (
|
||||
<CommandGroup
|
||||
heading={t("configForm.semanticSearchModel.builtIn", {
|
||||
ns: "views/settings",
|
||||
defaultValue: "Built-in Models",
|
||||
})}
|
||||
>
|
||||
{builtInModels.map((model) => (
|
||||
<CommandItem
|
||||
key={model.value}
|
||||
value={model.value}
|
||||
onSelect={() => {
|
||||
onChange(model.value);
|
||||
setOpen(false);
|
||||
}}
|
||||
>
|
||||
<Check
|
||||
className={cn(
|
||||
"mr-2 h-4 w-4",
|
||||
value === model.value ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
{model.label}
|
||||
</CommandItem>
|
||||
))}
|
||||
</CommandGroup>
|
||||
)}
|
||||
{embeddingsProviders.length > 0 && (
|
||||
<CommandGroup
|
||||
heading={t("configForm.semanticSearchModel.genaiProviders", {
|
||||
ns: "views/settings",
|
||||
defaultValue: "GenAI Providers",
|
||||
})}
|
||||
>
|
||||
{embeddingsProviders.map((provider) => (
|
||||
<CommandItem
|
||||
key={provider.value}
|
||||
value={provider.value}
|
||||
onSelect={() => {
|
||||
onChange(provider.value);
|
||||
setOpen(false);
|
||||
}}
|
||||
>
|
||||
<Check
|
||||
className={cn(
|
||||
"mr-2 h-4 w-4",
|
||||
value === provider.value ? "opacity-100" : "opacity-0",
|
||||
)}
|
||||
/>
|
||||
{provider.label}
|
||||
</CommandItem>
|
||||
))}
|
||||
</CommandGroup>
|
||||
)}
|
||||
</CommandList>
|
||||
</Command>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
);
|
||||
}
|
||||
Reference in New Issue
Block a user