refactor(BA-4092): Use VFolderFilterStatusFailed for invalid purge status

- Replace VFolderInvalidParameter with VFolderFilterStatusFailed in
  repository purge_vfolder() for consistency with existing error types
- Remove try-except in API handler since VFolderFilterStatusFailed
  already inherits from HTTPBadRequest
- Update tests accordingly

Author: fregataa

src/ai/backend/manager/api/vfolder.py

@@ -1938,14 +1938,11 @@ async def purge(request: web.Request, params: PurgeRequestModel) -> web.Response
     ):
         raise InsufficientPrivilege("You are not allowed to purge vfolders")
 
-    try:
-        await root_ctx.processors.vfolder.purge_vfolder.wait_for_complete(
-            PurgeVFolderAction(
-                purger=Purger(row_class=VFolderRow, pk_value=folder_id),
-            )
+    await root_ctx.processors.vfolder.purge_vfolder.wait_for_complete(
+        PurgeVFolderAction(
+            purger=Purger(row_class=VFolderRow, pk_value=folder_id),
         )
-    except VFolderInvalidParameter as e:
-        raise InvalidAPIParameters(str(e))
+    )
 
     return web.Response(status=HTTPStatus.NO_CONTENT)
 

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

@@ -30,6 +30,7 @@
 from ai.backend.manager.errors.resource import DBOperationFailed, ProjectNotFound
 from ai.backend.manager.errors.storage import (
     VFolderDeletionNotAllowed,
+    VFolderFilterStatusFailed,
     VFolderInvalidParameter,
     VFolderNotFound,
 )
@@ -423,7 +424,7 @@ async def purge_vfolder(self, purger: Purger[VFolderRow]) -> VFolderData:
 
         Raises:
             VFolderNotFound: If the vfolder doesn't exist.
-            VFolderInvalidParameter: If the vfolder status is not purgable.
+            VFolderFilterStatusFailed: If the vfolder status is not purgable.
         """
         vfolder_uuid = cast(uuid.UUID, purger.pk_value)
         async with self._db.begin_session() as session:
@@ -432,9 +433,7 @@ async def purge_vfolder(self, purger: Purger[VFolderRow]) -> VFolderData:
             if vfolder_row is None:
                 raise VFolderNotFound(extra_data=str(vfolder_uuid))
             if vfolder_row.status not in vfolder_status_map[VFolderStatusSet.PURGABLE]:
-                raise VFolderInvalidParameter(
-                    f"Cannot purge vfolder with status {vfolder_row.status}"
-                )
+                raise VFolderFilterStatusFailed
             await execute_purger(session, purger)
             return vfolder_row.to_data()
 

tests/unit/manager/repositories/vfolder/test_vfolder_repository.py

@@ -21,7 +21,7 @@
     VFolderOperationStatus,
     VFolderOwnershipType,
 )
-from ai.backend.manager.errors.storage import VFolderInvalidParameter, VFolderNotFound
+from ai.backend.manager.errors.storage import VFolderFilterStatusFailed, VFolderNotFound
 from ai.backend.manager.models.agent import AgentRow
 from ai.backend.manager.models.deployment_auto_scaling_policy import DeploymentAutoScalingPolicyRow
 from ai.backend.manager.models.deployment_policy import DeploymentPolicyRow
@@ -710,7 +710,7 @@ async def test_purge_vfolder_invalid_status(
 
         purger = Purger(row_class=VFolderRow, pk_value=vfolder_id)
 
-        with pytest.raises(VFolderInvalidParameter):
+        with pytest.raises(VFolderFilterStatusFailed):
             await vfolder_repository.purge_vfolder(purger)
 
         # Verify vfolder still exists in DB (not deleted)

tests/unit/manager/services/vfolder/test_vfolder_service.py

@@ -17,7 +17,7 @@
     VFolderOperationStatus,
     VFolderOwnershipType,
 )
-from ai.backend.manager.errors.storage import VFolderInvalidParameter, VFolderNotFound
+from ai.backend.manager.errors.storage import VFolderFilterStatusFailed, VFolderNotFound
 from ai.backend.manager.models.vfolder import VFolderRow
 from ai.backend.manager.repositories.base.purger import Purger
 from ai.backend.manager.repositories.vfolder.repository import VfolderRepository
@@ -128,12 +128,10 @@ async def test_purge_vfolder_invalid_status_propagates(
         mock_vfolder_repository: MagicMock,
         sample_action: PurgeVFolderAction,
     ) -> None:
-        """Test that VFolderInvalidParameter from repository is propagated."""
-        mock_vfolder_repository.purge_vfolder = AsyncMock(
-            side_effect=VFolderInvalidParameter("Cannot purge vfolder with status ready")
-        )
+        """Test that VFolderFilterStatusFailed from repository is propagated."""
+        mock_vfolder_repository.purge_vfolder = AsyncMock(side_effect=VFolderFilterStatusFailed)
 
-        with pytest.raises(VFolderInvalidParameter):
+        with pytest.raises(VFolderFilterStatusFailed):
             await vfolder_service.purge(sample_action)
 
         mock_vfolder_repository.purge_vfolder.assert_called_once_with(sample_action.purger)