Merge 1ffba7caa8 into 213a1fbd00

frigate/stats/util.py

@@ -362,7 +362,7 @@ def stats_snapshot(
             stats["embeddings"]["review_description_speed"] = round(
                 embeddings_metrics.review_desc_speed.value * 1000, 2
             )
-            stats["embeddings"]["review_description_events_per_second"] = round(
+            stats["embeddings"]["review_descriptions"] = round(
                 embeddings_metrics.review_desc_dps.value, 2
             )
 
@@ -370,7 +370,7 @@ def stats_snapshot(
             stats["embeddings"]["object_description_speed"] = round(
                 embeddings_metrics.object_desc_speed.value * 1000, 2
             )
-            stats["embeddings"]["object_description_events_per_second"] = round(
+            stats["embeddings"]["object_descriptions"] = round(
                 embeddings_metrics.object_desc_dps.value, 2
             )
 
@@ -378,7 +378,7 @@ def stats_snapshot(
             stats["embeddings"][f"{key}_classification_speed"] = round(
                 embeddings_metrics.classification_speeds[key].value * 1000, 2
             )
-            stats["embeddings"][f"{key}_classification_events_per_second"] = round(
+            stats["embeddings"][f"{key}_classification"] = round(
                 embeddings_metrics.classification_cps[key].value, 2
             )
 

web/public/locales/en/views/system.json

@@ -169,7 +169,6 @@
   "enrichments": {
     "title": "Enrichments",
     "infPerSecond": "Inferences Per Second",
-    "averageInf": "Average Inference Time",
     "embeddings": {
       "image_embedding": "Image Embedding",
       "text_embedding": "Text Embedding",
@@ -181,13 +180,7 @@
       "plate_recognition_speed": "Plate Recognition Speed",
       "text_embedding_speed": "Text Embedding Speed",
       "yolov9_plate_detection_speed": "YOLOv9 Plate Detection Speed",
-      "yolov9_plate_detection": "YOLOv9 Plate Detection",
+      "yolov9_plate_detection": "YOLOv9 Plate Detection"
-      "review_description": "Review Description",
-      "review_description_speed": "Review Description Speed",
-      "review_description_events_per_second": "Review Description",
-      "object_description": "Object Description",
-      "object_description_speed": "Object Description Speed",
-      "object_description_events_per_second": "Object Description"
     }
   }
 }

web/src/components/overlay/detail/SearchDetailDialog.tsx

@@ -807,15 +807,6 @@ function ObjectDetailsTab({
     }
   }, [search]);
 
-  const isEventsKey = useCallback((key: unknown): boolean => {
-    const candidate = Array.isArray(key) ? key[0] : key;
-    const EVENTS_KEY_PATTERNS = ["events", "events/search", "events/explore"];
-    return (
-      typeof candidate === "string" &&
-      EVENTS_KEY_PATTERNS.some((p) => candidate.includes(p))
-    );
-  }, []);
-
   const updateDescription = useCallback(() => {
     if (!search) {
       return;
@@ -830,7 +821,11 @@ function ObjectDetailsTab({
           });
         }
         mutate(
-          (key) => isEventsKey(key),
+          (key) =>
+            typeof key === "string" &&
+            (key.includes("events") ||
+              key.includes("events/search") ||
+              key.includes("events/explore")),
           (currentData: SearchResult[][] | SearchResult[] | undefined) =>
             mapSearchResults(currentData, (event) =>
               event.id === search.id
@@ -843,7 +838,6 @@ function ObjectDetailsTab({
             revalidate: false,
           },
         );
-        setSearch({ ...search, data: { ...search.data, description: desc } });
       })
       .catch((error) => {
         const errorMessage =
@@ -860,7 +854,7 @@ function ObjectDetailsTab({
         );
         setDesc(search.data.description);
       });
-  }, [desc, search, mutate, t, mapSearchResults, isEventsKey, setSearch]);
+  }, [desc, search, mutate, t, mapSearchResults]);
 
   const regenerateDescription = useCallback(
     (source: "snapshot" | "thumbnails") => {
@@ -927,7 +921,11 @@ function ObjectDetailsTab({
             });
 
             mutate(
-              (key) => isEventsKey(key),
+              (key) =>
+                typeof key === "string" &&
+                (key.includes("events") ||
+                  key.includes("events/search") ||
+                  key.includes("events/explore")),
               (currentData: SearchResult[][] | SearchResult[] | undefined) =>
                 mapSearchResults(currentData, (event) =>
                   event.id === search.id
@@ -974,7 +972,7 @@ function ObjectDetailsTab({
           );
         });
     },
-    [search, apiHost, mutate, setSearch, t, mapSearchResults, isEventsKey],
+    [search, apiHost, mutate, setSearch, t, mapSearchResults],
   );
 
   // recognized plate
@@ -998,7 +996,11 @@ function ObjectDetailsTab({
             });
 
             mutate(
-              (key) => isEventsKey(key),
+              (key) =>
+                typeof key === "string" &&
+                (key.includes("events") ||
+                  key.includes("events/search") ||
+                  key.includes("events/explore")),
               (currentData: SearchResult[][] | SearchResult[] | undefined) =>
                 mapSearchResults(currentData, (event) =>
                   event.id === search.id
@@ -1045,7 +1047,7 @@ function ObjectDetailsTab({
           );
         });
     },
-    [search, apiHost, mutate, setSearch, t, mapSearchResults, isEventsKey],
+    [search, apiHost, mutate, setSearch, t, mapSearchResults],
   );
 
   // speech transcription
@@ -1101,9 +1103,12 @@ function ObjectDetailsTab({
           });
 
       setState("submitted");
-      setSearch({ ...search, plus_id: "new_upload" });
       mutate(
-        (key) => isEventsKey(key),
+        (key) =>
+          typeof key === "string" &&
+          (key.includes("events") ||
+            key.includes("events/search") ||
+            key.includes("events/explore")),
         (currentData: SearchResult[][] | SearchResult[] | undefined) =>
           mapSearchResults(currentData, (event) =>
             event.id === search.id
@@ -1117,7 +1122,7 @@ function ObjectDetailsTab({
         },
       );
     },
-    [search, mutate, mapSearchResults, setSearch, isEventsKey],
+    [search, mutate, mapSearchResults],
   );
 
   const popoverContainerRef = useRef<HTMLDivElement | null>(null);

web/src/components/overlay/dialog/FrigatePlusDialog.tsx

@@ -6,199 +6,51 @@ import {
   DialogTitle,
 } from "@/components/ui/dialog";
 import { Event } from "@/types/event";
-import { isDesktop, isMobile, isSafari } from "react-device-detect";
+import { isDesktop, isMobile } from "react-device-detect";
+import { ObjectSnapshotTab } from "../detail/SearchDetailDialog";
 import { cn } from "@/lib/utils";
-import { useCallback, useEffect, useState } from "react";
-import axios from "axios";
-import { useTranslation, Trans } from "react-i18next";
-import { Button } from "@/components/ui/button";
-import ActivityIndicator from "@/components/indicators/activity-indicator";
-import { FaCheckCircle } from "react-icons/fa";
-import { Card, CardContent } from "@/components/ui/card";
-import { TransformComponent, TransformWrapper } from "react-zoom-pan-pinch";
-import ImageLoadingIndicator from "@/components/indicators/ImageLoadingIndicator";
-import { baseUrl } from "@/api/baseUrl";
-import { getTranslatedLabel } from "@/utils/i18n";
-import useImageLoaded from "@/hooks/use-image-loaded";
 
-export type FrigatePlusDialogProps = {
+type FrigatePlusDialogProps = {
   upload?: Event;
   dialog?: boolean;
   onClose: () => void;
   onEventUploaded: () => void;
 };
-
 export function FrigatePlusDialog({
   upload,
   dialog = true,
   onClose,
   onEventUploaded,
 }: FrigatePlusDialogProps) {
-  const { t, i18n } = useTranslation(["components/dialog"]);
+  if (!upload) {
-
+    return;
-  type SubmissionState = "reviewing" | "uploading" | "submitted";
+  }
-  const [state, setState] = useState<SubmissionState>(
+  if (dialog) {
-    upload?.plus_id ? "submitted" : "reviewing",
+    return (
-  );
+      <Dialog
-  useEffect(() => {
+        open={upload != undefined}
-    setState(upload?.plus_id ? "submitted" : "reviewing");
+        onOpenChange={(open) => (!open ? onClose() : null)}
-  }, [upload?.plus_id]);
-
-  const onSubmitToPlus = useCallback(
-    async (falsePositive: boolean) => {
-      if (!upload) return;
-      falsePositive
-        ? axios.put(`events/${upload.id}/false_positive`)
-        : axios.post(`events/${upload.id}/plus`, { include_annotation: 1 });
-      setState("submitted");
-      onEventUploaded();
-    },
-    [upload, onEventUploaded],
-  );
-
-  const [imgRef, imgLoaded, onImgLoad] = useImageLoaded();
-  const showCard =
-    !!upload &&
-    upload.data.type === "object" &&
-    upload.plus_id !== "not_enabled" &&
-    upload.end_time &&
-    upload.label !== "on_demand";
-
-  if (!dialog || !upload) return null;
-
-  return (
-    <Dialog open={true} onOpenChange={(open) => (!open ? onClose() : null)}>
-      <DialogContent
-        className={cn(
-          "scrollbar-container overflow-y-auto",
-          isDesktop &&
-            "max-h-[95dvh] sm:max-w-xl md:max-w-4xl lg:max-w-4xl xl:max-w-7xl",
-          isMobile && "px-4",
-        )}
       >
-        <DialogHeader>
+        <DialogContent
-          <DialogTitle className="sr-only">Submit to Frigate+</DialogTitle>
+          className={cn(
-          <DialogDescription className="sr-only">
+            "scrollbar-container overflow-y-auto",
-            Submit this snapshot to Frigate+
+            isDesktop &&
-          </DialogDescription>
+              "max-h-[95dvh] sm:max-w-xl md:max-w-4xl lg:max-w-4xl xl:max-w-7xl",
-        </DialogHeader>
+            isMobile && "px-4",
-
+          )}
-        <div className="relative size-full">
+        >
-          <ImageLoadingIndicator
+          <DialogHeader>
-            className="absolute inset-0 aspect-video min-h-[60dvh] w-full"
+            <DialogTitle className="sr-only">Submit to Frigate+</DialogTitle>
-            imgLoaded={imgLoaded}
+            <DialogDescription className="sr-only">
+              Submit this snapshot to Frigate+
+            </DialogDescription>
+          </DialogHeader>
+          <ObjectSnapshotTab
+            search={upload}
+            onEventUploaded={onEventUploaded}
           />
-          <div className={imgLoaded ? "visible" : "invisible"}>
+        </DialogContent>
-            <TransformWrapper minScale={1.0} wheel={{ smoothStep: 0.005 }}>
+      </Dialog>
-              <div className="flex flex-col space-y-3">
+    );
-                <TransformComponent
+  }
-                  wrapperStyle={{ width: "100%", height: "100%" }}
-                  contentStyle={{
-                    position: "relative",
-                    width: "100%",
-                    height: "100%",
-                  }}
-                >
-                  {upload.id && (
-                    <div className="relative mx-auto">
-                      <img
-                        ref={imgRef}
-                        className="mx-auto max-h-[60dvh] rounded-lg bg-black object-contain"
-                        src={`${baseUrl}api/events/${upload.id}/snapshot.jpg`}
-                        alt={`${upload.label}`}
-                        loading={isSafari ? "eager" : "lazy"}
-                        onLoad={onImgLoad}
-                      />
-                    </div>
-                  )}
-                </TransformComponent>
-
-                {showCard && (
-                  <Card className="p-1 text-sm md:p-2">
-                    <CardContent className="flex flex-col items-center justify-between gap-3 p-2 md:flex-row">
-                      <div className="flex flex-col space-y-3">
-                        <div className="text-lg leading-none">
-                          {t("explore.plus.submitToPlus.label")}
-                        </div>
-                        <div className="text-sm text-muted-foreground">
-                          {t("explore.plus.submitToPlus.desc")}
-                        </div>
-                      </div>
-                      <div className="flex w-full flex-1 flex-col justify-center gap-2 md:ml-8 md:w-auto md:justify-end">
-                        {state === "reviewing" && (
-                          <>
-                            <div>
-                              {i18n.language === "en" ? (
-                                /^[aeiou]/i.test(upload.label || "") ? (
-                                  <Trans
-                                    ns="components/dialog"
-                                    values={{ label: upload.label }}
-                                  >
-                                    explore.plus.review.question.ask_an
-                                  </Trans>
-                                ) : (
-                                  <Trans
-                                    ns="components/dialog"
-                                    values={{ label: upload.label }}
-                                  >
-                                    explore.plus.review.question.ask_a
-                                  </Trans>
-                                )
-                              ) : (
-                                <Trans
-                                  ns="components/dialog"
-                                  values={{
-                                    untranslatedLabel: upload.label,
-                                    translatedLabel: getTranslatedLabel(
-                                      upload.label,
-                                    ),
-                                  }}
-                                >
-                                  explore.plus.review.question.ask_full
-                                </Trans>
-                              )}
-                            </div>
-                            <div className="flex w-full flex-row gap-2">
-                              <Button
-                                className="flex-1 bg-success"
-                                aria-label={t("button.yes", { ns: "common" })}
-                                onClick={() => {
-                                  setState("uploading");
-                                  onSubmitToPlus(false);
-                                }}
-                              >
-                                {t("button.yes", { ns: "common" })}
-                              </Button>
-                              <Button
-                                className="flex-1 text-white"
-                                aria-label={t("button.no", { ns: "common" })}
-                                variant="destructive"
-                                onClick={() => {
-                                  setState("uploading");
-                                  onSubmitToPlus(true);
-                                }}
-                              >
-                                {t("button.no", { ns: "common" })}
-                              </Button>
-                            </div>
-                          </>
-                        )}
-                        {state === "uploading" && <ActivityIndicator />}
-                        {state === "submitted" && (
-                          <div className="flex flex-row items-center justify-center gap-2">
-                            <FaCheckCircle className="size-4 text-success" />
-                            {t("explore.plus.review.state.submitted")}
-                          </div>
-                        )}
-                      </div>
-                    </CardContent>
-                  </Card>
-                )}
-              </div>
-            </TransformWrapper>
-          </div>
-        </div>
-      </DialogContent>
-    </Dialog>
-  );
 }

web/src/views/system/EnrichmentMetrics.tsx

@@ -67,14 +67,13 @@ export default function EnrichmentMetrics({
 
   // features stats
 
-  const groupedEnrichmentMetrics = useMemo(() => {
+  const embeddingInferenceTimeSeries = useMemo(() => {
     if (!statsHistory) {
       return [];
     }
 
     const series: {
       [key: string]: {
-        rawKey: string;
         name: string;
         metrics: Threshold;
         data: { x: number; y: number }[];
@@ -91,7 +90,6 @@ export default function EnrichmentMetrics({
 
         if (!(key in series)) {
           series[key] = {
-            rawKey,
             name: t("enrichments.embeddings." + rawKey),
             metrics: getThreshold(rawKey),
             data: [],
@@ -101,57 +99,7 @@ export default function EnrichmentMetrics({
         series[key].data.push({ x: statsIdx + 1, y: stat });
       });
     });
-
+    return Object.values(series);
-    // Group series by category (extract base name from raw key)
-    const grouped: {
-      [category: string]: {
-        categoryName: string;
-        speedSeries?: {
-          name: string;
-          metrics: Threshold;
-          data: { x: number; y: number }[];
-        };
-        eventsSeries?: {
-          name: string;
-          metrics: Threshold;
-          data: { x: number; y: number }[];
-        };
-      };
-    } = {};
-
-    Object.values(series).forEach((s) => {
-      // Extract base category name from raw key
-      // All metrics follow the pattern: {base}_speed and {base}_events_per_second
-      let categoryKey = s.rawKey;
-      let isSpeed = false;
-
-      if (s.rawKey.endsWith("_speed")) {
-        categoryKey = s.rawKey.replace("_speed", "");
-        isSpeed = true;
-      } else if (s.rawKey.endsWith("_events_per_second")) {
-        categoryKey = s.rawKey.replace("_events_per_second", "");
-        isSpeed = false;
-      }
-
-      // Get translated category name
-      const categoryName = t("enrichments.embeddings." + categoryKey);
-
-      if (!(categoryKey in grouped)) {
-        grouped[categoryKey] = {
-          categoryName,
-          speedSeries: undefined,
-          eventsSeries: undefined,
-        };
-      }
-
-      if (isSpeed) {
-        grouped[categoryKey].speedSeries = s;
-      } else {
-        grouped[categoryKey].eventsSeries = s;
-      }
-    });
-
-    return Object.values(grouped);
   }, [statsHistory, t, getThreshold]);
 
   return (
@@ -162,42 +110,35 @@ export default function EnrichmentMetrics({
         </div>
         <div
           className={cn(
-            "mt-4 grid w-full grid-cols-1 gap-2 sm:grid-cols-2 md:grid-cols-4",
+            "mt-4 grid w-full grid-cols-1 gap-2 sm:grid-cols-3",
+            embeddingInferenceTimeSeries && "sm:grid-cols-4",
           )}
         >
           {statsHistory.length != 0 ? (
             <>
-              {groupedEnrichmentMetrics.map((group) => (
+              {embeddingInferenceTimeSeries.map((series) => (
-                <div
+                <div className="rounded-lg bg-background_alt p-2.5 md:rounded-2xl">
-                  key={group.categoryName}
+                  <div className="mb-5 smart-capitalize">{series.name}</div>
-                  className="rounded-lg bg-background_alt p-2.5 md:rounded-2xl"
+                  {series.name.endsWith("Speed") ? (
-                >
+                    <ThresholdBarGraph
-                  <div className="mb-5 smart-capitalize">
+                      key={series.name}
-                    {group.categoryName}
+                      graphId={`${series.name}-inference`}
-                  </div>
+                      name={series.name}
-                  <div className="space-y-4">
+                      unit="ms"
-                    {group.speedSeries && (
+                      threshold={series.metrics}
-                      <ThresholdBarGraph
+                      updateTimes={updateTimes}
-                        key={`${group.categoryName}-speed`}
+                      data={[series]}
-                        graphId={`${group.categoryName}-inference`}
+                    />
-                        name={t("enrichments.averageInf")}
+                  ) : (
-                        unit="ms"
+                    <EventsPerSecondsLineGraph
-                        threshold={group.speedSeries.metrics}
+                      key={series.name}
-                        updateTimes={updateTimes}
+                      graphId={`${series.name}-fps`}
-                        data={[group.speedSeries]}
+                      unit=""
-                      />
+                      name={t("enrichments.infPerSecond")}
-                    )}
+                      updateTimes={updateTimes}
-                    {group.eventsSeries && (
+                      data={[series]}
-                      <EventsPerSecondsLineGraph
+                    />
-                        key={`${group.categoryName}-events`}
+                  )}
-                        graphId={`${group.categoryName}-fps`}
-                        unit=""
-                        name={t("enrichments.infPerSecond")}
-                        updateTimes={updateTimes}
-                        data={[group.eventsSeries]}
-                      />
-                    )}
-                  </div>
                 </div>
               ))}
             </>