Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2026-02-07 08:23:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

chores: updates-and-linters (#1868)

Browse Source 
* switch to ruff

* add ruff

* run ruff --fix

* update ruff

* resolve ruff errors

* drop isort from CI

* fix decorator order
This commit is contained in:
Hayden
2022-11-30 20:20:28 -09:00
committed by GitHub
parent fd0e02a5c6
commit 82dc586bac
62 changed files with 362 additions and 536 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mealie/repos/repository_generic.py
View File

@@ -283,7 +283,7 @@ class RepositoryGeneric(Generic[Schema, Model]):
except ValueError as e:
self.logger.error(e)
raise HTTPException(status_code=400, detail=str(e))
raise HTTPException(status_code=400, detail=str(e)) from e
count = query.count()

4
mealie/repos/repository_group.py
View File

@@ -1,5 +1,3 @@
from typing import Union
from pydantic import UUID4
from mealie.db.models.group import Group
@@ -15,7 +13,7 @@ from .repository_generic import RepositoryGeneric
class RepositoryGroup(RepositoryGeneric[GroupInDB, Group]):
def get_by_name(self, name: str, limit=1) -> Union[GroupInDB, Group, None]:
def get_by_name(self, name: str, limit=1) -> GroupInDB | Group | None:
dbgroup = self.session.query(self.model).filter_by(**{"name": name}).one_or_none()
if dbgroup is None:
return None

12
mealie/repos/repository_recipes.py
View File

@@ -1,5 +1,5 @@
from random import randint
from typing import Any, Optional
from typing import Any
from uuid import UUID
from pydantic import UUID4
@@ -135,10 +135,10 @@ class RepositoryRecipes(RepositoryGeneric[Recipe, RecipeModel]):
pagination: PaginationQuery,
override=None,
load_food=False,
cookbook: Optional[ReadCookBook] = None,
categories: Optional[list[UUID4 | str]] = None,
tags: Optional[list[UUID4 | str]] = None,
tools: Optional[list[UUID4 | str]] = None,
cookbook: ReadCookBook | None = None,
categories: list[UUID4 | str] | None = None,
tags: list[UUID4 | str] | None = None,
tools: list[UUID4 | str] | None = None,
) -> RecipePagination:
q = self.session.query(self.model)
@@ -307,7 +307,7 @@ class RepositoryRecipes(RepositoryGeneric[Recipe, RecipeModel]):
.limit(limit)
]
def get_by_slug(self, group_id: UUID4, slug: str, limit=1) -> Optional[Recipe]:
def get_by_slug(self, group_id: UUID4, slug: str, limit=1) -> Recipe | None:
dbrecipe = (
self.session.query(RecipeModel)
.filter(RecipeModel.group_id == group_id, RecipeModel.slug == slug)