mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-05-01 19:17:41 +03:00
Fix file exist checks for plus:// paths
This commit is contained in:
parent
1762f3524a
commit
8327601c4b
@ -511,9 +511,10 @@ class FrigateConfig(FrigateBaseModel):
|
||||
elif detector_config.type == "edgetpu":
|
||||
model_config["path"] = "/edgetpu_model.tflite"
|
||||
|
||||
# Verify that the model path points to an existing file.
|
||||
if not os.path.exists(model_config["path"]):
|
||||
raise ValueError(f"Model path '{model_config['path']}' does not exist.")
|
||||
# If using a local file, verify that the model path points to an existing file.
|
||||
if not model_config["path"].startswith("plus://"):
|
||||
if not os.path.exists(model_config["path"]):
|
||||
raise ValueError(f"Model path '{model_config['path']}' does not exist.")
|
||||
|
||||
model = ModelConfig.model_validate(model_config)
|
||||
model.check_and_load_plus_model(self.plus_api, detector_config.type)
|
||||
|
||||
@ -103,14 +103,17 @@ class ModelConfig(BaseModel):
|
||||
def __init__(self, **config):
|
||||
super().__init__(**config)
|
||||
|
||||
# Verify that the labelmap path points to an existing file.
|
||||
if not os.path.exists(config.get("labelmap_path", "/labelmap.txt")):
|
||||
raise ValueError(
|
||||
f"Model labelmap_path '{config.get('labelmap_path', '/labelmap.txt')}' does not exist."
|
||||
)
|
||||
path = config.get("labelmap_path", "/labelmap.txt")
|
||||
|
||||
# If using a local file, verify that the labelmap path points to an existing file.
|
||||
if not path.startswith("plus://"):
|
||||
if not os.path.exists(path):
|
||||
raise ValueError(
|
||||
f"Model labelmap_path '{path}' does not exist."
|
||||
)
|
||||
|
||||
self._merged_labelmap = {
|
||||
**load_labels(config.get("labelmap_path", "/labelmap.txt")),
|
||||
**load_labels(path),
|
||||
**config.get("labelmap", {}),
|
||||
}
|
||||
self._colormap = {}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user