dayhoff-tools 1.6.14__tar.gz → 1.7.0__tar.gz

{dayhoff_tools-1.6.14 → dayhoff_tools-1.7.0}/PKG-INFO

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

{dayhoff_tools-1.6.14 → dayhoff_tools-1.7.0}/dayhoff_tools/cli/engine_commands.py

@@ -1764,22 +1764,16 @@ def attach_studio(
         last_error = None
 
         for attempt in range(max_attempts):
-            # If the attach already completed in the previous iteration (but we
-            # didn't notice because the operation table wasn't updated yet),
-            # bail out early.
+            # Check if the attach already completed
             if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
-                console.print("[dim]DEBUG: Studio already attached (detected by _is_studio_attached)[/dim]")
                 success = True
                 break
             
-            console.print(f"[dim]DEBUG: Attempt {attempt + 1}/{max_attempts}[/dim]")
             success, error_msg = _attempt_studio_attach(
                 studio, engine, target_user, public_key
             )
-            console.print(f"[dim]DEBUG: Attempt result: success={success}, error_msg={error_msg}[/dim]")
 
             if success:
-                console.print("[dim]DEBUG: Success! Breaking out of retry loop[/dim]")
                 break  # success!
 
             if error_msg:
@@ -1851,33 +1845,19 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
         },
     )
 
-    # DEBUG: Log what we're getting back
-    console.print(f"[dim]DEBUG: Attach response: {response.status_code}[/dim]")
-    if response.status_code not in (200, 202):
-        try:
-            console.print(f"[dim]DEBUG: Error: {response.json().get('error', 'No error field')}[/dim]")
-        except:
-            console.print(f"[dim]DEBUG: Could not parse error response[/dim]")
-
     # Fast-path success
     if response.status_code == 200:
-        console.print("[dim]DEBUG: Got 200 - immediate success[/dim]")
         return True, None
 
     # Asynchronous path – API returned 202 Accepted and operation tracking ID
     if response.status_code == 202:
-        op_id = response.json().get("operation_id")
-        console.print(f"[dim]DEBUG: Got 202 - operation {op_id} started[/dim]")
-        
-        # Instead of polling the operation status (which seems broken),
-        # just wait a bit and check if the studio is actually attached
-        # This is what dh studio status does and it works reliably
+        # The operation status polling is broken in the Lambda, so we just
+        # wait and check if the studio is actually attached
         time.sleep(5)  # Give the async operation a moment to start
         
-        # Now check periodically if the studio is attached
+        # Check periodically if the studio is attached
         for check in range(20):  # Check for up to 60 seconds
             if _is_studio_attached(studio["studio_id"], engine["instance_id"]):
-                console.print("[dim]DEBUG: Studio attachment detected via status check[/dim]")
                 return True, None
             time.sleep(3)
         
@@ -1924,45 +1904,8 @@ def _attempt_studio_attach(studio, engine, target_user, public_key):
     return False, None
 
 
-def _poll_operation(operation_id: str, timeout: int = 600) -> Tuple[bool, str]:
-    """Poll `/operations/<id>` until it reports COMPLETED or FAILED.
-
-    Returns (True, "") on success or (False, error_message) on failure or
-    timeout.
-
-    IMPORTANT: This helper deliberately *avoids* creating its own Rich Live/
-    spinner so that it can be called from inside another Progress/Live context
-    (the outer "Attaching studio…" progress bar).  Nested Live renderables lead
-    to constant hide/show repaint cycles, which is what caused the flickering
-    the user observed.
-    """
-    start_ts = time.time()
-    while True:
-        # ---- timeout guard -------------------------------------------------
-        if time.time() - start_ts > timeout:
-            return False, "Timed out waiting for attach operation to complete"
-
-        # ---- fetch status ---------------------------------------------------
-        op_resp = make_api_request("GET", f"/operations/{operation_id}")
-        if op_resp.status_code != 200:
-            console.print(f"[dim]DEBUG: Operation poll failed: HTTP {op_resp.status_code}[/dim]")
-            return False, (
-                f"Failed to fetch operation status (HTTP {op_resp.status_code})"
-            )
-        data = op_resp.json()
-        op_status = data.get("status")
-        console.print(f"[dim]DEBUG: Operation status: {op_status}[/dim]")
-
-        # ---- interpret state -----------------------------------------------
-        if op_status == "COMPLETED":
-            console.print("[dim]DEBUG: Operation completed successfully[/dim]")
-            return True, ""
-        if op_status == "FAILED":
-            console.print(f"[dim]DEBUG: Operation failed: {data.get('error', 'Operation failed')}[/dim]")
-            return False, data.get("error", "Operation failed")
-
-        # Not finished yet – wait a little and poll again (no live spinner)
-        time.sleep(3)
+# Note: _poll_operation was removed because the Lambda's operation tracking is broken.
+# We now use _is_studio_attached() to check if the studio is actually attached instead.
     
 
 @studio_app.command("detach")

{dayhoff_tools-1.6.14 → dayhoff_tools-1.7.0}/pyproject.toml

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