diff --git a/mealie/db/init_db.py b/mealie/db/init_db.py index 92f3e5222..794d35f54 100644 --- a/mealie/db/init_db.py +++ b/mealie/db/init_db.py @@ -1,6 +1,6 @@ from core.security import get_password_hash from fastapi.logger import logger -from schema.settings_models import SiteSettings, Webhooks +from schema.settings import SiteSettings, Webhooks from sqlalchemy.orm import Session from sqlalchemy.orm.session import Session from fastapi.logger import logger diff --git a/mealie/routes/backup_routes.py b/mealie/routes/backup_routes.py index 557110fd0..94f1d93ec 100644 --- a/mealie/routes/backup_routes.py +++ b/mealie/routes/backup_routes.py @@ -4,7 +4,7 @@ import shutil from core.config import BACKUP_DIR, TEMPLATE_DIR from db.db_setup import generate_session from fastapi import APIRouter, Depends, File, HTTPException, UploadFile -from schema.backup_models import BackupJob, ImportJob, Imports, LocalBackup +from schema.backup import BackupJob, ImportJob, Imports, LocalBackup from services.backups.exports import backup_all from services.backups.imports import ImportDatabase from sqlalchemy.orm.session import Session diff --git a/mealie/routes/migration_routes.py b/mealie/routes/migration_routes.py index d5848551a..cd2b0963f 100644 --- a/mealie/routes/migration_routes.py +++ b/mealie/routes/migration_routes.py @@ -5,7 +5,7 @@ from typing import List from core.config import MIGRATION_DIR from db.db_setup import generate_session from fastapi import APIRouter, Depends, File, HTTPException, UploadFile -from schema.migration_models import MigrationFile, Migrations +from schema.migration import MigrationFile, Migrations from services.migrations.chowdown import chowdown_migrate as chowdow_migrate from services.migrations.nextcloud import migrate as nextcloud_migrate from sqlalchemy.orm.session import Session diff --git a/mealie/routes/recipe/all_recipe_routes.py b/mealie/routes/recipe/all_recipe_routes.py index 1ea759077..5e3c7ab87 100644 --- a/mealie/routes/recipe/all_recipe_routes.py +++ b/mealie/routes/recipe/all_recipe_routes.py @@ -3,7 +3,7 @@ from typing import List, Optional from db.database import db from db.db_setup import generate_session from fastapi import APIRouter, Depends, Query -from schema.recipe_models import AllRecipeRequest +from schema.recipe import AllRecipeRequest from slugify import slugify from sqlalchemy.orm.session import Session diff --git a/mealie/routes/recipe/category_routes.py b/mealie/routes/recipe/category_routes.py index a10a7c6af..bbf5b36de 100644 --- a/mealie/routes/recipe/category_routes.py +++ b/mealie/routes/recipe/category_routes.py @@ -1,7 +1,7 @@ from db.database import db from db.db_setup import generate_session from fastapi import APIRouter, Depends -from schema.category_models import RecipeCategoryResponse +from schema.category import RecipeCategoryResponse from sqlalchemy.orm.session import Session from schema.snackbar import SnackResponse diff --git a/mealie/routes/recipe/recipe_crud_routes.py b/mealie/routes/recipe/recipe_crud_routes.py index 134783b2f..58ace63a8 100644 --- a/mealie/routes/recipe/recipe_crud_routes.py +++ b/mealie/routes/recipe/recipe_crud_routes.py @@ -2,7 +2,7 @@ from db.db_setup import generate_session from fastapi import APIRouter, Depends, File, Form, HTTPException from fastapi.logger import logger from fastapi.responses import FileResponse -from schema.recipe_models import RecipeURLIn +from schema.recipe import RecipeURLIn from services.image_services import read_image, write_image from services.recipe_services import Recipe from services.scraper.scraper import create_from_url diff --git a/mealie/routes/setting_routes.py b/mealie/routes/setting_routes.py index 1124a0073..b59cd6677 100644 --- a/mealie/routes/setting_routes.py +++ b/mealie/routes/setting_routes.py @@ -1,7 +1,7 @@ from db.database import db from db.db_setup import generate_session from fastapi import APIRouter, Depends -from schema.settings_models import SiteSettings +from schema.settings import SiteSettings from sqlalchemy.orm.session import Session from utils.post_webhooks import post_webhooks from schema.snackbar import SnackResponse diff --git a/mealie/routes/theme_routes.py b/mealie/routes/theme_routes.py index b8d99875c..fa6a26361 100644 --- a/mealie/routes/theme_routes.py +++ b/mealie/routes/theme_routes.py @@ -1,6 +1,6 @@ from db.db_setup import generate_session from fastapi import APIRouter, Depends -from schema.theme_models import SiteTheme +from schema.theme import SiteTheme from sqlalchemy.orm.session import Session from schema.snackbar import SnackResponse from db.database import db diff --git a/mealie/routes/users/crud.py b/mealie/routes/users/crud.py index b8a3d1f78..6960fbcba 100644 --- a/mealie/routes/users/crud.py +++ b/mealie/routes/users/crud.py @@ -2,7 +2,7 @@ from core.security import get_password_hash from db.database import db from db.db_setup import generate_session from fastapi import APIRouter, Depends -from schema.user_models import CreateUser, UserResponse +from schema.user import CreateUser, UserResponse from routes.deps import manager from sqlalchemy.orm.session import Session diff --git a/mealie/schema/backup_models.py b/mealie/schema/backup.py similarity index 100% rename from mealie/schema/backup_models.py rename to mealie/schema/backup.py diff --git a/mealie/schema/category_models.py b/mealie/schema/category.py similarity index 100% rename from mealie/schema/category_models.py rename to mealie/schema/category.py diff --git a/mealie/schema/meal_models.py b/mealie/schema/meal.py similarity index 100% rename from mealie/schema/meal_models.py rename to mealie/schema/meal.py diff --git a/mealie/schema/migration_models.py b/mealie/schema/migration.py similarity index 100% rename from mealie/schema/migration_models.py rename to mealie/schema/migration.py diff --git a/mealie/schema/recipe_models.py b/mealie/schema/recipe.py similarity index 100% rename from mealie/schema/recipe_models.py rename to mealie/schema/recipe.py diff --git a/mealie/schema/import_models.py b/mealie/schema/restore.py similarity index 100% rename from mealie/schema/import_models.py rename to mealie/schema/restore.py diff --git a/mealie/schema/settings_models.py b/mealie/schema/settings.py similarity index 100% rename from mealie/schema/settings_models.py rename to mealie/schema/settings.py diff --git a/mealie/schema/theme_models.py b/mealie/schema/theme.py similarity index 100% rename from mealie/schema/theme_models.py rename to mealie/schema/theme.py diff --git a/mealie/schema/user_models.py b/mealie/schema/user.py similarity index 100% rename from mealie/schema/user_models.py rename to mealie/schema/user.py diff --git a/mealie/services/backups/imports.py b/mealie/services/backups/imports.py index e364093e1..2f0944179 100644 --- a/mealie/services/backups/imports.py +++ b/mealie/services/backups/imports.py @@ -6,8 +6,8 @@ from typing import List from core.config import BACKUP_DIR, IMG_DIR, TEMP_DIR from db.database import db -from schema.import_models import RecipeImport, SettingsImport, ThemeImport -from schema.theme_models import SiteTheme +from schema.restore import RecipeImport, SettingsImport, ThemeImport +from schema.theme import SiteTheme from services.recipe_services import Recipe from sqlalchemy.orm.session import Session from fastapi.logger import logger diff --git a/mealie/services/scheduler/scheduled_jobs.py b/mealie/services/scheduler/scheduled_jobs.py index 8a4f317fb..37e4efeb9 100644 --- a/mealie/services/scheduler/scheduled_jobs.py +++ b/mealie/services/scheduler/scheduled_jobs.py @@ -4,7 +4,7 @@ from services.backups.exports import auto_backup_job from services.scheduler.global_scheduler import scheduler from services.scheduler.scheduler_utils import Cron, cron_parser from fastapi.logger import logger -from schema.settings_models import SiteSettings +from schema.settings import SiteSettings from db.database import db from utils.post_webhooks import post_webhooks diff --git a/mealie/utils/post_webhooks.py b/mealie/utils/post_webhooks.py index 2c96ac2c9..9bc475039 100644 --- a/mealie/utils/post_webhooks.py +++ b/mealie/utils/post_webhooks.py @@ -3,7 +3,7 @@ import json import requests from db.database import db from db.db_setup import create_session -from schema.settings_models import SiteSettings +from schema.settings import SiteSettings from services.meal_services import MealPlan from services.recipe_services import Recipe