dayhoff-tools 1.4.6__py3-none-any.whl → 1.4.12__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -616,7 +616,6 @@ def engine_status(
         f"[bold]Instance:[/bold]    {engine['instance_id']}",
         f"[bold]Type:[/bold]        {engine['engine_type']} ({engine['instance_type']})",
         f"[bold]Status:[/bold]      {format_status(engine['state'], engine.get('ready'))}",
-        f"[bold]Bootstrap:[/bold]   {_colour_stage(stage_val)}",
         f"[bold]User:[/bold]        {engine['user']}",
         f"[bold]IP:[/bold]          {engine.get('public_ip', 'N/A')}",
         f"[bold]Launched:[/bold]    {launch_time.strftime('%Y-%m-%d %H:%M:%S')} ({format_duration(uptime)} ago)",
@@ -1607,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(
@@ -1619,33 +1621,14 @@ def attach_studio(
                 console.print("[red]❌ Failed to start engine[/red]")
                 raise typer.Exit(1)
             console.print("[green]✓ Engine started[/green]")
-            console.print("Waiting for engine to be ready...")
-            # Wait until the engine is fully running & marked ready (max 5 min)
-            console.print("Waiting for engine to be ready (this can take a couple of minutes)…")
-            # Progress classes already imported at module level – do not re-import to avoid UnboundLocalError
-
-            with Progress(SpinnerColumn(), TimeElapsedColumn(), TextColumn("[progress.description]{task.description}"), transient=True) as prog:
-                prog.add_task("Awaiting engine readiness…", total=None)
-                max_attempts = 30  # 30 × 10 s  ≈ 5 min
-                for _ in range(max_attempts):
-                    time.sleep(10)
-
-                    status_resp = make_api_request("GET", f"/engines/{engine['instance_id']}")
-                    if status_resp.status_code != 200:
-                        continue
-
-                    detailed = status_resp.json().get("engine", {})
-                    state_ok = detailed.get("state", "").lower() == "running"
-                    ready_ok = detailed.get("ready") is True
-
-                    if state_ok and ready_ok:
-                        break
-                else:
-                    console.print("[yellow]Engine is still starting up. If attachment fails, wait a little longer and retry.[/yellow]")
+            # 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)
 
-    # Get SSH key
+    # Retrieve SSH public key (required for authorised_keys provisioning)
     try:
         public_key = get_ssh_public_key()
     except FileNotFoundError as e:
@@ -1654,36 +1637,113 @@ def attach_studio(
 
     console.print(f"Attaching studio to engine [cyan]{engine['name']}[/cyan]...")
 
-    with Progress(
-        SpinnerColumn(),
-        TextColumn("[progress.description]{task.description}"),
-        transient=True,
-    ) as progress:
-        task = progress.add_task("Attaching studio...", total=100)
+    # Determine retry strategy
+    max_attempts = 40 if engine_started_now else 3
+    retry_delay  = 10 if engine_started_now else 3
 
-        response = make_api_request(
-            "POST",
-            f"/studios/{studio['studio_id']}/attach",
-            json_data={
-                "vm_id": engine["instance_id"],
-                "user": target_user,  # Use target_user instead of username
-                "public_key": public_key,
-            },
-        )
+    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)
 
-        progress.update(task, completed=100)
+            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  # good to go
+
+            if error_msg:
+                console.print(f"[red]❌ Failed to attach studio: {error_msg}[/red]")
+                return
+
+            time.sleep(retry_delay)
+
+        else:
+            console.print("[yellow]Could not attach studio – please retry in a moment.[/yellow]")
+            return
+
+    # Successful attach path
+    console.print(f"[green]✓ Studio attached successfully![/green]")
+
+    # Update SSH config - use target_user for the connection
+    update_ssh_config_entry(engine["name"], engine["instance_id"], target_user)
+    console.print(f"[green]✓ SSH config updated[/green]")
+    console.print(f"\nConnect with: [cyan]ssh {engine['name']}[/cyan]")
+    console.print(f"Files are at: [cyan]/studios/{target_user}[/cyan]")
+
+
+def _attempt_studio_attach(studio, engine, target_user, public_key):
+    response = make_api_request(
+        "POST",
+        f"/studios/{studio['studio_id']}/attach",
+        json_data={
+            "vm_id": engine["instance_id"],
+            "user": target_user,
+            "public_key": public_key,
+        },
+    )
 
     if response.status_code == 200:
-        console.print(f"[green]✓ Studio attached successfully![/green]")
+        return True, None
 
-        # Update SSH config - use target_user for the connection
-        update_ssh_config_entry(engine["name"], engine["instance_id"], target_user)
-        console.print(f"[green]✓ SSH config updated[/green]")
-        console.print(f"\nConnect with: [cyan]ssh {engine['name']}[/cyan]")
-        console.print(f"Files are at: [cyan]/studios/{target_user}[/cyan]")
+    # --- determine if we should retry ---
+    recoverable = False
+    if response.status_code in (409, 503):
+        recoverable = True
     else:
+        err_msg = response.json().get("error", "").lower()
+        RECOVERABLE_PATTERNS = [
+            "not ready",
+            "still starting",
+            "initializing",
+            "failed to mount",
+            "device busy",
+            "not available",
+            "pending",  # VM state pending
+        ]
+        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:
+        # fatal – abort immediately and show message
         error = response.json().get("error", "Unknown error")
-        console.print(f"[red]❌ Failed to attach studio: {error}[/red]")
+        return False, error
+
+    # otherwise wait and retry
+    return False, None
 
 
 @studio_app.command("detach")

{dayhoff_tools-1.4.6.dist-info → dayhoff_tools-1.4.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.4.6
+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.6.dist-info → dayhoff_tools-1.4.12.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=A1fs8_8eClQ24hRQSeVALZt-_ABvv_XNLx7KA0UtRSU,83443
+dayhoff_tools/cli/engine_commands.py,sha256=enbpFSLCsmPACL1EOarxCcF8L-TkpiNqq4DB4vhv6X0,85005
 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.6.dist-info/METADATA,sha256=rAMwQNz7gAwDPqfHieIQ4-EiOaCzho3kIlnUVXq7Pdg,2824
-dayhoff_tools-1.4.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.4.6.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.4.6.dist-info/RECORD,,
+dayhoff_tools-1.4.12.dist-info/METADATA,sha256=GjDgKBeFXN1cwgetohVhR8Ix8SD_bTxHAQqd7HrqX_4,2825
+dayhoff_tools-1.4.12.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.4.12.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.4.12.dist-info/RECORD,,