mirror of
https://github.com/blakeblackshear/frigate.git
synced 2025-07-30 13:48:07 +02:00
Fix key error when model path key doesn't exist. (#17217)
* fixed metrics race condition * ruff formatting * adjust for default path config * ruff * check for model too
This commit is contained in:
parent
bf22d89f67
commit
cf16eda76e
@ -177,14 +177,18 @@ def config(request: Request):
|
|||||||
|
|
||||||
# Add model plus data if plus is enabled
|
# Add model plus data if plus is enabled
|
||||||
if config["plus"]["enabled"]:
|
if config["plus"]["enabled"]:
|
||||||
model_json_path = FilePath(config["model"]["path"]).with_suffix(".json")
|
model_path = config.get("model", {}).get("path")
|
||||||
try:
|
if model_path:
|
||||||
with open(model_json_path, "r") as f:
|
model_json_path = FilePath(model_path).with_suffix(".json")
|
||||||
model_plus_data = json.load(f)
|
try:
|
||||||
config["model"]["plus"] = model_plus_data
|
with open(model_json_path, "r") as f:
|
||||||
except FileNotFoundError:
|
model_plus_data = json.load(f)
|
||||||
config["model"]["plus"] = None
|
config["model"]["plus"] = model_plus_data
|
||||||
except json.JSONDecodeError:
|
except FileNotFoundError:
|
||||||
|
config["model"]["plus"] = None
|
||||||
|
except json.JSONDecodeError:
|
||||||
|
config["model"]["plus"] = None
|
||||||
|
else:
|
||||||
config["model"]["plus"] = None
|
config["model"]["plus"] = None
|
||||||
|
|
||||||
# use merged labelamp
|
# use merged labelamp
|
||||||
|
Loading…
Reference in New Issue
Block a user