PyPI - lyceum-cli - Versions diffs - 1.0.22__tar.gz → 1.0.24__tar.gz - Mend

lyceum-cli 1.0.22tar.gz → 1.0.24tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (57) hide show

{lyceum_cli-1.0.22 → lyceum_cli-1.0.24}/PKG-INFO RENAMED Viewed

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

lyceum_cli-1.0.24/lyceum/external/__init__.py ADDED Viewed

	@@ -0,0 +1 @@
1	+

lyceum_cli-1.0.24/lyceum/external/auth/__init__.py ADDED Viewed

	@@ -0,0 +1 @@
1	+

{lyceum_cli-1.0.22 → lyceum_cli-1.0.24}/lyceum/external/auth/login.py RENAMED Viewed

@@ -1,16 +1,14 @@
-"""
-Authentication commands: login, logout, status
-"""
+"""Authentication commands: login, logout, status"""
-from typing import Optional
-import typer
-from rich.console import Console
-import webbrowser
+import socket
 import threading
 import time
-from http.server import HTTPServer, BaseHTTPRequestHandler
-from urllib.parse import urlparse, parse_qs
-import socket
+import webbrowser
+from http.server import BaseHTTPRequestHandler, HTTPServer
+from urllib.parse import parse_qs, urlparse
+import typer
+from rich.console import Console
 from ...shared.config import config
@@ -24,37 +22,38 @@ callback_result = {"token": None, "error": None, "received": False}
 class CallbackHandler(BaseHTTPRequestHandler):
     """HTTP handler for OAuth callback"""
     def log_message(self, format, *args):
-        # Suppress HTTP server logs
+        """Suppress HTTP server logs"""
         pass
     def do_GET(self):
+        """Handle GET request for OAuth callback"""
         global callback_result
         try:
             # Parse the callback URL
             parsed_url = urlparse(self.path)
             query_params = parse_qs(parsed_url.query)
             if parsed_url.path == "/callback":
                 # Extract token from query parameters
                 if "token" in query_params:
                     token = query_params["token"][0]
                     user_info = query_params.get("user", [None])[0]
                     refresh_token = query_params.get("refresh_token", [None])[0]
                     callback_result["token"] = token
                     callback_result["user"] = user_info
                     if refresh_token:
                         callback_result["refresh_token"] = refresh_token
                     callback_result["received"] = True
                     # Send success response
                     self.send_response(200)
                     self.send_header("Content-type", "text/html")
                     self.end_headers()
                     success_html = """
                     <!DOCTYPE html>
                     <html lang="en">
@@ -73,31 +72,31 @@ class CallbackHandler(BaseHTTPRequestHandler):
                                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M5 13l4 4L19 7"></path>
                                     </svg>
                                 </div>
                                 <!-- Header -->
                                 <div class="mb-6">
                                     <h1 class="text-2xl font-bold text-gray-900 mb-2">Authentication Successful!</h1>
                                     <p class="text-gray-600 text-lg">Welcome to Lyceum</p>
                                 </div>
                                 <!-- Instructions -->
                                 <div class="space-y-3 mb-8">
                                     <p class="text-gray-700">You can now close this browser tab and return to the CLI.</p>
                                     <p class="text-sm text-gray-500">Your Lyceum CLI has been authenticated successfully and is ready to use.</p>
                                 </div>
                                 <!-- Close Message -->
                                 <div class="w-full py-3 px-4 bg-gray-50 text-gray-700 rounded-md border border-gray-200">
                                     You can close this window now
                                 </div>
                                 <!-- Lyceum Branding -->
                                 <div class="mt-8 pt-6 border-t border-gray-200">
                                     <p class="text-xs text-gray-400">Powered by Lyceum Technology</p>
                                 </div>
                             </div>
                         </div>
                         <!-- Auto-close script -->
                         <script>
                             // Auto-close after 10 seconds
@@ -113,17 +112,17 @@ class CallbackHandler(BaseHTTPRequestHandler):
                     except (BrokenPipeError, ConnectionResetError):
                         # Browser closed connection (expected when tab auto-closes)
                         pass
                 elif "error" in query_params:
                     error = query_params["error"][0]
                     callback_result["error"] = error
                     callback_result["received"] = True
                     # Send error response
                     self.send_response(400)
                     self.send_header("Content-type", "text/html")
                     self.end_headers()
                     error_html = f"""
                     <!DOCTYPE html>
                     <html lang="en">
@@ -142,13 +141,13 @@ class CallbackHandler(BaseHTTPRequestHandler):
                                         <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12"></path>
                                     </svg>
                                 </div>
                                 <!-- Header -->
                                 <div class="mb-6">
                                     <h1 class="text-2xl font-bold text-gray-900 mb-2">Authentication Failed</h1>
                                     <p class="text-red-600 text-lg">Something went wrong</p>
                                 </div>
                                 <!-- Error Details -->
                                 <div class="space-y-3 mb-8">
                                     <div class="bg-red-50 border border-red-200 text-red-700 px-4 py-3 rounded-md">
@@ -156,12 +155,12 @@ class CallbackHandler(BaseHTTPRequestHandler):
                                     </div>
                                     <p class="text-gray-600">Please try again or contact support if the issue persists.</p>
                                 </div>
                                 <!-- Close Message -->
                                 <div class="w-full py-3 px-4 bg-gray-50 text-gray-700 rounded-md border border-gray-200">
                                     You can close this window now
                                 </div>
                                 <!-- Lyceum Branding -->
                                 <div class="mt-8 pt-6 border-t border-gray-200">
                                     <p class="text-xs text-gray-400">Powered by Lyceum Technology</p>
@@ -180,7 +179,7 @@ class CallbackHandler(BaseHTTPRequestHandler):
                     # Missing parameters
                     callback_result["error"] = "Missing token or error parameter"
                     callback_result["received"] = True
                     self.send_response(400)
                     self.send_header("Content-type", "text/html")
                     self.end_headers()
@@ -253,11 +252,11 @@ class CallbackHandler(BaseHTTPRequestHandler):
                 except (BrokenPipeError, ConnectionResetError):
                     # Browser closed connection
                     pass
         except Exception as e:
             callback_result["error"] = str(e)
             callback_result["received"] = True
             self.send_response(500)
             self.send_header("Content-type", "text/html")
             self.end_headers()
@@ -309,24 +308,30 @@ def get_available_port():
 @auth_app.command("login")
 def login(
-    base_url: Optional[str] = typer.Option(None, "--url", help="API base URL (for development)"),
-    dashboard_url: Optional[str] = typer.Option("https://dashboard.lyceum.technology", "--dashboard", help="Dashboard URL"),
-    manual: bool = typer.Option(False, "--manual", help="Use manual API key login instead of browser"),
-    api_key: Optional[str] = typer.Option(None, "--api-key", "-k", help="API key for manual login"),
+    base_url: str | None = typer.Option(None, "--url", help="API base URL (for development)"),
+    dashboard_url: str | None = typer.Option(
+        "https://dashboard.lyceum.technology", "--dashboard", help="Dashboard URL"
+    ),
+    manual: bool = typer.Option(
+        False, "--manual", help="Use manual API key login instead of browser"
+    ),
+    api_key: str | None = typer.Option(
+        None, "--api-key", "-k", help="API key for manual login"
+    ),
 ):
     """Login to Lyceum via browser authentication"""
     global callback_result
     if manual:
         # Legacy manual login
         if not api_key:
             api_key = typer.prompt("Enter your Lyceum API key", hide_input=True)
         config.api_key = api_key
         if base_url:
             config.base_url = base_url
         config.save()
         # Test the connection
         try:
             import httpx
@@ -341,7 +346,7 @@ def login(
             console.print(f"[red]❌ Authentication failed: {e}[/red]")
             raise typer.Exit(1)
         return
     # OAuth-style browser login
     try:
         if base_url:
@@ -349,45 +354,45 @@ def login(
         else:
             # Reset to production URL if no custom URL specified
             config.base_url = "https://api.lyceum.technology"
         # Reset callback result
         callback_result = {"token": None, "error": None, "received": False}
         # Start callback server
         callback_port = get_available_port()
         callback_server = HTTPServer(('localhost', callback_port), CallbackHandler)
         console.print(f"[dim]Starting callback server on port {callback_port}...[/dim]")
         # Start server in background thread
         server_thread = threading.Thread(target=callback_server.serve_forever, daemon=True)
         server_thread.start()
         # Construct login URL
         callback_url = f"http://localhost:{callback_port}/callback"
         login_url = f"{dashboard_url}/cli-login?callback={callback_url}"
         console.print("[cyan]🌐 Opening browser for authentication...[/cyan]")
         console.print(f"[dim]If browser doesn't open, visit: {login_url}[/dim]")
         # Open browser
         if not webbrowser.open(login_url):
             console.print("[yellow]⚠️  Could not open browser automatically[/yellow]")
             console.print(f"[yellow]Please manually open: {login_url}[/yellow]")
         console.print("[dim]Waiting for authentication... (timeout: 120 seconds)[/dim]")
         # Wait for callback with timeout
         timeout = 120  # 2 minutes
         start_time = time.time()
         while not callback_result["received"] and (time.time() - start_time) < timeout:
             time.sleep(0.5)
         # Stop server
         callback_server.shutdown()
         callback_server.server_close()
         if callback_result["received"]:
             if callback_result["token"]:
                 # Save token and test connection
@@ -396,7 +401,7 @@ def login(
                 if callback_result.get("refresh_token"):
                     config.refresh_token = callback_result["refresh_token"]
                 config.save()
                 console.print("[green]✅ Authentication token received![/green]")
                 # Test the connection using health endpoint
@@ -430,14 +435,14 @@ def login(
                     console.print(f"[red]❌ Token validation failed: {e}[/red]")
                     console.print(f"[dim]Token saved but couldn't verify. Error type: {type(e).__name__}[/dim]")
                     raise typer.Exit(1)
             elif callback_result["error"]:
                 console.print(f"[red]❌ Authentication failed: {callback_result['error']}[/red]")
                 raise typer.Exit(1)
         else:
             console.print("[red]❌ Authentication timed out. Please try again.[/red]")
             raise typer.Exit(1)
     except KeyboardInterrupt:
         console.print("\n[yellow]Authentication cancelled by user.[/yellow]")
         raise typer.Exit(1)
@@ -461,11 +466,11 @@ def status():
     from ...shared.config import CONFIG_FILE
     console.print(f"[dim]Config file: {CONFIG_FILE}[/dim]")
     console.print(f"[dim]Base URL: {config.base_url}[/dim]")
     if config.api_key:
-        console.print(f"[green]✅ Authenticated[/green]")
+        console.print("[green]✅ Authenticated[/green]")
         console.print(f"[dim]API Key: {config.api_key[:8]}...[/dim]")
         # Test connection
         try:
             import httpx
@@ -478,4 +483,4 @@ def status():
         except Exception as e:
             console.print(f"[red]❌ API connection failed: {e}[/red]")
     else:
-        console.print("[red]❌ Not authenticated. Run 'lyceum login' first.[/red]")
+        console.print("[red]❌ Not authenticated. Run 'lyceum login' first.[/red]")

lyceum_cli-1.0.24/lyceum/external/compute/__init__.py ADDED Viewed

	@@ -0,0 +1 @@
1	+

lyceum_cli-1.0.24/lyceum/external/compute/execution/__init__.py ADDED Viewed

	@@ -0,0 +1 @@
1	+

lyceum_cli-1.0.24/lyceum/external/compute/execution/config.py ADDED Viewed

@@ -0,0 +1,258 @@
+"""Workspace configuration commands for Python execution"""
+import importlib.metadata as im
+import json
+from pathlib import Path
+from typing import Optional
+import typer
+from rich.console import Console
+from ....shared.imports import (
+    is_stdlib_module_by_name,
+    should_skip_path,
+    find_imports_in_file,
+    SKIP_DIRS,
+)
+console = Console()
+config_app = typer.Typer(name="config", help="Workspace configuration commands")
+# Known package name mismatches (import name -> pip name)
+PACKAGE_NAME_MAP = {
+    "sklearn": "scikit-learn",
+    "cv2": "opencv-python",
+    "PIL": "Pillow",
+    "bs4": "beautifulsoup4",
+    "yaml": "PyYAML",
+    "Crypto": "pycryptodome",
+    "OpenSSL": "pyOpenSSL",
+    "cudf": "cudf-cu12",
+    "cpuinfo": "py-cpuinfo",
+}
+def get_package_name(module_name: str) -> str:
+    """Convert import name to pip package name."""
+    top_level = module_name.split(".")[0]
+    return PACKAGE_NAME_MAP.get(top_level, top_level)
+def get_installed_version(package_name: str) -> Optional[str]:
+    """Get installed version of a package."""
+    try:
+        return im.version(package_name)
+    except Exception:
+        return None
+def find_local_packages(workspace: Path) -> dict[str, Path]:
+    """Find all local Python packages in the workspace recursively."""
+    packages = {}
+    for init_file in workspace.rglob("__init__.py"):
+        if should_skip_path(init_file):
+            continue
+        package_dir = init_file.parent
+        parent_init = package_dir.parent / "__init__.py"
+        if parent_init.exists() and not should_skip_path(parent_init):
+            continue
+        try:
+            rel_path = package_dir.relative_to(workspace)
+            packages[str(rel_path)] = package_dir
+        except ValueError:
+            pass
+    for item in workspace.iterdir():
+        if should_skip_path(item):
+            continue
+        if item.is_file() and item.suffix == ".py" and item.stem != "__init__":
+            packages[item.stem] = item
+    return packages
+def collect_all_python_files(workspace: Path) -> list[Path]:
+    """Collect all Python files in the workspace."""
+    py_files = []
+    for py_file in workspace.rglob("*.py"):
+        if not should_skip_path(py_file):
+            py_files.append(py_file)
+    return py_files
+def parse_requirements_file(req_file: Path) -> list[str]:
+    """Parse a requirements.txt file into a list of dependencies."""
+    deps = []
+    try:
+        with open(req_file) as f:
+            for line in f:
+                line = line.strip()
+                if line and not line.startswith("#") and not line.startswith("-"):
+                    deps.append(line)
+    except Exception:
+        pass
+    return deps
+def extract_package_name(dep: str) -> str:
+    """Extract package name from a dependency string."""
+    return dep.split("==")[0].split(">=")[0].split("<=")[0].split("<")[0].split(">")[0].split("[")[0].split("~=")[0].lower()
+@config_app.command("init")
+def init_config(
+    workspace: Path = typer.Argument(".", help="Workspace directory to analyze"),
+    requirements: Path | None = typer.Option(
+        None, "--requirements", "-r", help="Path to requirements.txt"
+    ),
+    force: bool = typer.Option(False, "--force", "-f", help="Overwrite existing config"),
+):
+    """Initialize workspace configuration for Lyceum Cloud execution.
+    Scans the workspace to detect:
+    - Local Python packages (for import resolution at runtime)
+    - External dependencies (from imports and requirements.txt)
+    Creates .lyceum/config.json with workspace metadata.
+    Local file contents are resolved at runtime based on what each script imports.
+    Example:
+        lyceum python config init
+        lyceum python config init ./my-project
+        lyceum python config init -r requirements.txt
+    """
+    workspace = Path(workspace).resolve()
+    if not workspace.exists():
+        console.print(f"[red]Error: Workspace directory does not exist: {workspace}[/red]")
+        raise typer.Exit(1)
+    config_dir = workspace / ".lyceum"
+    config_file = config_dir / "config.json"
+    if config_file.exists() and not force:
+        console.print(f"[yellow]Config already exists: {config_file}[/yellow]")
+        console.print("[dim]Use --force to overwrite[/dim]")
+        raise typer.Exit(1)
+    console.print(f"[dim]Scanning workspace: {workspace}[/dim]")
+    # Find local packages
+    local_packages = find_local_packages(workspace)
+    console.print(f"[dim]Found {len(local_packages)} local packages/modules[/dim]")
+    if local_packages:
+        for name in sorted(local_packages.keys())[:10]:
+            console.print(f"[dim]  - {name}[/dim]")
+        if len(local_packages) > 10:
+            console.print(f"[dim]  ... and {len(local_packages) - 10} more[/dim]")
+    # Collect all Python files for import scanning
+    py_files = collect_all_python_files(workspace)
+    console.print(f"[dim]Found {len(py_files)} Python files[/dim]")
+    # Scan all files for imports to detect external dependencies
+    all_imports = set()
+    for py_file in py_files:
+        all_imports.update(find_imports_in_file(py_file))
+    # Filter to external dependencies
+    local_package_names = {Path(p).parts[0] if "/" in p else p for p in local_packages.keys()}
+    external_deps = {
+        imp for imp in all_imports
+        if not is_stdlib_module_by_name(imp) and imp not in local_package_names
+    }
+    console.print(f"[dim]Found {len(external_deps)} external dependencies from imports[/dim]")
+    # Parse requirements.txt
+    requirements_deps = []
+    req_file = requirements or workspace / "requirements.txt"
+    if req_file.exists():
+        console.print(f"[dim]Reading requirements from: {req_file}[/dim]")
+        requirements_deps = parse_requirements_file(req_file)
+    # Build merged dependencies with versions
+    merged_deps = []
+    req_names = {extract_package_name(dep) for dep in requirements_deps}
+    for dep in requirements_deps:
+        merged_deps.append(dep)
+    for imp in sorted(external_deps):
+        pkg_name = get_package_name(imp)
+        if pkg_name.lower() not in req_names:
+            version = get_installed_version(pkg_name)
+            if version:
+                merged_deps.append(f"{pkg_name}=={version}")
+            else:
+                merged_deps.append(pkg_name)
+    # Build config (no local_imports - resolved at runtime)
+    config_data = {
+        "workspace": str(workspace),
+        "local_packages": {name: str(path) for name, path in sorted(local_packages.items())},
+        "dependencies": {
+            "from_imports": sorted(external_deps),
+            "from_requirements": requirements_deps,
+            "merged": sorted(set(merged_deps), key=str.lower),
+        },
+    }
+    # Write config
+    config_dir.mkdir(exist_ok=True)
+    with open(config_file, "w") as f:
+        json.dump(config_data, f, indent=2)
+    console.print(f"[green]Created config: {config_file}[/green]")
+    console.print(f"[dim]  - {len(local_packages)} local packages[/dim]")
+    console.print(f"[dim]  - {len(config_data['dependencies']['merged'])} dependencies[/dim]")
+    console.print("[dim]  - Local imports resolved at runtime per-file[/dim]")
+@config_app.command("show")
+def show_config(
+    workspace: Path = typer.Argument(".", help="Workspace directory"),
+):
+    """Show current workspace configuration."""
+    workspace = Path(workspace).resolve()
+    config_file = workspace / ".lyceum" / "config.json"
+    if not config_file.exists():
+        console.print(f"[yellow]No config found at: {config_file}[/yellow]")
+        console.print("[dim]Run 'lyceum python config init' to create one[/dim]")
+        raise typer.Exit(1)
+    with open(config_file) as f:
+        config_data = json.load(f)
+    console.print(f"[bold]Workspace:[/bold] {config_data.get('workspace', 'unknown')}")
+    local_packages = config_data.get("local_packages", {})
+    console.print(f"\n[bold]Local packages ({len(local_packages)}):[/bold]")
+    for pkg in list(local_packages.keys())[:15]:
+        console.print(f"  - {pkg}")
+    if len(local_packages) > 15:
+        console.print(f"  ... and {len(local_packages) - 15} more")
+    deps = config_data.get("dependencies", {})
+    merged = deps.get("merged", [])
+    console.print(f"\n[bold]Dependencies ({len(merged)}):[/bold]")
+    for dep in merged[:20]:
+        console.print(f"  - {dep}")
+    if len(merged) > 20:
+        console.print(f"  ... and {len(merged) - 20} more")
+@config_app.command("refresh")
+def refresh_config(
+    workspace: Path = typer.Argument(".", help="Workspace directory"),
+    requirements: Path | None = typer.Option(
+        None, "--requirements", "-r", help="Path to requirements.txt"
+    ),
+):
+    """Refresh workspace configuration (re-scans the workspace)."""
+    init_config(workspace=workspace, requirements=requirements, force=True)

lyceum-cli 1.0.22__tar.gz → 1.0.24__tar.gz

lyceum-cli 1.0.22tar.gz → 1.0.24tar.gz