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
+12 -11
View File
@@ -4,10 +4,11 @@ import logging
import os
import threading
import time
from collections.abc import Callable
from dataclasses import dataclass
from pathlib import Path
from queue import Full, Queue
from typing import Any, Callable, Optional
from typing import Any
from peewee import DoesNotExist
@@ -47,16 +48,16 @@ class ExportJob(Job):
job_type: str = "export"
camera: str = ""
name: Optional[str] = None
image_path: Optional[str] = None
export_case_id: Optional[str] = None
name: str | None = None
image_path: str | None = None
export_case_id: str | None = None
request_start_time: float = 0.0
request_end_time: float = 0.0
playback_source: str = PlaybackSourceEnum.recordings.value
ffmpeg_input_args: Optional[str] = None
ffmpeg_output_args: Optional[str] = None
ffmpeg_input_args: str | None = None
ffmpeg_output_args: str | None = None
cpu_fallback: bool = False
chapters: Optional[ChaptersEnum] = None
chapters: ChaptersEnum | None = None
current_step: str = "queued"
progress_percent: float = 0.0
@@ -149,7 +150,7 @@ class ExportJobManager:
config: FrigateConfig,
max_concurrent: int,
max_queued: int = MAX_QUEUED_EXPORT_JOBS,
publisher: Optional[JobStatePublisher] = None,
publisher: JobStatePublisher | None = None,
) -> None:
self.config = config
self.max_concurrent = max(1, max_concurrent)
@@ -268,7 +269,7 @@ class ExportJobManager:
return job.id
def get_job(self, job_id: str) -> Optional[ExportJob]:
def get_job(self, job_id: str) -> ExportJob | None:
"""Get a job by ID."""
with self.lock:
return self.jobs.get(job_id)
@@ -379,7 +380,7 @@ class ExportJobManager:
self._schedule_job_cleanup(job.id)
_job_manager: Optional[ExportJobManager] = None
_job_manager: ExportJobManager | None = None
_job_manager_lock = threading.Lock()
@@ -485,7 +486,7 @@ def start_export_job(config: FrigateConfig, job: ExportJob) -> str:
return get_export_job_manager(config).enqueue(job)
def get_export_job(config: FrigateConfig, job_id: str) -> Optional[ExportJob]:
def get_export_job(config: FrigateConfig, job_id: str) -> ExportJob | None:
"""Get a queued or completed export job by ID."""
return get_export_job_manager(config).get_job(job_id)