test(all): old utility endpoint now tested

Author: grololo06

QA/py/tests/test_admin.py

@@ -10,7 +10,6 @@
 from tests.test_import import do_import_uvp6
 
 PROJECT_DIGEST_URL = "/admin/images/{project_id}/digest?max_digests=100"
-DIGEST_URL = "/admin/images/digest"
 NIGHTLY_URL = "/admin/nightly"
 
 
@@ -36,10 +35,6 @@ def test_admin_images(fastapi):
     assert rsp.status_code == status.HTTP_200_OK
     assert rsp.json() == "Digest for 0 images done."
 
-    rsp = fastapi.get(DIGEST_URL, headers=ADMIN_AUTH)
-    assert rsp.status_code == status.HTTP_200_OK
-    assert rsp.json() == "Digest for 0 images done."
-
 
 def do_nightly(fastapi):
     rsp = fastapi.get(NIGHTLY_URL, headers=ADMIN_AUTH)

QA/py/tests/test_admin_images.py

@@ -0,0 +1,30 @@
+from starlette import status
+
+from tests.credentials import ADMIN_AUTH, USER_AUTH
+from tests.test_admin import PROJECT_DIGEST_URL
+from tests.test_import import do_import_uvp6
+
+CLEANUP_URL = "/admin/images/cleanup1?project_id={project_id}"
+
+
+def test_admin_images_cleanup(fastapi):
+    # Prepare a project with some images
+    prj_id = do_import_uvp6(fastapi, "Test Project Admin Images Cleanup1")
+
+    url = PROJECT_DIGEST_URL.format(project_id=prj_id)
+    rsp = fastapi.get(url, headers=ADMIN_AUTH)
+    assert rsp.status_code == status.HTTP_200_OK
+    assert isinstance(rsp.json(), str)
+    assert "Digest for" in rsp.json()
+
+    url = CLEANUP_URL.format(project_id=prj_id)
+
+    # Simple user cannot access the admin cleanup endpoint
+    rsp = fastapi.get(url, headers=USER_AUTH)
+    assert rsp.status_code == status.HTTP_403_FORBIDDEN
+
+    # Admin can
+    rsp = fastapi.get(url, headers=ADMIN_AUTH)
+    assert rsp.status_code == status.HTTP_200_OK
+    assert isinstance(rsp.json(), str)
+    assert rsp.json().startswith("Dupl remover for")

QA/py/tests/test_collections.py

@@ -177,9 +177,9 @@ def test_collection_lifecycle(fastapi, who):
 
     # update the project_ids
     url = COLLECTION_UPDATE_URL.format(collection_id=coll_id)
-    the_coll = {"project_ids": [6, prj_id]}
+    the_coll = {"project_ids": [-1, prj_id]}
     rsp = fastapi.patch(url, headers=who, json=the_coll)
-    assert rsp.status_code == status.HTTP_200_OK
+    assert rsp.status_code == status.HTTP_404_NOT_FOUND
     # reset to previous for compatibility with other tests
     url = COLLECTION_UPDATE_URL.format(collection_id=coll_id)
     the_coll = {"project_ids": [prj_id]}
@@ -202,7 +202,7 @@ def test_collection_lifecycle(fastapi, who):
     assert rsp.status_code == status.HTTP_200_OK
     assert rsp.json() == []
 
-    # Delete the collection
+    # Delete the collection. Note: It will cascade errors if a problem prevents it
     url = COLLECTION_DELETE_URL.format(collection_id=coll_id)
     rsp = fastapi.delete(url, headers=who)
     if who == CREATOR_AUTH:

py/API_operations/admin/ImageManager.py

@@ -127,9 +127,9 @@ def _md5_on_record(self, img_file: ImageFile, imgid: int, orig_file_name: str):
             logger.exception(e)
             img_file.state = ImageFileStateEnum.ERROR.value
 
-    def do_cleanup_dup_same_obj(  # TODO: Not working and not tested anyway
+    def do_cleanup_dup_same_obj(
         self, current_user_id: UserIDT, prj_id: ProjectIDT, max_deletes: int
-    ) -> str:
+    ) -> str:  #
         """
         Simplest duplication pattern. Inside the same object there are several identical images.
         """
@@ -139,7 +139,7 @@ def do_cleanup_dup_same_obj(  # TODO: Not working and not tested anyway
         orig_img = aliased(Image, name="orig")
         orig_file = aliased(ImageFile, name="orig_file")
         qry = self.session.query(
-            orig_img.file_name, orig_img.imgid, Image, ImageFile
+            orig_img.orig_file_name, orig_img.imgid, Image, ImageFile
         )  # Select what to delete
         qry = (
             qry.join(ObjectHeader, ObjectHeader.objid == Image.objid)
@@ -166,13 +166,6 @@ def do_cleanup_dup_same_obj(  # TODO: Not working and not tested anyway
                 ImageFile.state == ImageFileStateEnum.OK.value,
             ),
         )
-        qry = qry.join(
-            orig_file,
-            and_(
-                orig_file.path == orig_img.file_name,
-                orig_file.state == ImageFileStateEnum.OK.value,
-            ),
-        )
         # and the same value of course
         qry = qry.filter(
             and_(
@@ -202,7 +195,10 @@ def do_cleanup_dup_same_obj(  # TODO: Not working and not tested anyway
                 continue
             # Even if MD5s match, be paranoid and compare files
             orig_path = self.vault.image_path(orig_file_name)
-            dup_path = self.vault.image_path(an_image.file_name)
+            img_file_name = Image.img_from_id_and_orig(
+                an_image.imgid, an_image.orig_file_name
+            )
+            dup_path = self.vault.image_path(img_file_name)
             assert orig_path != dup_path
             orig_exists = exists(orig_path)
             dup_exists = exists(dup_path)
@@ -232,7 +228,7 @@ def do_cleanup_dup_same_obj(  # TODO: Not working and not tested anyway
             # Do the cleanup
             deleted_imgids.add(an_image.imgid)
             if dup_exists:
-                remover.add_files([an_image.file_name])
+                remover.add_files([img_file_name])
             self.session.delete(an_image)
             self.session.delete(an_image_file)
         # Wait for the files handled

py/main.py

@@ -159,7 +159,6 @@
 from DB.Project import ProjectTaxoStat, Project
 from DB.ProjectPrivilege import ProjectPrivilege
 from DB.User import User, OrganizationIDT
-from helpers.Asyncio import async_bg_run, log_streamer
 from helpers.DynamicLogs import get_logger, get_api_logger, MONITOR_LOG_PATH
 from helpers.fastApiUtils import (
     internal_server_error_handler,
@@ -3490,33 +3489,6 @@ def digest_project_images(
     return ret
 
 
-@app.get(
-    "/admin/images/digest",
-    operation_id="digest_images",
-    tags=["WIP"],
-    include_in_schema=False,
-    response_model=str,
-)  # TODO: Looks like a duplicate of above
-def digest_images(
-    max_digests: Optional[int] = Query(
-        default=100000, description="Number of images to scan."
-    ),
-    project_id: Optional[int] = Query(
-        default=None, description="Internal, numeric id of the project."
-    ),
-    current_user: int = Depends(get_current_user),
-) -> str:
-    """
-    Compute digests if they are not.
-    """
-    with ImageManagerService() as sce:
-        with RightsThrower():
-            ret: str = sce.do_digests(
-                current_user, prj_id=project_id, max_digests=max_digests
-            )
-    return ret
-
-
 @app.get(
     "/admin/images/cleanup1",
     operation_id="cleanup_images_1",