dayhoff-tools 1.13.10__py3-none-any.whl → 1.13.11__py3-none-any.whl

dayhoff_tools/deployment/deploy_aws.py

@@ -344,46 +344,55 @@ def create_or_update_job_definition(
             f"Adding mount points to job definition: {batch_job_config['mountPoints']}"
         )
 
-    # Auto-mount Primordial Drive if available
-    # This ensures all batch jobs have access to shared datasets at /primordial/
-    primordial_fs_id = get_primordial_fs_id(session)
-    if primordial_fs_id:
-        print(f"Adding Primordial Drive configuration (fs_id: {primordial_fs_id})")
-
-        # Add volume configuration
-        efs_volume = {
-            "name": "primordial",
-            "efsVolumeConfiguration": {
-                "fileSystemId": primordial_fs_id,
-                "rootDirectory": "/",
-            },
-        }
-
-        if "volumes" not in container_properties:
-            container_properties["volumes"] = []
-
-        # Check if already added to avoid duplicates
-        if not any(
-            v.get("name") == "primordial" for v in container_properties["volumes"]
-        ):
-            container_properties["volumes"].append(efs_volume)
-
-        # Add mount point
-        mount_point = {
-            "sourceVolume": "primordial",
-            "containerPath": "/primordial",
-            "readOnly": False,
-        }
-
-        if "mountPoints" not in container_properties:
-            container_properties["mountPoints"] = []
-
-        # Check if already added
-        if not any(
-            mp.get("containerPath") == "/primordial"
-            for mp in container_properties["mountPoints"]
-        ):
-            container_properties["mountPoints"].append(mount_point)
+    # Mount Primordial Drive if explicitly enabled via feature flag
+    # Add 'mount_primordial_drive' to features list to mount shared EFS at /primordial/
+    features = config.get("features", []) or []
+    features_set = {f if isinstance(f, str) else next(iter(f)) for f in features}
+    mount_primordial = "mount_primordial_drive" in features_set
+
+    if mount_primordial:
+        primordial_fs_id = get_primordial_fs_id(session)
+        if primordial_fs_id:
+            print(f"Adding Primordial Drive configuration (fs_id: {primordial_fs_id})")
+
+            # Add volume configuration
+            efs_volume = {
+                "name": "primordial",
+                "efsVolumeConfiguration": {
+                    "fileSystemId": primordial_fs_id,
+                    "rootDirectory": "/",
+                },
+            }
+
+            if "volumes" not in container_properties:
+                container_properties["volumes"] = []
+
+            # Check if already added to avoid duplicates
+            if not any(
+                v.get("name") == "primordial" for v in container_properties["volumes"]
+            ):
+                container_properties["volumes"].append(efs_volume)
+
+            # Add mount point
+            mount_point = {
+                "sourceVolume": "primordial",
+                "containerPath": "/primordial",
+                "readOnly": False,
+            }
+
+            if "mountPoints" not in container_properties:
+                container_properties["mountPoints"] = []
+
+            # Check if already added
+            if not any(
+                mp.get("containerPath") == "/primordial"
+                for mp in container_properties["mountPoints"]
+            ):
+                container_properties["mountPoints"].append(mount_point)
+        else:
+            print(
+                "Warning: mount_primordial_drive enabled but Primordial Drive not found in this environment"
+            )
 
     # Check if job definition already exists using the session client
     try:

{dayhoff_tools-1.13.10.dist-info → dayhoff_tools-1.13.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dayhoff-tools
-Version: 1.13.10
+Version: 1.13.11
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.13.10.dist-info → dayhoff_tools-1.13.11.dist-info}/RECORD

@@ -29,7 +29,7 @@ dayhoff_tools/cli/main.py,sha256=Nz_jtbppmvWKHZydQ0nkt_eejccJE90ces8xCGrerdY,708
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=e2P4dCCtoqMUGNyb0lFBZ6GZpl5Zslm1qqE5qIvsy38,50765
 dayhoff_tools/deployment/base.py,sha256=fM9zyhuRvIK8YqY6ooYg9j6wy_8touA_L-dkV7FA5q4,18058
-dayhoff_tools/deployment/deploy_aws.py,sha256=3xNuGvwDKvICfiLXVeM4Oz8MXQ363voTM-6vXHtEHZY,20987
+dayhoff_tools/deployment/deploy_aws.py,sha256=1j16aE4hmln4pQVtcSGuIGVWbOBfWwveytvihjofADo,21519
 dayhoff_tools/deployment/deploy_gcp.py,sha256=xgaOVsUDmP6wSEMYNkm1yRNcVskfdz80qJtCulkBIAM,8860
 dayhoff_tools/deployment/deploy_utils.py,sha256=KyUFZZWn8NGT9QpR0HGqkX-huOFubvYCabko9SlC5Gg,26516
 dayhoff_tools/deployment/job_runner.py,sha256=hljvFpH2Bw96uYyUup5Ths72PZRL_X27KxlYzBMgguo,5086
@@ -48,7 +48,7 @@ dayhoff_tools/intake/uniprot.py,sha256=BZYJQF63OtPcBBnQ7_P9gulxzJtqyorgyuDiPeOJq
 dayhoff_tools/logs.py,sha256=DKdeP0k0kliRcilwvX0mUB2eipO5BdWUeHwh-VnsICs,838
 dayhoff_tools/sqlite.py,sha256=jV55ikF8VpTfeQqqlHSbY8OgfyfHj8zgHNpZjBLos_E,18672
 dayhoff_tools/warehouse.py,sha256=UETBtZD3r7WgvURqfGbyHlT7cxoiVq8isjzMuerKw8I,24475
-dayhoff_tools-1.13.10.dist-info/METADATA,sha256=RwVcLNZbrSHXOK8jbzm9c3bPchOE3sZAET6k1VYV0zQ,2981
-dayhoff_tools-1.13.10.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-dayhoff_tools-1.13.10.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.13.10.dist-info/RECORD,,
+dayhoff_tools-1.13.11.dist-info/METADATA,sha256=BkD-bKUPgbnhU1G91rDs7Ex8bGPQ4JTwoG5Netpfs7g,2981
+dayhoff_tools-1.13.11.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dayhoff_tools-1.13.11.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.13.11.dist-info/RECORD,,