chore: upgrade pre-commit hooks (#1735)

* change pep585 hook to pyupgrade

* run pyupgrade + cleanup lint errors

mealie/schema/group/group_shopping_list.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from datetime import datetime
-from typing import Optional, Union
 
 from pydantic import UUID4
 from pydantic.utils import GetterDict
@@ -33,19 +32,19 @@ class ShoppingListItemCreate(MealieModel):
 
     is_food: bool = False
 
-    note: Optional[str] = ""
+    note: str | None = ""
     quantity: float = 1
     unit_id: UUID4 = None
-    unit: Optional[IngredientUnit]
+    unit: IngredientUnit | None
     food_id: UUID4 = None
-    food: Optional[IngredientFood]
+    food: IngredientFood | None
 
-    label_id: Optional[UUID4] = None
+    label_id: UUID4 | None = None
     recipe_references: list[ShoppingListItemRecipeRef] = []
-    extras: Optional[dict] = {}
+    extras: dict | None = {}
 
-    created_at: Optional[datetime]
-    update_at: Optional[datetime]
+    created_at: datetime | None
+    update_at: datetime | None
 
 
 class ShoppingListItemUpdate(ShoppingListItemCreate):
@@ -53,8 +52,8 @@ class ShoppingListItemUpdate(ShoppingListItemCreate):
 
 
 class ShoppingListItemOut(ShoppingListItemUpdate):
-    label: Optional[MultiPurposeLabelSummary]
-    recipe_references: list[Union[ShoppingListItemRecipeRef, ShoppingListItemRecipeRefOut]] = []
+    label: MultiPurposeLabelSummary | None
+    recipe_references: list[ShoppingListItemRecipeRef | ShoppingListItemRecipeRefOut] = []
 
     class Config:
         orm_mode = True
@@ -69,10 +68,10 @@ class ShoppingListItemOut(ShoppingListItemUpdate):
 
 class ShoppingListCreate(MealieModel):
     name: str = None
-    extras: Optional[dict] = {}
+    extras: dict | None = {}
 
-    created_at: Optional[datetime]
-    update_at: Optional[datetime]
+    created_at: datetime | None
+    update_at: datetime | None
 
 
 class ShoppingListRecipeRefOut(MealieModel):
@@ -119,8 +118,8 @@ class ShoppingListOut(ShoppingListUpdate):
         orm_mode = True
 
 
-from mealie.schema.labels.multi_purpose_label import MultiPurposeLabelSummary
-from mealie.schema.recipe.recipe import RecipeSummary
+from mealie.schema.labels.multi_purpose_label import MultiPurposeLabelSummary  # noqa: E402
+from mealie.schema.recipe.recipe import RecipeSummary  # noqa: E402
 
 ShoppingListRecipeRefOut.update_forward_refs()
 ShoppingListItemOut.update_forward_refs()

mealie/schema/recipe/recipe.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import datetime
 from pathlib import Path
-from typing import Any, Optional
+from typing import Any
 from uuid import uuid4
 
 from pydantic import UUID4, BaseModel, Field, validator
@@ -69,35 +69,35 @@ class CreateRecipe(MealieModel):
 
 
 class RecipeSummary(MealieModel):
-    id: Optional[UUID4]
+    id: UUID4 | None
 
     user_id: UUID4 = Field(default_factory=uuid4)
     group_id: UUID4 = Field(default_factory=uuid4)
 
-    name: Optional[str]
+    name: str | None
     slug: str = ""
-    image: Optional[Any]
-    recipe_yield: Optional[str]
+    image: Any | None
+    recipe_yield: str | None
 
-    total_time: Optional[str] = None
-    prep_time: Optional[str] = None
-    cook_time: Optional[str] = None
-    perform_time: Optional[str] = None
+    total_time: str | None = None
+    prep_time: str | None = None
+    cook_time: str | None = None
+    perform_time: str | None = None
 
-    description: Optional[str] = ""
-    recipe_category: Optional[list[RecipeCategory]] = []
-    tags: Optional[list[RecipeTag]] = []
+    description: str | None = ""
+    recipe_category: list[RecipeCategory] | None = []
+    tags: list[RecipeTag] | None = []
     tools: list[RecipeTool] = []
-    rating: Optional[int]
-    org_url: Optional[str] = Field(None, alias="orgURL")
+    rating: int | None
+    org_url: str | None = Field(None, alias="orgURL")
 
-    recipe_ingredient: Optional[list[RecipeIngredient]] = []
+    recipe_ingredient: list[RecipeIngredient] | None = []
 
-    date_added: Optional[datetime.date]
-    date_updated: Optional[datetime.datetime]
+    date_added: datetime.date | None
+    date_updated: datetime.datetime | None
 
-    created_at: Optional[datetime.datetime]
-    update_at: Optional[datetime.datetime]
+    created_at: datetime.datetime | None
+    update_at: datetime.datetime | None
 
     class Config:
         orm_mode = True
@@ -137,17 +137,17 @@ class RecipePagination(PaginationBase):
 
 class Recipe(RecipeSummary):
     recipe_ingredient: list[RecipeIngredient] = []
-    recipe_instructions: Optional[list[RecipeStep]] = []
-    nutrition: Optional[Nutrition]
+    recipe_instructions: list[RecipeStep] | None = []
+    nutrition: Nutrition | None
 
     # Mealie Specific
-    settings: Optional[RecipeSettings] = None
-    assets: Optional[list[RecipeAsset]] = []
-    notes: Optional[list[RecipeNote]] = []
-    extras: Optional[dict] = {}
-    is_ocr_recipe: Optional[bool] = False
+    settings: RecipeSettings | None = None
+    assets: list[RecipeAsset] | None = []
+    notes: list[RecipeNote] | None = []
+    extras: dict | None = {}
+    is_ocr_recipe: bool | None = False
 
-    comments: Optional[list[RecipeCommentOut]] = []
+    comments: list[RecipeCommentOut] | None = []
 
     @staticmethod
     def directory_from_id(recipe_id: UUID4 | str) -> Path:
@@ -205,7 +205,7 @@ class Recipe(RecipeSummary):
         return recipe_ingredient
 
 
-from mealie.schema.recipe.recipe_ingredient import RecipeIngredient
+from mealie.schema.recipe.recipe_ingredient import RecipeIngredient  # noqa: E402
 
 RecipeSummary.update_forward_refs()
 Recipe.update_forward_refs()

mealie/schema/recipe/recipe_ingredient.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import datetime
 import enum
-from typing import Optional, Union
 from uuid import UUID, uuid4
 
 from pydantic import UUID4, Field, validator
@@ -17,11 +16,11 @@ from mealie.schema.response.pagination import PaginationBase
 class UnitFoodBase(MealieModel):
     name: str
     description: str = ""
-    extras: Optional[dict] = {}
+    extras: dict | None = {}
 
 
 class CreateIngredientFood(UnitFoodBase):
-    label_id: Optional[UUID4] = None
+    label_id: UUID4 | None = None
 
 
 class SaveIngredientFood(CreateIngredientFood):
@@ -30,9 +29,9 @@ class SaveIngredientFood(CreateIngredientFood):
 
 class IngredientFood(CreateIngredientFood):
     id: UUID4
-    label: Optional[MultiPurposeLabelSummary] = None
-    created_at: Optional[datetime.datetime]
-    update_at: Optional[datetime.datetime]
+    label: MultiPurposeLabelSummary | None = None
+    created_at: datetime.datetime | None
+    update_at: datetime.datetime | None
 
     class Config:
         orm_mode = True
@@ -61,8 +60,8 @@ class SaveIngredientUnit(CreateIngredientUnit):
 
 class IngredientUnit(CreateIngredientUnit):
     id: UUID4
-    created_at: Optional[datetime.datetime]
-    update_at: Optional[datetime.datetime]
+    created_at: datetime.datetime | None
+    update_at: datetime.datetime | None
 
     class Config:
         orm_mode = True
@@ -73,13 +72,13 @@ class IngredientUnitPagination(PaginationBase):
 
 
 class RecipeIngredient(MealieModel):
-    title: Optional[str]
-    note: Optional[str]
-    unit: Optional[Union[IngredientUnit, CreateIngredientUnit]]
-    food: Optional[Union[IngredientFood, CreateIngredientFood]]
+    title: str | None
+    note: str | None
+    unit: IngredientUnit | CreateIngredientUnit | None
+    food: IngredientFood | CreateIngredientFood | None
     disable_amount: bool = True
     quantity: NoneFloat = 1
-    original_text: Optional[str]
+    original_text: str | None
 
     # Ref is used as a way to distinguish between an individual ingredient on the frontend
     # It is required for the reorder and section titles to function properly because of how
@@ -123,7 +122,7 @@ class IngredientConfidence(MealieModel):
 
 
 class ParsedIngredient(MealieModel):
-    input: Optional[str]
+    input: str | None
     confidence: IngredientConfidence = IngredientConfidence()
     ingredient: RecipeIngredient
 
@@ -153,6 +152,6 @@ class MergeUnit(MealieModel):
     to_unit: UUID4
 
 
-from mealie.schema.labels.multi_purpose_label import MultiPurposeLabelSummary
+from mealie.schema.labels.multi_purpose_label import MultiPurposeLabelSummary  # noqa: E402
 
 IngredientFood.update_forward_refs()

mealie/schema/response/query_filter.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 import re
 from enum import Enum
-from typing import Any, TypeVar, Union, cast
+from typing import Any, TypeVar, cast
 
 from dateutil import parser as date_parser
 from dateutil.parser import ParserError
@@ -209,13 +209,13 @@ class QueryFilter:
     @staticmethod
     def _parse_base_components_into_filter_components(
         base_components: list[str],
-    ) -> list[Union[str, QueryFilterComponent, LogicalOperator]]:
+    ) -> list[str | QueryFilterComponent | LogicalOperator]:
         """Walk through base components and construct filter collections"""
         relational_operators = [op.value for op in RelationalOperator]
         logical_operators = [op.value for op in LogicalOperator]
 
         # parse QueryFilterComponents and logical operators
-        components: list[Union[str, QueryFilterComponent, LogicalOperator]] = []
+        components: list[str | QueryFilterComponent | LogicalOperator] = []
         for i, base_component in enumerate(base_components):
             if base_component in QueryFilter.seps:
                 components.append(base_component)