dayhoff-tools 1.4.10__tar.gz → 1.4.12__tar.gz

{dayhoff_tools-1.4.10 → dayhoff_tools-1.4.12}/PKG-INFO

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

{dayhoff_tools-1.4.10 → dayhoff_tools-1.4.12}/dayhoff_tools/cli/engine_commands.py

@@ -1606,6 +1606,9 @@ def attach_studio(
     engines = response.json().get("engines", [])
     engine = resolve_engine(engine_name_or_id, engines)
 
+    # Flag to track if we started the engine in this command (affects retry length)
+    engine_started_now: bool = False
+
     if engine["state"].lower() != "running":
         console.print(f"[yellow]⚠️  Engine is {engine['state']}[/yellow]")
         if engine["state"].lower() == "stopped" and Confirm.ask(
@@ -1618,14 +1621,13 @@ def attach_studio(
                 console.print("[red]❌ Failed to start engine[/red]")
                 raise typer.Exit(1)
             console.print("[green]✓ Engine started[/green]")
+            # Mark that we booted the engine so attach loop gets extended retries
+            engine_started_now = True
             # No further waiting here – attachment attempts below handle retry logic while the
             # engine finishes booting.
         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()
@@ -1635,33 +1637,55 @@ 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:
+        # Quick path: engine is already running – try a couple of times then fail fast
+        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  # good to go
 
             if error_msg:
                 console.print(f"[red]❌ Failed to attach studio: {error_msg}[/red]")
                 return
 
-            time.sleep(RETRY_DELAY)
+            time.sleep(retry_delay)
 
         else:
-            console.print("[yellow]Engine is still starting up – please retry in a minute.[/yellow]")
+            console.print("[yellow]Could not attach studio – please retry in a moment.[/yellow]")
             return
 
     # Successful attach path

{dayhoff_tools-1.4.10 → dayhoff_tools-1.4.12}/pyproject.toml

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