Compare commits

..

No commits in common. "5a214eb0d1634f87388174f96aa262edd282f23e" and "687fefb343ea597df420ea44998474da66911720" have entirely different histories.

8 changed files with 65 additions and 79 deletions

View File

@ -153,9 +153,6 @@ Each line represents a detection state, not necessarily unique individuals. Pare
if "other_concerns" in schema.get("required", []): if "other_concerns" in schema.get("required", []):
schema["required"].remove("other_concerns") schema["required"].remove("other_concerns")
# OpenAI strict mode requires additionalProperties: false on all objects
schema["additionalProperties"] = False
response_format = { response_format = {
"type": "json_schema", "type": "json_schema",
"json_schema": { "json_schema": {

View File

@ -36,12 +36,19 @@ def _to_jpeg(img_bytes: bytes) -> bytes | None:
class LlamaCppClient(GenAIClient): class LlamaCppClient(GenAIClient):
"""Generative AI client for Frigate using llama.cpp server.""" """Generative AI client for Frigate using llama.cpp server."""
LOCAL_OPTIMIZED_OPTIONS = {
"temperature": 0.7,
"repeat_penalty": 1.05,
"top_p": 0.8,
}
provider: str # base_url provider: str # base_url
provider_options: dict[str, Any] provider_options: dict[str, Any]
def _init_provider(self): def _init_provider(self):
"""Initialize the client.""" """Initialize the client."""
self.provider_options = { self.provider_options = {
**self.LOCAL_OPTIMIZED_OPTIONS,
**self.genai_config.provider_options, **self.genai_config.provider_options,
} }
return ( return (

View File

@ -38,7 +38,6 @@ const localeMap: Record<string, () => Promise<Locale>> = {
th: () => import("date-fns/locale/th").then((module) => module.th), th: () => import("date-fns/locale/th").then((module) => module.th),
ca: () => import("date-fns/locale/ca").then((module) => module.ca), ca: () => import("date-fns/locale/ca").then((module) => module.ca),
hr: () => import("date-fns/locale/hr").then((module) => module.hr), hr: () => import("date-fns/locale/hr").then((module) => module.hr),
sl: () => import("date-fns/locale/sl").then((module) => module.sl),
}; };
export function useDateLocale(): Locale { export function useDateLocale(): Locale {

View File

@ -106,11 +106,13 @@ export default function useStats(stats: FrigateStats | undefined) {
const cameraName = config?.cameras?.[name]?.friendly_name ?? name; const cameraName = config?.cameras?.[name]?.friendly_name ?? name;
// Skip ffmpeg warnings for replay cameras // Skip ffmpeg warnings for replay cameras when debug replay is active
if ( if (
!isNaN(ffmpegAvg) && !isNaN(ffmpegAvg) &&
ffmpegAvg >= CameraFfmpegThreshold.error && ffmpegAvg >= CameraFfmpegThreshold.error &&
!isReplayCamera(name) !(
debugReplayStatus?.active && debugReplayStatus?.replay_camera === name
)
) { ) {
problems.push({ problems.push({
text: t("stats.ffmpegHighCpuUsage", { text: t("stats.ffmpegHighCpuUsage", {

View File

@ -26,7 +26,6 @@ export const supportedLanguageKeys = [
"pl", "pl",
"hr", "hr",
"sk", "sk",
"sl",
"lt", "lt",
"uk", "uk",
"cs", "cs",

View File

@ -381,7 +381,7 @@ export default function Replay() {
</div> </div>
{/* Side panel */} {/* Side panel */}
<div className="order-last mb-2 mt-2 flex h-full w-full flex-col overflow-hidden rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mb-0 md:mr-2 md:mt-0 md:w-4/12"> <div className="scrollbar-container order-last mb-2 mt-2 flex h-full w-full flex-col overflow-y-auto rounded-lg border-[1px] border-secondary-foreground bg-background_alt p-2 md:order-none md:mb-0 md:mr-2 md:mt-0 md:w-4/12">
<div className="mb-5 flex flex-col space-y-2"> <div className="mb-5 flex flex-col space-y-2">
<Heading as="h3" className="mb-0"> <Heading as="h3" className="mb-0">
{t("title")} {t("title")}
@ -399,10 +399,7 @@ export default function Replay() {
<p>{t("description")}</p> <p>{t("description")}</p>
</div> </div>
</div> </div>
<Tabs <Tabs defaultValue="debug" className="flex h-full w-full flex-col">
defaultValue="debug"
className="flex min-h-0 w-full flex-1 flex-col"
>
<TabsList className="grid w-full grid-cols-3"> <TabsList className="grid w-full grid-cols-3">
<TabsTrigger value="debug"> <TabsTrigger value="debug">
{t("debug.debugging", { ns: "views/settings" })} {t("debug.debugging", { ns: "views/settings" })}
@ -412,10 +409,7 @@ export default function Replay() {
{t("websocket_messages")} {t("websocket_messages")}
</TabsTrigger> </TabsTrigger>
</TabsList> </TabsList>
<TabsContent <TabsContent value="debug" className="mt-2">
value="debug"
className="scrollbar-container mt-2 overflow-y-auto"
>
<div className="mt-2 space-y-6"> <div className="mt-2 space-y-6">
<div className="my-2.5 flex flex-col gap-2.5"> <div className="my-2.5 flex flex-col gap-2.5">
{DEBUG_OPTION_KEYS.map((key) => { {DEBUG_OPTION_KEYS.map((key) => {
@ -560,10 +554,7 @@ export default function Replay() {
</div> </div>
</div> </div>
</TabsContent> </TabsContent>
<TabsContent <TabsContent value="objects" className="mt-2">
value="objects"
className="scrollbar-container mt-2 overflow-y-auto"
>
<ObjectList <ObjectList
cameraConfig={replayCameraConfig} cameraConfig={replayCameraConfig}
objects={objects} objects={objects}

View File

@ -9,7 +9,6 @@ import {
useState, useState,
} from "react"; } from "react";
import { isCurrentHour } from "@/utils/dateUtil"; import { isCurrentHour } from "@/utils/dateUtil";
import { isFirefox, isMobile, isSafari } from "react-device-detect";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { CameraConfig } from "@/types/frigateConfig"; import { CameraConfig } from "@/types/frigateConfig";
import useSWR from "swr"; import useSWR from "swr";
@ -306,46 +305,31 @@ function MotionPreviewClip({
); );
}, [clipStart, preview, range.end_time]); }, [clipStart, preview, range.end_time]);
const compatIntervalRef = useRef<ReturnType<typeof setInterval> | null>(null);
useEffect(() => {
return () => {
if (compatIntervalRef.current) {
clearInterval(compatIntervalRef.current);
}
};
}, []);
const resetPlayback = useCallback(() => { const resetPlayback = useCallback(() => {
if (!videoRef.current || !preview) { if (!videoRef.current || !preview) {
return; return;
} }
if (compatIntervalRef.current) {
clearInterval(compatIntervalRef.current);
compatIntervalRef.current = null;
}
videoRef.current.currentTime = clipStart; videoRef.current.currentTime = clipStart;
videoRef.current.playbackRate = playbackRate;
}, [clipStart, playbackRate, preview]);
if (isSafari || (isFirefox && isMobile)) { useEffect(() => {
// Safari / iOS can't play at speeds > 2x, so manually step through frames if (!videoRef.current || !preview) {
videoRef.current.pause(); return;
compatIntervalRef.current = setInterval(() => {
if (!videoRef.current) {
return;
}
videoRef.current.currentTime += 1;
if (videoRef.current.currentTime >= clipEnd) {
videoRef.current.currentTime = clipStart;
}
}, 1000 / playbackRate);
} else {
videoRef.current.playbackRate = playbackRate;
} }
}, [clipStart, clipEnd, playbackRate, preview]);
if (!isVisible) {
videoRef.current.pause();
videoRef.current.currentTime = clipStart;
return;
}
if (videoRef.current.readyState >= 2) {
resetPlayback();
void videoRef.current.play().catch(() => undefined);
}
}, [clipStart, isVisible, preview, resetPlayback]);
const drawDimOverlay = useCallback(() => { const drawDimOverlay = useCallback(() => {
if (!dimOverlayCanvasRef.current) { if (!dimOverlayCanvasRef.current) {
@ -479,17 +463,15 @@ function MotionPreviewClip({
{showLoadingIndicator && ( {showLoadingIndicator && (
<Skeleton className="absolute inset-0 z-10 rounded-lg md:rounded-2xl" /> <Skeleton className="absolute inset-0 z-10 rounded-lg md:rounded-2xl" />
)} )}
{preview && isVisible ? ( {preview ? (
<> <>
<video <video
ref={videoRef} ref={videoRef}
className="size-full bg-black object-contain" className="size-full bg-black object-contain"
preload="auto"
autoPlay
playsInline playsInline
preload={isVisible ? "metadata" : "none"}
muted muted
disableRemotePlayback autoPlay={isVisible}
loop
onLoadedMetadata={() => { onLoadedMetadata={() => {
setVideoLoaded(true); setVideoLoaded(true);
@ -499,21 +481,36 @@ function MotionPreviewClip({
height: videoRef.current.videoHeight, height: videoRef.current.videoHeight,
}); });
} }
if (!isVisible) {
return;
}
resetPlayback();
if (videoRef.current) {
void videoRef.current.play().catch(() => undefined);
}
}} }}
onCanPlay={() => { onCanPlay={() => {
setVideoLoaded(true); setVideoLoaded(true);
if (!isVisible) {
return;
}
if (videoRef.current) {
void videoRef.current.play().catch(() => undefined);
}
}} }}
onPlay={() => { onPlay={() => setVideoPlaying(true)}
setVideoPlaying(true);
resetPlayback();
}}
onLoadedData={() => setVideoLoaded(true)} onLoadedData={() => setVideoLoaded(true)}
onError={() => { onError={() => {
setVideoLoaded(true); setVideoLoaded(true);
setVideoPlaying(true); setVideoPlaying(true);
}} }}
onTimeUpdate={() => { onTimeUpdate={() => {
if (!videoRef.current || !preview) { if (!videoRef.current || !preview || !isVisible) {
return; return;
} }
@ -522,10 +519,12 @@ function MotionPreviewClip({
} }
}} }}
> >
<source {isVisible && (
src={`${baseUrl}${preview.src.substring(1)}`} <source
type={preview.type} src={`${baseUrl}${preview.src.substring(1)}`}
/> type={preview.type}
/>
)}
</video> </video>
{motionHeatmap && ( {motionHeatmap && (
<canvas <canvas

View File

@ -4,7 +4,7 @@ import useSWR from "swr";
import axios from "axios"; import axios from "axios";
import ActivityIndicator from "@/components/indicators/activity-indicator"; import ActivityIndicator from "@/components/indicators/activity-indicator";
import AutoUpdatingCameraImage from "@/components/camera/AutoUpdatingCameraImage"; import AutoUpdatingCameraImage from "@/components/camera/AutoUpdatingCameraImage";
import { useCallback, useEffect, useMemo, useRef, useState } from "react"; import { useCallback, useEffect, useMemo, useState } from "react";
import { Slider } from "@/components/ui/slider"; import { Slider } from "@/components/ui/slider";
import { Label } from "@/components/ui/label"; import { Label } from "@/components/ui/label";
import { import {
@ -63,8 +63,6 @@ export default function MotionTunerView({
improve_contrast: undefined, improve_contrast: undefined,
}); });
const userInteractedRef = useRef(false);
const cameraConfig = useMemo(() => { const cameraConfig = useMemo(() => {
if (config && selectedCamera) { if (config && selectedCamera) {
return config.cameras[selectedCamera]; return config.cameras[selectedCamera];
@ -72,7 +70,6 @@ export default function MotionTunerView({
}, [config, selectedCamera]); }, [config, selectedCamera]);
useEffect(() => { useEffect(() => {
userInteractedRef.current = false;
if (cameraConfig) { if (cameraConfig) {
setMotionSettings({ setMotionSettings({
threshold: cameraConfig.motion.threshold, threshold: cameraConfig.motion.threshold,
@ -90,29 +87,24 @@ export default function MotionTunerView({
}, [selectedCamera]); }, [selectedCamera]);
useEffect(() => { useEffect(() => {
if (!motionSettings.threshold || !userInteractedRef.current) return; if (!motionSettings.threshold) return;
sendMotionThreshold(motionSettings.threshold); sendMotionThreshold(motionSettings.threshold);
}, [motionSettings.threshold, sendMotionThreshold]); }, [motionSettings.threshold, sendMotionThreshold]);
useEffect(() => { useEffect(() => {
if (!motionSettings.contour_area || !userInteractedRef.current) return; if (!motionSettings.contour_area) return;
sendMotionContourArea(motionSettings.contour_area); sendMotionContourArea(motionSettings.contour_area);
}, [motionSettings.contour_area, sendMotionContourArea]); }, [motionSettings.contour_area, sendMotionContourArea]);
useEffect(() => { useEffect(() => {
if ( if (motionSettings.improve_contrast === undefined) return;
motionSettings.improve_contrast === undefined ||
!userInteractedRef.current
)
return;
sendImproveContrast(motionSettings.improve_contrast ? "ON" : "OFF"); sendImproveContrast(motionSettings.improve_contrast ? "ON" : "OFF");
}, [motionSettings.improve_contrast, sendImproveContrast]); }, [motionSettings.improve_contrast, sendImproveContrast]);
const handleMotionConfigChange = (newConfig: Partial<MotionSettings>) => { const handleMotionConfigChange = (newConfig: Partial<MotionSettings>) => {
userInteractedRef.current = true;
setMotionSettings((prevConfig) => ({ ...prevConfig, ...newConfig })); setMotionSettings((prevConfig) => ({ ...prevConfig, ...newConfig }));
setUnsavedChanges(true); setUnsavedChanges(true);
setChangedValue(true); setChangedValue(true);