mirror of
https://github.com/mealie-recipes/mealie.git
synced 2025-12-14 14:25:53 -05:00
chore: Miscellaneous cleanup (#6708)
This commit is contained in:
@@ -13,6 +13,7 @@ RUN echo "export PROMPT_COMMAND='history -a'" >> /home/vscode/.bashrc \
|
|||||||
&& chown vscode:vscode -R /home/vscode/
|
&& chown vscode:vscode -R /home/vscode/
|
||||||
|
|
||||||
RUN npm install -g @go-task/cli
|
RUN npm install -g @go-task/cli
|
||||||
|
RUN npm install -g json-schema-to-typescript
|
||||||
|
|
||||||
# Install additional OS packages
|
# Install additional OS packages
|
||||||
RUN apt-get update \
|
RUN apt-get update \
|
||||||
|
|||||||
@@ -23,7 +23,6 @@
|
|||||||
"settings": {
|
"settings": {
|
||||||
"python.defaultInterpreterPath": "/usr/local/bin/python",
|
"python.defaultInterpreterPath": "/usr/local/bin/python",
|
||||||
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
|
"python.formatting.autopep8Path": "/usr/local/py-utils/bin/autopep8",
|
||||||
"python.formatting.blackPath": "/usr/local/py-utils/bin/black",
|
|
||||||
"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
|
"python.formatting.yapfPath": "/usr/local/py-utils/bin/yapf",
|
||||||
"mypy.runUsingActiveInterpreter": true
|
"mypy.runUsingActiveInterpreter": true
|
||||||
},
|
},
|
||||||
@@ -34,6 +33,7 @@
|
|||||||
"ms-python.pylint",
|
"ms-python.pylint",
|
||||||
"ms-python.python",
|
"ms-python.python",
|
||||||
"ms-python.vscode-pylance",
|
"ms-python.vscode-pylance",
|
||||||
|
"streetsidesoftware.code-spell-checker-cspell-bundled-dictionaries",
|
||||||
"Vue.volar"
|
"Vue.volar"
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
@@ -41,6 +41,7 @@
|
|||||||
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
// Use 'forwardPorts' to make a list of ports inside the container available locally.
|
||||||
"forwardPorts": [
|
"forwardPorts": [
|
||||||
3000,
|
3000,
|
||||||
|
8000, // used by mkdocs
|
||||||
9000,
|
9000,
|
||||||
9091, // used by docker production
|
9091, // used by docker production
|
||||||
24678 // used by nuxt when hot-reloading using polling
|
24678 // used by nuxt when hot-reloading using polling
|
||||||
|
|||||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -20,6 +20,7 @@ dev/data/backups/*
|
|||||||
dev/data/debug/*
|
dev/data/debug/*
|
||||||
dev/data/img/*
|
dev/data/img/*
|
||||||
dev/data/migration/*
|
dev/data/migration/*
|
||||||
|
dev/data/templates/*
|
||||||
dev/data/users/*
|
dev/data/users/*
|
||||||
dev/data/groups/*
|
dev/data/groups/*
|
||||||
|
|
||||||
|
|||||||
@@ -110,80 +110,6 @@ export interface CreateBackup {
|
|||||||
options: BackupOptions;
|
options: BackupOptions;
|
||||||
templates?: string[] | null;
|
templates?: string[] | null;
|
||||||
}
|
}
|
||||||
export interface CustomPageBase {
|
|
||||||
name: string;
|
|
||||||
slug: string | null;
|
|
||||||
position: number;
|
|
||||||
categories?: RecipeCategoryResponse[];
|
|
||||||
}
|
|
||||||
export interface RecipeCategoryResponse {
|
|
||||||
name: string;
|
|
||||||
id: string;
|
|
||||||
groupId?: string | null;
|
|
||||||
slug: string;
|
|
||||||
recipes?: RecipeSummary[];
|
|
||||||
}
|
|
||||||
export interface RecipeSummary {
|
|
||||||
id?: string | null;
|
|
||||||
userId?: string;
|
|
||||||
householdId?: string;
|
|
||||||
groupId?: string;
|
|
||||||
name?: string | null;
|
|
||||||
slug?: string;
|
|
||||||
image?: unknown;
|
|
||||||
recipeServings?: number;
|
|
||||||
recipeYieldQuantity?: number;
|
|
||||||
recipeYield?: string | null;
|
|
||||||
totalTime?: string | null;
|
|
||||||
prepTime?: string | null;
|
|
||||||
cookTime?: string | null;
|
|
||||||
performTime?: string | null;
|
|
||||||
description?: string | null;
|
|
||||||
recipeCategory?: RecipeCategory[] | null;
|
|
||||||
tags?: RecipeTag[] | null;
|
|
||||||
tools?: RecipeTool[];
|
|
||||||
rating?: number | null;
|
|
||||||
orgURL?: string | null;
|
|
||||||
dateAdded?: string | null;
|
|
||||||
dateUpdated?: string | null;
|
|
||||||
createdAt?: string | null;
|
|
||||||
updatedAt?: string | null;
|
|
||||||
lastMade?: string | null;
|
|
||||||
}
|
|
||||||
export interface RecipeCategory {
|
|
||||||
id?: string | null;
|
|
||||||
groupId?: string | null;
|
|
||||||
name: string;
|
|
||||||
slug: string;
|
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
|
||||||
export interface RecipeTag {
|
|
||||||
id?: string | null;
|
|
||||||
groupId?: string | null;
|
|
||||||
name: string;
|
|
||||||
slug: string;
|
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
|
||||||
export interface RecipeTool {
|
|
||||||
id: string;
|
|
||||||
groupId?: string | null;
|
|
||||||
name: string;
|
|
||||||
slug: string;
|
|
||||||
householdsWithTool?: string[];
|
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
|
||||||
export interface CustomPageImport {
|
|
||||||
name: string;
|
|
||||||
status: boolean;
|
|
||||||
exception?: string | null;
|
|
||||||
}
|
|
||||||
export interface CustomPageOut {
|
|
||||||
name: string;
|
|
||||||
slug: string | null;
|
|
||||||
position: number;
|
|
||||||
categories?: RecipeCategoryResponse[];
|
|
||||||
id: number;
|
|
||||||
}
|
|
||||||
export interface DebugResponse {
|
export interface DebugResponse {
|
||||||
success: boolean;
|
success: boolean;
|
||||||
response?: string | null;
|
response?: string | null;
|
||||||
@@ -248,11 +174,6 @@ export interface Migrations {
|
|||||||
type: string;
|
type: string;
|
||||||
files?: MigrationFile[];
|
files?: MigrationFile[];
|
||||||
}
|
}
|
||||||
export interface NotificationImport {
|
|
||||||
name: string;
|
|
||||||
status: boolean;
|
|
||||||
exception?: string | null;
|
|
||||||
}
|
|
||||||
export interface RecipeImport {
|
export interface RecipeImport {
|
||||||
name: string;
|
name: string;
|
||||||
status: boolean;
|
status: boolean;
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ export interface QueryFilterJSONPart {
|
|||||||
attributeName?: string | null;
|
attributeName?: string | null;
|
||||||
relationalOperator?: RelationalKeyword | RelationalOperator | null;
|
relationalOperator?: RelationalKeyword | RelationalOperator | null;
|
||||||
value?: string | string[] | null;
|
value?: string | string[] | null;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface SaveCookBook {
|
export interface SaveCookBook {
|
||||||
name: string;
|
name: string;
|
||||||
|
|||||||
@@ -334,7 +334,6 @@ export interface IngredientUnit {
|
|||||||
}
|
}
|
||||||
export interface IngredientUnitAlias {
|
export interface IngredientUnitAlias {
|
||||||
name: string;
|
name: string;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface CreateIngredientUnit {
|
export interface CreateIngredientUnit {
|
||||||
id?: string | null;
|
id?: string | null;
|
||||||
@@ -349,11 +348,9 @@ export interface CreateIngredientUnit {
|
|||||||
pluralAbbreviation?: string | null;
|
pluralAbbreviation?: string | null;
|
||||||
useAbbreviation?: boolean;
|
useAbbreviation?: boolean;
|
||||||
aliases?: CreateIngredientUnitAlias[];
|
aliases?: CreateIngredientUnitAlias[];
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface CreateIngredientUnitAlias {
|
export interface CreateIngredientUnitAlias {
|
||||||
name: string;
|
name: string;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface IngredientFood {
|
export interface IngredientFood {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -372,7 +369,6 @@ export interface IngredientFood {
|
|||||||
}
|
}
|
||||||
export interface IngredientFoodAlias {
|
export interface IngredientFoodAlias {
|
||||||
name: string;
|
name: string;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface MultiPurposeLabelSummary {
|
export interface MultiPurposeLabelSummary {
|
||||||
name: string;
|
name: string;
|
||||||
@@ -391,11 +387,9 @@ export interface CreateIngredientFood {
|
|||||||
labelId?: string | null;
|
labelId?: string | null;
|
||||||
aliases?: CreateIngredientFoodAlias[];
|
aliases?: CreateIngredientFoodAlias[];
|
||||||
householdsWithIngredientFood?: string[];
|
householdsWithIngredientFood?: string[];
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface CreateIngredientFoodAlias {
|
export interface CreateIngredientFoodAlias {
|
||||||
name: string;
|
name: string;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface Recipe {
|
export interface Recipe {
|
||||||
id?: string | null;
|
id?: string | null;
|
||||||
@@ -433,21 +427,18 @@ export interface Recipe {
|
|||||||
[k: string]: unknown;
|
[k: string]: unknown;
|
||||||
} | null;
|
} | null;
|
||||||
comments?: RecipeCommentOut[] | null;
|
comments?: RecipeCommentOut[] | null;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeCategory {
|
export interface RecipeCategory {
|
||||||
id?: string | null;
|
id?: string | null;
|
||||||
groupId?: string | null;
|
groupId?: string | null;
|
||||||
name: string;
|
name: string;
|
||||||
slug: string;
|
slug: string;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeTag {
|
export interface RecipeTag {
|
||||||
id?: string | null;
|
id?: string | null;
|
||||||
groupId?: string | null;
|
groupId?: string | null;
|
||||||
name: string;
|
name: string;
|
||||||
slug: string;
|
slug: string;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeTool {
|
export interface RecipeTool {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -455,7 +446,6 @@ export interface RecipeTool {
|
|||||||
name: string;
|
name: string;
|
||||||
slug: string;
|
slug: string;
|
||||||
householdsWithTool?: string[];
|
householdsWithTool?: string[];
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeStep {
|
export interface RecipeStep {
|
||||||
id?: string | null;
|
id?: string | null;
|
||||||
@@ -463,11 +453,9 @@ export interface RecipeStep {
|
|||||||
summary?: string | null;
|
summary?: string | null;
|
||||||
text: string;
|
text: string;
|
||||||
ingredientReferences?: IngredientReferences[];
|
ingredientReferences?: IngredientReferences[];
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface IngredientReferences {
|
export interface IngredientReferences {
|
||||||
referenceId?: string | null;
|
referenceId?: string | null;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface Nutrition {
|
export interface Nutrition {
|
||||||
calories?: string | null;
|
calories?: string | null;
|
||||||
@@ -481,7 +469,6 @@ export interface Nutrition {
|
|||||||
sugarContent?: string | null;
|
sugarContent?: string | null;
|
||||||
transFatContent?: string | null;
|
transFatContent?: string | null;
|
||||||
unsaturatedFatContent?: string | null;
|
unsaturatedFatContent?: string | null;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeSettings {
|
export interface RecipeSettings {
|
||||||
public?: boolean;
|
public?: boolean;
|
||||||
@@ -490,18 +477,15 @@ export interface RecipeSettings {
|
|||||||
landscapeView?: boolean;
|
landscapeView?: boolean;
|
||||||
disableComments?: boolean;
|
disableComments?: boolean;
|
||||||
locked?: boolean;
|
locked?: boolean;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeAsset {
|
export interface RecipeAsset {
|
||||||
name: string;
|
name: string;
|
||||||
icon: string;
|
icon: string;
|
||||||
fileName?: string | null;
|
fileName?: string | null;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeNote {
|
export interface RecipeNote {
|
||||||
title: string;
|
title: string;
|
||||||
text: string;
|
text: string;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface RecipeCommentOut {
|
export interface RecipeCommentOut {
|
||||||
recipeId: string;
|
recipeId: string;
|
||||||
@@ -511,14 +495,12 @@ export interface RecipeCommentOut {
|
|||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
userId: string;
|
userId: string;
|
||||||
user: UserBase;
|
user: UserBase;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface UserBase {
|
export interface UserBase {
|
||||||
id: string;
|
id: string;
|
||||||
username?: string | null;
|
username?: string | null;
|
||||||
admin: boolean;
|
admin: boolean;
|
||||||
fullName?: string | null;
|
fullName?: string | null;
|
||||||
[k: string]: unknown;
|
|
||||||
}
|
}
|
||||||
export interface ShoppingListAddRecipeParamsBulk {
|
export interface ShoppingListAddRecipeParamsBulk {
|
||||||
recipeIncrementQuantity?: number;
|
recipeIncrementQuantity?: number;
|
||||||
|
|||||||
@@ -3,11 +3,11 @@ from .datetime_parse import DateError, DateTimeError, DurationError, TimeError
|
|||||||
from .mealie_model import HasUUID, MealieModel, SearchType
|
from .mealie_model import HasUUID, MealieModel, SearchType
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
"HasUUID",
|
||||||
|
"MealieModel",
|
||||||
|
"SearchType",
|
||||||
"DateError",
|
"DateError",
|
||||||
"DateTimeError",
|
"DateTimeError",
|
||||||
"DurationError",
|
"DurationError",
|
||||||
"TimeError",
|
"TimeError",
|
||||||
"HasUUID",
|
|
||||||
"MealieModel",
|
|
||||||
"SearchType",
|
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -5,49 +5,35 @@ from .debug import DebugResponse
|
|||||||
from .email import EmailReady, EmailSuccess, EmailTest
|
from .email import EmailReady, EmailSuccess, EmailTest
|
||||||
from .maintenance import MaintenanceLogs, MaintenanceStorageDetails, MaintenanceSummary
|
from .maintenance import MaintenanceLogs, MaintenanceStorageDetails, MaintenanceSummary
|
||||||
from .migration import ChowdownURL, MigrationFile, MigrationImport, Migrations
|
from .migration import ChowdownURL, MigrationFile, MigrationImport, Migrations
|
||||||
from .restore import (
|
from .restore import CommentImport, GroupImport, ImportBase, RecipeImport, SettingsImport, UserImport
|
||||||
CommentImport,
|
|
||||||
CustomPageImport,
|
|
||||||
GroupImport,
|
|
||||||
ImportBase,
|
|
||||||
NotificationImport,
|
|
||||||
RecipeImport,
|
|
||||||
SettingsImport,
|
|
||||||
UserImport,
|
|
||||||
)
|
|
||||||
from .settings import CustomPageBase, CustomPageOut
|
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"MaintenanceLogs",
|
|
||||||
"MaintenanceStorageDetails",
|
|
||||||
"MaintenanceSummary",
|
|
||||||
"ChowdownURL",
|
|
||||||
"MigrationFile",
|
|
||||||
"MigrationImport",
|
|
||||||
"Migrations",
|
|
||||||
"CustomPageBase",
|
|
||||||
"CustomPageOut",
|
|
||||||
"CommentImport",
|
|
||||||
"CustomPageImport",
|
|
||||||
"GroupImport",
|
|
||||||
"ImportBase",
|
|
||||||
"NotificationImport",
|
|
||||||
"RecipeImport",
|
|
||||||
"SettingsImport",
|
|
||||||
"UserImport",
|
|
||||||
"AllBackups",
|
"AllBackups",
|
||||||
"BackupFile",
|
"BackupFile",
|
||||||
"BackupOptions",
|
"BackupOptions",
|
||||||
"CreateBackup",
|
"CreateBackup",
|
||||||
"ImportJob",
|
"ImportJob",
|
||||||
|
"MaintenanceLogs",
|
||||||
|
"MaintenanceStorageDetails",
|
||||||
|
"MaintenanceSummary",
|
||||||
"AdminAboutInfo",
|
"AdminAboutInfo",
|
||||||
"AppInfo",
|
"AppInfo",
|
||||||
"AppStartupInfo",
|
"AppStartupInfo",
|
||||||
"AppStatistics",
|
"AppStatistics",
|
||||||
"AppTheme",
|
"AppTheme",
|
||||||
"CheckAppConfig",
|
"CheckAppConfig",
|
||||||
|
"DebugResponse",
|
||||||
"EmailReady",
|
"EmailReady",
|
||||||
"EmailSuccess",
|
"EmailSuccess",
|
||||||
"EmailTest",
|
"EmailTest",
|
||||||
"DebugResponse",
|
"ChowdownURL",
|
||||||
|
"MigrationFile",
|
||||||
|
"MigrationImport",
|
||||||
|
"Migrations",
|
||||||
|
"CommentImport",
|
||||||
|
"GroupImport",
|
||||||
|
"ImportBase",
|
||||||
|
"RecipeImport",
|
||||||
|
"SettingsImport",
|
||||||
|
"UserImport",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -25,11 +25,3 @@ class GroupImport(ImportBase):
|
|||||||
|
|
||||||
class UserImport(ImportBase):
|
class UserImport(ImportBase):
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
class CustomPageImport(ImportBase):
|
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
class NotificationImport(ImportBase):
|
|
||||||
pass
|
|
||||||
|
|||||||
@@ -1,31 +0,0 @@
|
|||||||
from typing import Annotated
|
|
||||||
|
|
||||||
from pydantic import ConfigDict, Field, field_validator
|
|
||||||
from slugify import slugify
|
|
||||||
|
|
||||||
from mealie.schema._mealie import MealieModel
|
|
||||||
|
|
||||||
from ..recipe.recipe_category import RecipeCategoryResponse
|
|
||||||
|
|
||||||
|
|
||||||
class CustomPageBase(MealieModel):
|
|
||||||
name: str
|
|
||||||
slug: Annotated[str | None, Field(validate_default=True)]
|
|
||||||
position: int
|
|
||||||
categories: list[RecipeCategoryResponse] = []
|
|
||||||
model_config = ConfigDict(from_attributes=True)
|
|
||||||
|
|
||||||
@field_validator("slug", mode="before")
|
|
||||||
def validate_slug(slug: str, values):
|
|
||||||
name: str = values["name"]
|
|
||||||
calc_slug: str = slugify(name)
|
|
||||||
|
|
||||||
if slug != calc_slug:
|
|
||||||
slug = calc_slug
|
|
||||||
|
|
||||||
return slug
|
|
||||||
|
|
||||||
|
|
||||||
class CustomPageOut(CustomPageBase):
|
|
||||||
id: int
|
|
||||||
model_config = ConfigDict(from_attributes=True)
|
|
||||||
@@ -7,13 +7,13 @@ from .group_seeder import SeederConfig
|
|||||||
from .group_statistics import GroupStorage
|
from .group_statistics import GroupStorage
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"GroupDataExport",
|
|
||||||
"CreateGroupPreferences",
|
"CreateGroupPreferences",
|
||||||
"ReadGroupPreferences",
|
"ReadGroupPreferences",
|
||||||
"UpdateGroupPreferences",
|
"UpdateGroupPreferences",
|
||||||
"GroupStorage",
|
"GroupDataExport",
|
||||||
"DataMigrationCreate",
|
"DataMigrationCreate",
|
||||||
"SupportedMigrations",
|
"SupportedMigrations",
|
||||||
"SeederConfig",
|
"SeederConfig",
|
||||||
"GroupAdminUpdate",
|
"GroupAdminUpdate",
|
||||||
|
"GroupStorage",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -70,6 +70,15 @@ from .invite_token import CreateInviteToken, EmailInitationResponse, EmailInvita
|
|||||||
from .webhook import CreateWebhook, ReadWebhook, SaveWebhook, WebhookPagination, WebhookType
|
from .webhook import CreateWebhook, ReadWebhook, SaveWebhook, WebhookPagination, WebhookType
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
"CreateHouseholdPreferences",
|
||||||
|
"ReadHouseholdPreferences",
|
||||||
|
"SaveHouseholdPreferences",
|
||||||
|
"UpdateHouseholdPreferences",
|
||||||
|
"CreateWebhook",
|
||||||
|
"ReadWebhook",
|
||||||
|
"SaveWebhook",
|
||||||
|
"WebhookPagination",
|
||||||
|
"WebhookType",
|
||||||
"GroupEventNotifierCreate",
|
"GroupEventNotifierCreate",
|
||||||
"GroupEventNotifierOptions",
|
"GroupEventNotifierOptions",
|
||||||
"GroupEventNotifierOptionsOut",
|
"GroupEventNotifierOptionsOut",
|
||||||
@@ -79,40 +88,7 @@ __all__ = [
|
|||||||
"GroupEventNotifierSave",
|
"GroupEventNotifierSave",
|
||||||
"GroupEventNotifierUpdate",
|
"GroupEventNotifierUpdate",
|
||||||
"GroupEventPagination",
|
"GroupEventPagination",
|
||||||
"CreateGroupRecipeAction",
|
|
||||||
"GroupRecipeActionOut",
|
|
||||||
"GroupRecipeActionPagination",
|
|
||||||
"GroupRecipeActionPayload",
|
|
||||||
"GroupRecipeActionType",
|
|
||||||
"SaveGroupRecipeAction",
|
|
||||||
"CreateWebhook",
|
|
||||||
"ReadWebhook",
|
|
||||||
"SaveWebhook",
|
|
||||||
"WebhookPagination",
|
|
||||||
"WebhookType",
|
|
||||||
"CreateHouseholdPreferences",
|
|
||||||
"ReadHouseholdPreferences",
|
|
||||||
"SaveHouseholdPreferences",
|
|
||||||
"UpdateHouseholdPreferences",
|
|
||||||
"HouseholdCreate",
|
|
||||||
"HouseholdInDB",
|
|
||||||
"HouseholdPagination",
|
|
||||||
"HouseholdRecipeBase",
|
|
||||||
"HouseholdRecipeCreate",
|
|
||||||
"HouseholdRecipeOut",
|
|
||||||
"HouseholdRecipeSummary",
|
|
||||||
"HouseholdRecipeUpdate",
|
|
||||||
"HouseholdSave",
|
|
||||||
"HouseholdSummary",
|
|
||||||
"HouseholdUserSummary",
|
|
||||||
"UpdateHousehold",
|
|
||||||
"UpdateHouseholdAdmin",
|
|
||||||
"HouseholdStatistics",
|
"HouseholdStatistics",
|
||||||
"CreateInviteToken",
|
|
||||||
"EmailInitationResponse",
|
|
||||||
"EmailInvitation",
|
|
||||||
"ReadInviteToken",
|
|
||||||
"SaveInviteToken",
|
|
||||||
"ShoppingListAddRecipeParams",
|
"ShoppingListAddRecipeParams",
|
||||||
"ShoppingListAddRecipeParamsBulk",
|
"ShoppingListAddRecipeParamsBulk",
|
||||||
"ShoppingListCreate",
|
"ShoppingListCreate",
|
||||||
@@ -136,5 +112,29 @@ __all__ = [
|
|||||||
"ShoppingListSave",
|
"ShoppingListSave",
|
||||||
"ShoppingListSummary",
|
"ShoppingListSummary",
|
||||||
"ShoppingListUpdate",
|
"ShoppingListUpdate",
|
||||||
|
"HouseholdCreate",
|
||||||
|
"HouseholdInDB",
|
||||||
|
"HouseholdPagination",
|
||||||
|
"HouseholdRecipeBase",
|
||||||
|
"HouseholdRecipeCreate",
|
||||||
|
"HouseholdRecipeOut",
|
||||||
|
"HouseholdRecipeSummary",
|
||||||
|
"HouseholdRecipeUpdate",
|
||||||
|
"HouseholdSave",
|
||||||
|
"HouseholdSummary",
|
||||||
|
"HouseholdUserSummary",
|
||||||
|
"UpdateHousehold",
|
||||||
|
"UpdateHouseholdAdmin",
|
||||||
|
"CreateGroupRecipeAction",
|
||||||
|
"GroupRecipeActionOut",
|
||||||
|
"GroupRecipeActionPagination",
|
||||||
|
"GroupRecipeActionPayload",
|
||||||
|
"GroupRecipeActionType",
|
||||||
|
"SaveGroupRecipeAction",
|
||||||
|
"CreateInviteToken",
|
||||||
|
"EmailInitationResponse",
|
||||||
|
"EmailInvitation",
|
||||||
|
"ReadInviteToken",
|
||||||
|
"SaveInviteToken",
|
||||||
"SetPermissions",
|
"SetPermissions",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -12,9 +12,6 @@ from .plan_rules import PlanRulesCreate, PlanRulesDay, PlanRulesOut, PlanRulesPa
|
|||||||
from .shopping_list import ListItem, ShoppingListIn, ShoppingListOut
|
from .shopping_list import ListItem, ShoppingListIn, ShoppingListOut
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"ListItem",
|
|
||||||
"ShoppingListIn",
|
|
||||||
"ShoppingListOut",
|
|
||||||
"CreatePlanEntry",
|
"CreatePlanEntry",
|
||||||
"CreateRandomEntry",
|
"CreateRandomEntry",
|
||||||
"PlanEntryPagination",
|
"PlanEntryPagination",
|
||||||
@@ -28,4 +25,7 @@ __all__ = [
|
|||||||
"PlanRulesPagination",
|
"PlanRulesPagination",
|
||||||
"PlanRulesSave",
|
"PlanRulesSave",
|
||||||
"PlanRulesType",
|
"PlanRulesType",
|
||||||
|
"ListItem",
|
||||||
|
"ShoppingListIn",
|
||||||
|
"ShoppingListOut",
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -89,8 +89,27 @@ from .recipe_tool import RecipeToolCreate, RecipeToolOut, RecipeToolResponse, Re
|
|||||||
from .request_helpers import RecipeDuplicate, RecipeSlug, SlugResponse, UpdateImageResponse
|
from .request_helpers import RecipeDuplicate, RecipeSlug, SlugResponse, UpdateImageResponse
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"IngredientReferences",
|
"RecipeToolCreate",
|
||||||
"RecipeStep",
|
"RecipeToolOut",
|
||||||
|
"RecipeToolResponse",
|
||||||
|
"RecipeToolSave",
|
||||||
|
"RecipeTimelineEventCreate",
|
||||||
|
"RecipeTimelineEventIn",
|
||||||
|
"RecipeTimelineEventOut",
|
||||||
|
"RecipeTimelineEventPagination",
|
||||||
|
"RecipeTimelineEventUpdate",
|
||||||
|
"TimelineEventImage",
|
||||||
|
"TimelineEventType",
|
||||||
|
"RecipeAsset",
|
||||||
|
"RecipeSettings",
|
||||||
|
"RecipeShareToken",
|
||||||
|
"RecipeShareTokenCreate",
|
||||||
|
"RecipeShareTokenSave",
|
||||||
|
"RecipeShareTokenSummary",
|
||||||
|
"RecipeDuplicate",
|
||||||
|
"RecipeSlug",
|
||||||
|
"SlugResponse",
|
||||||
|
"UpdateImageResponse",
|
||||||
"RecipeNote",
|
"RecipeNote",
|
||||||
"CategoryBase",
|
"CategoryBase",
|
||||||
"CategoryIn",
|
"CategoryIn",
|
||||||
@@ -102,22 +121,23 @@ __all__ = [
|
|||||||
"TagIn",
|
"TagIn",
|
||||||
"TagOut",
|
"TagOut",
|
||||||
"TagSave",
|
"TagSave",
|
||||||
"RecipeAsset",
|
"RecipeCommentCreate",
|
||||||
"RecipeTimelineEventCreate",
|
"RecipeCommentOut",
|
||||||
"RecipeTimelineEventIn",
|
"RecipeCommentPagination",
|
||||||
"RecipeTimelineEventOut",
|
"RecipeCommentSave",
|
||||||
"RecipeTimelineEventPagination",
|
"RecipeCommentUpdate",
|
||||||
"RecipeTimelineEventUpdate",
|
"UserBase",
|
||||||
"TimelineEventImage",
|
"AssignCategories",
|
||||||
"TimelineEventType",
|
"AssignSettings",
|
||||||
"RecipeSuggestionQuery",
|
"AssignTags",
|
||||||
"RecipeSuggestionResponse",
|
"DeleteRecipes",
|
||||||
"RecipeSuggestionResponseItem",
|
"ExportBase",
|
||||||
|
"ExportRecipes",
|
||||||
|
"ExportTypes",
|
||||||
|
"IngredientReferences",
|
||||||
|
"RecipeStep",
|
||||||
|
"RecipeImageTypes",
|
||||||
"Nutrition",
|
"Nutrition",
|
||||||
"RecipeShareToken",
|
|
||||||
"RecipeShareTokenCreate",
|
|
||||||
"RecipeShareTokenSave",
|
|
||||||
"RecipeShareTokenSummary",
|
|
||||||
"CreateIngredientFood",
|
"CreateIngredientFood",
|
||||||
"CreateIngredientFoodAlias",
|
"CreateIngredientFoodAlias",
|
||||||
"CreateIngredientUnit",
|
"CreateIngredientUnit",
|
||||||
@@ -140,13 +160,9 @@ __all__ = [
|
|||||||
"SaveIngredientFood",
|
"SaveIngredientFood",
|
||||||
"SaveIngredientUnit",
|
"SaveIngredientUnit",
|
||||||
"UnitFoodBase",
|
"UnitFoodBase",
|
||||||
"RecipeCommentCreate",
|
"RecipeSuggestionQuery",
|
||||||
"RecipeCommentOut",
|
"RecipeSuggestionResponse",
|
||||||
"RecipeCommentPagination",
|
"RecipeSuggestionResponseItem",
|
||||||
"RecipeCommentSave",
|
|
||||||
"RecipeCommentUpdate",
|
|
||||||
"UserBase",
|
|
||||||
"RecipeSettings",
|
|
||||||
"CreateRecipe",
|
"CreateRecipe",
|
||||||
"CreateRecipeBulk",
|
"CreateRecipeBulk",
|
||||||
"CreateRecipeByUrlBulk",
|
"CreateRecipeByUrlBulk",
|
||||||
@@ -164,20 +180,4 @@ __all__ = [
|
|||||||
"ScrapeRecipeBase",
|
"ScrapeRecipeBase",
|
||||||
"ScrapeRecipeData",
|
"ScrapeRecipeData",
|
||||||
"ScrapeRecipeTest",
|
"ScrapeRecipeTest",
|
||||||
"AssignCategories",
|
|
||||||
"AssignSettings",
|
|
||||||
"AssignTags",
|
|
||||||
"DeleteRecipes",
|
|
||||||
"ExportBase",
|
|
||||||
"ExportRecipes",
|
|
||||||
"ExportTypes",
|
|
||||||
"RecipeToolCreate",
|
|
||||||
"RecipeToolOut",
|
|
||||||
"RecipeToolResponse",
|
|
||||||
"RecipeToolSave",
|
|
||||||
"RecipeImageTypes",
|
|
||||||
"RecipeDuplicate",
|
|
||||||
"RecipeSlug",
|
|
||||||
"SlugResponse",
|
|
||||||
"UpdateImageResponse",
|
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -117,9 +117,9 @@ class RecipeSummary(MealieModel):
|
|||||||
id: UUID4 | None = None
|
id: UUID4 | None = None
|
||||||
_normalize_search: ClassVar[bool] = True
|
_normalize_search: ClassVar[bool] = True
|
||||||
|
|
||||||
user_id: UUID4 = Field(default_factory=uuid4, validate_default=True)
|
user_id: Annotated[UUID4, Field(default_factory=uuid4, validate_default=True)]
|
||||||
household_id: UUID4 = Field(default_factory=uuid4, validate_default=True)
|
household_id: Annotated[UUID4, Field(default_factory=uuid4, validate_default=True)]
|
||||||
group_id: UUID4 = Field(default_factory=uuid4, validate_default=True)
|
group_id: Annotated[UUID4, Field(default_factory=uuid4, validate_default=True)]
|
||||||
|
|
||||||
name: str | None = None
|
name: str | None = None
|
||||||
slug: Annotated[str, Field(validate_default=True)] = ""
|
slug: Annotated[str, Field(validate_default=True)] = ""
|
||||||
@@ -134,7 +134,7 @@ class RecipeSummary(MealieModel):
|
|||||||
perform_time: str | None = None
|
perform_time: str | None = None
|
||||||
|
|
||||||
description: str | None = ""
|
description: str | None = ""
|
||||||
recipe_category: Annotated[list[RecipeCategory] | None, Field(validate_default=True)] | None = []
|
recipe_category: Annotated[list[RecipeCategory] | None, Field(validate_default=True)] = []
|
||||||
tags: Annotated[list[RecipeTag] | None, Field(validate_default=True)] = []
|
tags: Annotated[list[RecipeTag] | None, Field(validate_default=True)] = []
|
||||||
tools: list[RecipeTool] = []
|
tools: list[RecipeTool] = []
|
||||||
rating: float | None = None
|
rating: float | None = None
|
||||||
|
|||||||
@@ -21,6 +21,10 @@ from .responses import ErrorResponse, FileTokenResponse, SuccessResponse
|
|||||||
from .validation import ValidationResponse
|
from .validation import ValidationResponse
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
|
"ErrorResponse",
|
||||||
|
"FileTokenResponse",
|
||||||
|
"SuccessResponse",
|
||||||
|
"SearchFilter",
|
||||||
"LogicalOperator",
|
"LogicalOperator",
|
||||||
"QueryFilterBuilder",
|
"QueryFilterBuilder",
|
||||||
"QueryFilterBuilderComponent",
|
"QueryFilterBuilderComponent",
|
||||||
@@ -28,15 +32,11 @@ __all__ = [
|
|||||||
"QueryFilterJSONPart",
|
"QueryFilterJSONPart",
|
||||||
"RelationalKeyword",
|
"RelationalKeyword",
|
||||||
"RelationalOperator",
|
"RelationalOperator",
|
||||||
"ValidationResponse",
|
|
||||||
"OrderByNullPosition",
|
"OrderByNullPosition",
|
||||||
"OrderDirection",
|
"OrderDirection",
|
||||||
"PaginationBase",
|
"PaginationBase",
|
||||||
"PaginationQuery",
|
"PaginationQuery",
|
||||||
"RecipeSearchQuery",
|
"RecipeSearchQuery",
|
||||||
"RequestQuery",
|
"RequestQuery",
|
||||||
"SearchFilter",
|
"ValidationResponse",
|
||||||
"ErrorResponse",
|
|
||||||
"FileTokenResponse",
|
|
||||||
"SuccessResponse",
|
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -38,18 +38,12 @@ from .user_passwords import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
__all__ = [
|
__all__ = [
|
||||||
"ForgotPassword",
|
"CreateUserRegistration",
|
||||||
"PasswordResetToken",
|
|
||||||
"PrivatePasswordResetToken",
|
|
||||||
"ResetPassword",
|
|
||||||
"SavePasswordResetToken",
|
|
||||||
"ValidateResetToken",
|
|
||||||
"CredentialsRequest",
|
"CredentialsRequest",
|
||||||
"CredentialsRequestForm",
|
"CredentialsRequestForm",
|
||||||
"Token",
|
"Token",
|
||||||
"TokenData",
|
"TokenData",
|
||||||
"UnlockResults",
|
"UnlockResults",
|
||||||
"CreateUserRegistration",
|
|
||||||
"ChangePassword",
|
"ChangePassword",
|
||||||
"CreateToken",
|
"CreateToken",
|
||||||
"DeleteTokenResponse",
|
"DeleteTokenResponse",
|
||||||
@@ -75,4 +69,10 @@ __all__ = [
|
|||||||
"UserRatings",
|
"UserRatings",
|
||||||
"UserSummary",
|
"UserSummary",
|
||||||
"UserSummaryPagination",
|
"UserSummaryPagination",
|
||||||
|
"ForgotPassword",
|
||||||
|
"PasswordResetToken",
|
||||||
|
"PrivatePasswordResetToken",
|
||||||
|
"ResetPassword",
|
||||||
|
"SavePasswordResetToken",
|
||||||
|
"ValidateResetToken",
|
||||||
]
|
]
|
||||||
|
|||||||
Reference in New Issue
Block a user