dayhoff-tools 1.4.16__py3-none-any.whl → 1.4.18__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -429,6 +429,11 @@ def launch_engine(
         "-s",
         help="Boot disk size in GB (default: 50GB, min: 20GB, max: 1000GB)",
     ),
+    availability_zone: Optional[str] = typer.Option(
+        None,
+        "--az",
+        help="Prefer a specific Availability Zone (e.g., us-east-1b). If omitted the service will try all public subnets.",
+    ),
 ):
     """Launch a new engine instance."""
     username = check_aws_sso()
@@ -471,6 +476,8 @@ def launch_engine(
         }
         if boot_disk_size is not None:
             request_data["boot_disk_size"] = boot_disk_size
+        if availability_zone:
+            request_data["availability_zone"] = availability_zone
 
         response = make_api_request("POST", "/engines", json_data=request_data)
 
@@ -1262,20 +1269,25 @@ def create_ami(
     ec2 = boto3.client("ec2", region_name="us-east-1")
 
     try:
-        # First, we need to clean up the sentinel file via SSM
-        console.print("Cleaning up bootstrap sentinel file...")
+        # First, we need to clean up the instance before snapshotting
+        console.print("Cleaning up instance for AMI creation...")
         ssm = boto3.client("ssm", region_name="us-east-1")
 
+        # Stop SSM, wipe registration, remove sentinel, and clear logs/history
+        cleanup_commands = [
+            "sudo systemctl stop amazon-ssm-agent",
+            "sudo rm -rf /var/lib/amazon/ssm/* /etc/amazon/ssm/*",
+            "sudo rm -f /opt/dayhoff/first_boot_complete.sentinel",
+            "history -c",
+            "sudo rm -rf /tmp/* /var/log/messages /var/log/cloud-init.log",
+        ]
+
         cleanup_response = ssm.send_command(
             InstanceIds=[engine["instance_id"]],
             DocumentName="AWS-RunShellScript",
             Parameters={
-                "commands": [
-                    "sudo rm -f /opt/dayhoff/first_boot_complete.sentinel",
-                    "history -c",
-                    "sudo rm -rf /tmp/* /var/log/*",
-                ],
-                "executionTimeout": ["60"],
+                "commands": cleanup_commands,
+                "executionTimeout": ["120"],
             },
         )
 

{dayhoff_tools-1.4.16.dist-info → dayhoff_tools-1.4.18.dist-info}/METADATA

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

{dayhoff_tools-1.4.16.dist-info → dayhoff_tools-1.4.18.dist-info}/RECORD

@@ -3,7 +3,7 @@ dayhoff_tools/chemistry/standardizer.py,sha256=uMn7VwHnx02nc404eO6fRuS4rsl4dvSPf
 dayhoff_tools/chemistry/utils.py,sha256=jt-7JgF-GeeVC421acX-bobKbLU_X94KNOW24p_P-_M,2257
 dayhoff_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dayhoff_tools/cli/cloud_commands.py,sha256=33qcWLmq-FwEXMdL3F0OHm-5Stlh2r65CldyEZgQ1no,40904
-dayhoff_tools/cli/engine_commands.py,sha256=rdNQGSrXmRqwk6_olIPxt2E4anSyDB-yrgNcQc317as,85436
+dayhoff_tools/cli/engine_commands.py,sha256=e7Dkm6QQ0C2nzbldBksvjeOrxAqYB3wC4a8RwjZzsXA,85998
 dayhoff_tools/cli/main.py,sha256=rgeEHD9lJ8SBCR34BTLb7gVInHUUdmEBNXAJnq5yEU4,4795
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=qs8vH9TBFHsOPC3X8cU3qZigM3dDn-2Ytq4o_F2WubU,27874
@@ -27,7 +27,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=8YbnQ--usrEgDQGfvpV4MrMji55A0rq2hZaOgFGh6ag,15896
-dayhoff_tools-1.4.16.dist-info/METADATA,sha256=2AquY7xrPM_wPzlG98zXepFLURHkpWfJzjJWWQXHjlI,2825
-dayhoff_tools-1.4.16.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.4.16.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.4.16.dist-info/RECORD,,
+dayhoff_tools-1.4.18.dist-info/METADATA,sha256=uWo9GtGIyOYbWlMuiLGSw2nE94aKmC0RA_TaArPT1b4,2825
+dayhoff_tools-1.4.18.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.4.18.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.4.18.dist-info/RECORD,,