···
1
+
diff --git a/frigate/api/media.py b/frigate/api/media.py
2
+
index b5f3ba70..09a09c13 100644
3
+
--- a/frigate/api/media.py
4
+
+++ b/frigate/api/media.py
5
+
@@ -31,6 +31,7 @@ from frigate.config import FrigateConfig
6
+
from frigate.const import (
10
+
MAX_SEGMENT_DURATION,
13
+
@@ -154,7 +155,9 @@ def latest_frame(
14
+
frame_processor.get_current_frame_time(camera_name) + retry_interval
16
+
if request.app.camera_error_image is None:
17
+
- error_image = glob.glob("/opt/frigate/frigate/images/camera-error.jpg")
18
+
+ error_image = glob.glob(
19
+
+ os.path.join(INSTALL_DIR, "frigate/images/camera-error.jpg")
22
+
if len(error_image) > 0:
23
+
request.app.camera_error_image = cv2.imread(
24
+
@@ -497,7 +500,7 @@ def recording_clip(
27
+
file_name = sanitize_filename(f"playlist_{camera_name}_{start_ts}-{end_ts}.txt")
28
+
- file_path = f"/tmp/cache/{file_name}"
29
+
+ file_path = os.path.join(CACHE_DIR, file_name)
30
+
with open(file_path, "w") as file:
32
+
for clip in recordings:
33
+
diff --git a/frigate/api/preview.py b/frigate/api/preview.py
34
+
index d14a15ff..2db2326a 100644
35
+
--- a/frigate/api/preview.py
36
+
+++ b/frigate/api/preview.py
37
+
@@ -9,7 +9,7 @@ from fastapi import APIRouter
38
+
from fastapi.responses import JSONResponse
40
+
from frigate.api.defs.tags import Tags
41
+
-from frigate.const import CACHE_DIR, PREVIEW_FRAME_TYPE
42
+
+from frigate.const import BASE_DIR, CACHE_DIR, PREVIEW_FRAME_TYPE
43
+
from frigate.models import Previews
45
+
logger = logging.getLogger(__name__)
46
+
@@ -52,7 +52,7 @@ def preview_ts(camera_name: str, start_ts: float, end_ts: float):
49
+
"camera": preview["camera"],
50
+
- "src": preview["path"].replace("/media/frigate", ""),
51
+
+ "src": preview["path"].replace(BASE_DIR, ""),
52
+
"type": "video/mp4",
53
+
"start": preview["start_time"],
54
+
"end": preview["end_time"],
55
+
diff --git a/frigate/comms/webpush.py b/frigate/comms/webpush.py
56
+
index abfd52d1..ab4cf3c5 100644
57
+
--- a/frigate/comms/webpush.py
58
+
+++ b/frigate/comms/webpush.py
59
+
@@ -12,7 +12,7 @@ from pywebpush import WebPusher
60
+
from frigate.comms.config_updater import ConfigSubscriber
61
+
from frigate.comms.dispatcher import Communicator
62
+
from frigate.config import FrigateConfig
63
+
-from frigate.const import CONFIG_DIR
64
+
+from frigate.const import BASE_DIR, CONFIG_DIR
65
+
from frigate.models import User
67
+
logger = logging.getLogger(__name__)
68
+
@@ -151,7 +151,7 @@ class WebPushClient(Communicator): # type: ignore[misc]
69
+
camera: str = payload["after"]["camera"]
70
+
title = f"{', '.join(sorted_objects).replace('_', ' ').title()}{' was' if state == 'end' else ''} detected in {', '.join(payload['after']['data']['zones']).replace('_', ' ').title()}"
71
+
message = f"Detected on {camera.replace('_', ' ').title()}"
72
+
- image = f"{payload['after']['thumb_path'].replace('/media/frigate', '')}"
73
+
+ image = f"{payload['after']['thumb_path'].replace(BASE_DIR, '')}"
75
+
# if event is ongoing open to live view otherwise open to recordings view
76
+
direct_url = f"/review?id={reviewId}" if state == "end" else f"/#{camera}"
77
+
diff --git a/frigate/const.py b/frigate/const.py
78
+
index 5976f47b..dc710467 100644
79
+
--- a/frigate/const.py
80
+
+++ b/frigate/const.py
84
+
+INSTALL_DIR = "/opt/frigate"
85
+
CONFIG_DIR = "/config"
86
+
DEFAULT_DB_PATH = f"{CONFIG_DIR}/frigate.db"
87
+
MODEL_CACHE_DIR = f"{CONFIG_DIR}/model_cache"
88
+
diff --git a/frigate/detectors/detector_config.py b/frigate/detectors/detector_config.py
89
+
index 452f1fee..13535a62 100644
90
+
--- a/frigate/detectors/detector_config.py
91
+
+++ b/frigate/detectors/detector_config.py
92
+
@@ -9,7 +9,7 @@ import requests
93
+
from pydantic import BaseModel, ConfigDict, Field
94
+
from pydantic.fields import PrivateAttr
96
+
-from frigate.const import DEFAULT_ATTRIBUTE_LABEL_MAP
97
+
+from frigate.const import DEFAULT_ATTRIBUTE_LABEL_MAP, MODEL_CACHE_DIR
98
+
from frigate.plus import PlusApi
99
+
from frigate.util.builtin import generate_color_palette, load_labels
101
+
@@ -117,7 +117,7 @@ class ModelConfig(BaseModel):
104
+
model_id = self.path[7:]
105
+
- self.path = f"/config/model_cache/{model_id}"
106
+
+ self.path = os.path.join(MODEL_CACHE_DIR, model_id)
107
+
model_info_path = f"{self.path}.json"
109
+
# download the model if it doesn't exist
110
+
diff --git a/frigate/detectors/plugins/hailo8l.py b/frigate/detectors/plugins/hailo8l.py
111
+
index b66d78bd..69e86bc5 100644
112
+
--- a/frigate/detectors/plugins/hailo8l.py
113
+
+++ b/frigate/detectors/plugins/hailo8l.py
114
+
@@ -22,6 +22,7 @@ except ModuleNotFoundError:
115
+
from pydantic import BaseModel, Field
116
+
from typing_extensions import Literal
118
+
+from frigate.const import MODEL_CACHE_DIR
119
+
from frigate.detectors.detection_api import DetectionApi
120
+
from frigate.detectors.detector_config import BaseDetectorConfig
122
+
@@ -57,7 +58,7 @@ class HailoDetector(DetectionApi):
123
+
self.h8l_tensor_format = detector_config.model.input_tensor
124
+
self.h8l_pixel_format = detector_config.model.input_pixel_format
125
+
self.model_url = "https://hailo-model-zoo.s3.eu-west-2.amazonaws.com/ModelZoo/Compiled/v2.11.0/hailo8l/ssd_mobilenet_v1.hef"
126
+
- self.cache_dir = "/config/model_cache/h8l_cache"
127
+
+ self.cache_dir = os.path.join(MODEL_CACHE_DIR, "h8l_cache")
128
+
self.expected_model_filename = "ssd_mobilenet_v1.hef"
129
+
output_type = "FLOAT32"
131
+
diff --git a/frigate/detectors/plugins/openvino.py b/frigate/detectors/plugins/openvino.py
132
+
index 51e48530..d199317b 100644
133
+
--- a/frigate/detectors/plugins/openvino.py
134
+
+++ b/frigate/detectors/plugins/openvino.py
135
+
@@ -7,6 +7,7 @@ import openvino.properties as props
136
+
from pydantic import Field
137
+
from typing_extensions import Literal
139
+
+from frigate.const import MODEL_CACHE_DIR
140
+
from frigate.detectors.detection_api import DetectionApi
141
+
from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum
143
+
@@ -35,8 +36,10 @@ class OvDetector(DetectionApi):
144
+
logger.error(f"OpenVino model file {detector_config.model.path} not found.")
145
+
raise FileNotFoundError
147
+
- os.makedirs("/config/model_cache/openvino", exist_ok=True)
148
+
- self.ov_core.set_property({props.cache_dir: "/config/model_cache/openvino"})
149
+
+ os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino"), exist_ok=True)
150
+
+ self.ov_core.set_property(
151
+
+ {props.cache_dir: os.path.join(MODEL_CACHE_DIR, "openvino")}
153
+
self.interpreter = self.ov_core.compile_model(
154
+
model=detector_config.model.path, device_name=detector_config.device
156
+
diff --git a/frigate/detectors/plugins/rknn.py b/frigate/detectors/plugins/rknn.py
157
+
index df94d7b6..bc3d9ae0 100644
158
+
--- a/frigate/detectors/plugins/rknn.py
159
+
+++ b/frigate/detectors/plugins/rknn.py
160
+
@@ -6,6 +6,7 @@ from typing import Literal
162
+
from pydantic import Field
164
+
+from frigate.const import MODEL_CACHE_DIR
165
+
from frigate.detectors.detection_api import DetectionApi
166
+
from frigate.detectors.detector_config import BaseDetectorConfig, ModelTypeEnum
168
+
@@ -17,7 +18,7 @@ supported_socs = ["rk3562", "rk3566", "rk3568", "rk3576", "rk3588"]
170
+
supported_models = {ModelTypeEnum.yolonas: "^deci-fp16-yolonas_[sml]$"}
172
+
-model_cache_dir = "/config/model_cache/rknn_cache/"
173
+
+model_cache_dir = os.path.join(MODEL_CACHE_DIR, "rknn_cache/")
176
+
class RknnDetectorConfig(BaseDetectorConfig):
177
+
diff --git a/frigate/detectors/plugins/rocm.py b/frigate/detectors/plugins/rocm.py
178
+
index 60118d12..7c87edb5 100644
179
+
--- a/frigate/detectors/plugins/rocm.py
180
+
+++ b/frigate/detectors/plugins/rocm.py
181
+
@@ -9,6 +9,7 @@ import numpy as np
182
+
from pydantic import Field
183
+
from typing_extensions import Literal
185
+
+from frigate.const import MODEL_CACHE_DIR
186
+
from frigate.detectors.detection_api import DetectionApi
187
+
from frigate.detectors.detector_config import (
188
+
BaseDetectorConfig,
189
+
@@ -116,7 +117,7 @@ class ROCmDetector(DetectionApi):
191
+
logger.info(f"AMD/ROCm: saving parsed model into {mxr_path}")
193
+
- os.makedirs("/config/model_cache/rocm", exist_ok=True)
194
+
+ os.makedirs(os.path.join(MODEL_CACHE_DIR, "rocm"), exist_ok=True)
195
+
migraphx.save(self.model, mxr_path)
197
+
logger.info("AMD/ROCm: model loaded")
198
+
diff --git a/frigate/output/birdseye.py b/frigate/output/birdseye.py
199
+
index 00f17c8f..8331eb64 100644
200
+
--- a/frigate/output/birdseye.py
201
+
+++ b/frigate/output/birdseye.py
202
+
@@ -16,7 +16,7 @@ import numpy as np
204
+
from frigate.comms.config_updater import ConfigSubscriber
205
+
from frigate.config import BirdseyeModeEnum, FfmpegConfig, FrigateConfig
206
+
-from frigate.const import BASE_DIR, BIRDSEYE_PIPE
207
+
+from frigate.const import BASE_DIR, BIRDSEYE_PIPE, INSTALL_DIR
208
+
from frigate.util.image import (
209
+
SharedMemoryFrameManager,
210
+
copy_yuv_to_position,
211
+
@@ -297,7 +297,9 @@ class BirdsEyeFrameManager:
212
+
birdseye_logo = cv2.imread(custom_logo_files[0], cv2.IMREAD_UNCHANGED)
214
+
if birdseye_logo is None:
215
+
- logo_files = glob.glob("/opt/frigate/frigate/images/birdseye.png")
216
+
+ logo_files = glob.glob(
217
+
+ os.path.join(INSTALL_DIR, "frigate/images/birdseye.png")
220
+
if len(logo_files) > 0:
221
+
birdseye_logo = cv2.imread(logo_files[0], cv2.IMREAD_UNCHANGED)
222
+
diff --git a/frigate/test/http_api/base_http_test.py b/frigate/test/http_api/base_http_test.py
223
+
index e7a1d03e..4fa4a5b5 100644
224
+
--- a/frigate/test/http_api/base_http_test.py
225
+
+++ b/frigate/test/http_api/base_http_test.py
226
+
@@ -9,6 +9,7 @@ from playhouse.sqliteq import SqliteQueueDatabase
228
+
from frigate.api.fastapi_app import create_fastapi_app
229
+
from frigate.config import FrigateConfig
230
+
+from frigate.const import BASE_DIR, CACHE_DIR
231
+
from frigate.models import Event, Recordings, ReviewSegment
232
+
from frigate.review.types import SeverityEnum
233
+
from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS
234
+
@@ -72,19 +73,19 @@ class BaseTestHttp(unittest.TestCase):
238
+
- "/media/frigate/clips": {
239
+
+ os.path.join(BASE_DIR, "clips"): {
241
+
"mount_type": "ext4",
245
+
- "/media/frigate/recordings": {
246
+
+ os.path.join(BASE_DIR, "recordings"): {
248
+
"mount_type": "ext4",
255
+
"mount_type": "tmpfs",
257
+
diff --git a/frigate/test/test_config.py b/frigate/test/test_config.py
258
+
index e6cb1274..5a3deefd 100644
259
+
--- a/frigate/test/test_config.py
260
+
+++ b/frigate/test/test_config.py
261
+
@@ -854,9 +854,9 @@ class TestConfig(unittest.TestCase):
262
+
assert frigate_config.model.merged_labelmap[0] == "person"
264
+
def test_plus_labelmap(self):
265
+
- with open("/config/model_cache/test", "w") as f:
266
+
+ with open(os.path.join(MODEL_CACHE_DIR, "test"), "w") as f:
267
+
json.dump(self.plus_model_info, f)
268
+
- with open("/config/model_cache/test.json", "w") as f:
269
+
+ with open(os.path.join(MODEL_CACHE_DIR, "test.json"), "w") as f:
270
+
json.dump(self.plus_model_info, f)
273
+
diff --git a/frigate/test/test_http.py b/frigate/test/test_http.py
274
+
index 21379425..66f9d22a 100644
275
+
--- a/frigate/test/test_http.py
276
+
+++ b/frigate/test/test_http.py
277
+
@@ -12,6 +12,7 @@ from playhouse.sqliteq import SqliteQueueDatabase
279
+
from frigate.api.fastapi_app import create_fastapi_app
280
+
from frigate.config import FrigateConfig
281
+
+from frigate.const import BASE_DIR, CACHE_DIR
282
+
from frigate.models import Event, Recordings, Timeline
283
+
from frigate.stats.emitter import StatsEmitter
284
+
from frigate.test.const import TEST_DB, TEST_DB_CLEANUPS
285
+
@@ -76,19 +77,19 @@ class TestHttp(unittest.TestCase):
289
+
- "/media/frigate/clips": {
290
+
+ os.path.join(BASE_DIR, "clips"): {
292
+
"mount_type": "ext4",
296
+
- "/media/frigate/recordings": {
297
+
+ os.path.join(BASE_DIR, "recordings"): {
299
+
"mount_type": "ext4",
306
+
"mount_type": "tmpfs",
308
+
diff --git a/frigate/util/config.py b/frigate/util/config.py
309
+
index d456c755..b6b270c9 100644
310
+
--- a/frigate/util/config.py
311
+
+++ b/frigate/util/config.py
312
+
@@ -14,7 +14,7 @@ from frigate.util.services import get_video_properties
313
+
logger = logging.getLogger(__name__)
315
+
CURRENT_CONFIG_VERSION = "0.15-1"
316
+
-DEFAULT_CONFIG_FILE = "/config/config.yml"
317
+
+DEFAULT_CONFIG_FILE = os.path.join(CONFIG_DIR, "config.yml")
320
+
def find_config_file() -> str:
321
+
diff --git a/frigate/util/model.py b/frigate/util/model.py
322
+
index ce2c9538..6e93cb38 100644
323
+
--- a/frigate/util/model.py
324
+
+++ b/frigate/util/model.py
325
+
@@ -12,6 +12,8 @@ except ImportError:
326
+
# openvino is not included
329
+
+from frigate.const import MODEL_CACHE_DIR
331
+
logger = logging.getLogger(__name__)
334
+
@@ -46,7 +48,8 @@ def get_ort_providers(
335
+
# so it is not enabled by default
336
+
if device == "Tensorrt":
338
+
- "/config/model_cache/tensorrt/ort/trt-engines", exist_ok=True
339
+
+ os.path.join(MODEL_CACHE_DIR, "tensorrt/ort/trt-engines"),
342
+
device_id = 0 if not device.isdigit() else int(device)
343
+
providers.append(provider)
344
+
@@ -57,19 +60,23 @@ def get_ort_providers(
345
+
and os.environ.get("USE_FP_16", "True") != "False",
346
+
"trt_timing_cache_enable": True,
347
+
"trt_engine_cache_enable": True,
348
+
- "trt_timing_cache_path": "/config/model_cache/tensorrt/ort",
349
+
- "trt_engine_cache_path": "/config/model_cache/tensorrt/ort/trt-engines",
350
+
+ "trt_timing_cache_path": os.path.join(
351
+
+ MODEL_CACHE_DIR, "tensorrt/ort"
353
+
+ "trt_engine_cache_path": os.path.join(
354
+
+ MODEL_CACHE_DIR, "tensorrt/ort/trt-engines"
360
+
elif provider == "OpenVINOExecutionProvider":
361
+
- os.makedirs("/config/model_cache/openvino/ort", exist_ok=True)
362
+
+ os.makedirs(os.path.join(MODEL_CACHE_DIR, "openvino/ort"), exist_ok=True)
363
+
providers.append(provider)
366
+
"arena_extend_strategy": "kSameAsRequested",
367
+
- "cache_dir": "/config/model_cache/openvino/ort",
368
+
+ "cache_dir": os.path.join(MODEL_CACHE_DIR, "openvino/ort"),
369
+
"device_type": device,
372
+
@@ -103,7 +110,7 @@ class ONNXModelRunner:
374
+
self.ov = ov.Core()
375
+
self.ov.set_property(
376
+
- {ov.properties.cache_dir: "/config/model_cache/openvino"}
377
+
+ {ov.properties.cache_dir: os.path.join(MODEL_CACHE_DIR, "openvino")}
379
+
self.interpreter = self.ov.compile_model(
380
+
model=model_path, device_name=device
pyrox.dev