dsimaging-admin 0.3.2__tar.gz → 0.3.4__tar.gz

{dsimaging_admin-0.3.2 → dsimaging_admin-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dsimaging-admin
-Version: 0.3.2
+Version: 0.3.4
 Summary: Admin CLI for managing medical imaging datasets in S3/MinIO for DataSHIELD
 Project-URL: Homepage, https://github.com/isglobal-brge/dsimaging-admin
 Project-URL: Repository, https://github.com/isglobal-brge/dsimaging-admin

{dsimaging_admin-0.3.2 → dsimaging_admin-0.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "dsimaging-admin"
-version = "0.3.2"
+version = "0.3.4"
 description = "Admin CLI for managing medical imaging datasets in S3/MinIO for DataSHIELD"
 readme = "README.md"
 license = "MIT"

{dsimaging_admin-0.3.2 → dsimaging_admin-0.3.4}/src/dsimaging_admin/__init__.py

@@ -1,3 +1,3 @@
 """dsimaging-admin: Admin CLI for managing medical imaging datasets in S3/MinIO."""
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"

{dsimaging_admin-0.3.2 → dsimaging_admin-0.3.4}/src/dsimaging_admin/s3.py

@@ -33,6 +33,8 @@ def list_datasets(s3, bucket: str) -> list[dict]:
     for page in paginator.paginate(Bucket=bucket, Prefix="datasets/", Delimiter="/"):
         for cp in page.get("CommonPrefixes", []):
             ds_id = cp["Prefix"].strip("/").split("/")[-1]
+            if not _prefix_has_current_objects(s3, bucket, f"datasets/{ds_id}/"):
+                continue
             has_manifest = _object_exists(s3, bucket, f"datasets/{ds_id}/manifest.yaml")
             datasets.append({
                 "dataset_id": ds_id,
@@ -175,3 +177,12 @@ def _object_exists(s3, bucket: str, key: str) -> bool:
         return True
     except Exception:
         return False
+
+
+def _prefix_has_current_objects(s3, bucket: str, prefix: str) -> bool:
+    paginator = s3.get_paginator("list_objects_v2")
+    for page in paginator.paginate(Bucket=bucket, Prefix=prefix):
+        for obj in page.get("Contents", []):
+            if _object_exists(s3, bucket, obj["Key"]):
+                return True
+    return False