feat: server side search (#2112) (#2117)

* feat: server side search API (#2112)

* refactor repository_recipes filter building

* add food filter to recipe repository page_all

* fix query type annotations

* working search

* add tests and make sure title matches are ordered correctly

* remove instruction matching again

* fix formatting and small issues

* fix another linting error

* make search test no rely on actual words

* fix failing postgres compiled query

* revise incorrectly ordered migration

* automatically extract latest migration version

* test migration orderes

* run type generators

* new search function

* wip: new search page

* sortable field options

* fix virtual scroll issue

* fix search casing bug

* finalize search filters/sorts

* remove old composable

* fix type errors

---------

Co-authored-by: Sören <fleshgolem@gmx.net>

mealie/schema/_mealie/__init__.py

@@ -1,6 +1,7 @@
 # This file is auto-generated by gen_schema_exports.py
-from .mealie_model import MealieModel
+from .mealie_model import HasUUID, MealieModel
 
 __all__ = [
+    "HasUUID",
     "MealieModel",
 ]

mealie/schema/_mealie/mealie_model.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
-from typing import TypeVar
+from collections.abc import Sequence
+from typing import Protocol, TypeVar
 
 from humps.main import camelize
-from pydantic import BaseModel
+from pydantic import UUID4, BaseModel
 
 T = TypeVar("T", bound=BaseModel)
 
@@ -52,3 +53,11 @@ class MealieModel(BaseModel):
             val = getattr(src, field)
             if field in self.__fields__ and (val is not None or replace_null):
                 setattr(self, field, val)
+
+
+class HasUUID(Protocol):
+    id: UUID4
+
+
+def extract_uuids(models: Sequence[HasUUID]) -> list[UUID4]:
+    return [x.id for x in models]

mealie/schema/group/__init__.py

@@ -14,11 +14,7 @@ from .group_events import (
 from .group_exports import GroupDataExport
 from .group_migration import DataMigrationCreate, SupportedMigrations
 from .group_permissions import SetPermissions
-from .group_preferences import (
-    CreateGroupPreferences,
-    ReadGroupPreferences,
-    UpdateGroupPreferences,
-)
+from .group_preferences import CreateGroupPreferences, ReadGroupPreferences, UpdateGroupPreferences
 from .group_seeder import SeederConfig
 from .group_shopping_list import (
     ShoppingListAddRecipeParams,
@@ -41,23 +37,19 @@ from .group_shopping_list import (
     ShoppingListUpdate,
 )
 from .group_statistics import GroupStatistics, GroupStorage
-from .invite_token import (
-    CreateInviteToken,
-    EmailInitationResponse,
-    EmailInvitation,
-    ReadInviteToken,
-    SaveInviteToken,
-)
-from .webhook import (
-    CreateWebhook,
-    ReadWebhook,
-    SaveWebhook,
-    WebhookPagination,
-    WebhookType,
-)
+from .invite_token import CreateInviteToken, EmailInitationResponse, EmailInvitation, ReadInviteToken, SaveInviteToken
+from .webhook import CreateWebhook, ReadWebhook, SaveWebhook, WebhookPagination, WebhookType
 
 __all__ = [
-    "GroupAdminUpdate",
+    "CreateGroupPreferences",
+    "ReadGroupPreferences",
+    "UpdateGroupPreferences",
+    "GroupDataExport",
+    "CreateWebhook",
+    "ReadWebhook",
+    "SaveWebhook",
+    "WebhookPagination",
+    "WebhookType",
     "GroupEventNotifierCreate",
     "GroupEventNotifierOptions",
     "GroupEventNotifierOptionsOut",
@@ -67,13 +59,8 @@ __all__ = [
     "GroupEventNotifierSave",
     "GroupEventNotifierUpdate",
     "GroupEventPagination",
-    "GroupDataExport",
     "DataMigrationCreate",
     "SupportedMigrations",
-    "SetPermissions",
-    "CreateGroupPreferences",
-    "ReadGroupPreferences",
-    "UpdateGroupPreferences",
     "SeederConfig",
     "ShoppingListAddRecipeParams",
     "ShoppingListCreate",
@@ -83,9 +70,9 @@ __all__ = [
     "ShoppingListItemRecipeRefCreate",
     "ShoppingListItemRecipeRefOut",
     "ShoppingListItemRecipeRefUpdate",
-    "ShoppingListItemsCollectionOut",
     "ShoppingListItemUpdate",
     "ShoppingListItemUpdateBulk",
+    "ShoppingListItemsCollectionOut",
     "ShoppingListOut",
     "ShoppingListPagination",
     "ShoppingListRecipeRefOut",
@@ -93,6 +80,8 @@ __all__ = [
     "ShoppingListSave",
     "ShoppingListSummary",
     "ShoppingListUpdate",
+    "GroupAdminUpdate",
+    "SetPermissions",
     "GroupStatistics",
     "GroupStorage",
     "CreateInviteToken",
@@ -100,9 +89,4 @@ __all__ = [
     "EmailInvitation",
     "ReadInviteToken",
     "SaveInviteToken",
-    "CreateWebhook",
-    "ReadWebhook",
-    "SaveWebhook",
-    "WebhookPagination",
-    "WebhookType",
 ]

mealie/schema/recipe/__init__.py

@@ -7,7 +7,6 @@ from .recipe import (
     RecipeCategory,
     RecipeCategoryPagination,
     RecipePagination,
-    RecipePaginationQuery,
     RecipeSummary,
     RecipeTag,
     RecipeTagPagination,
@@ -155,7 +154,6 @@ __all__ = [
     "RecipeCategory",
     "RecipeCategoryPagination",
     "RecipePagination",
-    "RecipePaginationQuery",
     "RecipeSummary",
     "RecipeTag",
     "RecipeTagPagination",

mealie/schema/recipe/recipe.py

@@ -12,7 +12,7 @@ from slugify import slugify
 from mealie.core.config import get_app_dirs
 from mealie.db.models.recipe.recipe import RecipeModel
 from mealie.schema._mealie import MealieModel
-from mealie.schema.response.pagination import PaginationBase, PaginationQuery
+from mealie.schema.response.pagination import PaginationBase
 
 from .recipe_asset import RecipeAsset
 from .recipe_comments import RecipeCommentOut
@@ -102,14 +102,6 @@ class RecipeSummary(MealieModel):
         orm_mode = True
 
 
-class RecipeSummaryWithIngredients(RecipeSummary):
-    recipe_ingredient: list[RecipeIngredient] | None = []
-
-
-class RecipePaginationQuery(PaginationQuery):
-    load_food: bool = False
-
-
 class RecipePagination(PaginationBase):
     items: list[RecipeSummary]
 
@@ -211,5 +203,4 @@ class Recipe(RecipeSummary):
 from mealie.schema.recipe.recipe_ingredient import RecipeIngredient  # noqa: E402
 
 RecipeSummary.update_forward_refs()
-RecipeSummaryWithIngredients.update_forward_refs()
 Recipe.update_forward_refs()

mealie/schema/response/pagination.py

@@ -3,7 +3,7 @@ from typing import Any, Generic, TypeVar
 from urllib.parse import parse_qs, urlencode, urlsplit, urlunsplit
 
 from humps import camelize
-from pydantic import BaseModel
+from pydantic import UUID4, BaseModel
 from pydantic.generics import GenericModel
 
 from mealie.schema._mealie import MealieModel
@@ -16,6 +16,15 @@ class OrderDirection(str, enum.Enum):
     desc = "desc"
 
 
+class RecipeSearchQuery(MealieModel):
+    cookbook: UUID4 | str | None
+    require_all_categories: bool = False
+    require_all_tags: bool = False
+    require_all_tools: bool = False
+    require_all_foods: bool = False
+    search: str | None
+
+
 class PaginationQuery(MealieModel):
     page: int = 1
     per_page: int = 50