From 0ee32cf11006e91863b917c4faabee32e901aff8 Mon Sep 17 00:00:00 2001
From: Josh Hawkins <32435876+hawkeye217@users.noreply.github.com>
Date: Mon, 14 Oct 2024 09:23:08 -0500
Subject: [PATCH] Fix yaml bug and ensure embeddings progress doesn't show
until all models are loaded (#14338)
---
frigate/util/builtin.py | 15 +++++----------
web/src/pages/Explore.tsx | 2 +-
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/frigate/util/builtin.py b/frigate/util/builtin.py
index 7c2c5790e..6dab16206 100644
--- a/frigate/util/builtin.py
+++ b/frigate/util/builtin.py
@@ -183,16 +183,11 @@ def update_yaml_from_url(file_path, url):
update_yaml_file(file_path, key_path, new_value_list)
else:
value = new_value_list[0]
- if "," in value:
- # Skip conversion if we're a mask or zone string
- update_yaml_file(file_path, key_path, value)
- else:
- try:
- value = ast.literal_eval(value)
- except (ValueError, SyntaxError):
- pass
- update_yaml_file(file_path, key_path, value)
-
+ try:
+ # no need to convert if we have a mask/zone string
+ value = ast.literal_eval(value) if "," not in value else value
+ except (ValueError, SyntaxError):
+ pass
update_yaml_file(file_path, key_path, value)
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index 03a60a8d0..816618fe5 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -275,7 +275,7 @@ export default function Explore() {
Search Unavailable
- {embeddingsReindexing && (
+ {embeddingsReindexing && allModelsLoaded && (
<>
Search can be used after tracked object embeddings have