diff --git a/.flake8 b/.flake8 index b90fca4d2..b764320eb 100644 --- a/.flake8 +++ b/.flake8 @@ -1,6 +1,6 @@ [flake8] ignore = [ E501 # Line Length - See Black Config in pyproject.toml - E722 # Bare Exception | Temporary + E402 # Import Not at Top of File ] exclude = _all_models.py diff --git a/mealie/routes/backup_routes.py b/mealie/routes/backup_routes.py index 3cd4c68ac..f357be508 100644 --- a/mealie/routes/backup_routes.py +++ b/mealie/routes/backup_routes.py @@ -1,17 +1,15 @@ import operator import shutil -from typing import Optional from fastapi import APIRouter, Depends, File, HTTPException, UploadFile, status from mealie.core.config import app_dirs from mealie.core.security import create_file_token from mealie.db.db_setup import generate_session -from mealie.routes.deps import get_current_user, validate_file_token +from mealie.routes.deps import get_current_user from mealie.schema.backup import BackupJob, ImportJob, Imports, LocalBackup from mealie.services.backups import imports from mealie.services.backups.exports import backup_all from sqlalchemy.orm.session import Session -from starlette.responses import FileResponse router = APIRouter(prefix="/api/backups", tags=["Backups"], dependencies=[Depends(get_current_user)]) diff --git a/mealie/routes/debug_routes.py b/mealie/routes/debug_routes.py index 8dc919683..500ee742e 100644 --- a/mealie/routes/debug_routes.py +++ b/mealie/routes/debug_routes.py @@ -1,5 +1,3 @@ -import json - from fastapi import APIRouter, Depends from mealie.core.config import APP_VERSION, app_dirs, settings from mealie.core.root_logger import LOGGER_FILE diff --git a/mealie/routes/migration_routes.py b/mealie/routes/migration_routes.py index 5c2c29af1..8fcfd7800 100644 --- a/mealie/routes/migration_routes.py +++ b/mealie/routes/migration_routes.py @@ -9,6 +9,7 @@ from mealie.routes.deps import get_current_user from mealie.schema.migration import MigrationFile, Migrations from mealie.services.migrations import migration from sqlalchemy.orm.session import Session +from fastapi import HTTPException router = APIRouter(prefix="/api/migrations", tags=["Migration"], dependencies=[Depends(get_current_user)]) diff --git a/mealie/routes/recipe/recipe_crud_routes.py b/mealie/routes/recipe/recipe_crud_routes.py index 146d318b1..00ecb2e4a 100644 --- a/mealie/routes/recipe/recipe_crud_routes.py +++ b/mealie/routes/recipe/recipe_crud_routes.py @@ -1,14 +1,10 @@ -from enum import Enum - from fastapi import APIRouter, Depends, File, Form, HTTPException, status -from fastapi.responses import FileResponse -from mealie.core.config import app_dirs from mealie.core.root_logger import get_logger from mealie.db.database import db from mealie.db.db_setup import generate_session from mealie.routes.deps import get_current_user from mealie.schema.recipe import Recipe, RecipeURLIn -from mealie.services.image.image import IMG_OPTIONS, delete_image, read_image, rename_image, scrape_image, write_image +from mealie.services.image.image import delete_image, rename_image, scrape_image, write_image from mealie.services.scraper.scraper import create_from_url from sqlalchemy.orm.session import Session diff --git a/mealie/routes/recipe/tag_routes.py b/mealie/routes/recipe/tag_routes.py index f810cbb6d..b3f0d1126 100644 --- a/mealie/routes/recipe/tag_routes.py +++ b/mealie/routes/recipe/tag_routes.py @@ -1,4 +1,4 @@ -from fastapi import APIRouter, Depends +from fastapi import APIRouter, Depends, HTTPException, status from mealie.db.database import db from mealie.db.db_setup import generate_session from mealie.routes.deps import get_current_user diff --git a/mealie/routes/users/auth.py b/mealie/routes/users/auth.py index 48a0679ec..555abf3be 100644 --- a/mealie/routes/users/auth.py +++ b/mealie/routes/users/auth.py @@ -1,5 +1,3 @@ -from datetime import timedelta - from fastapi import APIRouter, Depends, status from fastapi.exceptions import HTTPException from fastapi.security import OAuth2PasswordRequestForm diff --git a/mealie/routes/users/crud.py b/mealie/routes/users/crud.py index fe4fea517..390149a88 100644 --- a/mealie/routes/users/crud.py +++ b/mealie/routes/users/crud.py @@ -1,5 +1,4 @@ import shutil -from datetime import timedelta from fastapi import APIRouter, Depends, File, UploadFile, status, HTTPException from fastapi.responses import FileResponse diff --git a/mealie/routes/users/sign_up.py b/mealie/routes/users/sign_up.py index 068f8d58c..c62d4f204 100644 --- a/mealie/routes/users/sign_up.py +++ b/mealie/routes/users/sign_up.py @@ -8,6 +8,7 @@ from mealie.routes.deps import get_current_user from mealie.schema.sign_up import SignUpIn, SignUpOut, SignUpToken from mealie.schema.user import UserIn, UserInDB from sqlalchemy.orm.session import Session +from fastapi import HTTPException, status router = APIRouter(prefix="/api/users/sign-ups", tags=["User Signup"]) @@ -59,7 +60,7 @@ async def create_user_with_token( # Create User new_user.admin = db_entry.admin new_user.password = get_password_hash(new_user.password) - data = db.users.create(session, new_user.dict()) + db.users.create(session, new_user.dict()) # DeleteToken db.sign_ups.delete(session, token) diff --git a/mealie/routes/utility_routes.py b/mealie/routes/utility_routes.py index d09980268..6f30128ab 100644 --- a/mealie/routes/utility_routes.py +++ b/mealie/routes/utility_routes.py @@ -4,6 +4,7 @@ from typing import Optional from fastapi import APIRouter, Depends from mealie.routes.deps import validate_file_token from starlette.responses import FileResponse +from fastapi import HTTPException, status router = APIRouter(prefix="/api/utils", tags=["Utils"], include_in_schema=True) diff --git a/mealie/services/image/minify.py b/mealie/services/image/minify.py index 252c7b3c2..e33bbb38e 100644 --- a/mealie/services/image/minify.py +++ b/mealie/services/image/minify.py @@ -41,9 +41,9 @@ def minify_image(image_file: Path) -> ImageSizes: if file.suffix != ".webp": file.unlink() - org_dest = image_file.parent.joinpath(f"original.webp") - min_dest = image_file.parent.joinpath(f"min-original.webp") - tiny_dest = image_file.parent.joinpath(f"tiny-original.webp") + org_dest = image_file.parent.joinpath("original.webp") + min_dest = image_file.parent.joinpath("min-original.webp") + tiny_dest = image_file.parent.joinpath("tiny-original.webp") if min_dest.exists() and tiny_dest.exists() and org_dest.exists(): return diff --git a/mealie/services/migrations/_migration_base.py b/mealie/services/migrations/_migration_base.py index 15434d5b2..6eb35895f 100644 --- a/mealie/services/migrations/_migration_base.py +++ b/mealie/services/migrations/_migration_base.py @@ -8,7 +8,7 @@ from mealie.core import root_logger from mealie.db.database import db from mealie.schema.migration import MigrationImport from mealie.schema.recipe import Recipe -from mealie.services.image import image, minify +from mealie.services.image import image from mealie.services.scraper.cleaner import Cleaner from mealie.utils.unzip import unpack_zip from pydantic import BaseModel diff --git a/tests/conftest.py b/tests/conftest.py index 74b34c497..f12b327f6 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -1,6 +1,6 @@ from mealie.core.config import app_dirs, settings -#! I don't like it either! +# ! I don't like it either! SQLITE_FILE = app_dirs.SQLITE_DIR.joinpath("test.db") SQLITE_FILE.unlink(missing_ok=True)