dayhoff-tools 1.4.9__py3-none-any.whl → 1.4.10__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -1623,6 +1623,9 @@ def attach_studio(
         else:
             raise typer.Exit(1)
 
+    # Track whether this command just started the engine (affects retry length)
+    engine_started_now = False
+
     # Retrieve SSH public key (required for authorised_keys provisioning)
     try:
         public_key = get_ssh_public_key()
@@ -1639,7 +1642,7 @@ def attach_studio(
         transient=True,
     ) as prog:
         task = prog.add_task("Attaching studio (engine is still booting)…", total=None)
-        ATTEMPT_LIMIT = 40  # ~6-7 min max (40 × 10 s)
+        ATTEMPT_LIMIT = 40 if engine_started_now else 6  # shorter retries for already-running engines
         RETRY_DELAY = 10
         for attempt in range(ATTEMPT_LIMIT):
             success, error_msg = _attempt_studio_attach(studio, engine, target_user, public_key)
@@ -1648,7 +1651,8 @@ def attach_studio(
                 break  # success!
 
             # Update spinner description with attempt number
-            prog.update(task, description=f"Attaching studio (engine is still booting)… {attempt+1}/{ATTEMPT_LIMIT}")
+            if attempt % 3 == 0:  # update every 3rd attempt to avoid spam
+                prog.update(task, description=f"Attaching studio (engine is still booting)… {attempt+1}/{ATTEMPT_LIMIT}")
 
             if error_msg:
                 console.print(f"[red]❌ Failed to attach studio: {error_msg}[/red]")
@@ -1699,7 +1703,14 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
             "not available",
             "pending",  # VM state pending
         ]
-        if any(p in err_msg for p in RECOVERABLE_PATTERNS):
+        FATAL_PATTERNS = [
+            "in-use",
+            "already attached",
+            "permission",
+        ]
+        if any(p in err_msg for p in FATAL_PATTERNS):
+            recoverable = False
+        elif any(p in err_msg for p in RECOVERABLE_PATTERNS):
             recoverable = True
 
     if not recoverable:

{dayhoff_tools-1.4.9.dist-info → dayhoff_tools-1.4.10.dist-info}/METADATA

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

{dayhoff_tools-1.4.9.dist-info → dayhoff_tools-1.4.10.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=jZvSCjyuwYD7VkLgNZtPdql1DIRfV1cBqxfCeX7He-Y,83666
+dayhoff_tools/cli/engine_commands.py,sha256=ul6hdl3oMLXeKqwG5p9bjZbWJisU_l9siObg1Ls_fKs,84109
 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.9.dist-info/METADATA,sha256=W66afkFiTx--DfzPdtSb3FqaZtskSvpboofWw9KvACQ,2824
-dayhoff_tools-1.4.9.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.4.9.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.4.9.dist-info/RECORD,,
+dayhoff_tools-1.4.10.dist-info/METADATA,sha256=Fenvb3Ijq1lKIoXpOaqu2Sb3tS82qQSgHN5iLFd1c9E,2825
+dayhoff_tools-1.4.10.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.4.10.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.4.10.dist-info/RECORD,,