dayhoff-tools 1.13.7__py3-none-any.whl → 1.13.9__py3-none-any.whl

dayhoff_tools/cli/engines_studios/api_client.py

@@ -120,7 +120,7 @@ class StudioManagerClient:
         """
         url = f"{self.api_url}{path}"
         response = requests.request(method, url, **kwargs)
-        
+
         # Parse error body if request failed
         if not response.ok:
             try:
@@ -128,10 +128,10 @@ class StudioManagerClient:
                 error_message = error_body.get("error", response.text)
             except Exception:
                 error_message = response.text or f"HTTP {response.status_code}"
-            
+
             # Raise exception with the actual error message from API
             raise RuntimeError(error_message)
-            
+
         return response.json()
 
     # Engine operations

dayhoff_tools/cli/engines_studios/engine_commands.py

@@ -75,6 +75,7 @@ def _update_ssh_config_silent(client: StudioManagerClient, env: str) -> bool:
             config_entries.append(f"\nHost {name}\n")
             config_entries.append(f"    HostName {instance_id}\n")
             config_entries.append(f"    User {user}\n")
+            config_entries.append(f"    ForwardAgent yes\n")
             config_entries.append(
                 f"    ProxyCommand aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p' --profile {profile}\n"
             )
@@ -886,6 +887,7 @@ def config_ssh(clean: bool, all: bool, admin: bool, env: Optional[str]):
             config_entries.append(f"\nHost {name}\n")
             config_entries.append(f"    HostName {instance_id}\n")
             config_entries.append(f"    User {username}\n")
+            config_entries.append(f"    ForwardAgent yes\n")
             config_entries.append(
                 f"    ProxyCommand aws ssm start-session --target %h --document-name AWS-StartSSHSession --parameters 'portNumber=%p' --profile {aws_profile}\n"
             )

dayhoff_tools/cli/engines_studios/progress.py

@@ -207,8 +207,12 @@ def format_idle_state(
 
                     if isinstance(value, list):
                         if value:  # Only show non-empty lists
-                            # All lists shown with bullets, no header for containers/connections/sessions
-                            if key in ["containers", "connections", "sessions"]:
+                            # Show workload containers with clear header
+                            if key == "containers":
+                                # Show actual workload container names that are keeping engine active
+                                for item in value[:5]:
+                                    lines.append(f"    • {item}")
+                            elif key in ["connections", "sessions"]:
                                 # Just show the items with bullets, no header
                                 for item in value[:5]:
                                     lines.append(f"    • {item}")

dayhoff_tools/cli/engines_studios/simulators/studio_list_simulator.py

@@ -20,7 +20,9 @@ def colorize(text: str, color_code: str) -> str:
     return f"\033[{color_code}m{text}\033[0m"
 
 
-def format_list_output(studios: list[dict[str, Any]], engines_map: dict[str, str], env: str = "dev") -> None:
+def format_list_output(
+    studios: list[dict[str, Any]], engines_map: dict[str, str], env: str = "dev"
+) -> None:
     """Format and print studio list output matching the actual CLI."""
 
     # Header with blue account name
@@ -31,7 +33,9 @@ def format_list_output(studios: list[dict[str, Any]], engines_map: dict[str, str
         return
 
     # Calculate dynamic width for User column (longest user + 2 for padding)
-    max_user_len = max((len(studio.get("user", "unknown")) for studio in studios), default=4)
+    max_user_len = max(
+        (len(studio.get("user", "unknown")) for studio in studios), default=4
+    )
     user_width = max(max_user_len + 2, len("User") + 2)
 
     # Calculate dynamic width for Attached To column
@@ -41,7 +45,9 @@ def format_list_output(studios: list[dict[str, Any]], engines_map: dict[str, str
             instance_id = studio["attached_to"]
             engine_name = engines_map.get(instance_id, "unknown")
             max_attached_len = max(max_attached_len, len(engine_name))
-    attached_width = max(max_attached_len + 2, len("Attached To") + 2, 3)  # At least 3 for "-"
+    attached_width = max(
+        max_attached_len + 2, len("Attached To") + 2, 3
+    )  # At least 3 for "-"
 
     # Fixed widths for other columns
     status_width = 12
@@ -49,13 +55,39 @@ def format_list_output(studios: list[dict[str, Any]], engines_map: dict[str, str
     id_width = 25
 
     # Table top border
-    print("╭" + "─" * (user_width + 1) + "┬" + "─" * (status_width + 1) + "┬" + "─" * (attached_width + 1) + "┬" + "─" * (size_width + 1) + "┬" + "─" * (id_width + 1) + "╮")
+    print(
+        "╭"
+        + "─" * (user_width + 1)
+        + "┬"
+        + "─" * (status_width + 1)
+        + "┬"
+        + "─" * (attached_width + 1)
+        + "┬"
+        + "─" * (size_width + 1)
+        + "┬"
+        + "─" * (id_width + 1)
+        + "╮"
+    )
 
     # Table header
-    print(f"│ {'User':<{user_width}}│ {'Status':<{status_width}}│ {'Attached To':<{attached_width}}│ {'Size':<{size_width}}│ {'Studio ID':<{id_width}}│")
+    print(
+        f"│ {'User':<{user_width}}│ {'Status':<{status_width}}│ {'Attached To':<{attached_width}}│ {'Size':<{size_width}}│ {'Studio ID':<{id_width}}│"
+    )
 
     # Header separator
-    print("├" + "─" * (user_width + 1) + "┼" + "─" * (status_width + 1) + "┼" + "─" * (attached_width + 1) + "┼" + "─" * (size_width + 1) + "┼" + "─" * (id_width + 1) + "┤")
+    print(
+        "├"
+        + "─" * (user_width + 1)
+        + "┼"
+        + "─" * (status_width + 1)
+        + "┼"
+        + "─" * (attached_width + 1)
+        + "┼"
+        + "─" * (size_width + 1)
+        + "┼"
+        + "─" * (id_width + 1)
+        + "┤"
+    )
 
     # Table rows
     for studio in studios:
@@ -67,7 +99,7 @@ def format_list_output(studios: list[dict[str, Any]], engines_map: dict[str, str
 
         # Truncate if needed
         if len(user) > user_width - 1:
-            user = user[:user_width - 1]
+            user = user[: user_width - 1]
 
         # Color the user (blue)
         user_display = colorize(f"{user:<{user_width}}", "34")
@@ -75,7 +107,9 @@ def format_list_output(studios: list[dict[str, Any]], engines_map: dict[str, str
         # Format status - display "in-use" as "attached" in purple
         if status == "in-use":
             display_status = "attached"
-            status_display = colorize(f"{display_status:<{status_width}}", "35")  # Purple
+            status_display = colorize(
+                f"{display_status:<{status_width}}", "35"
+            )  # Purple
         elif status == "available":
             status_display = colorize(f"{status:<{status_width}}", "32")  # Green
         elif status in ["attaching", "detaching"]:
@@ -99,10 +133,24 @@ def format_list_output(studios: list[dict[str, Any]], engines_map: dict[str, str
         # Color the studio ID (grey)
         studio_id_display = colorize(f"{studio_id:<{id_width}}", "90")
 
-        print(f"│ {user_display}│ {status_display}│ {attached_display}│ {size:<{size_width}}│ {studio_id_display}│")
+        print(
+            f"│ {user_display}│ {status_display}│ {attached_display}│ {size:<{size_width}}│ {studio_id_display}│"
+        )
 
     # Table bottom border
-    print("╰" + "─" * (user_width + 1) + "┴" + "─" * (status_width + 1) + "┴" + "─" * (attached_width + 1) + "┴" + "─" * (size_width + 1) + "┴" + "─" * (id_width + 1) + "╯")
+    print(
+        "╰"
+        + "─" * (user_width + 1)
+        + "┴"
+        + "─" * (status_width + 1)
+        + "┴"
+        + "─" * (attached_width + 1)
+        + "┴"
+        + "─" * (size_width + 1)
+        + "┴"
+        + "─" * (id_width + 1)
+        + "╯"
+    )
 
     print(f"Total: {len(studios)}\n")
 
@@ -309,7 +357,9 @@ def main():
             print("=" * 80 + "\n")
 
             env = args.env if args.env else scenario_data["env"]
-            format_list_output(scenario_data["studios"], scenario_data["engines_map"], env)
+            format_list_output(
+                scenario_data["studios"], scenario_data["engines_map"], env
+            )
             print()  # Extra newline between scenarios
     else:
         # Show specific scenario
@@ -322,4 +372,3 @@ def main():
 
 if __name__ == "__main__":
     main()
-

dayhoff_tools/cli/engines_studios/studio_commands.py

@@ -222,9 +222,18 @@ def studio_status(user: Optional[str], env: Optional[str]):
         click.echo(f"User: {studio['user']}")
         # Status in blue
         click.echo(f"Status: \033[34m{studio['status']}\033[0m")
-        # Attached to in blue (if present)
+        # Attached to in blue (if present) - resolve instance ID to engine name
         if studio.get("attached_to"):
-            click.echo(f"Attached to: \033[34m{studio['attached_to']}\033[0m")
+            instance_id = studio["attached_to"]
+            # Try to resolve instance ID to engine name
+            engine_name = instance_id  # Default to instance ID if not found
+            try:
+                engine = client.get_engine_by_name(instance_id)
+                if engine:
+                    engine_name = engine.get("name", instance_id)
+            except Exception:
+                pass  # Fall back to instance ID
+            click.echo(f"Attached to: \033[34m{engine_name}\033[0m")
         click.echo(f"Account: {env}")
         click.echo(f"Size: {studio['size_gb']}GB")
         if studio.get("created_at"):
@@ -272,7 +281,9 @@ def list_studios(env: Optional[str]):
             engines_map[engine["instance_id"]] = engine["name"]
 
         # Calculate dynamic width for User column (longest user + 2 for padding)
-        max_user_len = max((len(studio.get("user", "unknown")) for studio in studios), default=4)
+        max_user_len = max(
+            (len(studio.get("user", "unknown")) for studio in studios), default=4
+        )
         user_width = max(max_user_len + 2, len("User") + 2)
 
         # Calculate dynamic width for Attached To column
@@ -282,7 +293,9 @@ def list_studios(env: Optional[str]):
                 instance_id = studio["attached_to"]
                 engine_name = engines_map.get(instance_id, "unknown")
                 max_attached_len = max(max_attached_len, len(engine_name))
-        attached_width = max(max_attached_len + 2, len("Attached To") + 2, 3)  # At least 3 for "-"
+        attached_width = max(
+            max_attached_len + 2, len("Attached To") + 2, 3
+        )  # At least 3 for "-"
 
         # Fixed widths for other columns - reordered to [User, Status, Attached To, Size, Studio ID]
         status_width = 12
@@ -290,7 +303,19 @@ def list_studios(env: Optional[str]):
         id_width = 25
 
         # Table top border
-        click.echo("╭" + "─" * (user_width + 1) + "┬" + "─" * (status_width + 1) + "┬" + "─" * (attached_width + 1) + "┬" + "─" * (size_width + 1) + "┬" + "─" * (id_width + 1) + "╮")
+        click.echo(
+            "╭"
+            + "─" * (user_width + 1)
+            + "┬"
+            + "─" * (status_width + 1)
+            + "┬"
+            + "─" * (attached_width + 1)
+            + "┬"
+            + "─" * (size_width + 1)
+            + "┬"
+            + "─" * (id_width + 1)
+            + "╮"
+        )
 
         # Table header - reordered to [User, Status, Attached To, Size, Studio ID]
         click.echo(
@@ -298,7 +323,19 @@ def list_studios(env: Optional[str]):
         )
 
         # Header separator
-        click.echo("├" + "─" * (user_width + 1) + "┼" + "─" * (status_width + 1) + "┼" + "─" * (attached_width + 1) + "┼" + "─" * (size_width + 1) + "┼" + "─" * (id_width + 1) + "┤")
+        click.echo(
+            "├"
+            + "─" * (user_width + 1)
+            + "┼"
+            + "─" * (status_width + 1)
+            + "┼"
+            + "─" * (attached_width + 1)
+            + "┼"
+            + "─" * (size_width + 1)
+            + "┼"
+            + "─" * (id_width + 1)
+            + "┤"
+        )
 
         # Table rows
         for studio in studios:
@@ -310,7 +347,7 @@ def list_studios(env: Optional[str]):
 
             # Truncate if needed
             if len(user) > user_width - 1:
-                user = user[:user_width - 1]
+                user = user[: user_width - 1]
 
             # Color the user (blue)
             user_display = f"\033[34m{user:<{user_width}}\033[0m"
@@ -318,7 +355,9 @@ def list_studios(env: Optional[str]):
             # Format status - display "in-use" as "attached" in purple
             if status == "in-use":
                 display_status = "attached"
-                status_display = f"\033[35m{display_status:<{status_width}}\033[0m"  # Purple
+                status_display = (
+                    f"\033[35m{display_status:<{status_width}}\033[0m"  # Purple
+                )
             elif status == "available":
                 status_display = f"\033[32m{status:<{status_width}}\033[0m"  # Green
             elif status in ["attaching", "detaching"]:
@@ -326,9 +365,13 @@ def list_studios(env: Optional[str]):
             elif status == "attached":
                 status_display = f"\033[35m{status:<{status_width}}\033[0m"  # Purple
             elif status == "error":
-                status_display = f"\033[31m{status:<{status_width}}\033[0m"  # Red for error
+                status_display = (
+                    f"\033[31m{status:<{status_width}}\033[0m"  # Red for error
+                )
             else:
-                status_display = f"{status:<{status_width}}"  # No color for other states
+                status_display = (
+                    f"{status:<{status_width}}"  # No color for other states
+                )
 
             # Format Attached To column
             if attached_to:
@@ -347,7 +390,19 @@ def list_studios(env: Optional[str]):
             )
 
         # Table bottom border
-        click.echo("╰" + "─" * (user_width + 1) + "┴" + "─" * (status_width + 1) + "┴" + "─" * (attached_width + 1) + "┴" + "─" * (size_width + 1) + "┴" + "─" * (id_width + 1) + "╯")
+        click.echo(
+            "╰"
+            + "─" * (user_width + 1)
+            + "┴"
+            + "─" * (status_width + 1)
+            + "┴"
+            + "─" * (attached_width + 1)
+            + "┴"
+            + "─" * (size_width + 1)
+            + "┴"
+            + "─" * (id_width + 1)
+            + "╯"
+        )
 
         click.echo(f"Total: {len(studios)}\n")
 

{dayhoff_tools-1.13.7.dist-info → dayhoff_tools-1.13.9.dist-info}/METADATA

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

{dayhoff_tools-1.13.7.dist-info → dayhoff_tools-1.13.9.dist-info}/RECORD

@@ -11,20 +11,20 @@ dayhoff_tools/cli/engine1/engine_management.py,sha256=s_H3FtMlKsdfzR8pwV-j2W2QX-
 dayhoff_tools/cli/engine1/shared.py,sha256=Ecx6I1jtzmxQDn3BezKpgpQ4SJeZf4SZjUCLg-67p80,16844
 dayhoff_tools/cli/engine1/studio_commands.py,sha256=VwTQujz32-uMcYusDRE73SdzRpgvIkv7ZAF4zRv6AzA,30266
 dayhoff_tools/cli/engines_studios/__init__.py,sha256=E6aG0C6qjJnJuClemSKRFlYvLUL49MQZOvfqNQ7SDKs,159
-dayhoff_tools/cli/engines_studios/api_client.py,sha256=McZyyh5H36gkrK6s6Z7s9hl7yLLSLrHjsBtR4Opg6Ko,13491
+dayhoff_tools/cli/engines_studios/api_client.py,sha256=7puTEpr3ukcguZr5aqRaSXLKM9Et799lnXwiywPvPz8,13459
 dayhoff_tools/cli/engines_studios/auth.py,sha256=rwetV5hp4jSvK8FyvKgXCnezLOZx1aW8oiSDc6U83iE,5189
 dayhoff_tools/cli/engines_studios/engine-studio-cli.md,sha256=or4k7ZZKPMTkvu67PdcUTE2_cxjnj0HQxxTuJZR1uiA,29924
-dayhoff_tools/cli/engines_studios/engine_commands.py,sha256=HZKWKgKcSADQ6giW5kq8UwYPY4nCrVofE3PNB0bFPi8,38249
-dayhoff_tools/cli/engines_studios/progress.py,sha256=SMahdG2YmO5bEPSONrfAXVTdS6m_69Ep02t3hc2DdKQ,9264
+dayhoff_tools/cli/engines_studios/engine_commands.py,sha256=8utssuiLfxrff3Pk3PjMSUIVMU83mm9N8-Ny1uQr9es,38371
+dayhoff_tools/cli/engines_studios/progress.py,sha256=VW70t7sEHlbLpCi6LOaY19Rp1Kx6Rt9CKNnmaZWFteA,9496
 dayhoff_tools/cli/engines_studios/simulators/cli-simulators.md,sha256=FZJl6nehdr2Duht2cx3yijcak0yKyOaHTrTzvFTAfZs,4976
 dayhoff_tools/cli/engines_studios/simulators/demo.sh,sha256=8tYABSCxLNXqGs-4r071V9mpKNZ5DTQ34WZ-v3d5s94,5364
 dayhoff_tools/cli/engines_studios/simulators/engine_list_simulator.py,sha256=vUrB6gV9UX74L5uCRMTVcPmk_1ZOuP1jYJf6cMP7dOE,9525
 dayhoff_tools/cli/engines_studios/simulators/engine_status_simulator.py,sha256=KUm3gA2MiRgGrQV7KURhb5zabM18-30z_ugRjiq5iso,13024
 dayhoff_tools/cli/engines_studios/simulators/idle_status_simulator.py,sha256=F_MfEXdPKNVDCKgJV72QyU2oMG8hLt-Bwic4yFadRXE,17570
 dayhoff_tools/cli/engines_studios/simulators/simulator_utils.py,sha256=HA08pIMJWV3OFrWj3Ca8GldvgJZfFoTOloyLK0UWMgA,6729
-dayhoff_tools/cli/engines_studios/simulators/studio_list_simulator.py,sha256=CHqxeTApdYneOngfGCAZiNxi9al_yAP1hNhVsQJ57V4,11197
+dayhoff_tools/cli/engines_studios/simulators/studio_list_simulator.py,sha256=ntizeR0BJLdJOwCRBKPajc2xT-BL7SNnONxfgxXDgr8,11609
 dayhoff_tools/cli/engines_studios/simulators/studio_status_simulator.py,sha256=6WvpnRawJVaQf_H81zuR1_66igRRVxPxjAt8e69xjp4,5394
-dayhoff_tools/cli/engines_studios/studio_commands.py,sha256=0x0x2DZ7LWXQZOq0rKWdguVp2QQCrkSUjK43O6jnLOM,24391
+dayhoff_tools/cli/engines_studios/studio_commands.py,sha256=ThA5LN4E15ADkKRxN2bnvm70FCgqtpZTa8mRCgU8Rx8,25443
 dayhoff_tools/cli/main.py,sha256=Nz_jtbppmvWKHZydQ0nkt_eejccJE90ces8xCGrerdY,7086
 dayhoff_tools/cli/swarm_commands.py,sha256=5EyKj8yietvT5lfoz8Zx0iQvVaNgc3SJX1z2zQR6o6M,5614
 dayhoff_tools/cli/utility_commands.py,sha256=e2P4dCCtoqMUGNyb0lFBZ6GZpl5Zslm1qqE5qIvsy38,50765
@@ -48,7 +48,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=UETBtZD3r7WgvURqfGbyHlT7cxoiVq8isjzMuerKw8I,24475
-dayhoff_tools-1.13.7.dist-info/METADATA,sha256=ylXgCRVZUklhlePHVBhWKq50uBdex_XfCTG4hXx8g7A,2980
-dayhoff_tools-1.13.7.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-dayhoff_tools-1.13.7.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.13.7.dist-info/RECORD,,
+dayhoff_tools-1.13.9.dist-info/METADATA,sha256=gKTsv3bywMV_JtQHzZAdQmgPo2ZRr-JHHR2oq7FzEe4,2980
+dayhoff_tools-1.13.9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+dayhoff_tools-1.13.9.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.13.9.dist-info/RECORD,,