refactor/rename schema files

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

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

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

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
 

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
 

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

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

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

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
 

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

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
 

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