refactor(BA-5947): route model_cards loader through SearchModelCardsAction

Replace the bespoke batch_load_by_vfolder_ids action/service/processor/repo
chain with the same shape used by deployment.batch_load_revisions_by_ids:
the adapter constructs a ``BatchQuerier`` (``NoPagination`` +
``ModelCardConditions.by_vfolder_ids`` + most-recent/id ordering) and
delegates to the existing ``SearchModelCardsAction``. The grouping by
``vfolder_id`` happens once in the adapter where the GQL connection is
also assembled.

This removes the standalone batch_load_by_vfolder_ids action file, the
service method, the processor attribute, and the repository/db_source
helpers. The ``test_batch_load_by_vfolder_ids`` repo test is dropped
together with the db_source method it pinned; the search path is
already covered by the broader model_card search tests.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Author: fregataa

src/ai/backend/manager/api/adapters/model_card/adapter.py

@@ -68,11 +68,13 @@
 from ai.backend.manager.models.model_card.orders import ModelCardOrders
 from ai.backend.manager.models.model_card.row import ModelCardRow
 from ai.backend.manager.repositories.base import (
+    BatchQuerier,
     QueryCondition,
     QueryOrder,
     combine_conditions_or,
     negate_conditions,
 )
+from ai.backend.manager.repositories.base.pagination import NoPagination
 from ai.backend.manager.repositories.base.rbac.entity_creator import RBACEntityCreator
 from ai.backend.manager.repositories.base.updater import Updater
 from ai.backend.manager.repositories.model_card.creators import ModelCardCreatorSpec
@@ -82,9 +84,6 @@
 from ai.backend.manager.services.model_card.actions.available_presets import (
     AvailablePresetsAction,
 )
-from ai.backend.manager.services.model_card.actions.batch_load_by_vfolder_ids import (
-    BatchLoadModelCardsByVFolderIdsAction,
-)
 from ai.backend.manager.services.model_card.actions.create import CreateModelCardAction
 from ai.backend.manager.services.model_card.actions.delete import DeleteModelCardAction
 from ai.backend.manager.services.model_card.actions.scan import ScanProjectModelCardsAction
@@ -229,10 +228,23 @@ async def batch_load_by_vfolder_ids(
         """
         if not vfolder_ids:
             return []
-        action_result = await self._processors.model_card.batch_load_model_cards_by_vfolder_ids.wait_for_complete(
-            BatchLoadModelCardsByVFolderIdsAction(vfolder_ids=list(vfolder_ids))
+        querier = BatchQuerier(
+            pagination=NoPagination(),
+            conditions=[ModelCardConditions.by_vfolder_ids(list(vfolder_ids))],
+            orders=[
+                ModelCardOrders.created_at(ascending=False),
+                ModelCardOrders.id(ascending=False),
+            ],
         )
-        return [[self._data_to_node(item) for item in cards] for cards in action_result.data]
+        result = await self._processors.model_card.search.wait_for_complete(
+            SearchModelCardsAction(querier=querier)
+        )
+        cards_by_vfolder: dict[VFolderUUID, list[ModelCardNode]] = {}
+        for data in result.items:
+            cards_by_vfolder.setdefault(VFolderUUID(data.vfolder_id), []).append(
+                self._data_to_node(data)
+            )
+        return [cards_by_vfolder.get(vfolder_id, []) for vfolder_id in vfolder_ids]
 
     async def get(self, card_id: UUID) -> ModelCardNode:
         conditions: list[QueryCondition] = [lambda: ModelCardRow.id == card_id]

src/ai/backend/manager/models/model_card/conditions.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+from collections.abc import Collection
 from uuid import UUID
 
 import sqlalchemy as sa
@@ -11,6 +12,7 @@
     UUIDEqualMatchSpec,
     UUIDInMatchSpec,
 )
+from ai.backend.common.identifier.vfolder import VFolderUUID
 from ai.backend.manager.models.condition_utils import (
     make_nested_string_in_factory,
     make_string_in_factory,
@@ -23,6 +25,13 @@
 
 
 class ModelCardConditions:
+    @staticmethod
+    def by_vfolder_ids(vfolder_ids: Collection[VFolderUUID]) -> QueryCondition:
+        def inner() -> sa.sql.expression.ColumnElement[bool]:
+            return ModelCardRow.vfolder.in_(vfolder_ids)
+
+        return inner
+
     @staticmethod
     def by_domain(domain_name: str) -> QueryCondition:
         def inner() -> sa.sql.expression.ColumnElement[bool]:

src/ai/backend/manager/repositories/model_card/db_source/db_source.py

@@ -19,7 +19,6 @@
     SearchDeploymentRevisionPresetsInput,
 )
 from ai.backend.common.dto.manager.v2.model_card.request import DeleteModelCardOptions
-from ai.backend.common.identifier.vfolder import VFolderUUID
 from ai.backend.common.types import VFolderID, VFolderUsageMode
 from ai.backend.logging.utils import BraceStyleAdapter
 from ai.backend.manager.data.group.types import ProjectType
@@ -90,35 +89,6 @@ async def get_by_id(self, card_id: UUID) -> ModelCardData:
                 raise ModelCardNotFound()
             return row.to_data()
 
-    async def batch_load_by_vfolder_ids(
-        self,
-        vfolder_ids: Sequence[VFolderUUID],
-    ) -> list[list[ModelCardData]]:
-        """Group all model cards backed by each requested vfolder.
-
-        Returns one inner list per input vfolder (same order); each inner list
-        is sorted by ``created_at`` descending so the most recent card appears
-        first. The (name, domain, project) unique constraint does not extend
-        to ``vfolder``, so a vfolder may legitimately back multiple cards.
-        """
-        if not vfolder_ids:
-            return []
-        async with self._db.begin_readonly_session() as session:
-            # ``id`` tiebreaks cards that share a ``created_at`` (e.g. siblings
-            # written by ``bulk_upsert_scan`` in one statement) so the per-vfolder
-            # order is stable across requests, matching the tiebreaker used by
-            # ``_model_card_pagination_spec``.
-            stmt = (
-                sa.select(ModelCardRow)
-                .where(ModelCardRow.vfolder.in_(list(vfolder_ids)))
-                .order_by(ModelCardRow.created_at.desc(), ModelCardRow.id.desc())
-            )
-            rows = (await session.execute(stmt)).scalars().all()
-            cards_by_vfolder: dict[VFolderUUID, list[ModelCardData]] = {}
-            for row in rows:
-                cards_by_vfolder.setdefault(row.vfolder, []).append(row.to_data())
-            return [cards_by_vfolder.get(vfolder_id, []) for vfolder_id in vfolder_ids]
-
     async def update(self, updater: Updater[ModelCardRow]) -> ModelCardData:
         async with self._db.begin_session() as session:
             result = await execute_updater(session, updater)

src/ai/backend/manager/repositories/model_card/repository.py

@@ -8,7 +8,6 @@
     SearchDeploymentRevisionPresetsInput,
 )
 from ai.backend.common.dto.manager.v2.model_card.request import DeleteModelCardOptions
-from ai.backend.common.identifier.vfolder import VFolderUUID
 from ai.backend.logging import BraceStyleAdapter
 from ai.backend.manager.data.model_card.types import ModelCardData, VFolderScanData
 from ai.backend.manager.models.model_card.row import ModelCardRow
@@ -40,12 +39,6 @@ async def create(self, creator: RBACEntityCreator[ModelCardRow]) -> ModelCardDat
     async def get_by_id(self, card_id: UUID) -> ModelCardData:
         return await self._db_source.get_by_id(card_id)
 
-    async def batch_load_by_vfolder_ids(
-        self,
-        vfolder_ids: Sequence[VFolderUUID],
-    ) -> list[list[ModelCardData]]:
-        return await self._db_source.batch_load_by_vfolder_ids(vfolder_ids)
-
     async def update(self, updater: Updater[ModelCardRow]) -> ModelCardData:
         return await self._db_source.update(updater)
 

src/ai/backend/manager/services/model_card/actions/batch_load_by_vfolder_ids.py

@@ -9,10 +9,6 @@
     AvailablePresetsAction,
     AvailablePresetsActionResult,
 )
-from ai.backend.manager.services.model_card.actions.batch_load_by_vfolder_ids import (
-    BatchLoadModelCardsByVFolderIdsAction,
-    BatchLoadModelCardsByVFolderIdsActionResult,
-)
 from ai.backend.manager.services.model_card.actions.create import (
     CreateModelCardAction,
     CreateModelCardActionResult,
@@ -50,10 +46,6 @@ class ModelCardProcessors(AbstractProcessorPackage):
     ]
     scan: ActionProcessor[ScanProjectModelCardsAction, ScanProjectModelCardsActionResult]
     available_presets: ActionProcessor[AvailablePresetsAction, AvailablePresetsActionResult]
-    batch_load_model_cards_by_vfolder_ids: ActionProcessor[
-        BatchLoadModelCardsByVFolderIdsAction,
-        BatchLoadModelCardsByVFolderIdsActionResult,
-    ]
 
     def __init__(
         self,
@@ -74,9 +66,6 @@ def __init__(
         )
         self.scan = ActionProcessor(service.scan, action_monitors)
         self.available_presets = ActionProcessor(service.available_presets, action_monitors)
-        self.batch_load_model_cards_by_vfolder_ids = ActionProcessor(
-            service.batch_load_by_vfolder_ids, action_monitors
-        )
 
     @override
     def supported_actions(self) -> list[ActionSpec]:
@@ -88,5 +77,4 @@ def supported_actions(self) -> list[ActionSpec]:
             SearchModelCardsInProjectAction.spec(),
             ScanProjectModelCardsAction.spec(),
             AvailablePresetsAction.spec(),
-            BatchLoadModelCardsByVFolderIdsAction.spec(),
         ]

src/ai/backend/manager/services/model_card/processors.py

@@ -16,10 +16,6 @@
     AvailablePresetsAction,
     AvailablePresetsActionResult,
 )
-from ai.backend.manager.services.model_card.actions.batch_load_by_vfolder_ids import (
-    BatchLoadModelCardsByVFolderIdsAction,
-    BatchLoadModelCardsByVFolderIdsActionResult,
-)
 from ai.backend.manager.services.model_card.actions.create import (
     CreateModelCardAction,
     CreateModelCardActionResult,
@@ -77,12 +73,6 @@ async def delete(self, action: DeleteModelCardAction) -> DeleteModelCardActionRe
         data = await self._repository.delete(action.id, action.options)
         return DeleteModelCardActionResult(model_card=data)
 
-    async def batch_load_by_vfolder_ids(
-        self, action: BatchLoadModelCardsByVFolderIdsAction
-    ) -> BatchLoadModelCardsByVFolderIdsActionResult:
-        data = await self._repository.batch_load_by_vfolder_ids(action.vfolder_ids)
-        return BatchLoadModelCardsByVFolderIdsActionResult(data=data)
-
     async def search(self, action: SearchModelCardsAction) -> SearchModelCardsActionResult:
         result = await self._repository.search(action.querier)
         return SearchModelCardsActionResult(