diff --git a/mealie/schema/recipe.py b/mealie/schema/recipe.py index 54a83d534..be1df086e 100644 --- a/mealie/schema/recipe.py +++ b/mealie/schema/recipe.py @@ -43,6 +43,7 @@ class Recipe(BaseModel): recipeIngredient: Optional[list[str]] recipeInstructions: Optional[list[RecipeStep]] nutrition: Optional[Nutrition] + tools: Optional[list[str]] = [] totalTime: Optional[str] = None prepTime: Optional[str] = None @@ -67,6 +68,7 @@ class Recipe(BaseModel): "recipeIngredient": [x.ingredient for x in name_orm.recipeIngredient], "recipeCategory": [x.name for x in name_orm.recipeCategory], "tags": [x.name for x in name_orm.tags], + "tools": [x.tool for x in name_orm.tools], "extras": {x.key_name: x.value for x in name_orm.extras}, } diff --git a/mealie/schema/scheduler.py b/mealie/schema/scheduler.py deleted file mode 100644 index 12f8dee4f..000000000 --- a/mealie/schema/scheduler.py +++ /dev/null @@ -1,10 +0,0 @@ -from pydantic import BaseModel - - -class WebhookJob(BaseModel): - webhook_urls: list[str] = [] - webhook_time: str = "00:00" - webhook_enable: bool - - class Config: - orm_mode = True diff --git a/mealie/utils/post_webhooks.py b/mealie/utils/post_webhooks.py index 15b07645d..2ccaa28c0 100644 --- a/mealie/utils/post_webhooks.py +++ b/mealie/utils/post_webhooks.py @@ -7,7 +7,7 @@ from sqlalchemy.orm.session import Session def post_webhooks(group: int, session: Session = None): - session = session if session else create_session() + session = session or create_session() group_settings: GroupInDB = db.groups.get(session, group) if not group_settings.webhook_enable: