dayhoff-tools 1.4.11__tar.gz → 1.4.13__tar.gz

{dayhoff_tools-1.4.11 → dayhoff_tools-1.4.13}/PKG-INFO

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

{dayhoff_tools-1.4.11 → dayhoff_tools-1.4.13}/dayhoff_tools/cli/engine_commands.py

@@ -1637,33 +1637,62 @@ def attach_studio(
 
     console.print(f"Attaching studio to engine [cyan]{engine['name']}[/cyan]...")
 
-    with Progress(
-        SpinnerColumn(),
-        TimeElapsedColumn(),
-        TextColumn("[progress.description]{task.description}"),
-        transient=True,
-    ) as prog:
-        task = prog.add_task("Attaching studio (engine is still booting)…", total=None)
-        ATTEMPT_LIMIT = 40 if engine_started_now else 6  # shorter retries for already-running engines
-        RETRY_DELAY = 10
-        for attempt in range(ATTEMPT_LIMIT):
+    # Determine retry strategy
+    max_attempts = 40 if engine_started_now else 3
+    retry_delay  = 10 if engine_started_now else 3
+
+    if engine_started_now:
+        # Long spinner-based loop while the freshly started engine finishes booting
+        with Progress(
+            SpinnerColumn(),
+            TimeElapsedColumn(),
+            TextColumn("[progress.description]{task.description}"),
+            transient=True,
+        ) as prog:
+            task = prog.add_task("Attaching studio (engine is still booting)…", total=None)
+
+            for attempt in range(max_attempts):
+                success, error_msg = _attempt_studio_attach(studio, engine, target_user, public_key)
+
+                if success:
+                    break  # success!
+
+                # Update spinner every 3rd try to avoid log spam
+                if attempt % 3 == 0:
+                    prog.update(task, description=f"Attaching studio (engine is still booting)… {attempt+1}/{max_attempts}")
+
+                if error_msg:
+                    console.print(f"[red]❌ Failed to attach studio: {error_msg}[/red]")
+                    return
+
+                time.sleep(retry_delay)
+
+            else:
+                console.print("[yellow]Engine is still starting up – please retry in a minute.[/yellow]")
+                return
+    else:
+        # Give the (already-running) engine a little breathing room – e.g. it may still be mounting EFS
+        max_attempts = 10  # ~1 min total
+        retry_delay  = 6
+
+        for attempt in range(max_attempts):
             success, error_msg = _attempt_studio_attach(studio, engine, target_user, public_key)
 
             if success:
-                break  # success!
-
-            # Update spinner description with attempt number
-            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}")
+                break  # attached!
 
             if error_msg:
+                # Fatal – bubble up immediately
                 console.print(f"[red]❌ Failed to attach studio: {error_msg}[/red]")
                 return
 
-            time.sleep(RETRY_DELAY)
+            # Recoverable and still not ready – short wait + optional info
+            if attempt < max_attempts - 1:
+                console.print("[dim]Engine not ready yet – retrying …[/dim]")
+                time.sleep(retry_delay)
 
         else:
-            console.print("[yellow]Engine is still starting up – please retry in a minute.[/yellow]")
+            console.print("[yellow]Engine is busy or still initialising – please retry in about a minute.[/yellow]")
             return
 
     # Successful attach path

{dayhoff_tools-1.4.11 → dayhoff_tools-1.4.13}/pyproject.toml

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