Mirrors/mealie
1
0
Fork 0
mirror of https://github.com/mealie-recipes/mealie.git synced 2025-11-02 02:03:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: strict optional errors (#1759)

Browse Source 
* fix strict optional errors

* fix typing in repository

* fix backup db files location

* update workspace settings
This commit is contained in:
Hayden
2022-10-23 13:04:04 -08:00
committed by GitHub
parent 97d9e2a109
commit 84c23765cd
31 changed files with 253 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mealie/repos/repository_generic.py
View File

@@ -1,5 +1,7 @@
from __future__ import annotations
from math import ceil
from typing import Any, Generic, TypeVar, Union
from typing import Any, Generic, TypeVar
from fastapi import HTTPException
from pydantic import UUID4, BaseModel
@@ -24,8 +26,8 @@ class RepositoryGeneric(Generic[Schema, Model]):
Generic ([Model]): Represents the SqlAlchemyModel Model
"""
user_id: UUID4 = None
group_id: UUID4 = None
user_id: UUID4 | None = None
group_id: UUID4 | None = None
def __init__(self, session: Session, primary_key: str, sql_model: type[Model], schema: type[Schema]) -> None:
self.session = session
@@ -35,11 +37,11 @@ class RepositoryGeneric(Generic[Schema, Model]):
self.logger = get_logger()
def by_user(self, user_id: UUID4) -> "RepositoryGeneric[Schema, Model]":
def by_user(self, user_id: UUID4) -> RepositoryGeneric[Schema, Model]:
self.user_id = user_id
return self
def by_group(self, group_id: UUID4) -> "RepositoryGeneric[Schema, Model]":
def by_group(self, group_id: UUID4) -> RepositoryGeneric[Schema, Model]:
self.group_id = group_id
return self
@@ -221,7 +223,7 @@ class RepositoryGeneric(Generic[Schema, Model]):
attr_match: str = None,
count=True,
override_schema=None,
) -> Union[int, list[Schema]]: # sourcery skip: assign-if-exp
) -> int | list[Schema]: # sourcery skip: assign-if-exp
eff_schema = override_schema or self.schema
q = self._query().filter(attribute_name == attr_match)