Mirrors/blakeblackshear.frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2025-07-16 13:47:07 +02:00
Code Issues Projects Releases Wiki Activity

Improve handling of error conditions with ollama and snapshot regeneration (#15527)

Browse Source
This commit is contained in:
Josh Hawkins 2024-12-15 20:51:23 -06:00 committed by GitHub
parent d49f958d4d
commit 717493e668
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
frigate/embeddings/maintainer.py
View File

@ -325,10 +325,15 @@ class EmbeddingMaintainer(threading.Thread):
) )
if event.has_snapshot and source == "snapshot": if event.has_snapshot and source == "snapshot":
with open( snapshot_file = os.path.join(CLIPS_DIR, f"{event.camera}-{event.id}.jpg")
os.path.join(CLIPS_DIR, f"{event.camera}-{event.id}.jpg"),
"rb", if not os.path.isfile(snapshot_file):
) as image_file: logger.error(
f"Cannot regenerate description for {event.id}, snapshot file not found: {snapshot_file}"
)
return
with open(snapshot_file, "rb") as image_file:
snapshot_image = image_file.read() snapshot_image = image_file.read()
img = cv2.imdecode( img = cv2.imdecode(
np.frombuffer(snapshot_image, dtype=np.int8), cv2.IMREAD_COLOR np.frombuffer(snapshot_image, dtype=np.int8), cv2.IMREAD_COLOR

5
frigate/genai/ollama.py
View File

@ -38,6 +38,11 @@ class OllamaClient(GenAIClient):
def _send(self, prompt: str, images: list[bytes]) -> Optional[str]: def _send(self, prompt: str, images: list[bytes]) -> Optional[str]:
"""Submit a request to Ollama""" """Submit a request to Ollama"""
if self.provider is None:
logger.warning(
"Ollama provider has not been initialized, a description will not be generated. Check your Ollama configuration."
)
return None
try: try:
result = self.provider.generate( result = self.provider.generate(
self.genai_config.model, self.genai_config.model,