dayhoff-tools 1.4.17__py3-none-any.whl → 1.4.19__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -686,9 +686,8 @@ def engine_status(
         status_lines.append("")
         status_lines.append("[bold]Attached Studios:[/bold]")
         for studio in attached_studios:
-            attach_time = studio.get("attach_time", "Unknown")
             status_lines.append(
-                f"  • {studio['user']} ({studio['studio_id']}) - attached {attach_time}"
+                f"  • {studio['user']} ({studio['studio_id']})"
             )
 
     console.print(Panel("\n".join(status_lines), title="Engine Status", border_style="blue"))
@@ -1269,20 +1268,26 @@ 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")
 
+        # Clean up instance state, stopping SSM agent last to allow proper status reporting
+        cleanup_commands = [
+            "sudo rm -f /opt/dayhoff/first_boot_complete.sentinel",
+            "history -c",
+            "sudo rm -rf /tmp/* /var/log/messages /var/log/cloud-init.log",
+            "sudo rm -rf /var/lib/amazon/ssm/* /etc/amazon/ssm/*",
+            # Stop SSM agent last with a delay to allow status reporting
+            "sleep 2 && sudo systemctl stop amazon-ssm-agent &",
+        ]
+
         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"],
             },
         )
 
@@ -1297,9 +1302,14 @@ def create_ami(
             if result["Status"] in ["Success", "Failed"]:
                 break
 
-        if result["Status"] != "Success":
+        # Note: InProgress status is expected when SSM agent stops itself
+        if result["Status"] not in ["Success", "InProgress"]:
+            console.print(
+                f"[yellow]⚠️  Warning: Cleanup command status: {result['Status']}[/yellow]"
+            )
+        elif result["Status"] == "InProgress":
             console.print(
-                "[yellow]⚠️  Warning: Cleanup command may have failed[/yellow]"
+                "[dim]ℹ️  Cleanup command still in progress (expected when SSM agent stops itself)[/dim]"
             )
 
         # Get instance details to find volumes to exclude

{dayhoff_tools-1.4.17.dist-info → dayhoff_tools-1.4.19.dist-info}/METADATA

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

{dayhoff_tools-1.4.17.dist-info → dayhoff_tools-1.4.19.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=5-nRqW5g7o1cAid49fPi21toL90fGqxfS2ovlG_x1pQ,85746
+dayhoff_tools/cli/engine_commands.py,sha256=jXaUXbdpZKssFbMdwT6brvTuBmLkYdIHcjt3L5ZP6Ys,86313
 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.17.dist-info/METADATA,sha256=bNFA69p0roBs1SGTr8H-T2zIpGV51rGpPCunC99Y9eQ,2825
-dayhoff_tools-1.4.17.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.4.17.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.4.17.dist-info/RECORD,,
+dayhoff_tools-1.4.19.dist-info/METADATA,sha256=ycGToXMGp3AgtO9yKGlzTSfMBl7ZKIfm7UbDW12G2Hg,2825
+dayhoff_tools-1.4.19.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.4.19.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.4.19.dist-info/RECORD,,