Merge branch 'mealie-next' into wakelock

frontend/components/Domain/ShoppingList/ShoppingListItem.vue

@@ -140,7 +140,7 @@ export default defineComponent({
   setup(props, context) {
     const { i18n } = useContext();
     const displayRecipeRefs = ref(false);
-    const itemLabelCols = ref<string>(props.value.checked ? "auto" : props.showLabel ? "8" : "9");
+    const itemLabelCols = ref<string>(props.value.checked ? "auto" : props.showLabel ? "4" : "6");
 
     const contextMenu: actions[] = [
       {

frontend/composables/use-users/preferences.ts

@@ -115,7 +115,7 @@ export function useShoppingListPreferences(): Ref<UserShoppingListPreferences> {
     "shopping-list-preferences",
     {
       viewAllLists: false,
-      viewByLabel: false,
+      viewByLabel: true,
     },
     { mergeDefaults: true }
     // we cast to a Ref because by default it will return an optional type ref

mealie/app.py

@@ -63,6 +63,8 @@ async def lifespan_fn(_: FastAPI) -> AsyncGenerator[None, None]:
         settings.model_dump_json(
             indent=4,
             exclude={
+                "LDAP_QUERY_PASSWORD",
+                "OPENAI_API_KEY",
                 "SECRET",
                 "SFTP_PASSWORD",
                 "SFTP_USERNAME",

mealie/repos/repository_recipes.py

@@ -7,7 +7,7 @@
 from pydantic import UUID4
 from slugify import slugify
 from sqlalchemy.exc import IntegrityError
-from sqlalchemy.orm import InstrumentedAttribute, joinedload
+from sqlalchemy.orm import InstrumentedAttribute
 from typing_extensions import Self
 
 from mealie.db.models.recipe.category import Category
@@ -165,15 +165,6 @@ def page_all(  # type: ignore
         pagination_result = pagination.model_copy()
         q = sa.select(self.model)
 
-        args = [
-            joinedload(RecipeModel.recipe_category),
-            joinedload(RecipeModel.tags),
-            joinedload(RecipeModel.tools),
-            joinedload(RecipeModel.user),
-        ]
-
-        q = q.options(*args)
-
         fltr = self._filter_builder()
         q = q.filter_by(**fltr)
 
@@ -212,6 +203,8 @@ def page_all(  # type: ignore
 
         q, count, total_pages = self.add_pagination_to_query(q, pagination_result)
 
+        # Apply options late, so they do not get used for counting
+        q = q.options(*RecipeSummary.loader_options())
         try:
             data = self.session.execute(q).scalars().unique().all()
         except Exception as e:

mealie/schema/household/group_shopping_list.py

@@ -14,6 +14,7 @@
     ShoppingListRecipeReference,
 )
 from mealie.db.models.recipe import IngredientFoodModel, RecipeModel
+from mealie.db.models.users.users import User
 from mealie.schema._mealie import MealieModel
 from mealie.schema._mealie.mealie_model import UpdatedAtField
 from mealie.schema._mealie.types import NoneFloat
@@ -137,7 +138,9 @@ def loader_options(cls) -> list[LoaderOption]:
             joinedload(ShoppingListItem.label),
             joinedload(ShoppingListItem.unit),
             selectinload(ShoppingListItem.recipe_references),
-            joinedload(ShoppingListItem.shopping_list).joinedload(ShoppingList.user),
+            joinedload(ShoppingListItem.shopping_list)
+            .joinedload(ShoppingList.user)
+            .load_only(User.household_id, User.group_id),
         ]
 
 
@@ -232,7 +235,7 @@ def loader_options(cls) -> list[LoaderOption]:
             .joinedload(ShoppingListRecipeReference.recipe)
             .joinedload(RecipeModel.tools),
             selectinload(ShoppingList.label_settings).joinedload(ShoppingListMultiPurposeLabel.label),
-            joinedload(ShoppingList.user),
+            joinedload(ShoppingList.user).load_only(User.household_id, User.group_id),
         ]
 
 
@@ -279,7 +282,7 @@ def loader_options(cls) -> list[LoaderOption]:
             .joinedload(ShoppingListRecipeReference.recipe)
             .joinedload(RecipeModel.tools),
             selectinload(ShoppingList.label_settings).joinedload(ShoppingListMultiPurposeLabel.label),
-            joinedload(ShoppingList.user),
+            joinedload(ShoppingList.user).load_only(User.household_id, User.group_id),
         ]
 
 

mealie/schema/household/household_preferences.py

@@ -1,5 +1,9 @@
 from pydantic import UUID4, ConfigDict
+from sqlalchemy.orm import joinedload
+from sqlalchemy.orm.interfaces import LoaderOption
 
+from mealie.db.models.household.household import Household
+from mealie.db.models.household.preferences import HouseholdPreferencesModel
 from mealie.schema._mealie import MealieModel
 
 
@@ -27,3 +31,9 @@ class SaveHouseholdPreferences(UpdateHouseholdPreferences):
 class ReadHouseholdPreferences(CreateHouseholdPreferences):
     id: UUID4
     model_config = ConfigDict(from_attributes=True)
+
+    @classmethod
+    def loader_options(cls) -> list[LoaderOption]:
+        return [
+            joinedload(HouseholdPreferencesModel.household).load_only(Household.group_id),
+        ]

mealie/schema/meal_plan/new_meal.py

@@ -10,6 +10,7 @@
 
 from mealie.db.models.household import GroupMealPlan
 from mealie.db.models.recipe import RecipeModel
+from mealie.db.models.users.users import User
 from mealie.schema._mealie import MealieModel
 from mealie.schema.recipe.recipe import RecipeSummary
 from mealie.schema.response.pagination import PaginationBase
@@ -66,7 +67,7 @@ def loader_options(cls) -> list[LoaderOption]:
             selectinload(GroupMealPlan.recipe).joinedload(RecipeModel.recipe_category),
             selectinload(GroupMealPlan.recipe).joinedload(RecipeModel.tags),
             selectinload(GroupMealPlan.recipe).joinedload(RecipeModel.tools),
-            selectinload(GroupMealPlan.user),
+            selectinload(GroupMealPlan.user).load_only(User.household_id),
         ]
 
 

mealie/schema/recipe/recipe.py

@@ -14,6 +14,7 @@
 from sqlalchemy.orm.interfaces import LoaderOption
 
 from mealie.core.config import get_app_dirs
+from mealie.db.models.users.users import User
 from mealie.schema._mealie import MealieModel, SearchType
 from mealie.schema._mealie.mealie_model import UpdatedAtField
 from mealie.schema.response.pagination import PaginationBase
@@ -121,6 +122,15 @@ def clean_strings(val: Any):
 
         return val
 
+    @classmethod
+    def loader_options(cls) -> list[LoaderOption]:
+        return [
+            joinedload(RecipeModel.recipe_category),
+            joinedload(RecipeModel.tags),
+            joinedload(RecipeModel.tools),
+            joinedload(RecipeModel.user).load_only(User.household_id),
+        ]
+
 
 class RecipePagination(PaginationBase):
     items: list[RecipeSummary]

mealie/schema/recipe/recipe_timeline_events.py

@@ -9,6 +9,7 @@
 
 from mealie.core.config import get_app_dirs
 from mealie.db.models.recipe.recipe_timeline import RecipeTimelineEvent
+from mealie.db.models.users.users import User
 from mealie.schema._mealie import MealieModel
 from mealie.schema._mealie.mealie_model import UpdatedAtField
 from mealie.schema.recipe.recipe import Recipe
@@ -67,7 +68,7 @@ class RecipeTimelineEventOut(RecipeTimelineEventCreate):
     def loader_options(cls) -> list[LoaderOption]:
         return [
             joinedload(RecipeTimelineEvent.recipe),
-            joinedload(RecipeTimelineEvent.user),
+            joinedload(RecipeTimelineEvent.user).load_only(User.household_id, User.group_id),
         ]
 
     @classmethod

mealie/schema/user/user.py

@@ -8,7 +8,9 @@
 from sqlalchemy.orm.interfaces import LoaderOption
 
 from mealie.core.config import get_app_dirs, get_app_settings
+from mealie.db.models.recipe.recipe import RecipeModel
 from mealie.db.models.users import User
+from mealie.db.models.users.user_to_recipe import UserToRecipe
 from mealie.db.models.users.users import AuthMethod, LongLiveToken
 from mealie.schema._mealie import MealieModel
 from mealie.schema.group.group_preferences import ReadGroupPreferences
@@ -88,6 +90,12 @@ class UserRatingUpdate(MealieModel):
 class UserRatingOut(UserRatingCreate):
     id: UUID4
 
+    @classmethod
+    def loader_options(cls) -> list[LoaderOption]:
+        return [
+            joinedload(UserToRecipe.recipe).joinedload(RecipeModel.user).load_only(User.household_id, User.group_id)
+        ]
+
 
 class UserRatings(BaseModel, Generic[DataT]):
     ratings: list[DataT]

pyproject.toml

@@ -31,7 +31,7 @@ python = "^3.10"
 python-dateutil = "^2.8.2"
 python-dotenv = "^1.0.0"
 python-ldap = "^3.3.1"
-python-multipart = "^0.0.9"
+python-multipart = "^0.0.10"
 python-slugify = "^8.0.0"
 recipe-scrapers = "^15.0.0"
 requests = "^2.31.0"