vantage-cli 0.1.8__tar.gz → 0.1.9__tar.gz

{vantage_cli-0.1.8 → vantage_cli-0.1.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: vantage-cli
-Version: 0.1.8
+Version: 0.1.9
 Summary: The Vantage Compute CLI.
 Author-email: jamesbeedy <james@vantagecompute.ai>
 License: GPL-3.0
@@ -41,7 +41,7 @@ Description-Content-Type: text/markdown
 # Vantage CLI
 A modern Python CLI tool to interface to Vantage Compute.
 
-[![License](https://img.shields.io/badge/license-Apache%202.0-green.svg)](LICENSE)
+[![License](https://img.shields.io/badge/license-GPLv3-green.svg)](LICENSE)
 [![Python](https://img.shields.io/badge/python-3.12+-blue.svg)](https://python.org)
 [![PyPI](https://img.shields.io/pypi/v/vantage-cli.svg)](https://pypi.org/project/vantage-cli/)
 
@@ -90,7 +90,7 @@ uv run vantage login
 ```bash
 vantage cluster create my-slurm-multipass-cluster \
     --cloud localhost \
-    --deploy slurm-multipass-localhost
+    --app slurm-multipass-localhost
 ```
 
 #### Create a Slurm Cluster on LXD
@@ -98,7 +98,7 @@ vantage cluster create my-slurm-multipass-cluster \
 ```bash
 vantage cluster create my-slurm-lxd-cluster \
     --cloud localhost \
-    --deploy slurm-juju-localhost
+    --app slurm-juju-localhost
 ```
 
 #### Create a Slurm Cluster on MicroK8S
@@ -106,7 +106,7 @@ vantage cluster create my-slurm-lxd-cluster \
 ```bash
 vantage cluster create my-slurm-microk8s-cluster \
     --cloud localhost \
-    --deploy slurm-microk8s-locahost
+    --app slurm-microk8s-locahost
 ```
 
 ## 📚 Documentation
@@ -120,30 +120,19 @@ Visit our comprehensive documentation site:
 - **[Troubleshooting](https://vantagecompute.github.io/vantage-cli/troubleshooting/)**: Common issues and solutions
 
 
-## 📄 License
-
-This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details.
-
-Copyright 2025 Vantage Compute Corporation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
 ## 🆘 Support
 
 - **Issues**: [GitHub Issues](https://github.com/vantagecompute/vantage-cli/issues)
 - **Discussions**: [GitHub Discussions](https://github.com/vantagecompute/vantage-cli/discussions)
 - **Email**: [james@vantagecompute.ai](mailto:james@vantagecompute.ai)
 
+
+## 📄 License
+
+Copyright &copy; 2025 Vantage Compute Corporation
+
+This project is licensed under the GPLv3 License - see the [LICENSE](LICENSE) file for details.
+
 ---
 
 **Made with ❤️ by [Vantage Compute](https://vantagecompute.ai)**

{vantage_cli-0.1.8 → vantage_cli-0.1.9}/README.md

@@ -8,7 +8,7 @@
 # Vantage CLI
 A modern Python CLI tool to interface to Vantage Compute.
 
-[![License](https://img.shields.io/badge/license-Apache%202.0-green.svg)](LICENSE)
+[![License](https://img.shields.io/badge/license-GPLv3-green.svg)](LICENSE)
 [![Python](https://img.shields.io/badge/python-3.12+-blue.svg)](https://python.org)
 [![PyPI](https://img.shields.io/pypi/v/vantage-cli.svg)](https://pypi.org/project/vantage-cli/)
 
@@ -57,7 +57,7 @@ uv run vantage login
 ```bash
 vantage cluster create my-slurm-multipass-cluster \
     --cloud localhost \
-    --deploy slurm-multipass-localhost
+    --app slurm-multipass-localhost
 ```
 
 #### Create a Slurm Cluster on LXD
@@ -65,7 +65,7 @@ vantage cluster create my-slurm-multipass-cluster \
 ```bash
 vantage cluster create my-slurm-lxd-cluster \
     --cloud localhost \
-    --deploy slurm-juju-localhost
+    --app slurm-juju-localhost
 ```
 
 #### Create a Slurm Cluster on MicroK8S
@@ -73,7 +73,7 @@ vantage cluster create my-slurm-lxd-cluster \
 ```bash
 vantage cluster create my-slurm-microk8s-cluster \
     --cloud localhost \
-    --deploy slurm-microk8s-locahost
+    --app slurm-microk8s-locahost
 ```
 
 ## 📚 Documentation
@@ -87,30 +87,19 @@ Visit our comprehensive documentation site:
 - **[Troubleshooting](https://vantagecompute.github.io/vantage-cli/troubleshooting/)**: Common issues and solutions
 
 
-## 📄 License
-
-This project is licensed under the Apache License 2.0 - see the [LICENSE](LICENSE) file for details.
-
-Copyright 2025 Vantage Compute Corporation
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
 ## 🆘 Support
 
 - **Issues**: [GitHub Issues](https://github.com/vantagecompute/vantage-cli/issues)
 - **Discussions**: [GitHub Discussions](https://github.com/vantagecompute/vantage-cli/discussions)
 - **Email**: [james@vantagecompute.ai](mailto:james@vantagecompute.ai)
 
+
+## 📄 License
+
+Copyright © 2025 Vantage Compute Corporation
+
+This project is licensed under the GPLv3 License - see the [LICENSE](LICENSE) file for details.
+
 ---
 
 **Made with ❤️ by [Vantage Compute](https://vantagecompute.ai)**

{vantage_cli-0.1.8 → vantage_cli-0.1.9}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vantage-cli"
-version = "0.1.8"
+version = "0.1.9"
 description = "The Vantage Compute CLI."
 authors = [
     {name = "jamesbeedy", email = "james@vantagecompute.ai"}

{vantage_cli-0.1.8 → vantage_cli-0.1.9}/uv.lock

@@ -1173,7 +1173,7 @@ wheels = [
 
 [[package]]
 name = "pydantic"
-version = "2.11.8"
+version = "2.11.9"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "annotated-types" },
@@ -1181,9 +1181,9 @@ dependencies = [
     { name = "typing-extensions" },
     { name = "typing-inspection" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/ac/c0/1ff9b59cf6f54494cf3ae2b95f4e9cf3a4b10ca352dade98a94d30e8a62e/pydantic-2.11.8.tar.gz", hash = "sha256:3d080f4a3ac6bde98e959ba552124d46be9f565b7be67769e49fcb286bae1bfb", size = 788452, upload-time = "2025-09-13T01:39:32.577Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/ff/5d/09a551ba512d7ca404d785072700d3f6727a02f6f3c24ecfd081c7cf0aa8/pydantic-2.11.9.tar.gz", hash = "sha256:6b8ffda597a14812a7975c90b82a8a2e777d9257aba3453f973acd3c032a18e2", size = 788495, upload-time = "2025-09-13T11:26:39.325Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/19/49/bdc01f684aff7070253fe32fb9c60788e70de6b8ec527eaebf96bdf1a76b/pydantic-2.11.8-py3-none-any.whl", hash = "sha256:830ec4cccc3cf21be1ef5aec1d3348a179c92a61a7dab0e59837f9cc9fa93351", size = 444830, upload-time = "2025-09-13T01:39:30.095Z" },
+    { url = "https://files.pythonhosted.org/packages/3e/d3/108f2006987c58e76691d5ae5d200dd3e0f532cb4e5fa3560751c3a1feba/pydantic-2.11.9-py3-none-any.whl", hash = "sha256:c42dd626f5cfc1c6950ce6205ea58c93efa406da65f479dcb4029d5934857da2", size = 444855, upload-time = "2025-09-13T11:26:36.909Z" },
 ]
 
 [[package]]
@@ -1747,7 +1747,7 @@ wheels = [
 
 [[package]]
 name = "vantage-cli"
-version = "0.1.8"
+version = "0.1.9"
 source = { editable = "." }
 dependencies = [
     { name = "aiohttp" },

vantage_cli-0.1.9/vantage_cli/apps/__init__.py

@@ -0,0 +1,16 @@
+# Copyright (C) 2025 Vantage Compute Corporation
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <https://www.gnu.org/licenses/>.
+"""Applications management for Vantage CLI.
+
+This package contains individual application implementations for deployment
+on various platforms (Juju, Multipass, MicroK8s, etc.).
+"""

vantage_cli-0.1.9/vantage_cli/apps/common.py

@@ -0,0 +1,319 @@
+# Copyright (C) 2025 Vantage Compute Corporation
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 3.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program. If not, see <https://www.gnu.org/licenses/>.
+"""Common validation utilities for deployment apps."""
+
+from datetime import datetime
+from pathlib import Path
+from typing import Any, Dict, List, Optional
+
+import typer
+import yaml
+from rich.console import Console
+
+from vantage_cli.constants import (
+    ERROR_NO_CLIENT_ID,
+    ERROR_NO_CLIENT_SECRET,
+    ERROR_NO_CLUSTER_DATA,
+)
+
+
+def validate_cluster_data(
+    cluster_data: Optional[Dict[str, Any]], console: Console
+) -> Dict[str, Any]:
+    """Validate that cluster data exists and contains required fields.
+
+    Args:
+        cluster_data: Optional cluster configuration dictionary
+        console: Rich console for error output
+
+    Returns:
+        Validated cluster data dictionary
+
+    Raises:
+        typer.Exit: If validation fails
+    """
+    if not cluster_data:
+        console.print(ERROR_NO_CLUSTER_DATA)
+        raise typer.Exit(code=1)
+    return cluster_data
+
+
+def validate_client_credentials(
+    cluster_data: Dict[str, Any], console: Console
+) -> tuple[str, Optional[str]]:
+    """Validate and extract client credentials from cluster data.
+
+    Args:
+        cluster_data: Cluster configuration dictionary
+        console: Rich console for error output
+
+    Returns:
+        Tuple of (client_id, client_secret) where client_secret may be None
+
+    Raises:
+        typer.Exit: If client_id is missing
+    """
+    client_id = cluster_data.get("clientId", None)
+    if not client_id:
+        console.print(ERROR_NO_CLIENT_ID)
+        raise typer.Exit(code=1)
+
+    client_secret = cluster_data.get("clientSecret", None)
+    return client_id, client_secret
+
+
+def require_client_secret(client_secret: Optional[str], console: Console) -> str:
+    """Validate that client secret exists.
+
+    Args:
+        client_secret: Optional client secret string
+        console: Rich console for error output
+
+    Returns:
+        Validated client secret string
+
+    Raises:
+        typer.Exit: If client secret is missing
+    """
+    if not client_secret:
+        console.print(ERROR_NO_CLIENT_SECRET)
+        raise typer.Exit(code=1)
+    return client_secret
+
+
+def generate_dev_cluster_data(cluster_name: str) -> Dict[str, Any]:
+    """Generate dummy cluster data for development/testing purposes.
+
+    Args:
+        cluster_name: Name of the cluster for development
+
+    Returns:
+        Dictionary containing dummy cluster data with all required fields
+    """
+    return {
+        "name": cluster_name,
+        "clientId": "dev-client-12345-abcde-fghij-klmno",
+        "clientSecret": "dev-secret-67890-pqrst-uvwxy-zabcd",
+        "creationParameters": {"jupyterhub_token": "dev-jupyter-token-98765"},
+        # Additional dummy metadata
+        "id": f"dev-cluster-{cluster_name}",
+        "status": "dev",
+        "region": "localhost",
+        "provider": "dev",
+    }
+
+
+def generate_default_deployment_name(app_name: str, cluster_name: str) -> str:
+    """Generate a default deployment name with timestamp.
+
+    Args:
+        app_name: Name of the app being deployed
+        cluster_name: Name of the cluster
+
+    Returns:
+        Default deployment name in format: <app-name>-<cluster-name>-<timestamp-string>
+    """
+    timestamp = datetime.now().strftime("%Y%m%d-%H%M%S")
+    return f"{app_name}-{cluster_name}-{timestamp}"
+
+
+def get_deployments_file_path() -> Path:
+    """Get the path to the deployments tracking file.
+
+    Returns:
+        Path to ~/.vantage-cli/deployments.yaml
+    """
+    vantage_dir = Path.home() / ".vantage-cli"
+    vantage_dir.mkdir(exist_ok=True)
+    return vantage_dir / "deployments.yaml"
+
+
+def load_deployments() -> Dict[str, Any]:
+    """Load deployment tracking data from ~/.vantage-cli/deployments.yaml.
+
+    Returns:
+        Dictionary containing deployments data with 'deployments' key
+    """
+    deployments_file = get_deployments_file_path()
+    if not deployments_file.exists():
+        return {"deployments": {}}
+
+    try:
+        with open(deployments_file, "r") as f:
+            data = yaml.safe_load(f) or {}
+            # Ensure the structure exists
+            if "deployments" not in data:
+                data["deployments"] = {}
+            return data
+    except Exception as e:
+        console = Console()
+        console.print(f"[yellow]Warning: Could not load deployments file: {e}[/yellow]")
+        return {"deployments": {}}
+
+
+def save_deployments(deployments_data: Dict[str, Any]) -> None:
+    """Save deployment tracking data to ~/.vantage-cli/deployments.yaml.
+
+    Args:
+        deployments_data: Dictionary containing deployments data
+    """
+    deployments_file = get_deployments_file_path()
+    try:
+        with open(deployments_file, "w") as f:
+            yaml.dump(deployments_data, f, default_flow_style=False, indent=2)
+    except Exception as e:
+        console = Console()
+        console.print(f"[red]Error: Could not save deployments file: {e}[/red]")
+
+
+def track_deployment(
+    deployment_id: str,
+    app_name: str,
+    cluster_name: str,
+    cluster_data: Dict[str, Any],
+    deployment_name: Optional[str] = None,
+    additional_metadata: Optional[Dict[str, Any]] = None,
+) -> None:
+    """Track a new deployment in the deployments file.
+
+    Args:
+        deployment_id: Unique identifier for the deployment
+        app_name: Name of the app being deployed (e.g., 'slurm-microk8s-localhost')
+        cluster_name: Name of the cluster
+        cluster_data: Cluster configuration data
+        deployment_name: Human-readable name for the deployment (optional)
+        additional_metadata: Additional app-specific metadata to store
+    """
+    deployments_data = load_deployments()
+
+    deployment_record = {
+        "deployment_name": deployment_name or f"{app_name}-{cluster_name}",
+        "app_name": app_name,
+        "cluster_name": cluster_name,
+        "cluster_id": cluster_data.get("id", "unknown"),
+        "client_id": cluster_data.get("clientId", "unknown"),
+        "created_at": datetime.now().isoformat(),
+        "status": "active",
+        "cluster_data": cluster_data,  # Store full cluster_data for cleanup
+        "metadata": additional_metadata or {},
+    }
+
+    deployments_data["deployments"][deployment_id] = deployment_record
+    save_deployments(deployments_data)
+
+    console = Console()
+    console.print(
+        f"[green]✓ Deployment '{deployment_id}' tracked in ~/.vantage-cli/deployments.yaml[/green]"
+    )
+
+
+def get_deployment(deployment_id: str) -> Optional[Dict[str, Any]]:
+    """Get deployment information by ID.
+
+    Args:
+        deployment_id: Unique identifier for the deployment
+
+    Returns:
+        Deployment record dictionary or None if not found
+    """
+    deployments_data = load_deployments()
+    return deployments_data["deployments"].get(deployment_id)
+
+
+def get_deployments() -> List[Dict[str, Any]]:
+    """Get all deployments with their IDs included.
+
+    Returns:
+        List of deployment records with deployment_id field added
+    """
+    deployments_data = load_deployments()
+    deployments_list = []
+
+    for deployment_id, deployment_data in deployments_data["deployments"].items():
+        # Add the deployment_id to the deployment data
+        deployment_record = deployment_data.copy()
+        deployment_record["deployment_id"] = deployment_id
+        # Add cluster_data for cleanup functions (stored as metadata in old format)
+        if "cluster_data" not in deployment_record and "metadata" in deployment_record:
+            deployment_record["cluster_data"] = deployment_record["metadata"]
+        deployments_list.append(deployment_record)
+
+    return deployments_list
+
+
+def list_deployments_by_app(app_name: str) -> Dict[str, Dict[str, Any]]:
+    """List all deployments for a specific app.
+
+    Args:
+        app_name: Name of the app to filter by
+
+    Returns:
+        Dictionary of deployment_id -> deployment_record
+    """
+    deployments_data = load_deployments()
+    return {
+        dep_id: dep_data
+        for dep_id, dep_data in deployments_data["deployments"].items()
+        if dep_data.get("app_name") == app_name and dep_data.get("status") == "active"
+    }
+
+
+def list_deployments_by_cluster(cluster_name: str) -> Dict[str, Dict[str, Any]]:
+    """List all active deployments for a specific cluster.
+
+    Args:
+        cluster_name: Name of the cluster to filter by
+
+    Returns:
+        Dictionary of deployment_id -> deployment_record for active deployments
+    """
+    deployments_data = load_deployments()
+    return {
+        dep_id: dep_data
+        for dep_id, dep_data in deployments_data["deployments"].items()
+        if dep_data.get("cluster_name") == cluster_name and dep_data.get("status") == "active"
+    }
+
+
+def mark_deployment_deleted(deployment_id: str) -> bool:
+    """Mark a deployment as deleted in the tracking file.
+
+    Args:
+        deployment_id: Unique identifier for the deployment
+
+    Returns:
+        True if deployment was found and marked as deleted, False otherwise
+    """
+    deployments_data = load_deployments()
+    if deployment_id in deployments_data["deployments"]:
+        deployments_data["deployments"][deployment_id]["status"] = "deleted"
+        deployments_data["deployments"][deployment_id]["deleted_at"] = datetime.now().isoformat()
+        save_deployments(deployments_data)
+        return True
+    return False
+
+
+def remove_deployment(deployment_id: str) -> bool:
+    """Remove a deployment entry completely from the tracking file.
+
+    Args:
+        deployment_id: Unique identifier for the deployment
+
+    Returns:
+        True if deployment was found and removed, False otherwise
+    """
+    deployments_data = load_deployments()
+    if deployment_id in deployments_data["deployments"]:
+        del deployments_data["deployments"][deployment_id]
+        save_deployments(deployments_data)
+        return True
+    return False