Merge branch 'johnny/vibe-cli' into nm/support-cli-model-configs

Author: nabinchha

pyproject.toml

@@ -29,8 +29,10 @@ dependencies = [
   "pygments>=2.19.2",
   "pyyaml>=6.0.1",
   "python-json-logger==2.0.7",
+  "prompt-toolkit>=3.0.0",
   "requests<3,>=2.32.2",
   "rich>=13.7.1",
+  "typer>=0.12.0",
   "anyascii>=0.3.3,<1.0",
   "boto3==1.35.74",
   "datasets>=4.0.0",
@@ -52,6 +54,9 @@ dependencies = [
   "ruff==0.12.3",
 ]
 
+[project.scripts]
+data-designer = "data_designer.cli:main"
+
 [dependency-groups]
 dev = [
   "jsonpath-ng==1.5.3",

src/data_designer/cli/__init__.py

@@ -0,0 +1,6 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+from data_designer.cli.main import app, main
+
+__all__ = ["app", "main"]

src/data_designer/cli/commands/__init__.py

@@ -0,0 +1,2 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0

src/data_designer/cli/commands/list.py

@@ -0,0 +1,237 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+
+import json
+from pathlib import Path
+
+from rich.table import Table
+import typer
+
+from data_designer.cli.ui import console, print_error, print_header, print_info, print_warning
+from data_designer.cli.utils import get_default_config_dir, get_model_config_path, get_model_provider_path
+from data_designer.config.errors import InvalidConfigError, InvalidFileFormatError, InvalidFilePathError
+from data_designer.config.models import ModelConfig
+from data_designer.config.utils.constants import NordColor
+from data_designer.engine.model_provider import ModelProviderRegistry
+
+
+def list_command(
+    config_dir: str | None = typer.Option(None, "--config-dir", help="Custom configuration directory"),
+    output_json: bool = typer.Option(False, "--json", help="Output as JSON"),
+) -> None:
+    """List current Data Designer configurations."""
+    # Determine config directory
+    if config_dir:
+        config_path = Path(config_dir).expanduser().resolve()
+    else:
+        config_path = get_default_config_dir()
+
+    if not output_json:
+        print_header("Data Designer Configuration")
+        print_info(f"Configuration directory: {config_path}")
+        console.print()
+
+    # Load and display providers
+    provider_path = get_model_provider_path(config_path)
+    providers_data = load_providers(provider_path, output_json)
+
+    # Load and display models
+    model_path = get_model_config_path(config_path)
+    models_data = load_models(model_path, output_json)
+
+    # Output as JSON if requested
+    if output_json:
+        output = {
+            "config_directory": str(config_path),
+            "providers": providers_data,
+            "models": models_data,
+        }
+        console.print_json(json.dumps(output, indent=2))
+    else:
+        # Display summary
+        console.print()
+        if providers_data or models_data:
+            print_info("Configuration loaded successfully")
+        else:
+            print_warning("No configuration files found. Run 'data-designer config' to see available commands.")
+
+
+def load_providers(provider_path: Path, as_json: bool) -> dict | None:
+    """Load and display model providers.
+
+    Args:
+        provider_path: Path to provider configuration file
+        as_json: If True, return data for JSON output instead of displaying
+
+    Returns:
+        Provider data if as_json=True, None otherwise
+    """
+    try:
+        from data_designer.cli.utils import load_config_file
+
+        config = load_config_file(provider_path)
+
+        # Validate with Pydantic
+        registry = ModelProviderRegistry.model_validate(config)
+
+        if as_json:
+            return {
+                "file": str(provider_path),
+                "providers": [
+                    {
+                        "name": p.name,
+                        "endpoint": p.endpoint,
+                        "provider_type": p.provider_type,
+                        "api_key": p.api_key,
+                    }
+                    for p in registry.providers
+                ],
+                "default": registry.default or registry.providers[0].name,
+                "valid": True,
+            }
+
+        # Display as table
+        table = Table(title="Model Providers", border_style=NordColor.NORD8.value)
+        table.add_column("Name", style=NordColor.NORD14.value, no_wrap=True)
+        table.add_column("Endpoint", style=NordColor.NORD4.value)
+        table.add_column("Type", style=NordColor.NORD9.value, no_wrap=True)
+        table.add_column("API Key", style=NordColor.NORD7.value)
+        table.add_column("Default", style=NordColor.NORD13.value, justify="center")
+
+        default_name = registry.default or registry.providers[0].name
+
+        for provider in registry.providers:
+            is_default = "✓" if provider.name == default_name else ""
+            api_key_display = provider.api_key or "(not set)"
+
+            # Mask actual API keys (keep env var names visible)
+            if provider.api_key and not provider.api_key.isupper():
+                api_key_display = "***" + provider.api_key[-4:] if len(provider.api_key) > 4 else "***"
+
+            table.add_row(
+                provider.name,
+                provider.endpoint,
+                provider.provider_type,
+                api_key_display,
+                is_default,
+            )
+
+        console.print(table)
+        console.print()
+        return None
+
+    except InvalidFilePathError:
+        if not as_json:
+            print_warning(f"Provider configuration not found: {provider_path}")
+            print_info("Run 'data-designer config providers' to create it")
+            console.print()
+        return {"file": str(provider_path), "valid": False, "error": "File not found"} if as_json else None
+
+    except (InvalidFileFormatError, InvalidConfigError) as e:
+        if not as_json:
+            print_error(f"Invalid provider configuration: {e}")
+            console.print()
+        return {"file": str(provider_path), "valid": False, "error": str(e)} if as_json else None
+
+    except Exception as e:
+        if not as_json:
+            print_error(f"Error loading provider configuration: {e}")
+            console.print()
+        return {"file": str(provider_path), "valid": False, "error": str(e)} if as_json else None
+
+
+def load_models(model_path: Path, as_json: bool) -> dict | None:
+    """Load and display model configurations.
+
+    Args:
+        model_path: Path to model configuration file
+        as_json: If True, return data for JSON output instead of displaying
+
+    Returns:
+        Model data if as_json=True, None otherwise
+    """
+    try:
+        from data_designer.cli.utils import load_config_file
+
+        config = load_config_file(model_path)
+
+        # Validate model configs
+        if "model_configs" not in config:
+            raise InvalidConfigError("Missing 'model_configs' key in configuration")
+
+        model_configs = [ModelConfig.model_validate(mc) for mc in config["model_configs"]]
+
+        if as_json:
+            return {
+                "file": str(model_path),
+                "models": [
+                    {
+                        "alias": mc.alias,
+                        "model": mc.model,
+                        "provider": mc.provider,
+                        "inference_parameters": {
+                            "temperature": mc.inference_parameters.temperature,
+                            "top_p": mc.inference_parameters.top_p,
+                            "max_tokens": mc.inference_parameters.max_tokens,
+                            "max_parallel_requests": mc.inference_parameters.max_parallel_requests,
+                            "timeout": mc.inference_parameters.timeout,
+                        },
+                    }
+                    for mc in model_configs
+                ],
+                "valid": True,
+            }
+
+        # Display as table
+        table = Table(title="Model Configurations", border_style=NordColor.NORD8.value)
+        table.add_column("Alias", style=NordColor.NORD14.value, no_wrap=True)
+        table.add_column("Model ID", style=NordColor.NORD4.value)
+        table.add_column("Provider", style=NordColor.NORD9.value, no_wrap=True)
+        table.add_column("Temperature", style=NordColor.NORD15.value, justify="right")
+        table.add_column("Top P", style=NordColor.NORD15.value, justify="right")
+        table.add_column("Max Tokens", style=NordColor.NORD15.value, justify="right")
+
+        for mc in model_configs:
+            # Handle distribution-based parameters
+            temp_display = (
+                f"{mc.inference_parameters.temperature:.2f}"
+                if isinstance(mc.inference_parameters.temperature, (int, float))
+                else "dist"
+            )
+            top_p_display = (
+                f"{mc.inference_parameters.top_p:.2f}"
+                if isinstance(mc.inference_parameters.top_p, (int, float))
+                else "dist"
+            )
+
+            table.add_row(
+                mc.alias,
+                mc.model,
+                mc.provider or "(default)",
+                temp_display,
+                top_p_display,
+                str(mc.inference_parameters.max_tokens) if mc.inference_parameters.max_tokens else "(none)",
+            )
+
+        console.print(table)
+        console.print()
+        return None
+
+    except InvalidFilePathError:
+        if not as_json:
+            print_warning(f"Model configuration not found: {model_path}")
+            print_info("Run 'data-designer config models' to create it")
+            console.print()
+        return {"file": str(model_path), "valid": False, "error": "File not found"} if as_json else None
+
+    except (InvalidFileFormatError, InvalidConfigError) as e:
+        if not as_json:
+            print_error(f"Invalid model configuration: {e}")
+            console.print()
+        return {"file": str(model_path), "valid": False, "error": str(e)} if as_json else None
+
+    except Exception as e:
+        if not as_json:
+            print_error(f"Error loading model configuration: {e}")
+            console.print()
+        return {"file": str(model_path), "valid": False, "error": str(e)} if as_json else None