diff --git a/web/src/views/settings/FrigatePlusSettingsView.tsx b/web/src/views/settings/FrigatePlusSettingsView.tsx
index 4beeeea36..7bc81fae2 100644
--- a/web/src/views/settings/FrigatePlusSettingsView.tsx
+++ b/web/src/views/settings/FrigatePlusSettingsView.tsx
@@ -1,5 +1,5 @@
import Heading from "@/components/ui/heading";
-import { useCallback, useContext, useEffect, useState } from "react";
+import { useCallback, useContext, useEffect, useMemo, useState } from "react";
import { Toaster } from "@/components/ui/sonner";
import ActivityIndicator from "@/components/indicators/activity-indicator";
import { toast } from "sonner";
@@ -10,7 +10,7 @@ import { CheckCircle2, XCircle } from "lucide-react";
import { Trans, useTranslation } from "react-i18next";
import { Button } from "@/components/ui/button";
import { Link } from "react-router-dom";
-import { LuExternalLink } from "react-icons/lu";
+import { LuExternalLink, LuFilter } from "react-icons/lu";
import { StatusBarMessagesContext } from "@/context/statusbar-provider";
import {
Select,
@@ -19,6 +19,14 @@ import {
SelectItem,
SelectTrigger,
} from "@/components/ui/select";
+import {
+ Popover,
+ PopoverContent,
+ PopoverTrigger,
+} from "@/components/ui/popover";
+import { Switch } from "@/components/ui/switch";
+import { Label } from "@/components/ui/label";
+import { cn } from "@/lib/utils";
import { useDocDomain } from "@/hooks/use-doc-domain";
import { CameraNameLabel } from "@/components/camera/FriendlyNameLabel";
import {
@@ -26,6 +34,8 @@ import {
SplitCardRow,
} from "@/components/card/SettingsGroupCard";
import FrigatePlusCurrentModelSummary from "@/views/settings/components/FrigatePlusCurrentModelSummary";
+import { useRestart } from "@/api/ws";
+import RestartDialog from "@/components/overlay/dialog/RestartDialog";
type FrigatePlusModel = {
id: string;
@@ -58,6 +68,8 @@ export default function FrigatePlusSettingsView({
useSWR
("config");
const [changedValue, setChangedValue] = useState(false);
const [isLoading, setIsLoading] = useState(false);
+ const [restartDialogOpen, setRestartDialogOpen] = useState(false);
+ const { send: sendRestart } = useRestart();
const { addMessage, removeMessage } = useContext(StatusBarMessagesContext)!;
@@ -76,7 +88,7 @@ export default function FrigatePlusSettingsView({
},
);
- const { data: availableModels = {} } = useSWR<
+ const { data: availableModels = {}, isLoading: isLoadingModels } = useSWR<
Record
>("/plus/models", {
fallbackData: {},
@@ -92,6 +104,19 @@ export default function FrigatePlusSettingsView({
},
});
+ const [showBaseModels, setShowBaseModels] = useState(true);
+ const [showFineTunedModels, setShowFineTunedModels] = useState(true);
+
+ const filteredModelEntries = useMemo(
+ () =>
+ Object.entries(availableModels || {}).filter(([, model]) =>
+ model.isBaseModel ? showBaseModels : showFineTunedModels,
+ ),
+ [availableModels, showBaseModels, showFineTunedModels],
+ );
+
+ const isFilterActive = !showBaseModels || !showFineTunedModels;
+
useEffect(() => {
if (config) {
if (frigatePlusSettings?.model.id == undefined) {
@@ -128,47 +153,60 @@ export default function FrigatePlusSettingsView({
const saveToConfig = useCallback(async () => {
setIsLoading(true);
- axios
- .put(`config/set?model.path=plus://${frigatePlusSettings.model.id}`, {
+ try {
+ // Clear the existing model section so only the new path remains
+ await axios.put("config/set", {
requires_restart: 0,
- })
- .then((res) => {
- if (res.status === 200) {
- toast.success(t("frigatePlus.toast.success"), {
- position: "top-center",
- });
- setChangedValue(false);
- updateConfig();
- } else {
- toast.error(
- t("frigatePlus.toast.error", { errorMessage: res.statusText }),
- {
- position: "top-center",
- },
- );
- }
- })
- .catch((error) => {
- const errorMessage =
- error.response?.data?.message ||
- error.response?.data?.detail ||
- "Unknown error";
+ config_data: { model: null },
+ });
+ const res = await axios.put("config/set", {
+ requires_restart: 0,
+ config_data: {
+ model: { path: `plus://${frigatePlusSettings.model.id}` },
+ },
+ });
+
+ if (res.status === 200) {
+ toast.success(t("frigatePlus.toast.success"), {
+ position: "top-center",
+ action: (
+ setRestartDialogOpen(true)}>
+
+
+ ),
+ });
+ setChangedValue(false);
+ updateConfig();
+ } else {
toast.error(
- t("toast.save.error.title", { errorMessage, ns: "common" }),
+ t("frigatePlus.toast.error", { errorMessage: res.statusText }),
{
position: "top-center",
},
);
- })
- .finally(() => {
- addMessage(
- "plus_restart",
- t("frigatePlus.restart_required"),
- undefined,
- "plus_restart",
- );
- setIsLoading(false);
+ }
+ } catch (error) {
+ const err = error as {
+ response?: { data?: { message?: string; detail?: string } };
+ };
+ const errorMessage =
+ err.response?.data?.message ||
+ err.response?.data?.detail ||
+ "Unknown error";
+ toast.error(t("toast.save.error.title", { errorMessage, ns: "common" }), {
+ position: "top-center",
});
+ } finally {
+ addMessage(
+ "plus_restart",
+ t("frigatePlus.restart_required"),
+ undefined,
+ "plus_restart",
+ );
+ setIsLoading(false);
+ }
}, [updateConfig, addMessage, frigatePlusSettings, t]);
const onCancel = useCallback(() => {
@@ -201,274 +239,340 @@ export default function FrigatePlusSettingsView({
}
return (
-
+
-
-
-
-
-
- {t("frigatePlus.title")}
-
+
+
+
+ {t("frigatePlus.title")}
+
-
- {t("frigatePlus.description")}
-
-
+
+ {t("frigatePlus.description")}
+
+
-
-
-
- {t("frigatePlus.apiKey.desc")}
- {!config?.model.plus && (
-
-
- {t("frigatePlus.apiKey.plusLink")}
-
-
-
- )}
-
- }
- content={
-
- {config?.plus?.enabled ? (
-
- ) : (
-
- )}
-
- {config?.plus?.enabled
- ? t("frigatePlus.apiKey.validated")
- : t("frigatePlus.apiKey.notValidated")}
-
-
- }
- />
-
-
- {config?.model.plus && (
-
- )}
-
- {config?.model.plus && (
-
-
- frigatePlus.modelInfo.modelSelect
-
- }
- content={
-
+ />
+
+
+
+
+
+ {t("frigatePlus.modelInfo.filter.ariaLabel")}
+
+
+
+
+
+
+
+
+
+
+
+
+ }
+ />
+
+ )}
-
-
-
-
-
+
+
+
+
+ frigatePlus.snapshotConfig.desc
+
+
+
+
+ {t("readTheDocumentation", { ns: "common" })}
+
+
+
+
+ }
+ content={
+
+
+
+
+
+ |
+ {t("frigatePlus.snapshotConfig.table.camera")}
+ |
+
+ {t("frigatePlus.snapshotConfig.table.snapshots")}
+ |
+
+
+
+ {Object.entries(config.cameras).map(
+ ([name, camera]) => (
+
+ |
+
+ |
+
+ {camera.snapshots.enabled ? (
+
+ ) : (
+
+ )}
+ |
+
+ ),
+ )}
+
+
+
+
+
+
+
+
+
+ {changedValue && (
+
+
+ {t("unsavedChanges")}
+
+ )}
+
+ {changedValue && (
+
+ )}
+
+
setRestartDialogOpen(false)}
+ onRestart={() => sendRestart("restart")}
+ />
);
}
diff --git a/web/src/views/settings/Go2RtcStreamsSettingsView.tsx b/web/src/views/settings/Go2RtcStreamsSettingsView.tsx
index fbc55a24b..1d5781ad0 100644
--- a/web/src/views/settings/Go2RtcStreamsSettingsView.tsx
+++ b/web/src/views/settings/Go2RtcStreamsSettingsView.tsx
@@ -385,7 +385,7 @@ export default function Go2RtcStreamsSettingsView({
)}
-
+
{hasChanges && (