dayhoff-tools 1.3.3__py3-none-any.whl → 1.3.5__py3-none-any.whl

dayhoff_tools/cli/engine_commands.py

@@ -3,7 +3,7 @@
 import json
 import subprocess
 import sys
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from pathlib import Path
 from typing import Dict, List, Optional, Tuple
 
@@ -130,15 +130,31 @@ 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:
-            return datetime.strptime(launch_time_str, fmt)
+            parsed = datetime.strptime(launch_time_str, fmt)
+            # 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.utcnow()
+    return datetime.now(timezone.utc)
 
 
 def format_status(state: str, ready: Optional[bool]) -> str:
@@ -363,7 +379,7 @@ def list_engines(
         total_cost = 0.0
         for engine in engines:
             launch_time = parse_launch_time(engine["launch_time"])
-            uptime = datetime.utcnow() - launch_time
+            uptime = datetime.now(timezone.utc) - launch_time
             hourly_cost = HOURLY_COSTS.get(engine["engine_type"], 0)
 
             if engine["state"].lower() == "running":
@@ -418,7 +434,7 @@ def engine_status(
 
     # Calculate costs
     launch_time = parse_launch_time(engine["launch_time"])
-    uptime = datetime.utcnow() - launch_time
+    uptime = datetime.now(timezone.utc) - launch_time
     hourly_cost = HOURLY_COSTS.get(engine["engine_type"], 0)
     total_cost = hourly_cost * (uptime.total_seconds() / 3600)
 
@@ -550,7 +566,7 @@ def terminate_engine(
 
     # Calculate cost
     launch_time = parse_launch_time(engine["launch_time"])
-    uptime = datetime.utcnow() - launch_time
+    uptime = datetime.now(timezone.utc) - launch_time
     hourly_cost = HOURLY_COSTS.get(engine["engine_type"], 0)
     total_cost = hourly_cost * (uptime.total_seconds() / 3600)
 
@@ -1001,10 +1017,19 @@ def studio_status():
         return
 
     # Create status panel
+    # Format status with colors
+    status = studio['status']
+    if status == "in-use":
+        status_display = "[magenta]attached[/magenta]"
+    elif status in ["attaching", "detaching"]:
+        status_display = f"[yellow]{status}[/yellow]"
+    else:
+        status_display = f"[green]{status}[/green]"
+    
     status_lines = [
         f"[bold]Studio ID:[/bold]    {studio['studio_id']}",
         f"[bold]User:[/bold]         {studio['user']}",
-        f"[bold]Status:[/bold]       {studio['status']}",
+        f"[bold]Status:[/bold]       {status_display}",
         f"[bold]Size:[/bold]         {studio['size_gb']}GB",
         f"[bold]Created:[/bold]      {studio['creation_date']}",
     ]
@@ -1214,6 +1239,13 @@ def list_studios(
             console.print("No studios found.")
             return
 
+        # Get all engines to map instance IDs to names
+        engines_response = make_api_request("GET", "/engines")
+        engines = {}
+        if engines_response.status_code == 200:
+            for engine in engines_response.json().get("engines", []):
+                engines[engine["instance_id"]] = engine["name"]
+
         # Create table
         table = Table(title="Studios", box=box.ROUNDED)
         table.add_column("Studio ID", style="cyan")
@@ -1224,14 +1256,39 @@ def list_studios(
         table.add_column("Created")
 
         for studio in studios:
-            status_color = "green" if studio["status"] == "available" else "yellow"
+            # Change status display
+            if studio["status"] == "in-use":
+                status_display = "[magenta]attached[/magenta]"
+            elif studio["status"] in ["attaching", "detaching"]:
+                status_display = "[yellow]" + studio["status"] + "[/yellow]"
+            else:
+                status_display = "[green]available[/green]"
+            
+            # Format attached engine info
+            attached_to = "-"
+            if studio.get("attached_vm_id"):
+                vm_id = studio["attached_vm_id"]
+                engine_name = engines.get(vm_id, "unknown")
+                attached_to = f"{engine_name} ({vm_id})"
+            
+            # Format creation date (remove microseconds and timezone info)
+            created = studio["creation_date"]
+            try:
+                # Parse and reformat to just show date and time
+                if 'T' in created:
+                    created_dt = datetime.fromisoformat(created.replace('Z', '+00:00'))
+                    created = created_dt.strftime("%Y-%m-%d %H:%M")
+            except:
+                # If parsing fails, just truncate
+                created = created.split('T')[0] if 'T' in created else created[:16]
+
             table.add_row(
                 studio["studio_id"],
                 studio["user"],
-                f"[{status_color}]{studio['status']}[/{status_color}]",
+                status_display,
                 f"{studio['size_gb']}GB",
-                studio.get("attached_vm_id", "-"),
-                studio["creation_date"],
+                attached_to,
+                created,
             )
 
         console.print(table)

{dayhoff_tools-1.3.3.dist-info → dayhoff_tools-1.3.5.dist-info}/METADATA

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

{dayhoff_tools-1.3.3.dist-info → dayhoff_tools-1.3.5.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=uqS46dGMaF5UGNbIJ3G1oY3QxD38jUNHiBAfYMBpmf4,46268
+dayhoff_tools/cli/engine_commands.py,sha256=BU5mi4Q_UTsg2CQLkn2XQaw0anUKwIp_GhMa_Zjlcns,48604
 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.3.dist-info/METADATA,sha256=mWVT1xFladhd-RuJOeESPAoFxe1FDKsJP-G9tTlO1yk,2842
-dayhoff_tools-1.3.3.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-dayhoff_tools-1.3.3.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
-dayhoff_tools-1.3.3.dist-info/RECORD,,
+dayhoff_tools-1.3.5.dist-info/METADATA,sha256=LmjC7aGDDP-Pj-LII3xRjc_G8CELn7KJEozkjMtGeTU,2842
+dayhoff_tools-1.3.5.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dayhoff_tools-1.3.5.dist-info/entry_points.txt,sha256=iAf4jteNqW3cJm6CO6czLxjW3vxYKsyGLZ8WGmxamSc,49
+dayhoff_tools-1.3.5.dist-info/RECORD,,