dayhoff-tools 1.6.13__py3-none-any.whl → 1.6.15__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -1610,6 +1610,36 @@ def studio_status(
     console.print(panel)
 
 
+def _is_studio_attached(target_studio_id: str, target_vm_id: str) -> bool:
+    """Return True when the given studio already shows as attached to the VM.
+
+    Using this extra check lets us stop the outer retry loop as soon as the
+    asynchronous attach operation actually finishes, even in the unlikely
+    event that the operation-tracking DynamoDB record is not yet updated.
+    """
+    # First try the per-studio endpoint – fastest.
+    resp = make_api_request("GET", f"/studios/{target_studio_id}")
+    if resp.status_code == 200:
+        data = resp.json()
+        if (
+            data.get("status") == "in-use"
+            and data.get("attached_vm_id") == target_vm_id
+        ):
+            return True
+    # Fallback: list + filter (covers edge-cases where the direct endpoint
+    # is slower to update IAM/APIGW mapping than the list endpoint).
+    list_resp = make_api_request("GET", "/studios")
+    if list_resp.status_code == 200:
+        for stu in list_resp.json().get("studios", []):
+            if (
+                stu.get("studio_id") == target_studio_id
+                and stu.get("status") == "in-use"
+                and stu.get("attached_vm_id") == target_vm_id
+            ):
+                return True
+    return False
+
+
 @studio_app.command("attach")
 def attach_studio(
     engine_name_or_id: str = typer.Argument(help="Engine name or instance ID"),
@@ -1710,36 +1740,6 @@ def attach_studio(
 
     console.print(f"Attaching studio to engine [cyan]{engine['name']}[/cyan]...")
 
-    # Helper --------------------------------------------------------------
-    def _is_studio_attached(target_studio_id: str, target_vm_id: str) -> bool:
-        """Return True when the given studio already shows as attached to the VM.
-
-        Using this extra check lets us stop the outer retry loop as soon as the
-        asynchronous attach operation actually finishes, even in the unlikely
-        event that the operation-tracking DynamoDB record is not yet updated.
-        """
-        # First try the per-studio endpoint – fastest.
-        resp = make_api_request("GET", f"/studios/{target_studio_id}")
-        if resp.status_code == 200:
-            data = resp.json()
-            if (
-                data.get("status") == "in-use"
-                and data.get("attached_vm_id") == target_vm_id
-            ):
-                return True
-        # Fallback: list + filter (covers edge-cases where the direct endpoint
-        # is slower to update IAM/APIGW mapping than the list endpoint).
-        list_resp = make_api_request("GET", "/studios")
-        if list_resp.status_code == 200:
-            for stu in list_resp.json().get("studios", []):
-                if (
-                    stu.get("studio_id") == target_studio_id
-                    and stu.get("status") == "in-use"
-                    and stu.get("attached_vm_id") == target_vm_id
-                ):
-                    return True
-        return False
-
     # Determine retry strategy based on whether we just started the engine
     if engine_started_now:
         max_attempts = 40  # About 7 minutes total with exponential backoff
@@ -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.13.dist-info → dayhoff_tools-1.6.15.dist-info}/METADATA

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

{dayhoff_tools-1.6.13.dist-info → dayhoff_tools-1.6.15.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=Loc-ppwuuuAZbj5j2s0aNT5_R1u7oiOx7bDjjWuw3y8,98069
+dayhoff_tools/cli/engine_commands.py,sha256=4svrENpNa5OYqooeWuiXvoXe9h4jfuU9iUBoFOVIEMk,94855
 dayhoff_tools/cli/main.py,sha256=tRN7WCBHg6uyNp6rA54pKTCoVmBntta2i0Yas3bUpZ4,4853
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=FRZTPrjsG_qmIIqoNxd1Q1vVkS_5w8aY33IrVYVNCLg,18131
@@ -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=heaYc64qplgN3_1WVPFmqj53goStioWwY5NqlWc4c0s,24453
-dayhoff_tools-1.6.13.dist-info/METADATA,sha256=Vj0JcsRhUcJE8witxYBmGTiCWLdunubI_01WecoV3Xw,2915
-dayhoff_tools-1.6.13.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.6.13.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.6.13.dist-info/RECORD,,
+dayhoff_tools-1.6.15.dist-info/METADATA,sha256=4jiZolH68BiY1BfLPJFloriU69fF0unsDcLoUKPHlYc,2915
+dayhoff_tools-1.6.15.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.6.15.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.6.15.dist-info/RECORD,,