dayhoff-tools 1.1.10__py3-none-any.whl → 1.13.12__py3-none-any.whl

dayhoff_tools/cli/main.py

@@ -1,27 +1,58 @@
 """Entry file for the CLI, which aggregates and aliases all commands."""
 
+import sys
+from importlib.metadata import PackageNotFoundError, version
+
 import typer
 from dayhoff_tools.cli.cloud_commands import aws_app, gcp_app
+from dayhoff_tools.cli.engine1 import engine_app, studio_app
 from dayhoff_tools.cli.utility_commands import (
-    add_to_warehouse_typer,
+    add_dependency,
     build_and_upload_wheel,
     delete_local_branch,
-    get_ancestry,
-    import_from_warehouse_typer,
-    install_dependencies,
+    remove_dependency,
+    sync_with_toml,
     test_github_actions_locally,
     update_dependencies,
 )
+from dayhoff_tools.warehouse import (
+    _warn_if_gcp_default_sa,
+    add_to_warehouse_typer,
+    get_ancestry,
+    get_from_warehouse_typer,
+    import_from_warehouse_typer,
+)
+
+
+def _get_dht_version() -> str:
+    try:
+        return version("dayhoff-tools")
+    except PackageNotFoundError:
+        # Fallback to package __version__ if running from source
+        try:
+            from dayhoff_tools import __version__  # type: ignore
+
+            return __version__
+        except Exception:
+            return "unknown"
+
 
-app = typer.Typer()
+app = typer.Typer(
+    help=f"Dayhoff Tools (dh) v{_get_dht_version()}\n\nUse 'dh --version' to print version and exit."
+)
 
 # Utility commands
 app.command("clean")(delete_local_branch)
 
 # Dependency Management
 app.command(
-    "install", help="Install dependencies based on pyproject.toml and sync environment."
-)(install_dependencies)
+    "tomlsync",
+    help="Sync environment with platform-specific TOML manifest (install/update dependencies).",
+)(sync_with_toml)
+app.command("add", help="Add a dependency to all platform manifests.")(add_dependency)
+app.command("remove", help="Remove a dependency from all platform manifests.")(
+    remove_dependency
+)
 app.command("update", help="Update dayhoff-tools (or all deps) and sync environment.")(
     update_dependencies
 )
@@ -30,12 +61,64 @@ app.command("update", help="Update dayhoff-tools (or all deps) and sync environm
 app.command("gha")(test_github_actions_locally)
 app.command("wadd")(add_to_warehouse_typer)
 app.command("wancestry")(get_ancestry)
+app.command("wget")(get_from_warehouse_typer)
 app.command("wimport")(import_from_warehouse_typer)
 
 # Cloud commands
 app.add_typer(gcp_app, name="gcp", help="Manage GCP authentication and impersonation.")
 app.add_typer(aws_app, name="aws", help="Manage AWS SSO authentication.")
 
+# Engine and Studio commands (original implementation)
+app.add_typer(engine_app, name="engine", help="Manage compute engines for development.")
+app.add_typer(studio_app, name="studio", help="Manage persistent development studios.")
+
+
+# Engine and Studio commands (new implementation with progress tracking)
+# These use Click instead of Typer, so we need a passthrough wrapper
+@app.command(
+    "engine2",
+    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+)
+def engine2_cmd(ctx: typer.Context):
+    """Manage engines (new implementation with progress tracking)."""
+    from dayhoff_tools.cli.engines_studios import engine_cli
+
+    # Pass arguments directly to Click CLI
+    engine_cli(ctx.args, standalone_mode=False)
+
+
+@app.command(
+    "studio2",
+    context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
+)
+def studio2_cmd(ctx: typer.Context):
+    """Manage studios (new implementation with progress tracking)."""
+    from dayhoff_tools.cli.engines_studios import studio_cli
+
+    # Pass arguments directly to Click CLI
+    studio_cli(ctx.args, standalone_mode=False)
+
+
+@app.callback(invoke_without_command=True)
+def _version_option(
+    ctx: typer.Context,
+    version_flag: bool = typer.Option(
+        False,
+        "--version",
+        "-v",
+        help="Print version and exit.",
+        is_eager=True,
+    ),
+):
+    """Global options for the dh CLI (e.g., version)."""
+    if version_flag:
+        typer.echo(_get_dht_version())
+        raise typer.Exit()
+    # If no subcommand provided, show help instead of 'Missing command'
+    if ctx.invoked_subcommand is None:
+        typer.echo(ctx.get_help())
+        raise typer.Exit()
+
 
 @app.command("wheel")
 def build_and_upload_wheel_command(
@@ -96,6 +179,22 @@ def deploy_command(
     config_path: str = typer.Argument(help="Path to the YAML configuration file"),
 ):
     """Unified deployment command."""
+    # Check GCP credentials if deploying in batch mode with GCP
+    # Do this early to fail fast before importing deployment code
+    if mode == "batch":
+        try:
+            # Check cloud provider in config
+            import yaml
+
+            with open(config_path, "r") as f:
+                config = yaml.safe_load(f)
+
+            if config.get("cloud") == "gcp":
+                _warn_if_gcp_default_sa(force_prompt=True)
+        except Exception as e:
+            # Don't block deployment if config can't be read or other errors occur
+            print(f"Warning: Could not check GCP credentials: {e}", file=sys.stderr)
+
     from dayhoff_tools.deployment.base import deploy
 
     deploy(mode, config_path)