Compare commits

..

No commits in common. "00c1f5e688dcc3ff1a6925a4ea9dfc28ac14d868" and "c873c1c9029a9ffbf4e3296fc577e3857a9f3e96" have entirely different histories.

5 changed files with 11 additions and 18 deletions

View File

@ -22,4 +22,6 @@ class GenAIConfig(FrigateBaseModel):
api_key: Optional[EnvString] = Field(default=None, title="Provider API key.")
base_url: Optional[str] = Field(default=None, title="Provider base url.")
model: str = Field(default="gpt-4o", title="GenAI model.")
provider: GenAIProviderEnum | None = Field(default=None, title="GenAI provider.")
provider: GenAIProviderEnum | None = Field(
default=None, title="GenAI provider."
)

View File

@ -80,10 +80,6 @@ class GenAIReviewConfig(FrigateBaseModel):
enabled_in_config: Optional[bool] = Field(
default=None, title="Keep track of original state of generative AI."
)
preferred_language: str | None = Field(
title="Preferred language for GenAI Response",
default=None,
)
class ReviewConfig(FrigateBaseModel):

View File

@ -112,7 +112,6 @@ class ReviewDescriptionProcessor(PostProcessorApi):
final_data,
thumbs,
camera_config.review.genai.additional_concerns,
camera_config.review.genai.preferred_language,
),
).start()
@ -163,7 +162,6 @@ def run_analysis(
final_data: dict[str, str],
thumbs: list[bytes],
concerns: list[str],
preferred_language: str | None,
) -> None:
start = datetime.datetime.now().timestamp()
metadata = genai_client.generate_review_description(
@ -176,7 +174,6 @@ def run_analysis(
},
thumbs,
concerns,
preferred_language,
)
review_inference_speed.update(datetime.datetime.now().timestamp() - start)

View File

@ -1,5 +1,6 @@
"""Generative AI module for Frigate."""
import datetime
import importlib
import logging
import os
@ -40,23 +41,17 @@ class GenAIClient:
review_data: dict[str, Any],
thumbnails: list[bytes],
concerns: list[str],
preferred_language: str | None,
) -> ReviewMetadata | None:
"""Generate a description for the review item activity."""
if concerns:
concern_list = "\n - ".join(concerns)
concern_prompt = f"""
other_concerns = f"""
- `other_concerns` (list of strings): Include a list of any of the following concerns that are occurring:
- {concern_list}
"""
else:
concern_prompt = ""
if preferred_language:
language_prompt = f"Provide your answer in {preferred_language}"
else:
language_prompt = ""
other_concerns = None
context_prompt = f"""
Please analyze the image(s), which are in chronological order, strictly from the perspective of the {review_data["camera"].replace("_", " ")} security camera.
@ -85,11 +80,10 @@ Your response **MUST** be a flat JSON object with:
- 1 = Unusual but not overtly threatening
- 2 = Suspicious or potentially harmful
- 3 = Clear and immediate threat
{concern_prompt}
{other_concerns}
**IMPORTANT:**
- Values must be plain strings, floats, or integers no nested objects, no extra commentary.
{language_prompt}
"""
logger.debug(
f"Sending {len(thumbnails)} images to create review description on {review_data['camera']}"

View File

@ -76,6 +76,10 @@ export default function ReviewDetailDialog({
const aiAnalysis = useMemo(() => review?.data?.metadata, [review]);
const aiThreatLevel = useMemo(() => {
console.log(
`${aiAnalysis?.potential_threat_level} || ${aiAnalysis?.other_concerns}`,
);
if (
!aiAnalysis ||
(!aiAnalysis.potential_threat_level && !aiAnalysis.other_concerns)