bump ruff and do fixes (#2375)

This commit is contained in:
Hayden
2023-05-05 14:43:23 -08:00
committed by GitHub
parent f27bb00dc3
commit 23786c1f5e
8 changed files with 26 additions and 30 deletions

View File

@@ -7,9 +7,6 @@ import dotenv
from mealie.core.settings import app_settings_constructor
from .settings import AppDirectories, AppSettings
from .settings.static import APP_VERSION
APP_VERSION
CWD = Path(__file__).parent
BASE_DIR = CWD.parent.parent

View File

@@ -174,7 +174,7 @@ def auto_init(): # sourcery no-metrics
if val is None:
raise ValueError(f"Expected 'id' to be provided for {key}")
if isinstance(val, (str, int, UUID)):
if isinstance(val, str | int | UUID):
stmt = select(relation_cls).filter_by(**{get_attr: val})
instance = session.execute(stmt).scalars().one_or_none()
setattr(self, key, instance)

View File

@@ -116,9 +116,7 @@ def _register_endpoints(router: APIRouter, cls: type[Any], *urls: str) -> None:
raise Exception("An identical route role has been implemented more then once")
numbered_routes_by_endpoint = {
route.endpoint: (i, route)
for i, route in enumerate(router.routes)
if isinstance(route, (Route, WebSocketRoute))
route.endpoint: (i, route) for i, route in enumerate(router.routes) if isinstance(route, Route | WebSocketRoute)
}
prefix_length = len(router.prefix)

View File

@@ -1,6 +1,7 @@
from fastapi import APIRouter
from mealie.core.config import APP_VERSION, get_app_settings
from mealie.core.config import get_app_settings
from mealie.core.settings.static import APP_VERSION
from mealie.schema.admin.about import AppInfo
router = APIRouter(prefix="/about")

View File

@@ -136,7 +136,7 @@ class QueryFilter:
except ValueError as e:
raise ValueError(f"invalid query string: invalid UUID '{component.value}'") from e
if isinstance(attr.type, (sqltypes.Date, sqltypes.DateTime)):
if isinstance(attr.type, sqltypes.Date | sqltypes.DateTime):
# TODO: add support for IS NULL and IS NOT NULL
# in the meantime, this will work for the specific usecase of non-null dates/datetimes
if value in ["none", "null"] and component.relational_operator == RelationalOperator.NOTEQ:

View File

@@ -281,7 +281,7 @@ def clean_notes(notes: typing.Any) -> list[dict] | None:
parsed_notes: list[dict] = []
for note in notes:
if not isinstance(note, (str, dict)):
if not isinstance(note, str | dict):
continue
if isinstance(note, dict):