mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-12-28 05:05:12 -05:00
fix: strict optional errors (#1759)
* fix strict optional errors * fix typing in repository * fix backup db files location * update workspace settings
This commit is contained in:
@@ -7,7 +7,7 @@ class EmailReady(MealieModel):
|
||||
|
||||
class EmailSuccess(MealieModel):
|
||||
success: bool
|
||||
error: str = None
|
||||
error: str | None = None
|
||||
|
||||
|
||||
class EmailTest(MealieModel):
|
||||
|
||||
@@ -34,9 +34,9 @@ class ShoppingListItemCreate(MealieModel):
|
||||
|
||||
note: str | None = ""
|
||||
quantity: float = 1
|
||||
unit_id: UUID4 = None
|
||||
unit_id: UUID4 | None = None
|
||||
unit: IngredientUnit | None
|
||||
food_id: UUID4 = None
|
||||
food_id: UUID4 | None = None
|
||||
food: IngredientFood | None
|
||||
|
||||
label_id: UUID4 | None = None
|
||||
@@ -67,7 +67,7 @@ class ShoppingListItemOut(ShoppingListItemUpdate):
|
||||
|
||||
|
||||
class ShoppingListCreate(MealieModel):
|
||||
name: str = None
|
||||
name: str | None = None
|
||||
extras: dict | None = {}
|
||||
|
||||
created_at: datetime | None
|
||||
|
||||
@@ -25,7 +25,7 @@ app_dirs = get_app_dirs()
|
||||
|
||||
|
||||
class RecipeTag(MealieModel):
|
||||
id: UUID4 = None
|
||||
id: UUID4 | None = None
|
||||
name: str
|
||||
slug: str
|
||||
|
||||
@@ -56,8 +56,8 @@ class RecipeToolPagination(PaginationBase):
|
||||
|
||||
class CreateRecipeBulk(BaseModel):
|
||||
url: str
|
||||
categories: list[RecipeCategory] = None
|
||||
tags: list[RecipeTag] = None
|
||||
categories: list[RecipeCategory] | None = None
|
||||
tags: list[RecipeTag] | None = None
|
||||
|
||||
|
||||
class CreateRecipeByUrlBulk(BaseModel):
|
||||
|
||||
@@ -21,7 +21,7 @@ class PaginationQuery(MealieModel):
|
||||
per_page: int = 50
|
||||
order_by: str = "created_at"
|
||||
order_direction: OrderDirection = OrderDirection.desc
|
||||
query_filter: str = None
|
||||
query_filter: str | None = None
|
||||
|
||||
|
||||
class PaginationBase(GenericModel, Generic[DataT]):
|
||||
@@ -52,15 +52,12 @@ class PaginationBase(GenericModel, Generic[DataT]):
|
||||
self.previous = PaginationBase.merge_query_parameters(route, query_params)
|
||||
|
||||
def set_pagination_guides(self, route: str, query_params: dict[str, Any] | None) -> None:
|
||||
if not query_params:
|
||||
query_params = {}
|
||||
|
||||
query_params = camelize(query_params)
|
||||
valid_dict: dict[str, Any] = camelize(query_params) if query_params else {}
|
||||
|
||||
# sanitize user input
|
||||
self.page = max(self.page, 1)
|
||||
self._set_next(route, query_params)
|
||||
self._set_prev(route, query_params)
|
||||
self._set_next(route, valid_dict)
|
||||
self._set_prev(route, valid_dict)
|
||||
|
||||
@staticmethod
|
||||
def merge_query_parameters(url: str, params: dict[str, Any]):
|
||||
|
||||
Reference in New Issue
Block a user