Increase ruff coverage (#23644)
CI / AMD64 Build (push) Waiting to run
CI / ARM Build (push) Waiting to run
CI / AMD64 Extra Build (push) Blocked by required conditions
CI / ARM Extra Build (push) Blocked by required conditions
CI / Synaptics Build (push) Blocked by required conditions
CI / Assemble and push default build (push) Blocked by required conditions
CI / Jetson Jetpack 6 (push) Waiting to run

* Pin ruff

* Add python upgrade fixes

This enables python upgrade checks in ruff to look for deprecated types and patterns. This namely fixes:
- usage of deprecated `Typing` which is now built in
- some specific exceptions which are caught and have new aliases

Some specific UP checks were also ignored as they are stylistic / unimportant and likely to cause bugs

* Remove async blocking calls

Use asyncio.to_thread on two remaining blocking calls to fix hanging event thread loop. Enable this specific rule to block it in the future.

* Use proper logging mechanism

* Correctly format logs

* Raise with context

When raising an exception include the from context to improve debugging

* Cleanup
This commit is contained in:
Nicolas Mowen
2026-07-06 12:28:02 -05:00
committed by GitHub
parent 455b8687e8
commit 4ee12e6237
169 changed files with 1053 additions and 1150 deletions
+9 -9
View File
@@ -6,7 +6,7 @@ transport.
"""
import datetime
from typing import Any, Dict, List, Optional
from typing import Any
from playhouse.shortcuts import model_to_dict
@@ -216,7 +216,7 @@ def build_object_description_prompt(
return template.format(**model_to_dict(event))
def get_attribute_classifications(config: FrigateConfig) -> List[Dict[str, Any]]:
def get_attribute_classifications(config: FrigateConfig) -> list[dict[str, Any]]:
"""Return enabled custom classification models of `attribute` type.
Each entry: {"name": <model name>, "objects": [<object label>, ...]}.
@@ -224,7 +224,7 @@ def get_attribute_classifications(config: FrigateConfig) -> List[Dict[str, Any]]
types, which can later be filtered via the search_objects `attribute`
field.
"""
result: List[Dict[str, Any]] = []
result: list[dict[str, Any]] = []
for model_key, model_config in config.classification.custom.items():
if not model_config.enabled or model_config.object_config is None:
@@ -248,8 +248,8 @@ def get_attribute_classifications(config: FrigateConfig) -> List[Dict[str, Any]]
def get_tool_definitions(
semantic_search_enabled: bool = False,
attribute_classifications: Optional[List[Dict[str, Any]]] = None,
) -> List[Dict[str, Any]]:
attribute_classifications: list[dict[str, Any]] | None = None,
) -> list[dict[str, Any]]:
"""
Get OpenAI-compatible tool definitions for Frigate.
@@ -260,7 +260,7 @@ def get_tool_definitions(
included. When attribute classification models are configured, an
`attribute` parameter is exposed for filtering by their labels.
"""
search_objects_properties: Dict[str, Any] = {
search_objects_properties: dict[str, Any] = {
"camera": {
"type": "string",
"description": "Camera name to filter by (optional).",
@@ -657,9 +657,9 @@ def get_tool_definitions(
def build_chat_system_prompt(
config: FrigateConfig,
allowed_cameras: List[str],
allowed_cameras: list[str],
semantic_search_enabled: bool,
attribute_classifications: List[Dict[str, Any]],
attribute_classifications: list[dict[str, Any]],
) -> str:
"""Build the system prompt for the chat completion endpoint.
@@ -671,7 +671,7 @@ def build_chat_system_prompt(
current_date_str = current_datetime.strftime("%Y-%m-%d")
current_time_str = current_datetime.strftime("%I:%M:%S %p")
cameras_info: List[str] = []
cameras_info: list[str] = []
has_speed_zone = False
for camera_id in allowed_cameras:
if camera_id not in config.cameras: