dayhoff-tools 1.3.4__py3-none-any.whl → 1.3.6__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -130,17 +130,29 @@ def parse_launch_time(launch_time_str: str) -> datetime:
     formats = [
         "%Y-%m-%dT%H:%M:%S.%fZ",
         "%Y-%m-%dT%H:%M:%SZ",
+        "%Y-%m-%dT%H:%M:%S%z",  # ISO format with timezone
+        "%Y-%m-%dT%H:%M:%S+00:00",  # Explicit UTC offset
         "%Y-%m-%d %H:%M:%S",
     ]
+    
+    # First try parsing with fromisoformat for better timezone handling
+    try:
+        # Handle the ISO format properly
+        return datetime.fromisoformat(launch_time_str.replace('Z', '+00:00'))
+    except (ValueError, AttributeError):
+        pass
+    
+    # Fallback to manual format parsing
     for fmt in formats:
         try:
             parsed = datetime.strptime(launch_time_str, fmt)
-            # If the format includes 'Z', it's UTC
-            if fmt.endswith('Z'):
+            # If no timezone info, assume UTC
+            if parsed.tzinfo is None:
                 parsed = parsed.replace(tzinfo=timezone.utc)
             return parsed
         except ValueError:
             continue
+    
     # Fallback: assume it's recent
     return datetime.now(timezone.utc)
 
@@ -326,11 +338,10 @@ def launch_engine(
 @engine_app.command("list")
 def list_engines(
     user: Optional[str] = typer.Option(None, "--user", "-u", help="Filter by user"),
-    all_users: bool = typer.Option(False, "--all", "-a", help="Show all users' engines"),
     running_only: bool = typer.Option(False, "--running", help="Show only running engines"),
     stopped_only: bool = typer.Option(False, "--stopped", help="Show only stopped engines"),
 ):
-    """List all engines."""
+    """List engines (shows all engines by default)."""
     current_user = check_aws_sso()
 
     params = {}
@@ -606,14 +617,18 @@ def ssh_engine(
 @engine_app.command("config-ssh")
 def config_ssh(
     clean: bool = typer.Option(False, "--clean", help="Remove all managed entries"),
+    all_engines: bool = typer.Option(False, "--all", "-a", help="Include all engines from all users"),
 ):
-    """Update SSH config with all available engines."""
+    """Update SSH config with available engines."""
     username = check_aws_sso()
 
     if clean:
         console.print("Removing all managed SSH entries...")
     else:
-        console.print("Updating SSH config with all running engines...")
+        if all_engines:
+            console.print("Updating SSH config with all running engines...")
+        else:
+            console.print(f"Updating SSH config with running engines for [cyan]{username}[/cyan] and [cyan]shared[/cyan]...")
 
     # Get all engines
     response = make_api_request("GET", "/engines")
@@ -623,6 +638,14 @@ def config_ssh(
 
     engines = response.json().get("engines", [])
     running_engines = [e for e in engines if e["state"].lower() == "running"]
+    
+    # Filter engines based on options
+    if not all_engines:
+        # Show only current user's engines and shared engines
+        running_engines = [
+            e for e in running_engines 
+            if e["user"] == username or e["user"] == "shared"
+        ]
 
     # Read existing config
     config_path = Path.home() / ".ssh" / "config"
@@ -673,7 +696,8 @@ def config_ssh(
             f"[green]✓ Updated SSH config with {len(running_engines)} engines[/green]"
         )
         for engine in running_engines:
-            console.print(f"  • {engine['name']} → {engine['instance_id']}")
+            user_display = f"[dim]({engine['user']})[/dim]" if engine['user'] != username else ""
+            console.print(f"  • {engine['name']} → {engine['instance_id']} {user_display}")
 
 
 @engine_app.command("keep-awake")
@@ -1008,7 +1032,7 @@ def studio_status():
     # Format status with colors
     status = studio['status']
     if status == "in-use":
-        status_display = "[magenta]attached[/magenta]"
+        status_display = "[bright_blue]attached[/bright_blue]"
     elif status in ["attaching", "detaching"]:
         status_display = f"[yellow]{status}[/yellow]"
     else:
@@ -1246,7 +1270,7 @@ def list_studios(
         for studio in studios:
             # Change status display
             if studio["status"] == "in-use":
-                status_display = "[magenta]attached[/magenta]"
+                status_display = "[bright_blue]attached[/bright_blue]"
             elif studio["status"] in ["attaching", "detaching"]:
                 status_display = "[yellow]" + studio["status"] + "[/yellow]"
             else:

{dayhoff_tools-1.3.4.dist-info → dayhoff_tools-1.3.6.dist-info}/METADATA

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

{dayhoff_tools-1.3.4.dist-info → dayhoff_tools-1.3.6.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=w0wzs4aQUdzeyAyhHH9lHxpJEG8acrbguQ4Rd0u5bA4,48179
+dayhoff_tools/cli/engine_commands.py,sha256=iKyfpjDlOUpZjgjXAnEmLLkdFXFGQHPgnbblbaY1rzM,49206
 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.3.4.dist-info/METADATA,sha256=YZw82MtQpm4aWNzOfEl62Iov6ZRXtw6LfZ43eI9psKE,2842
-dayhoff_tools-1.3.4.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.3.4.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.3.4.dist-info/RECORD,,
+dayhoff_tools-1.3.6.dist-info/METADATA,sha256=uZRVYjvuh-1cjuDxrOBMEsZPzfxydAiYIWL3IAhsYaA,2842
+dayhoff_tools-1.3.6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.3.6.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.3.6.dist-info/RECORD,,