mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-10-10 16:52:47 +03:00
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
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:
@@ -3,9 +3,10 @@
|
||||
import copy
|
||||
import json
|
||||
import logging
|
||||
from datetime import datetime, timezone
|
||||
from collections.abc import Callable
|
||||
from datetime import UTC, datetime
|
||||
from pathlib import Path
|
||||
from typing import Any, Callable, Optional
|
||||
from typing import Any
|
||||
|
||||
from frigate.config.camera.updater import (
|
||||
CameraConfigUpdateEnum,
|
||||
@@ -169,9 +170,9 @@ class ProfileManager:
|
||||
|
||||
def activate_profile(
|
||||
self,
|
||||
profile_name: Optional[str],
|
||||
profile_name: str | None,
|
||||
clear_runtime_overrides: bool = True,
|
||||
) -> Optional[str]:
|
||||
) -> str | None:
|
||||
"""Activate a profile by name, or deactivate if None.
|
||||
|
||||
Args:
|
||||
@@ -256,7 +257,7 @@ class ProfileManager:
|
||||
|
||||
def _apply_profile_overrides(
|
||||
self, profile_name: str, changed: dict[str, set[str]]
|
||||
) -> Optional[str]:
|
||||
) -> str | None:
|
||||
"""Apply profile overrides for all cameras that have the named profile."""
|
||||
for cam_name, cam_config in self.config.cameras.items():
|
||||
profile = cam_config.profiles.get(profile_name)
|
||||
@@ -358,14 +359,14 @@ class ProfileManager:
|
||||
retain=True,
|
||||
)
|
||||
|
||||
def _persist_active_profile(self, profile_name: Optional[str]) -> None:
|
||||
def _persist_active_profile(self, profile_name: str | None) -> None:
|
||||
"""Persist the active profile state to disk as JSON."""
|
||||
try:
|
||||
data = self._load_persisted_data()
|
||||
data["active"] = profile_name
|
||||
if profile_name is not None:
|
||||
data.setdefault("last_activated", {})[profile_name] = datetime.now(
|
||||
timezone.utc
|
||||
UTC
|
||||
).timestamp()
|
||||
PERSISTENCE_FILE.write_text(json.dumps(data))
|
||||
except OSError:
|
||||
@@ -384,7 +385,7 @@ class ProfileManager:
|
||||
return {"active": None, "last_activated": {}}
|
||||
|
||||
@staticmethod
|
||||
def load_persisted_profile() -> Optional[str]:
|
||||
def load_persisted_profile() -> str | None:
|
||||
"""Load the persisted active profile name from disk."""
|
||||
data = ProfileManager._load_persisted_data()
|
||||
name = data.get("active")
|
||||
|
||||
Reference in New Issue
Block a user