mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-08-02 17:12:16 +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:
@@ -6,7 +6,7 @@ no chat feature is active) are never initialized.
|
||||
"""
|
||||
|
||||
import logging
|
||||
from typing import TYPE_CHECKING, Any, Optional
|
||||
from typing import TYPE_CHECKING, Any
|
||||
|
||||
from frigate.config import FrigateConfig
|
||||
from frigate.config.camera.genai import GenAIConfig, GenAIRoleEnum
|
||||
@@ -23,7 +23,7 @@ class GenAIClientManager:
|
||||
def __init__(self, config: FrigateConfig) -> None:
|
||||
self._configs: dict[str, GenAIConfig] = {}
|
||||
self._role_map: dict[GenAIRoleEnum, str] = {}
|
||||
self._clients: dict[str, "GenAIClient"] = {}
|
||||
self._clients: dict[str, GenAIClient] = {}
|
||||
self.update_config(config)
|
||||
|
||||
def update_config(self, config: FrigateConfig) -> None:
|
||||
@@ -59,7 +59,7 @@ class GenAIClientManager:
|
||||
for role in genai_cfg.roles:
|
||||
self._role_map[role] = name
|
||||
|
||||
def _get_client(self, name: str) -> "Optional[GenAIClient]":
|
||||
def _get_client(self, name: str) -> "GenAIClient | None":
|
||||
"""Return the client for *name*, creating it on first access."""
|
||||
if name in self._clients:
|
||||
client = self._clients[name]
|
||||
@@ -93,19 +93,19 @@ class GenAIClientManager:
|
||||
return client
|
||||
|
||||
@property
|
||||
def chat_client(self) -> "Optional[GenAIClient]":
|
||||
def chat_client(self) -> "GenAIClient | None":
|
||||
"""Client configured for the chat role (e.g. chat with function calling)."""
|
||||
name = self._role_map.get(GenAIRoleEnum.chat)
|
||||
return self._get_client(name) if name else None
|
||||
|
||||
@property
|
||||
def description_client(self) -> "Optional[GenAIClient]":
|
||||
def description_client(self) -> "GenAIClient | None":
|
||||
"""Client configured for the descriptions role (e.g. review descriptions, object descriptions)."""
|
||||
name = self._role_map.get(GenAIRoleEnum.descriptions)
|
||||
return self._get_client(name) if name else None
|
||||
|
||||
@property
|
||||
def embeddings_client(self) -> "Optional[GenAIClient]":
|
||||
def embeddings_client(self) -> "GenAIClient | None":
|
||||
"""Client configured for the embeddings role."""
|
||||
name = self._role_map.get(GenAIRoleEnum.embeddings)
|
||||
return self._get_client(name) if name else None
|
||||
|
||||
Reference in New Issue
Block a user