lyceum-cli 1.0.25__py3-none-any.whl → 1.0.27__py3-none-any.whl

lyceum/main.py

@@ -11,8 +11,10 @@ from rich.console import Console
 from .external.auth.login import auth_app
 from .external.compute.execution.python import python_app
 from .external.compute.execution.docker import docker_app
+from .external.compute.execution.docker_compose import compose_app
 from .external.compute.execution.workloads import workloads_app
 from .external.compute.execution.notebook import notebook_app
+from .external.vms.management import vms_app
 
 app = typer.Typer(
     name="lyceum",
@@ -26,6 +28,7 @@ console = Console()
 app.add_typer(auth_app, name="auth")
 app.add_typer(python_app, name="python")
 app.add_typer(docker_app, name="docker")
+app.add_typer(compose_app, name="compose")
 app.add_typer(workloads_app, name="workloads")
 app.add_typer(notebook_app, name="notebook")
 

lyceum/shared/config.py

@@ -1,32 +1,28 @@
 """Configuration management for Lyceum CLI"""
 
 import json
-
-# Add the generated client to the path
-import sys
+import os
 import time
 from pathlib import Path
 
 import jwt
 import typer
 from rich.console import Console
-
 from supabase import create_client
 
-sys.path.insert(0, str(Path(__file__).parent.parent.parent / "lyceum-cloud-execution-api-client"))
-
-# Commented out - using httpx directly instead
-# from lyceum_cloud_execution_api_client.client import AuthenticatedClient
-
 console = Console()
 
 # Configuration
 CONFIG_DIR = Path.home() / ".lyceum"
 CONFIG_FILE = CONFIG_DIR / "config.json"
 
+# Supabase configuration from environment variables (required)
+SUPABASE_URL = os.getenv("SUPABASE_URL")
+SUPABASE_ANON_KEY = os.getenv("SUPABASE_ANON_KEY")
 
-class Config:
-    """Configuration management for Lyceum CLI"""
+
+class _Config:
+    """Configuration management for Lyceum CLI (private - use the global 'config' instance)"""
 
     def __init__(self):
         """Initialize configuration with default values"""
@@ -92,17 +88,16 @@ class Config:
             return False
 
         try:
-            # Use Supabase's refresh_session method with the service role key
-            supabase_url = "https://tqcebgbexyszvqhnwnhh.supabase.co"
-            # NOTE: This service key is scoped for refresh token operations only
-            supabase_service_key = (
-                "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9."
-                "eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InRxY2ViZ2JleHlzenZxaG53bmhoIiwicm9sZSI6InNlcnZpY2Vfcm9sZSIs"
-                "ImlhdCI6MTc0NzE1NDQ3MSwiZXhwIjoyMDYyNzMwNDcxfQ."
-                "RpxhmMxFKJSJERobr28bmaZOG9Fxe-qthTYlg8iyFdc"
-            )
-
-            supabase = create_client(supabase_url, supabase_service_key)
+            # Check if Supabase credentials are configured
+            if not SUPABASE_URL or not SUPABASE_ANON_KEY:
+                console.print(
+                    "[red]Error: SUPABASE_URL and SUPABASE_ANON_KEY environment variables must be set[/red]"
+                )
+                return False
+
+            # Use Supabase's refresh_session method with the public anon key
+            # This is safe for client-side use and properly scoped for user token refresh
+            supabase = create_client(SUPABASE_URL, SUPABASE_ANON_KEY)
 
             # Use refresh_session method
             response = supabase.auth.refresh_session(refresh_token=self.refresh_token)
@@ -131,7 +126,7 @@ class Config:
     def get_client(self):
         """Get authenticated API client with automatic token refresh"""
         if not self.api_key:
-            console.print("[red]Error: Not authenticated. Run 'lyceum login' first.[/red]")
+            console.print("[red]Error: Not authenticated. Run 'lyceum auth login' first.[/red]")
             raise typer.Exit(1)
 
         # Check if token is expired and try to refresh
@@ -146,4 +141,4 @@ class Config:
 
 
 # Global config instance
-config = Config()
+config = _Config()

lyceum/shared/display.py

@@ -2,25 +2,6 @@
 
 from datetime import datetime
 
-from rich.table import Table
-
-
-def create_table(title: str, columns: list[tuple[str, str]]) -> Table:
-    """
-    Create a Rich table with the given title and columns.
-
-    Args:
-        title: Table title
-        columns: List of (column_name, style) tuples
-
-    Returns:
-        Rich Table instance
-    """
-    table = Table(title=title)
-    for col_name, style in columns:
-        table.add_column(col_name, style=style)
-    return table
-
 
 def format_timestamp(timestamp: str | int | datetime, relative: bool = False) -> str:
     """
@@ -161,33 +142,33 @@ def status_color(status: str) -> str:
         return 'white'
 
 
-def status_emoji(status: str) -> str:
+def status_icon(status: str) -> str:
     """
-    Get emoji for status display.
+    Get text icon for status display.
 
     Args:
         status: Status string
 
     Returns:
-        Emoji character
+        Text-based status indicator
     """
     status_lower = status.lower()
 
     if status_lower in ['completed', 'success']:
-        return '✅'
+        return '[OK]'
     elif status_lower in ['failed', 'error', 'failed_user', 'failed_system']:
-        return '❌'
+        return '[FAIL]'
     elif status_lower in ['running', 'in_progress']:
-        return '🔄'
+        return '[RUN]'
     elif status_lower in ['pending', 'queued']:
-        return '⏳'
+        return '[WAIT]'
     elif status_lower in ['validating']:
-        return '🔍'
+        return '[VAL]'
     elif status_lower in ['finalizing']:
-        return '📦'
+        return '[FIN]'
     elif status_lower in ['cancelled']:
-        return '🛑'
+        return '[STOP]'
     elif status_lower in ['expired', 'timeout']:
-        return '⏰'
+        return '[TIME]'
     else:
-        return '⚪'
+        return '[--]'

lyceum/shared/streaming.py

@@ -60,7 +60,7 @@ def normalize_newlines(text: str) -> str:
     return re.sub(r'\n{2,}', '\n', text)
 
 
-def stream_execution_output(execution_id: str, streaming_url: str = None, status: StatusLine = None) -> bool:
+def stream_execution_output(execution_id: str, streaming_url: str = None) -> bool:
     """Stream execution output in real-time. Returns True if successful, False if failed."""
     if not streaming_url:
         # Fallback to stream endpoint if no streaming URL provided
@@ -69,25 +69,15 @@ def stream_execution_output(execution_id: str, streaming_url: str = None, status
         stream_url = streaming_url
 
     try:
-        if status:
-            status.update("Connecting to stream...")
-
-        headers = {
-            "Accept": "text/event-stream",
-            "Cache-Control": "no-cache",
-        }
-        with httpx.stream("POST", stream_url, headers=headers, timeout=600.0) as response:
+        console.print("[dim]Connecting to execution stream...[/dim]")
+
+        headers = {"Authorization": f"Bearer {config.api_key}"}
+        with httpx.stream("GET", stream_url, headers=headers, timeout=600.0) as response:
             if response.status_code != 200:
-                if status:
-                    status.stop()
-                if response.status_code == 404:
-                    console.print("[yellow]Stream not found - execution may have already completed[/yellow]")
-                else:
-                    console.print(f"[red]Stream failed: HTTP {response.status_code}[/red]")
+                console.print(f"[red]Stream failed: HTTP {response.status_code}[/red]")
                 return False
 
-            if status:
-                status.update("Waiting for output...")
+            console.print("[dim]Streaming output...[/dim]")
 
             first_output = True
             for line in response.iter_lines():
@@ -103,10 +93,6 @@ def stream_execution_output(execution_id: str, streaming_url: str = None, status
                                 output_data = data["output"]
                                 content = output_data.get("content", "")
                                 if content:
-                                    # Stop status spinner on first output
-                                    if first_output and status:
-                                        status.stop()
-                                        first_output = False
                                     clean_output = strip_ansi_codes(content)
                                     # Normalize newlines to avoid excessive blank lines
                                     clean_output = normalize_newlines(clean_output)
@@ -114,8 +100,6 @@ def stream_execution_output(execution_id: str, streaming_url: str = None, status
 
                             # Handle job finished event
                             elif "jobFinished" in data:
-                                if status:
-                                    status.stop()
                                 job_data = data["jobFinished"]
                                 job = job_data.get("job", {})
                                 result = job.get("result", {})
@@ -126,7 +110,6 @@ def stream_execution_output(execution_id: str, streaming_url: str = None, status
                                 if not first_output:
                                     print()
 
-                                # Check for system failure (error field present)
                                 if error:
                                     console.print(f"[red]{error}[/red]")
                                     return False
@@ -143,46 +126,34 @@ def stream_execution_output(execution_id: str, streaming_url: str = None, status
                                 if event_type == "output":
                                     output = data.get("content", "")
                                     if output:
-                                        if first_output and status:
-                                            status.stop()
-                                            first_output = False
                                         clean_output = strip_ansi_codes(output)
                                         clean_output = normalize_newlines(clean_output)
                                         print(clean_output, end="", flush=True)
 
                                 elif event_type == "completed":
-                                    if status:
-                                        status.stop()
-                                    status_val = data.get("status", "unknown")
-                                    if not first_output:
-                                        print()
-                                    if status_val == "completed":
+                                    status = data.get("status", "unknown")
+                                    if status == "completed":
+                                        console.print("\n[green]Execution completed successfully[/green]")
                                         return True
                                     else:
-                                        console.print(f"[red]Failed: {status_val}[/red]")
+                                        console.print(f"\n[red]Execution failed: {status}[/red]")
                                         return False
 
                                 elif event_type == "error":
-                                    if status:
-                                        status.stop()
                                     error_msg = data.get("message", "Unknown error")
-                                    console.print(f"[red]Error: {error_msg}[/red]")
+                                    console.print(f"\n[red]Error: {error_msg}[/red]")
                                     return False
 
                         except json.JSONDecodeError:
                             # Skip malformed JSON
                             continue
 
-            if status:
-                status.stop()
-            console.print("[yellow]Stream ended without completion signal[/yellow]")
+            console.print("\n[yellow]Stream ended without completion signal[/yellow]")
             # Fallback: poll execution status
             return check_execution_status(execution_id)
 
     except Exception as e:
-        if status:
-            status.stop()
-        console.print(f"[red]Streaming error: {e}[/red]")
+        console.print(f"\n[red]Streaming error: {e}[/red]")
         # Fallback: poll execution status
         return check_execution_status(execution_id)
 
@@ -206,15 +177,16 @@ def check_execution_status(execution_id: str) -> bool:
                 status = data.get('status', 'unknown')
 
                 if status == 'completed':
+                    console.print("[green]Execution completed successfully[/green]")
                     return True
                 elif status in ['failed_user', 'failed_system', 'failed']:
-                    console.print(f"[red]Failed: {status}[/red]")
+                    console.print(f"[red]Execution failed: {status}[/red]")
                     errors = data.get('errors')
                     if errors:
                         console.print(f"[red]Error: {errors}[/red]")
                     return False
                 elif status in ['timeout', 'cancelled']:
-                    console.print(f"[yellow]{status.capitalize()}[/yellow]")
+                    console.print(f"[yellow]Execution {status}[/yellow]")
                     return False
                 elif status in ['running', 'pending', 'queued']:
                     # Still running, continue polling

{lyceum_cli-1.0.25.dist-info → lyceum_cli-1.0.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lyceum-cli
-Version: 1.0.25
+Version: 1.0.27
 Summary: Command-line interface for Lyceum Cloud Execution API
 Home-page: https://lyceum.technology
 Author: Lyceum Team

lyceum_cli-1.0.27.dist-info/RECORD

@@ -0,0 +1,34 @@
+lyceum/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum/main.py,sha256=s4ZvNPGMeGoV9AIq68hEwfo9ioFfu2qIoRXb2upjNDk,1076
+lyceum/external/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum/external/auth/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum/external/auth/login.py,sha256=-yJ0aEV8_vDXiT6BXzjpqZ2uDdnTnkop4qhagw2dSZA,23447
+lyceum/external/compute/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum/external/compute/execution/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum/external/compute/execution/config.py,sha256=6JJgLJnDPTwevEaNdB1nEICih_qbBmws5u5_S9gj7k0,8866
+lyceum/external/compute/execution/docker.py,sha256=0Y6lxJAm56Jrl0HxeNz1mX6DGs556i2iMN9_U1JQP0c,9635
+lyceum/external/compute/execution/docker_compose.py,sha256=YsWPnw5nB1ZpqjU9X8o_klT78I5m46PapVwVEeWra_8,9189
+lyceum/external/compute/execution/notebook.py,sha256=Gw9UhJ-UjYhpjdIYQ4IMYhVjhSkAFpOQ9aFYj1qOeww,7542
+lyceum/external/compute/execution/python.py,sha256=8Y9ElWs9RdauQbhECKcBPSoT0XZeGhXZ_pkEpr3sGro,12878
+lyceum/external/compute/execution/workloads.py,sha256=4fsRWbYGmsQMGPPIN1jUG8cG5NPG9yV26ANJ-DtaXqc,5844
+lyceum/external/compute/inference/__init__.py,sha256=4YLoUKDEzitexynJv_Q5O0w1lty8CJ6uyRxuc1LiaBw,89
+lyceum/external/compute/inference/batch.py,sha256=mgEndr02UM1j00o-iRLUpDqS5KFvyg0Htc0Gg0s3hTU,11394
+lyceum/external/compute/inference/chat.py,sha256=hITj_UGLaxCJQskU-YbeaEerM5Xt_eJpEsYrTJoUpk4,8485
+lyceum/external/compute/inference/models.py,sha256=BkCEdvyliezGOUulj557e-Eoif0_HKR3CxqpEhdAZaA,10339
+lyceum/external/general/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum/external/vms/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lyceum/external/vms/instances.py,sha256=8DKpI8PbyZFzk5RT-IPgoMDjkf_-HC-2pJKuSFs-5BA,11007
+lyceum/external/vms/management.py,sha256=dYEkN5Qiur-SG4G5CLOk2Rbr0HW3rK1BROSp0K6KxC8,15405
+lyceum/shared/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum/shared/config.py,sha256=gz2AjjdOsi6WbJApIh_GYRs_GYjsORQ6h3YJiHEIOxI,5384
+lyceum/shared/display.py,sha256=-VSAfoa0yivTvxRrN2RYr2Sq1x_msZqENjnkSedmbhQ,4444
+lyceum/shared/imports.py,sha256=wEG4wfVTIqJ6MBWDRAN96iGmVCb9ST2aOqSjkbvajug,11768
+lyceum/shared/streaming.py,sha256=x3zA8Pn9ia06t8nKJfP6hztxOVKPUC3Nk3qmAiIsl9M,8194
+lyceum_cloud_execution_api_client/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum_cloud_execution_api_client/api/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+lyceum_cloud_execution_api_client/models/__init__.py,sha256=AMlb9R9O9aNC9hvKz_8TFpEfOolYC3VtFS5JX17kYks,4888
+lyceum_cli-1.0.27.dist-info/METADATA,sha256=r__wR3k1hw1LzdIwKOVpNoOWRwYmJ1pmYhonGMC73Sc,1482
+lyceum_cli-1.0.27.dist-info/WHEEL,sha256=qELbo2s1Yzl39ZmrAibXA2jjPLUYfnVhUNTlyF1rq0Y,92
+lyceum_cli-1.0.27.dist-info/entry_points.txt,sha256=Oq-9wDkxVd6MHgNiUTYwXI9SGhvR3VkD7Mvk0xhiUZo,43
+lyceum_cli-1.0.27.dist-info/top_level.txt,sha256=CR7FEMloAXgLsHUR6ti3mWNcpgje27HRHSfq8doIils,41
+lyceum_cli-1.0.27.dist-info/RECORD,,

{lyceum_cli-1.0.25.dist-info → lyceum_cli-1.0.27.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

{lyceum_cli-1.0.25.dist-info → lyceum_cli-1.0.27.dist-info}/top_level.txt

@@ -1,3 +1,2 @@
 lyceum
 lyceum_cloud_execution_api_client
-tests

lyceum/external/compute/execution/docker_config.py

@@ -1,123 +0,0 @@
-"""Docker registry configuration commands"""
-
-import json
-from pathlib import Path
-
-import typer
-from rich.console import Console
-from rich.table import Table
-
-console = Console()
-
-docker_config_app = typer.Typer(name="config", help="Docker registry configuration")
-
-CONFIG_DIR = Path.home() / ".lyceum"
-DOCKER_CONFIG_FILE = CONFIG_DIR / "docker-registries.json"
-
-
-def load_docker_config() -> dict:
-    """Load docker registry configuration."""
-    if DOCKER_CONFIG_FILE.exists():
-        try:
-            with open(DOCKER_CONFIG_FILE) as f:
-                return json.load(f)
-        except Exception:
-            pass
-    return {"registries": {}}
-
-
-def save_docker_config(config: dict) -> None:
-    """Save docker registry configuration."""
-    CONFIG_DIR.mkdir(parents=True, exist_ok=True)
-    with open(DOCKER_CONFIG_FILE, "w") as f:
-        json.dump(config, f, indent=2)
-    # Set restrictive permissions since this contains credentials
-    DOCKER_CONFIG_FILE.chmod(0o600)
-
-
-def get_hub_credentials(image: str) -> dict | None:
-    """Get Docker Hub credentials if the image is from Docker Hub.
-
-    Docker Hub images either have no registry prefix or use docker.io.
-    Returns None if no credentials found or image is not from Docker Hub.
-    """
-    config = load_docker_config()
-    registries = config.get("registries", {})
-
-    if "hub" not in registries:
-        return None
-
-    # Check if this looks like a Docker Hub image
-    # Docker Hub: no dots in the first part, or explicitly docker.io
-    if "/" not in image:
-        # Single name like "python:3.9" - it's Docker Hub
-        return registries["hub"]
-
-    parts = image.split("/")
-    first_part = parts[0]
-
-    # If first part has a dot, it's a custom registry (not Docker Hub)
-    # Exception: docker.io is Docker Hub
-    if "." in first_part and first_part != "docker.io":
-        return None
-
-    # Otherwise it's Docker Hub (e.g., "myuser/myimage" or "docker.io/myuser/myimage")
-    return registries["hub"]
-
-
-@docker_config_app.command("hub")
-def configure_hub():
-    """Configure Docker Hub credentials interactively."""
-    console.print("\n[bold]Docker Hub Configuration[/bold]")
-    console.print("[dim]These credentials will be used for private Docker Hub images.[/dim]\n")
-
-    username = typer.prompt("Docker Hub Username")
-    password = typer.prompt("Docker Hub Password/Token", hide_input=True)
-
-    config = load_docker_config()
-    config["registries"]["hub"] = {
-        "username": username,
-        "password": password,
-    }
-    save_docker_config(config)
-
-    console.print("\n[green]Docker Hub credentials saved![/green]")
-    console.print("[dim]Credentials stored in ~/.lyceum/docker-registries.json[/dim]")
-
-
-@docker_config_app.command("show")
-def show_config():
-    """Show configured docker registries."""
-    config = load_docker_config()
-    registries = config.get("registries", {})
-
-    if not registries:
-        console.print("[dim]No docker registries configured.[/dim]")
-        console.print("[dim]Run 'lyceum docker config hub' to configure Docker Hub.[/dim]")
-        console.print("[dim]For AWS ECR, use 'lyceum docker run <image> --aws' to auto-detect credentials.[/dim]")
-        return
-
-    table = Table(title="Configured Docker Registries")
-    table.add_column("Registry", style="cyan")
-    table.add_column("Details", style="dim")
-
-    if "hub" in registries:
-        hub = registries["hub"]
-        username = hub.get("username", "")
-        table.add_row("Docker Hub", f"User: {username}")
-
-    console.print(table)
-    console.print("\n[dim]For AWS ECR, use 'lyceum docker run <image> --aws' to auto-detect credentials.[/dim]")
-
-
-@docker_config_app.command("clear")
-def clear_config():
-    """Clear saved Docker Hub credentials."""
-    config = load_docker_config()
-
-    if "hub" in config.get("registries", {}):
-        del config["registries"]["hub"]
-        save_docker_config(config)
-        console.print("[green]Cleared Docker Hub credentials.[/green]")
-    else:
-        console.print("[yellow]No Docker Hub credentials found.[/yellow]")