dayhoff-tools 1.13.10__tar.gz → 1.13.12__tar.gz

{dayhoff_tools-1.13.10 → dayhoff_tools-1.13.12}/PKG-INFO

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

{dayhoff_tools-1.13.10 → dayhoff_tools-1.13.12}/dayhoff_tools/deployment/base.py

@@ -177,8 +177,14 @@ def build_job_image(config: dict) -> str:
     platform = docker_config.get("platform", "linux/amd64")
     build_image_command.extend(["--platform", platform])
 
-    # Add build context
-    build_image_command.append(".")  # Use the root of the repo as image context
+    # Add build args if provided (for parameterized Dockerfiles)
+    build_args = docker_config.get("build_args", {})
+    for arg_name, arg_value in build_args.items():
+        build_image_command.extend(["--build-arg", f"{arg_name}={arg_value}"])
+
+    # Add build context (defaults to "." for backward compatibility)
+    build_context = docker_config.get("build_context", ".")
+    build_image_command.append(build_context)
     subprocess.run(build_image_command, check=True)
 
     # Get and print image size

{dayhoff_tools-1.13.10 → dayhoff_tools-1.13.12}/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 → dayhoff_tools-1.13.12}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.13.10"
+version = "1.13.12"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}