mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-07-15 00:11:15 +03:00
add DictAsYamlField for genai provider and runtime options
This commit is contained in:
parent
9cb76d0bd9
commit
2023311c5f
@ -59,11 +59,11 @@ class GenAIConfig(FrigateBaseModel):
|
|||||||
default={},
|
default={},
|
||||||
title="Provider options",
|
title="Provider options",
|
||||||
description="Additional provider-specific options to pass to the GenAI client.",
|
description="Additional provider-specific options to pass to the GenAI client.",
|
||||||
json_schema_extra={"additionalProperties": {"type": "string"}},
|
json_schema_extra={"additionalProperties": {}},
|
||||||
)
|
)
|
||||||
runtime_options: dict[str, Any] = Field(
|
runtime_options: dict[str, Any] = Field(
|
||||||
default={},
|
default={},
|
||||||
title="Runtime options",
|
title="Runtime options",
|
||||||
description="Runtime options passed to the provider for each inference call.",
|
description="Runtime options passed to the provider for each inference call.",
|
||||||
json_schema_extra={"additionalProperties": {"type": "string"}},
|
json_schema_extra={"additionalProperties": {}},
|
||||||
)
|
)
|
||||||
|
|||||||
17
web/package-lock.json
generated
17
web/package-lock.json
generated
@ -52,6 +52,7 @@
|
|||||||
"i18next-http-backend": "^3.0.1",
|
"i18next-http-backend": "^3.0.1",
|
||||||
"idb-keyval": "^6.2.1",
|
"idb-keyval": "^6.2.1",
|
||||||
"immer": "^10.1.1",
|
"immer": "^10.1.1",
|
||||||
|
"js-yaml": "^4.1.1",
|
||||||
"konva": "^10.2.3",
|
"konva": "^10.2.3",
|
||||||
"lodash": "^4.17.23",
|
"lodash": "^4.17.23",
|
||||||
"lucide-react": "^0.577.0",
|
"lucide-react": "^0.577.0",
|
||||||
@ -90,6 +91,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/forms": "^0.5.9",
|
"@tailwindcss/forms": "^0.5.9",
|
||||||
"@testing-library/jest-dom": "^6.6.2",
|
"@testing-library/jest-dom": "^6.6.2",
|
||||||
|
"@types/js-yaml": "^4.0.9",
|
||||||
"@types/lodash": "^4.17.12",
|
"@types/lodash": "^4.17.12",
|
||||||
"@types/node": "^20.14.10",
|
"@types/node": "^20.14.10",
|
||||||
"@types/react": "^19.2.14",
|
"@types/react": "^19.2.14",
|
||||||
@ -5494,6 +5496,13 @@
|
|||||||
"@types/unist": "*"
|
"@types/unist": "*"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@types/js-yaml": {
|
||||||
|
"version": "4.0.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/@types/js-yaml/-/js-yaml-4.0.9.tgz",
|
||||||
|
"integrity": "sha512-k4MGaQl5TGo/iipqb2UDG2UwjXziSWkh0uysQelTlJpX1qGlpUZYm8PnO4DxG1qBomtJUdYJ6qR6xdIah10JLg==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/@types/json-schema": {
|
"node_modules/@types/json-schema": {
|
||||||
"version": "7.0.15",
|
"version": "7.0.15",
|
||||||
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
"resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
|
||||||
@ -6132,7 +6141,6 @@
|
|||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
|
||||||
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
|
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==",
|
||||||
"dev": true,
|
|
||||||
"license": "Python-2.0"
|
"license": "Python-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/aria-hidden": {
|
"node_modules/aria-hidden": {
|
||||||
@ -9178,10 +9186,9 @@
|
|||||||
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
|
"integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
|
||||||
},
|
},
|
||||||
"node_modules/js-yaml": {
|
"node_modules/js-yaml": {
|
||||||
"version": "4.1.0",
|
"version": "4.1.1",
|
||||||
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz",
|
||||||
"integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
|
"integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==",
|
||||||
"dev": true,
|
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"argparse": "^2.0.1"
|
"argparse": "^2.0.1"
|
||||||
|
|||||||
@ -61,6 +61,7 @@
|
|||||||
"i18next-http-backend": "^3.0.1",
|
"i18next-http-backend": "^3.0.1",
|
||||||
"idb-keyval": "^6.2.1",
|
"idb-keyval": "^6.2.1",
|
||||||
"immer": "^10.1.1",
|
"immer": "^10.1.1",
|
||||||
|
"js-yaml": "^4.1.1",
|
||||||
"konva": "^10.2.3",
|
"konva": "^10.2.3",
|
||||||
"lodash": "^4.17.23",
|
"lodash": "^4.17.23",
|
||||||
"lucide-react": "^0.577.0",
|
"lucide-react": "^0.577.0",
|
||||||
@ -99,6 +100,7 @@
|
|||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tailwindcss/forms": "^0.5.9",
|
"@tailwindcss/forms": "^0.5.9",
|
||||||
"@testing-library/jest-dom": "^6.6.2",
|
"@testing-library/jest-dom": "^6.6.2",
|
||||||
|
"@types/js-yaml": "^4.0.9",
|
||||||
"@types/lodash": "^4.17.12",
|
"@types/lodash": "^4.17.12",
|
||||||
"@types/node": "^20.14.10",
|
"@types/node": "^20.14.10",
|
||||||
"@types/react": "^19.2.14",
|
"@types/react": "^19.2.14",
|
||||||
|
|||||||
@ -5,6 +5,7 @@ const genai: SectionConfigOverrides = {
|
|||||||
sectionDocs: "/configuration/genai/config",
|
sectionDocs: "/configuration/genai/config",
|
||||||
advancedFields: ["*.base_url", "*.provider_options", "*.runtime_options"],
|
advancedFields: ["*.base_url", "*.provider_options", "*.runtime_options"],
|
||||||
hiddenFields: ["genai.enabled_in_config"],
|
hiddenFields: ["genai.enabled_in_config"],
|
||||||
|
restartRequired: [],
|
||||||
uiSchema: {
|
uiSchema: {
|
||||||
"ui:options": { disableNestedCard: true },
|
"ui:options": { disableNestedCard: true },
|
||||||
"*": {
|
"*": {
|
||||||
@ -36,14 +37,10 @@ const genai: SectionConfigOverrides = {
|
|||||||
"ui:options": { size: "xs" },
|
"ui:options": { size: "xs" },
|
||||||
},
|
},
|
||||||
"*.provider_options": {
|
"*.provider_options": {
|
||||||
additionalProperties: {
|
"ui:field": "DictAsYamlField",
|
||||||
"ui:options": { size: "lg" },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
"*.runtime_options": {
|
"*.runtime_options": {
|
||||||
additionalProperties: {
|
"ui:field": "DictAsYamlField",
|
||||||
"ui:options": { size: "lg" },
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|||||||
112
web/src/components/config-form/theme/fields/DictAsYamlField.tsx
Normal file
112
web/src/components/config-form/theme/fields/DictAsYamlField.tsx
Normal file
@ -0,0 +1,112 @@
|
|||||||
|
import type { FieldPathList, FieldProps } from "@rjsf/utils";
|
||||||
|
import yaml from "js-yaml";
|
||||||
|
import { Textarea } from "@/components/ui/textarea";
|
||||||
|
import { cn } from "@/lib/utils";
|
||||||
|
import { useCallback, useEffect, useMemo, useState } from "react";
|
||||||
|
|
||||||
|
function formatYaml(value: unknown): string {
|
||||||
|
if (
|
||||||
|
value == null ||
|
||||||
|
(typeof value === "object" &&
|
||||||
|
!Array.isArray(value) &&
|
||||||
|
Object.keys(value as Record<string, unknown>).length === 0)
|
||||||
|
) {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
return yaml.dump(value, { indent: 2, lineWidth: -1 }).trimEnd();
|
||||||
|
} catch {
|
||||||
|
return "";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function parseYaml(text: string): {
|
||||||
|
value: Record<string, unknown> | undefined;
|
||||||
|
error: string | undefined;
|
||||||
|
} {
|
||||||
|
const trimmed = text.trim();
|
||||||
|
if (trimmed === "") {
|
||||||
|
return { value: {}, error: undefined };
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
const parsed = yaml.load(trimmed);
|
||||||
|
if (
|
||||||
|
typeof parsed !== "object" ||
|
||||||
|
parsed === null ||
|
||||||
|
Array.isArray(parsed)
|
||||||
|
) {
|
||||||
|
return { value: undefined, error: "Must be a YAML mapping" };
|
||||||
|
}
|
||||||
|
return { value: parsed as Record<string, unknown>, error: undefined };
|
||||||
|
} catch (e) {
|
||||||
|
const msg = e instanceof yaml.YAMLException ? e.reason : "Invalid YAML";
|
||||||
|
return { value: undefined, error: msg };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export function DictAsYamlField(props: FieldProps) {
|
||||||
|
const { formData, onChange, readonly, disabled, idSchema, schema } = props;
|
||||||
|
|
||||||
|
const emptyPath = useMemo(() => [] as FieldPathList, []);
|
||||||
|
const fieldPath =
|
||||||
|
(props as { fieldPathId?: { path?: FieldPathList } }).fieldPathId?.path ??
|
||||||
|
emptyPath;
|
||||||
|
|
||||||
|
const [text, setText] = useState(() => formatYaml(formData));
|
||||||
|
const [error, setError] = useState<string>();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setText(formatYaml(formData));
|
||||||
|
setError(undefined);
|
||||||
|
}, [formData]);
|
||||||
|
|
||||||
|
const handleChange = useCallback(
|
||||||
|
(e: React.ChangeEvent<HTMLTextAreaElement>) => {
|
||||||
|
const raw = e.target.value;
|
||||||
|
setText(raw);
|
||||||
|
const { value, error: parseError } = parseYaml(raw);
|
||||||
|
setError(parseError);
|
||||||
|
if (value !== undefined) {
|
||||||
|
onChange(value, fieldPath);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[onChange, fieldPath],
|
||||||
|
);
|
||||||
|
|
||||||
|
const handleBlur = useCallback(
|
||||||
|
(_e: React.FocusEvent<HTMLTextAreaElement>) => {
|
||||||
|
// Reformat on blur if valid
|
||||||
|
const { value } = parseYaml(text);
|
||||||
|
if (value !== undefined) {
|
||||||
|
setText(formatYaml(value));
|
||||||
|
}
|
||||||
|
},
|
||||||
|
[text],
|
||||||
|
);
|
||||||
|
|
||||||
|
const id = idSchema?.$id ?? props.name;
|
||||||
|
|
||||||
|
return (
|
||||||
|
<div className="flex flex-col gap-1.5">
|
||||||
|
{schema.title && (
|
||||||
|
<label htmlFor={id} className="text-sm font-medium">
|
||||||
|
{schema.title}
|
||||||
|
</label>
|
||||||
|
)}
|
||||||
|
<Textarea
|
||||||
|
id={id}
|
||||||
|
className={cn("font-mono text-sm", error && "border-destructive")}
|
||||||
|
value={text}
|
||||||
|
disabled={disabled || readonly}
|
||||||
|
placeholder={"key: value"}
|
||||||
|
rows={Math.max(3, text.split("\n").length + 1)}
|
||||||
|
onChange={handleChange}
|
||||||
|
onBlur={handleBlur}
|
||||||
|
/>
|
||||||
|
{error && <p className="text-xs text-destructive">{error}</p>}
|
||||||
|
{schema.description && (
|
||||||
|
<p className="text-xs text-muted-foreground">{schema.description}</p>
|
||||||
|
)}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
}
|
||||||
@ -48,6 +48,7 @@ import { LayoutGridField } from "./fields/LayoutGridField";
|
|||||||
import { DetectorHardwareField } from "./fields/DetectorHardwareField";
|
import { DetectorHardwareField } from "./fields/DetectorHardwareField";
|
||||||
import { ReplaceRulesField } from "./fields/ReplaceRulesField";
|
import { ReplaceRulesField } from "./fields/ReplaceRulesField";
|
||||||
import { CameraInputsField } from "./fields/CameraInputsField";
|
import { CameraInputsField } from "./fields/CameraInputsField";
|
||||||
|
import { DictAsYamlField } from "./fields/DictAsYamlField";
|
||||||
|
|
||||||
export interface FrigateTheme {
|
export interface FrigateTheme {
|
||||||
widgets: RegistryWidgetsType;
|
widgets: RegistryWidgetsType;
|
||||||
@ -103,5 +104,6 @@ export const frigateTheme: FrigateTheme = {
|
|||||||
DetectorHardwareField: DetectorHardwareField,
|
DetectorHardwareField: DetectorHardwareField,
|
||||||
ReplaceRulesField: ReplaceRulesField,
|
ReplaceRulesField: ReplaceRulesField,
|
||||||
CameraInputsField: CameraInputsField,
|
CameraInputsField: CameraInputsField,
|
||||||
|
DictAsYamlField: DictAsYamlField,
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user