deployml-core 0.0.54__tar.gz → 0.0.56__tar.gz

{deployml_core-0.0.54 → deployml_core-0.0.56}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: deployml-core
-Version: 0.0.54
+Version: 0.0.56
 Summary: Infra for academia
 License-File: LICENSE
 Author: Drew Hoang

{deployml_core-0.0.54 → deployml_core-0.0.56}/pyproject.toml

@@ -1,7 +1,7 @@
 
 [project]
 name = "deployml-core"
-version = "0.0.54"
+version = "0.0.56"
 description = "Infra for academia"
 authors = [
     {name = "Drew Hoang", email = "codentell@gmail.com"},

{deployml_core-0.0.54 → deployml_core-0.0.56}/src/deployml/cli/cli.py

@@ -23,6 +23,8 @@ import string
 from google.cloud import storage
 import hashlib
 
+from deployml.notebook.docker import build_images 
+
 # Import refactored utility functions
 from deployml.utils.helpers import (
     check,
@@ -34,6 +36,7 @@ from deployml.utils.helpers import (
     cleanup_cloud_sql_resources,
     cleanup_terraform_files,
     run_terraform_with_loading_bar,
+    _create_docker_folder,
 )
 from deployml.utils.infracost import (
     check_infracost_available,
@@ -707,8 +710,22 @@ def generate():
         )
 
     # Write configuration to file
-    config_filename = f"{name}.yaml"
-    import yaml
+    config_filename = "config.yaml"
+    
+    if not config_filename.exists():
+        typer.secho(
+            "config.yaml not found. Run 'mlops-infra init' first.",
+            fg=typer.colors.RED,
+        )
+        raise typer.Exit(code=1)
+
+    if not force:
+        confirm = typer.confirm(
+            "This will overwrite the existing config.yaml. Continue?"
+        )
+        if not confirm:
+            typer.echo("Aborted.")
+            raise typer.Exit()
 
     with open(config_filename, "w") as f:
         yaml.dump(config, f, default_flow_style=False, sort_keys=False)
@@ -1828,9 +1845,23 @@ def init(
     project_id: str = typer.Option(
         "", "--project-id", "-j", help="Project ID (for GCP)"
     ),
+    path: Path = typer.Option(
+        Path.cwd(),
+        "--path",
+        help="Directory where project should be initialized.",
+    ),
+    overwrite: bool = typer.Option(
+        False,
+        "--overwrite",
+        help="Overwrite existing docker folder if it exists.",
+    ),
 ):
     """
     Initialize cloud project by enabling required APIs/services before deployment.
+
+    This creates:
+      - docker/ folder with Dockerfile templates
+      - config.yaml template
     """
     if provider == "gcp":
         if not project_id:
@@ -1865,6 +1896,46 @@ def init(
     else:
         typer.echo(f" Unknown provider: {provider}")
         raise typer.Exit(code=1)
+    
+    project_root = Path(path)
+    try:
+        project_root.mkdir(parents=True, exist_ok=True)
+
+        # ----------------------------------------
+        # Create docker folder
+        # ----------------------------------------
+        _create_docker_folder(project_root, overwrite=overwrite)
+
+        # ----------------------------------------
+        # Create config.yaml
+        # ----------------------------------------
+        config_path = project_root / "config.yaml"
+
+        if config_path.exists() and not overwrite:
+            raise FileExistsError(
+                f"{config_path} already exists. Use --overwrite to replace."
+            )
+
+        config_template = {
+            "# Run `mlops-infra generate` to create your config"
+        }
+
+        with open(config_path, "w") as f:
+            yaml.dump(config_template, f, sort_keys=False)
+
+        typer.secho("Project initialized successfully.", fg=typer.colors.GREEN)
+        typer.echo()
+        typer.echo("Created:")
+        typer.echo("  - docker/")
+        typer.echo("  - config.yaml")
+        typer.echo()
+        typer.echo("Next steps:")
+        typer.echo("  1. Edit config.yaml")
+        typer.echo("  2. Build images with: mlops-infra build-images --docker-root docker")
+
+    except Exception as e:
+        typer.secho(f"Error: {e}", fg=typer.colors.RED)
+        raise typer.Exit(code=1)
 
 
 @cli.command()
@@ -2215,6 +2286,88 @@ def gke_apply(
         typer.echo(f"   Check: {manifests_dir}")
 
 
+@cli.command("build-images")
+def build_images_command(
+    docker_root: Path = typer.Option(
+        ...,
+        "--docker-root",
+        "-d",
+        help="Path to folder containing subfolders with Dockerfiles.",
+        exists=True,
+        file_okay=False,
+        dir_okay=True,
+        resolve_path=True,
+    ),
+    gcp_project: Optional[str] = typer.Option(
+        None,
+        "--gcp-project",
+        "-p",
+        help="If provided, images will be built using Cloud Build in this GCP project.",
+    ),
+    region: str = typer.Option(
+        "us-central1",
+        "--region",
+        help="GCP region for Artifact Registry.",
+    ),
+    repository: str = typer.Option(
+        "mlops-images",
+        "--repository",
+        help="Artifact Registry repository name.",
+    ),
+    tag: str = typer.Option(
+        "latest",
+        "--tag",
+        "-t",
+        help="Image tag to apply.",
+    ),
+    create_repo: bool = typer.Option(
+        False,
+        "--create-repo",
+        help="Create the Artifact Registry repository if it does not exist (GCP mode only).",
+    ),
+    dry_run: bool = typer.Option(
+        False,
+        "--dry-run",
+        help="Show what would be built without executing Docker or gcloud commands.",
+    ),
+):
+    """
+    Build all Docker images found in subdirectories of the given folder.
+
+    Local mode:
+        Builds using Docker.
+
+    GCP mode:
+        Uses Cloud Build and pushes to Artifact Registry.
+
+    --dry-run prints commands without executing them.
+    """
+
+    if create_repo and not gcp_project:
+        typer.secho(
+            "--create-repo can only be used with --gcp-project.",
+            fg=typer.colors.RED,
+        )
+        raise typer.Exit(code=1)
+
+    try:
+        build_images(
+            docker_root=docker_root,
+            gcp_project_id=gcp_project,
+            region=region,
+            repository=repository,
+            tag=tag,
+            create_repo=create_repo,
+            dry_run=dry_run,
+        )
+
+        if not dry_run:
+            typer.secho("Image build completed successfully.", fg=typer.colors.GREEN)
+
+    except Exception as e:
+        typer.secho(f"Error building images: {e}", fg=typer.colors.RED)
+        raise typer.Exit(code=1)
+
 def main():
     """
     Entry point for the DeployML CLI.

{deployml_core-0.0.54 → deployml_core-0.0.56}/src/deployml/utils/constants.py

@@ -48,4 +48,5 @@ REQUIRED_GCP_APIS = [
     "monitoring.googleapis.com",
     "logging.googleapis.com",
     "artifactregistry.googleapis.com",
+    "cloudbuild.googleapis.com",
 ]

{deployml_core-0.0.54 → deployml_core-0.0.56}/src/deployml/utils/helpers.py

@@ -1,5 +1,6 @@
 import shutil
 import subprocess
+import importlib.resources as pkg_resources
 from pathlib import Path
 from typing import Optional
 from google.cloud import storage
@@ -464,3 +465,26 @@ def run_terraform_with_loading_bar(cmd, cwd, estimated_minutes, stack=None):
             return returncode
         finally:
             f.close()  # Always close the file
+
+
+def _create_docker_folder(
+    project_root: Path,
+    overwrite: bool = False,
+) -> None:
+    docker_target = project_root / "docker"
+
+    if docker_target.exists() and not overwrite:
+        raise FileExistsError(
+            f"{docker_target} already exists. Use --overwrite to replace."
+        )
+
+    if docker_target.exists():
+        shutil.rmtree(docker_target)
+
+    docker_target.mkdir(parents=True, exist_ok=True)
+
+    templates = pkg_resources.files("deployml") / "docker"
+
+    for item in templates.iterdir():
+        if item.is_dir():
+            shutil.copytree(item, docker_target / item.name)