ml-dash 0.6.2rc1__py3-none-any.whl → 0.6.3__py3-none-any.whl

ml_dash/cli_commands/list.py

@@ -252,9 +252,9 @@ def cmd_list(args: argparse.Namespace) -> int:
     config = Config()
 
     # Get remote URL (command line > config)
-    remote_url = args.remote or config.remote_url
+    remote_url = args.dash_url or config.remote_url
     if not remote_url:
-        console.print("[red]Error:[/red] --remote URL is required (or set in config)")
+        console.print("[red]Error:[/red] --dash-url is required (or set in config)")
         return 1
 
     # Get API key (command line > config > auto-loaded from storage)
@@ -274,15 +274,135 @@ def cmd_list(args: argparse.Namespace) -> int:
         if args.tags:
             tags_filter = [tag.strip() for tag in args.tags.split(',')]
 
-        return list_experiments(
-            remote_client=remote_client,
-            project=args.project,
-            status_filter=args.status,
-            tags_filter=tags_filter,
-            output_json=args.json,
-            detailed=args.detailed,
-            verbose=args.verbose
-        )
+        # Check if pattern contains wildcards
+        has_wildcards = any(c in args.project for c in ['*', '?', '['])
+
+        if has_wildcards:
+            # Use searchExperiments GraphQL query for glob patterns
+            try:
+                # Expand simple project patterns to full namespace/project/experiment format
+                # If pattern has no slashes, assume it's just a project pattern
+                if '/' not in args.project:
+                    # Simple project pattern: "tut*" -> "*/tut*/*"
+                    search_pattern = f"*/{args.project}/*"
+                else:
+                    # Full or partial pattern: use as-is
+                    search_pattern = args.project
+
+                experiments = remote_client.search_experiments_graphql(search_pattern)
+
+                # Apply status filter if specified (server doesn't support it in searchExperiments yet)
+                if args.status:
+                    experiments = [
+                        exp for exp in experiments
+                        if exp.get('status') == args.status
+                    ]
+
+                # Apply tags filter if specified
+                if tags_filter:
+                    experiments = [
+                        exp for exp in experiments
+                        if any(tag in exp.get('tags', []) for tag in tags_filter)
+                    ]
+
+                if args.json:
+                    # JSON output
+                    output = {
+                        "pattern": search_pattern,
+                        "experiments": experiments,
+                        "count": len(experiments)
+                    }
+                    console.print(json.dumps(output, indent=2))
+                    return 0
+
+                # Human-readable output
+                if not experiments:
+                    console.print(f"[yellow]No experiments match pattern: {search_pattern}[/yellow]")
+                    return 0
+
+                # Group experiments by project for better display
+                from collections import defaultdict
+                projects_map = defaultdict(list)
+                for exp in experiments:
+                    project_slug = exp.get('project', {}).get('slug', 'unknown')
+                    projects_map[project_slug].append(exp)
+
+                # Display each project's experiments
+                for project_slug in sorted(projects_map.keys()):
+                    project_experiments = projects_map[project_slug]
+                    console.print(f"\n[bold]Experiments in project: {project_slug}[/bold]\n")
+
+                    # Create table
+                    table = Table(box=box.ROUNDED)
+                    table.add_column("Experiment", style="cyan", no_wrap=True)
+                    table.add_column("Status", justify="center")
+                    table.add_column("Metrics", justify="right")
+                    table.add_column("Logs", justify="right")
+                    table.add_column("Files", justify="right")
+
+                    if args.detailed:
+                        table.add_column("Tags", style="dim")
+                        table.add_column("Started", style="dim")
+
+                    for exp in project_experiments:
+                        status = exp.get('status', 'UNKNOWN')
+                        status_style = _get_status_style(status)
+
+                        # Count metrics
+                        metrics_count = len(exp.get('metrics', []))
+
+                        # Count logs
+                        log_metadata = exp.get('logMetadata') or {}
+                        logs_count = log_metadata.get('totalLogs', 0)
+
+                        # Count files
+                        files_count = len(exp.get('files', []))
+
+                        row = [
+                            exp['name'],
+                            f"[{status_style}]{status}[/{status_style}]",
+                            str(metrics_count),
+                            str(logs_count),
+                            str(files_count),
+                        ]
+
+                        if args.detailed:
+                            # Add tags
+                            tags = exp.get('tags', [])
+                            tags_str = ', '.join(tags[:3])
+                            if len(tags) > 3:
+                                tags_str += f" +{len(tags) - 3}"
+                            row.append(tags_str or '-')
+
+                            # Add started time (createdAt doesn't exist, use startedAt)
+                            started_at = exp.get('startedAt', '')
+                            row.append(_format_timestamp(started_at) if started_at else '-')
+
+                        table.add_row(*row)
+
+                    console.print(table)
+                    console.print(f"[dim]Total: {len(project_experiments)} experiment(s)[/dim]")
+
+                console.print(f"\n[dim]Grand total: {len(experiments)} experiment(s) across {len(projects_map)} project(s)[/dim]\n")
+                return 0
+
+            except Exception as e:
+                console.print(f"[red]Error searching experiments:[/red] {e}")
+                if args.verbose:
+                    import traceback
+                    console.print(traceback.format_exc())
+                return 1
+        else:
+            # No wildcards, use existing list method for exact project match
+            return list_experiments(
+                remote_client=remote_client,
+                project=args.project,
+                status_filter=args.status,
+                tags_filter=tags_filter,
+                output_json=args.json,
+                detailed=args.detailed,
+                verbose=args.verbose
+            )
     else:
         return list_projects(
             remote_client=remote_client,
@@ -300,14 +420,27 @@ def add_parser(subparsers) -> None:
     )
 
     # Remote configuration
-    parser.add_argument("--remote", type=str, help="Remote server URL")
+    parser.add_argument(
+        "--dash-url",
+        type=str,
+        help="ML-Dash server URL (defaults to config or https://api.dash.ml)",
+    )
     parser.add_argument(
         "--api-key",
         type=str,
         help="JWT authentication token (auto-loaded from storage if not provided)"
     )
     # Filtering options
-    parser.add_argument("--project", type=str, help="List experiments in this project")
+    parser.add_argument(
+        "-p",
+        "--pref",
+        "--prefix",
+        "--proj",
+        "--project",
+        dest="project",
+        type=str,
+        help="List experiments in this project (supports glob: 'tutorial*', 'test-?', 'proj-[0-9]*')"
+    )
     parser.add_argument("--status", type=str,
                        choices=["COMPLETED", "RUNNING", "FAILED", "ARCHIVED"],
                        help="Filter experiments by status")

ml_dash/cli_commands/login.py

@@ -1,8 +1,6 @@
 """Login command for ml-dash CLI."""
 
-import sys
 import webbrowser
-from typing import Optional
 
 from rich.console import Console
 from rich.panel import Panel
@@ -10,216 +8,225 @@ from rich.progress import Progress, SpinnerColumn, TextColumn
 
 from ml_dash.auth.device_flow import DeviceFlowClient
 from ml_dash.auth.device_secret import get_or_create_device_secret
-from ml_dash.auth.token_storage import get_token_storage
 from ml_dash.auth.exceptions import (
-    DeviceCodeExpiredError,
-    AuthorizationDeniedError,
-    TokenExchangeError,
+  AuthorizationDeniedError,
+  DeviceCodeExpiredError,
+  TokenExchangeError,
 )
+from ml_dash.auth.token_storage import get_token_storage
 from ml_dash.config import config
 
 
 def add_parser(subparsers):
-    """Add login command parser.
-
-    Args:
-        subparsers: Subparsers object from argparse
-    """
-    parser = subparsers.add_parser(
-        "login",
-        help="Authenticate with ml-dash using device authorization flow",
-        description="Login to ml-dash server using OAuth2 device authorization flow",
-    )
-
-    parser.add_argument(
-        "--remote",
-        type=str,
-        help="ML-Dash server URL (e.g., https://api.ml-dash.com)",
-    )
-
-    parser.add_argument(
-        "--no-browser",
-        action="store_true",
-        help="Don't automatically open browser for authorization",
-    )
+  """Add login command parser.
+
+  Args:
+      subparsers: Subparsers object from argparse
+  """
+  parser = subparsers.add_parser(
+    "login",
+    help="Authenticate with ml-dash using device authorization flow",
+    description=(
+      "Login to ml-dash server using OAuth2 device authorization flow.\n\n"
+      "After logging in, you can:\n"
+      "  • Upload/download experiments via CLI\n"
+      "  • View projects, experiments, and statistics at https://dash.ml\n"
+      "  • Create interactive plots and dashboards\n"
+    ),
+  )
+
+  parser.add_argument(
+    "--dash-url",
+    type=str,
+    help="ML-Dash server URL (e.g., https://api.dash.ml)",
+  )
+
+  parser.add_argument(
+    "--no-browser",
+    action="store_true",
+    help="Don't automatically open browser for authorization",
+  )
 
 
 def generate_qr_code_ascii(url: str) -> str:
-    """Generate ASCII QR code for the given URL.
+  """Generate ASCII QR code for the given URL.
 
-    Args:
-        url: URL to encode in QR code
+  Args:
+      url: URL to encode in QR code
 
-    Returns:
-        ASCII art QR code string
-    """
-    try:
-        import qrcode
+  Returns:
+      ASCII art QR code string
+  """
+  try:
+    import qrcode
 
-        qr = qrcode.QRCode(border=1)
-        qr.add_data(url)
-        qr.make(fit=True)
+    qr = qrcode.QRCode(border=1)
+    qr.add_data(url)
+    qr.make(fit=True)
 
-        # Generate ASCII art
-        output = []
-        for row in qr.get_matrix():
-            line = ""
-            for cell in row:
-                line += "██" if cell else "  "
-            output.append(line)
+    # Generate ASCII art
+    output = []
+    for row in qr.get_matrix():
+      line = ""
+      for cell in row:
+        line += "██" if cell else "  "
+      output.append(line)
 
-        return "\n".join(output)
-    except ImportError:
-        return "[QR code unavailable - install qrcode: pip install qrcode]"
-    except Exception:
-        return "[QR code generation failed]"
+    return "\n".join(output)
+  except ImportError:
+    return "[QR code unavailable - install qrcode: pip install qrcode]"
+  except Exception:
+    return "[QR code generation failed]"
 
 
 def cmd_login(args) -> int:
-    """Execute login command.
+  """Execute login command.
+
+  Args:
+      args: Parsed command-line arguments
+
+  Returns:
+      Exit code (0 for success, 1 for failure)
+  """
+  console = Console()
+
+  # Get remote URL
+  remote_url = args.dash_url or config.remote_url
+  if not remote_url:
+    console.print(
+      "[red]Error: No remote URL configured.[/red]\n\n"
+      "Please specify with --dash-url or set default:\n"
+      "  ml-dash login --dash-url https://api.dash.ml"
+    )
+    return 1
 
-    Args:
-        args: Parsed command-line arguments
+  try:
+    # Initialize device flow
+    console.print("[bold]Initializing device authorization...[/bold]\n")
 
-    Returns:
-        Exit code (0 for success, 1 for failure)
-    """
-    console = Console()
+    device_secret = get_or_create_device_secret(config)
+    device_client = DeviceFlowClient(
+      device_secret=device_secret, ml_dash_server_url=remote_url
+    )
 
-    # Get remote URL
-    remote_url = args.remote or config.remote_url
-    if not remote_url:
-        console.print(
-            "[red]Error: No remote URL configured.[/red]\n\n"
-            "Please specify with --remote or set default:\n"
-            "  ml-dash login --remote https://api.ml-dash.com"
-        )
-        return 1
+    # Start device flow with vuer-auth
+    flow = device_client.start_device_flow()
 
-    try:
-        # Initialize device flow
-        console.print("[bold]Initializing device authorization...[/bold]\n")
+    # Generate QR code
+    qr_code = generate_qr_code_ascii(flow.verification_uri_complete)
 
-        device_secret = get_or_create_device_secret(config)
-        device_client = DeviceFlowClient(
-            device_secret=device_secret, ml_dash_server_url=remote_url
-        )
+    # Display rich UI with QR code
+    panel_content = (
+      f"[bold cyan]1. Visit this URL:[/bold cyan]\n\n"
+      f"   {flow.verification_uri}\n\n"
+      f"[bold cyan]2. Enter this code:[/bold cyan]\n\n"
+      f"   [bold green]{flow.user_code}[/bold green]\n\n"
+    )
 
-        # Start device flow with vuer-auth
-        flow = device_client.start_device_flow()
+    # Add QR code if available
+    if "unavailable" not in qr_code and "failed" not in qr_code:
+      panel_content += f"[bold cyan]Or scan QR code:[/bold cyan]\n\n{qr_code}\n\n"
 
-        # Generate QR code
-        qr_code = generate_qr_code_ascii(flow.verification_uri_complete)
+    panel_content += f"[dim]Code expires in {flow.expires_in // 60} minutes[/dim]"
 
-        # Display rich UI with QR code
-        panel_content = (
-            f"[bold cyan]1. Visit this URL:[/bold cyan]\n\n"
-            f"   {flow.verification_uri}\n\n"
-            f"[bold cyan]2. Enter this code:[/bold cyan]\n\n"
-            f"   [bold green]{flow.user_code}[/bold green]\n\n"
+    panel = Panel(
+      panel_content,
+      title="[bold blue]DEVICE AUTHORIZATION REQUIRED[/bold blue]",
+      border_style="blue",
+      expand=False,
+    )
+    console.print(panel)
+    console.print()
+
+    # Auto-open browser unless disabled
+    if not args.no_browser:
+      try:
+        webbrowser.open(flow.verification_uri_complete)
+        console.print("[dim]✓ Opened browser automatically[/dim]\n")
+      except Exception:
+        # Silent failure - user can manually open URL
+        pass
+
+    # Poll for authorization with progress indicator
+    console.print("[bold]Waiting for authorization...[/bold]")
+
+    with Progress(
+      SpinnerColumn(),
+      TextColumn("[progress.description]{task.description}"),
+      console=console,
+      transient=True,
+    ) as progress:
+      task = progress.add_task("Polling", total=None)
+
+      def update_progress(elapsed: int):
+        progress.update(task, description=f"Waiting ({elapsed}s)")
+
+      try:
+        vuer_auth_token = device_client.poll_for_token(
+          max_attempts=120, progress_callback=update_progress
         )
-
-        # Add QR code if available
-        if "unavailable" not in qr_code and "failed" not in qr_code:
-            panel_content += f"[bold cyan]Or scan QR code:[/bold cyan]\n\n{qr_code}\n\n"
-
-        panel_content += f"[dim]Code expires in {flow.expires_in // 60} minutes[/dim]"
-
-        panel = Panel(
-            panel_content,
-            title="[bold blue]DEVICE AUTHORIZATION REQUIRED[/bold blue]",
-            border_style="blue",
-            expand=False,
+      except DeviceCodeExpiredError:
+        console.print(
+          "\n[red]✗ Device code expired[/red]\n\n"
+          "The authorization code expired after 10 minutes.\n"
+          "Please run 'ml-dash login' again."
         )
-        console.print(panel)
-        console.print()
-
-        # Auto-open browser unless disabled
-        if not args.no_browser:
-            try:
-                webbrowser.open(flow.verification_uri_complete)
-                console.print("[dim]✓ Opened browser automatically[/dim]\n")
-            except Exception:
-                # Silent failure - user can manually open URL
-                pass
-
-        # Poll for authorization with progress indicator
-        console.print("[bold]Waiting for authorization...[/bold]")
-
-        with Progress(
-            SpinnerColumn(),
-            TextColumn("[progress.description]{task.description}"),
-            console=console,
-            transient=True,
-        ) as progress:
-            task = progress.add_task("Polling", total=None)
-
-            def update_progress(elapsed: int):
-                progress.update(task, description=f"Waiting ({elapsed}s)")
-
-            try:
-                vuer_auth_token = device_client.poll_for_token(
-                    max_attempts=120, progress_callback=update_progress
-                )
-            except DeviceCodeExpiredError:
-                console.print(
-                    "\n[red]✗ Device code expired[/red]\n\n"
-                    "The authorization code expired after 10 minutes.\n"
-                    "Please run 'ml-dash login' again."
-                )
-                return 1
-            except AuthorizationDeniedError:
-                console.print(
-                    "\n[red]✗ Authorization denied[/red]\n\n"
-                    "You declined the authorization request in your browser.\n\n"
-                    "To try again:\n"
-                    "  ml-dash login"
-                )
-                return 1
-            except TimeoutError:
-                console.print(
-                    "\n[red]✗ Authorization timed out[/red]\n\n"
-                    "No response after 10 minutes.\n\n"
-                    "Please run 'ml-dash login' again."
-                )
-                return 1
-
-        console.print("[green]✓ Authorization successful![/green]\n")
-
-        # Exchange vuer-auth token for ml-dash token
-        console.print("[bold]Exchanging token with ml-dash server...[/bold]")
-
-        try:
-            ml_dash_token = device_client.exchange_token(vuer_auth_token)
-        except TokenExchangeError as e:
-            console.print(f"\n[red]✗ Token exchange failed:[/red] {e}\n")
-            return 1
-
-        # Store ml-dash permanent token
-        storage = get_token_storage()
-        storage.store("ml-dash-token", ml_dash_token)
-
-        console.print("[green]✓ Token exchanged successfully![/green]\n")
-
-        # Success message
+        return 1
+      except AuthorizationDeniedError:
+        console.print(
+          "\n[red]✗ Authorization denied[/red]\n\n"
+          "You declined the authorization request in your browser.\n\n"
+          "To try again:\n"
+          "  ml-dash login"
+        )
+        return 1
+      except TimeoutError:
         console.print(
-            "[bold green]✓ Logged in successfully![/bold green]\n\n"
-            "Your authentication token has been securely stored.\n"
-            "You can now use ml-dash commands without --api-key.\n\n"
-            "Examples:\n"
-            "  ml-dash upload ./experiments\n"
-            "  ml-dash download ./output\n"
-            "  ml-dash list"
+          "\n[red]✗ Authorization timed out[/red]\n\n"
+          "No response after 10 minutes.\n\n"
+          "Please run 'ml-dash login' again."
         )
+        return 1
 
-        return 0
+    console.print("[green]✓ Authorization successful![/green]\n")
 
-    except KeyboardInterrupt:
-        console.print("\n\n[yellow]Login cancelled by user.[/yellow]")
-        return 1
-    except Exception as e:
-        console.print(f"\n[red]✗ Unexpected error:[/red] {e}")
-        import traceback
+    # Exchange vuer-auth token for ml-dash token
+    console.print("[bold]Exchanging token with ml-dash server...[/bold]")
 
-        console.print(f"\n[dim]{traceback.format_exc()}[/dim]")
-        return 1
+    try:
+      ml_dash_token = device_client.exchange_token(vuer_auth_token)
+    except TokenExchangeError as e:
+      console.print(f"\n[red]✗ Token exchange failed:[/red] {e}\n")
+      return 1
+
+    # Store ml-dash permanent token
+    storage = get_token_storage()
+    storage.store("ml-dash-token", ml_dash_token)
+
+    console.print("[green]✓ Token exchanged successfully![/green]\n")
+
+    # Success message
+    console.print(
+      "[bold green]✓ Logged in successfully![/bold green]\n\n"
+      "Your authentication token has been securely stored.\n"
+      "You can now use ml-dash commands without --api-key.\n\n"
+      "[bold cyan]View your data online:[/bold cyan]\n"
+      "  [link=https://dash.ml]https://dash.ml[/link]\n\n"
+      "Access your projects, experiments, statistics, and interactive plots.\n\n"
+      "[bold]CLI Commands:[/bold]\n"
+      "  ml-dash upload ./experiments\n"
+      "  ml-dash download ./output\n"
+      "  ml-dash list"
+    )
+
+    return 0
+
+  except KeyboardInterrupt:
+    console.print("\n\n[yellow]Login cancelled by user.[/yellow]")
+    return 1
+  except Exception as e:
+    console.print(f"\n[red]✗ Unexpected error:[/red] {e}")
+    import traceback
+
+    console.print(f"\n[dim]{traceback.format_exc()}[/dim]")
+    return 1