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

mealie/db/data_access_layer/_base_access_model.py

@@ -1,10 +1,11 @@
 from typing import Callable, Generic, TypeVar, Union
 
-from mealie.core.root_logger import get_logger
 from sqlalchemy import func
 from sqlalchemy.orm import load_only
 from sqlalchemy.orm.session import Session
 
+from mealie.core.root_logger import get_logger
+
 logger = get_logger()
 
 T = TypeVar("T")

mealie/db/data_access_layer/db_access.py

@@ -1,5 +1,7 @@
 from logging import getLogger
 
+from sqlalchemy.orm.session import Session
+
 from mealie.db.data_access_layer.group_access_model import GroupDataAccessModel
 from mealie.db.models.event import Event, EventNotification
 from mealie.db.models.group import Group
@@ -26,7 +28,6 @@ from mealie.schema.recipe import (
     RecipeTagResponse,
 )
 from mealie.schema.user import GroupInDB, LongLiveTokenInDB, SignUpOut, UserInDB
-from sqlalchemy.orm.session import Session
 
 from ._base_access_model import BaseAccessModel
 from .recipe_access_model import RecipeDataAccessModel

mealie/db/data_access_layer/group_access_model.py

@@ -1,7 +1,8 @@
+from sqlalchemy.orm.session import Session
+
 from mealie.db.models.group import Group
 from mealie.schema.meal_plan.meal import MealPlanOut
 from mealie.schema.user.user import GroupInDB
-from sqlalchemy.orm.session import Session
 
 from ._base_access_model import BaseAccessModel
 

mealie/db/data_access_layer/recipe_access_model.py

@@ -1,9 +1,10 @@
 from random import randint
 
+from sqlalchemy.orm.session import Session
+
 from mealie.db.models.recipe.recipe import RecipeModel
 from mealie.db.models.recipe.settings import RecipeSettings
 from mealie.schema.recipe import Recipe
-from sqlalchemy.orm.session import Session
 
 from ._base_access_model import BaseAccessModel
 

mealie/db/db_setup.py

@@ -1,8 +1,9 @@
 import sqlalchemy as sa
-from mealie.core.config import settings
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm.session import Session
 
+from mealie.core.config import settings
+
 
 def sql_global_init(db_url: str):
     connect_args = {}

mealie/db/init_db.py

@@ -1,3 +1,5 @@
+from sqlalchemy.orm import Session
+
 from mealie.core import root_logger
 from mealie.core.config import settings
 from mealie.core.security import get_password_hash
@@ -7,7 +9,6 @@ from mealie.db.db_setup import create_session, engine
 from mealie.db.models._model_base import SqlAlchemyBase
 from mealie.schema.admin import SiteSettings
 from mealie.services.events import create_general_event
-from sqlalchemy.orm import Session
 
 logger = root_logger.get_logger("init_db")
 

mealie/db/models/event.py

@@ -1,6 +1,7 @@
-from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from sqlalchemy import Boolean, Column, DateTime, Integer, String
 
+from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
+
 
 class EventNotification(SqlAlchemyBase, BaseMixins):
     __tablename__ = "event_notifications"

mealie/db/models/group.py

@@ -1,9 +1,10 @@
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
+from sqlalchemy.orm.session import Session
+
 from mealie.core.config import settings
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from mealie.db.models.recipe.category import Category, group2categories
-from sqlalchemy.orm.session import Session
 
 
 class WebhookURLModel(SqlAlchemyBase):

mealie/db/models/mealplan.py

@@ -1,10 +1,11 @@
 import sqlalchemy.orm as orm
+from sqlalchemy import Column, Date, ForeignKey, Integer, String
+from sqlalchemy.ext.orderinglist import ordering_list
+
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from mealie.db.models.group import Group
 from mealie.db.models.recipe.recipe import RecipeModel
 from mealie.db.models.shopping_list import ShoppingList
-from sqlalchemy import Column, Date, ForeignKey, Integer, String
-from sqlalchemy.ext.orderinglist import ordering_list
 
 
 class Meal(SqlAlchemyBase):

mealie/db/models/recipe/api_extras.py

@@ -1,4 +1,5 @@
 import sqlalchemy as sa
+
 from mealie.db.models._model_base import SqlAlchemyBase
 
 

mealie/db/models/recipe/assets.py

@@ -1,4 +1,5 @@
 import sqlalchemy as sa
+
 from mealie.db.models._model_base import SqlAlchemyBase
 
 

mealie/db/models/recipe/category.py

@@ -1,10 +1,11 @@
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
-from mealie.core import root_logger
-from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from slugify import slugify
 from sqlalchemy.orm import validates
 
+from mealie.core import root_logger
+from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
+
 logger = root_logger.get_logger()
 
 site_settings2categories = sa.Table(

mealie/db/models/recipe/comment.py

@@ -1,10 +1,11 @@
 from datetime import datetime
 from uuid import uuid4
 
+from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, orm
+
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from mealie.db.models.recipe.recipe import RecipeModel
 from mealie.db.models.users import User
-from sqlalchemy import Column, DateTime, ForeignKey, Integer, String, orm
 
 
 def generate_uuid():

mealie/db/models/recipe/ingredient.py

@@ -1,6 +1,7 @@
-from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from sqlalchemy import Column, ForeignKey, Integer, String, orm
 
+from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
+
 from .._model_utils import auto_init
 
 

mealie/db/models/recipe/instruction.py

@@ -1,6 +1,7 @@
-from mealie.db.models._model_base import SqlAlchemyBase
 from sqlalchemy import Column, ForeignKey, Integer, String
 
+from mealie.db.models._model_base import SqlAlchemyBase
+
 
 class RecipeInstruction(SqlAlchemyBase):
     __tablename__ = "recipe_instructions"

mealie/db/models/recipe/note.py

@@ -1,4 +1,5 @@
 import sqlalchemy as sa
+
 from mealie.db.models._model_base import SqlAlchemyBase
 
 

mealie/db/models/recipe/nutrition.py

@@ -1,4 +1,5 @@
 import sqlalchemy as sa
+
 from mealie.db.models._model_base import SqlAlchemyBase
 
 

mealie/db/models/recipe/settings.py

@@ -1,4 +1,5 @@
 import sqlalchemy as sa
+
 from mealie.db.models._model_base import SqlAlchemyBase
 
 

mealie/db/models/recipe/tag.py

@@ -1,10 +1,11 @@
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
-from mealie.core import root_logger
-from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from slugify import slugify
 from sqlalchemy.orm import validates
 
+from mealie.core import root_logger
+from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
+
 logger = root_logger.get_logger()
 
 recipes2tags = sa.Table(

mealie/db/models/recipe/tool.py

@@ -1,4 +1,5 @@
 import sqlalchemy as sa
+
 from mealie.db.models._model_base import SqlAlchemyBase
 
 

mealie/db/models/settings.py

@@ -1,8 +1,9 @@
 import sqlalchemy as sa
 import sqlalchemy.orm as orm
+from sqlalchemy.orm import Session
+
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from mealie.db.models.recipe.category import Category, custom_pages2categories, site_settings2categories
-from sqlalchemy.orm import Session
 
 
 class SiteSettings(SqlAlchemyBase, BaseMixins):

mealie/db/models/shopping_list.py

@@ -1,10 +1,11 @@
 import sqlalchemy.orm as orm
-from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
-from mealie.db.models.group import Group
 from requests import Session
 from sqlalchemy import Boolean, Column, ForeignKey, Integer, String
 from sqlalchemy.ext.orderinglist import ordering_list
 
+from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
+from mealie.db.models.group import Group
+
 
 class ShoppingListItem(SqlAlchemyBase, BaseMixins):
     __tablename__ = "shopping_list_items"

mealie/db/models/sign_up.py

@@ -1,6 +1,7 @@
-from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from sqlalchemy import Boolean, Column, Integer, String
 
+from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
+
 
 class SignUp(SqlAlchemyBase, BaseMixins):
     __tablename__ = "sign_ups"

mealie/db/models/users.py

@@ -1,8 +1,9 @@
+from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, orm
+
 from mealie.core.config import settings
 from mealie.db.models._model_base import BaseMixins, SqlAlchemyBase
 from mealie.db.models.group import Group
 from mealie.db.models.recipe.recipe import RecipeModel
-from sqlalchemy import Boolean, Column, ForeignKey, Integer, String, orm
 
 
 class LongLiveToken(SqlAlchemyBase, BaseMixins):