style(backend): 🎨 add isort to lint and CI/CD

mealie/services/backups/exports.py

@@ -5,13 +5,14 @@ from pathlib import Path
 from typing import Union
 
 from jinja2 import Template
+from pathvalidate import sanitize_filename
+from pydantic.main import BaseModel
+
 from mealie.core import root_logger
 from mealie.core.config import app_dirs
 from mealie.db.database import db
 from mealie.db.db_setup import create_session
 from mealie.services.events import create_backup_event
-from pathvalidate import sanitize_filename
-from pydantic.main import BaseModel
 
 logger = root_logger.get_logger()
 

mealie/services/backups/imports.py

@@ -4,6 +4,9 @@ import zipfile
 from pathlib import Path
 from typing import Callable
 
+from pydantic.main import BaseModel
+from sqlalchemy.orm.session import Session
+
 from mealie.core.config import app_dirs
 from mealie.db.database import db
 from mealie.schema.admin import (
@@ -21,8 +24,6 @@ from mealie.schema.events import EventNotificationIn
 from mealie.schema.recipe import CommentOut, Recipe
 from mealie.schema.user import UpdateGroup, UserInDB
 from mealie.services.image import minify
-from pydantic.main import BaseModel
-from sqlalchemy.orm.session import Session
 
 
 class ImportDatabase:

mealie/services/events.py

@@ -1,8 +1,9 @@
 import apprise
+from sqlalchemy.orm.session import Session
+
 from mealie.db.database import db
 from mealie.db.db_setup import create_session
 from mealie.schema.events import Event, EventCategory
-from sqlalchemy.orm.session import Session
 
 
 def test_notification(notification_url, event=None) -> bool:

mealie/services/image/image.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass
 from pathlib import Path
 
 import requests
+
 from mealie.core import root_logger
 from mealie.schema.recipe import Recipe
 from mealie.services.image import minify

mealie/services/image/minify.py

@@ -2,10 +2,11 @@ import shutil
 from dataclasses import dataclass
 from pathlib import Path
 
+from PIL import Image
+
 from mealie.core import root_logger
 from mealie.core.config import app_dirs
 from mealie.schema.recipe import Recipe
-from PIL import Image
 
 logger = root_logger.get_logger()
 

mealie/services/meal_services.py

@@ -1,12 +1,13 @@
 from datetime import date, timedelta
 from typing import Union
 
+from sqlalchemy.orm.session import Session
+
 from mealie.db.database import db
 from mealie.db.db_setup import create_session
 from mealie.schema.meal_plan import MealDayIn, MealPlanIn
 from mealie.schema.recipe import Recipe
 from mealie.schema.user import GroupInDB
-from sqlalchemy.orm.session import Session
 
 
 def set_mealplan_dates(meal_plan_base: MealPlanIn) -> MealPlanIn:

mealie/services/migrations/_migration_base.py

@@ -4,6 +4,8 @@ from tempfile import TemporaryDirectory
 from typing import Any, Callable, Optional
 
 import yaml
+from pydantic import BaseModel
+
 from mealie.core import root_logger
 from mealie.db.database import db
 from mealie.schema.admin import MigrationImport
@@ -11,7 +13,6 @@ from mealie.schema.recipe import Recipe
 from mealie.services.image import image
 from mealie.services.scraper import cleaner
 from mealie.utils.unzip import unpack_zip
-from pydantic import BaseModel
 
 logger = root_logger.get_logger()
 

mealie/services/migrations/chowdown.py

@@ -1,11 +1,12 @@
 from pathlib import Path
 from typing import Optional
 
+from sqlalchemy.orm.session import Session
+
 from mealie.core.config import app_dirs
 from mealie.schema.admin import MigrationImport
 from mealie.services.migrations import helpers
 from mealie.services.migrations._migration_base import MigrationAlias, MigrationBase
-from sqlalchemy.orm.session import Session
 
 
 class ChowdownMigration(MigrationBase):

mealie/services/migrations/migration.py

@@ -1,10 +1,11 @@
 from enum import Enum
 from pathlib import Path
 
+from sqlalchemy.orm.session import Session
+
 from mealie.core import root_logger
 from mealie.schema.admin import MigrationImport
 from mealie.services.migrations import chowdown, nextcloud
-from sqlalchemy.orm.session import Session
 
 logger = root_logger.get_logger()
 

mealie/services/migrations/nextcloud.py

@@ -2,11 +2,12 @@ from dataclasses import dataclass
 from pathlib import Path
 from typing import Optional
 
+from slugify import slugify
+from sqlalchemy.orm.session import Session
+
 from mealie.schema.admin import MigrationImport
 from mealie.services.migrations import helpers
 from mealie.services.migrations._migration_base import MigrationAlias, MigrationBase
-from slugify import slugify
-from sqlalchemy.orm.session import Session
 
 
 @dataclass

mealie/services/recipe/all_recipes.py

@@ -3,12 +3,13 @@ from functools import lru_cache
 
 from fastapi import Depends, Response
 from fastapi.encoders import jsonable_encoder
+from sqlalchemy.orm.session import Session
+
 from mealie.core.root_logger import get_logger
 from mealie.db.database import db
 from mealie.db.db_setup import SessionLocal, generate_session
 from mealie.routes.deps import is_logged_in
 from mealie.schema.recipe import RecipeSummary
-from sqlalchemy.orm.session import Session
 
 logger = get_logger()
 

mealie/services/recipe/common_deps.py

@@ -1,11 +1,12 @@
 from typing import Any
 
 from fastapi import BackgroundTasks, Depends
-from mealie.db.db_setup import generate_session
-from mealie.routes.deps import get_current_user, is_logged_in
 from pydantic import BaseModel
 from sqlalchemy.orm.session import Session
 
+from mealie.db.db_setup import generate_session
+from mealie.routes.deps import get_current_user, is_logged_in
+
 
 class CommonDeps(BaseModel):
     session: Session

mealie/services/recipe/recipe_service.py

@@ -1,4 +1,7 @@
 from fastapi import BackgroundTasks, Depends, HTTPException, status
+from sqlalchemy.exc import IntegrityError
+from sqlalchemy.orm.session import Session
+
 from mealie.core.config import get_settings
 from mealie.db.database import get_database
 from mealie.db.db_setup import SessionLocal
@@ -6,8 +9,6 @@ from mealie.schema.recipe.recipe import CreateRecipe, Recipe
 from mealie.schema.user.user import UserInDB
 from mealie.services.events import create_recipe_event
 from mealie.services.recipe.media import delete_assets
-from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm.session import Session
 
 from .common_deps import CommonDeps, _read_deps, _write_deps
 

mealie/services/scheduler/global_scheduler.py

@@ -1,5 +1,6 @@
 from apscheduler.jobstores.sqlalchemy import SQLAlchemyJobStore
 from apscheduler.schedulers.background import BackgroundScheduler
+
 from mealie.core.config import app_dirs, settings
 
 app_dirs.DATA_DIR.joinpath("scheduler.db").unlink(missing_ok=True)

mealie/services/scheduler/scheduled_jobs.py

@@ -1,6 +1,7 @@
 import datetime
 
 from apscheduler.schedulers.background import BackgroundScheduler
+
 from mealie.core import root_logger
 from mealie.db.database import db
 from mealie.db.db_setup import create_session

mealie/services/scraper/cleaner.py

@@ -4,9 +4,10 @@ import re
 from datetime import datetime, timedelta
 from typing import List
 
-from mealie.core.root_logger import get_logger
 from slugify import slugify
 
+from mealie.core.root_logger import get_logger
+
 logger = get_logger()
 
 

mealie/services/scraper/ingredient_nlp/processor.py

@@ -5,10 +5,11 @@ from fractions import Fraction
 from pathlib import Path
 from typing import Optional
 
+from pydantic import BaseModel
+
 from mealie.core.config import settings
 from mealie.schema.recipe import RecipeIngredient
 from mealie.schema.recipe.recipe_ingredient import CreateIngredientFood, CreateIngredientUnit
-from pydantic import BaseModel
 
 from . import utils
 

mealie/services/scraper/open_graph.py

@@ -1,10 +1,11 @@
 from typing import Tuple
 
 import extruct
-from mealie.core.config import app_dirs
 from slugify import slugify
 from w3lib.html import get_base_url
 
+from mealie.core.config import app_dirs
+
 LAST_JSON = app_dirs.DEBUG_DIR.joinpath("last_recipe.json")
 
 

mealie/services/scraper/scraper.py

@@ -5,13 +5,14 @@ from uuid import uuid4
 
 import requests
 from fastapi import HTTPException, status
+from recipe_scrapers import NoSchemaFoundInWildMode, SchemaScraperFactory, WebsiteNotImplementedError, scrape_me
+from slugify import slugify
+
 from mealie.core.config import app_dirs
 from mealie.core.root_logger import get_logger
 from mealie.schema.recipe import Recipe, RecipeStep
 from mealie.services.image.image import scrape_image
 from mealie.services.scraper import cleaner, open_graph
-from recipe_scrapers import NoSchemaFoundInWildMode, SchemaScraperFactory, WebsiteNotImplementedError, scrape_me
-from slugify import slugify
 
 LAST_JSON = app_dirs.DEBUG_DIR.joinpath("last_recipe.json")