mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-07-26 13:47:03 +02:00
Fix model errors (#17171)
This commit is contained in:
parent
d87268acfe
commit
db541abed4
@ -608,6 +608,11 @@ class FrigateConfig(FrigateBaseModel):
|
|||||||
self.model.create_colormap(sorted(self.objects.all_objects))
|
self.model.create_colormap(sorted(self.objects.all_objects))
|
||||||
self.model.check_and_load_plus_model(self.plus_api)
|
self.model.check_and_load_plus_model(self.plus_api)
|
||||||
|
|
||||||
|
if self.plus_api and not self.snapshots.clean_copy:
|
||||||
|
logger.warning(
|
||||||
|
"Frigate+ is configured but clean snapshots are not enabled, submissions to Frigate+ will not be possible./"
|
||||||
|
)
|
||||||
|
|
||||||
for key, detector in self.detectors.items():
|
for key, detector in self.detectors.items():
|
||||||
adapter = TypeAdapter(DetectorConfig)
|
adapter = TypeAdapter(DetectorConfig)
|
||||||
model_dict = (
|
model_dict = (
|
||||||
|
@ -144,7 +144,8 @@ class BirdRealTimeProcessor(RealTimeProcessorApi):
|
|||||||
return
|
return
|
||||||
|
|
||||||
self.sub_label_publisher.publish(
|
self.sub_label_publisher.publish(
|
||||||
EventMetadataTypeEnum.sub_label, (id, self.labelmap[best_id], score)
|
EventMetadataTypeEnum.sub_label,
|
||||||
|
(obj_data["id"], self.labelmap[best_id], score),
|
||||||
)
|
)
|
||||||
self.detected_birds[obj_data["id"]] = score
|
self.detected_birds[obj_data["id"]] = score
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
import logging
|
import logging
|
||||||
|
import os
|
||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from pydantic import Field
|
from pydantic import Field
|
||||||
@ -45,9 +46,17 @@ class EdgeTpuTfl(DetectionApi):
|
|||||||
experimental_delegates=[edge_tpu_delegate],
|
experimental_delegates=[edge_tpu_delegate],
|
||||||
)
|
)
|
||||||
except ValueError:
|
except ValueError:
|
||||||
logger.error(
|
_, ext = os.path.splitext(detector_config.model.path)
|
||||||
"No EdgeTPU was detected. If you do not have a Coral device yet, you must configure CPU detectors."
|
|
||||||
)
|
if ext and ext != ".tflite":
|
||||||
|
logger.error(
|
||||||
|
"Incorrect model used with EdgeTPU. Only .tflite models can be used with a Coral EdgeTPU."
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
logger.error(
|
||||||
|
"No EdgeTPU was detected. If you do not have a Coral device yet, you must configure CPU detectors."
|
||||||
|
)
|
||||||
|
|
||||||
raise
|
raise
|
||||||
|
|
||||||
self.interpreter.allocate_tensors()
|
self.interpreter.allocate_tensors()
|
||||||
|
@ -225,6 +225,9 @@ class EmbeddingsContext:
|
|||||||
if os.path.isfile(file_path):
|
if os.path.isfile(file_path):
|
||||||
os.unlink(file_path)
|
os.unlink(file_path)
|
||||||
|
|
||||||
|
if len(os.listdir(folder)) == 0:
|
||||||
|
os.rmdir(folder)
|
||||||
|
|
||||||
def update_description(self, event_id: str, description: str) -> None:
|
def update_description(self, event_id: str, description: str) -> None:
|
||||||
self.requestor.send_data(
|
self.requestor.send_data(
|
||||||
EmbeddingsRequestEnum.embed_description.value,
|
EmbeddingsRequestEnum.embed_description.value,
|
||||||
|
@ -19,7 +19,6 @@ from frigate.const import (
|
|||||||
CACHE_DIR,
|
CACHE_DIR,
|
||||||
CLIPS_DIR,
|
CLIPS_DIR,
|
||||||
EXPORT_DIR,
|
EXPORT_DIR,
|
||||||
FFMPEG_HVC1_ARGS,
|
|
||||||
MAX_PLAYLIST_SECONDS,
|
MAX_PLAYLIST_SECONDS,
|
||||||
PREVIEW_FRAME_TYPE,
|
PREVIEW_FRAME_TYPE,
|
||||||
)
|
)
|
||||||
@ -233,9 +232,6 @@ class RecordingExporter(threading.Thread):
|
|||||||
)
|
)
|
||||||
).split(" ")
|
).split(" ")
|
||||||
|
|
||||||
if self.config.ffmpeg.apple_compatibility:
|
|
||||||
ffmpeg_cmd += FFMPEG_HVC1_ARGS
|
|
||||||
|
|
||||||
# add metadata
|
# add metadata
|
||||||
title = f"Frigate Recording for {self.camera}, {self.get_datetime_from_timestamp(self.start_time)} - {self.get_datetime_from_timestamp(self.end_time)}"
|
title = f"Frigate Recording for {self.camera}, {self.get_datetime_from_timestamp(self.start_time)} - {self.get_datetime_from_timestamp(self.end_time)}"
|
||||||
ffmpeg_cmd.extend(["-metadata", f"title={title}"])
|
ffmpeg_cmd.extend(["-metadata", f"title={title}"])
|
||||||
|
Loading…
Reference in New Issue
Block a user