dayhoff-tools 1.7.0__tar.gz → 1.7.2__tar.gz

{dayhoff_tools-1.7.0 → dayhoff_tools-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.7.0
+Version: 1.7.2
 Summary: Common tools for all the repos at Dayhoff Labs
 Author: Daniel Martin-Alarcon
 Author-email: dma@dayhofflabs.com

{dayhoff_tools-1.7.0 → dayhoff_tools-1.7.2}/dayhoff_tools/cli/engine_commands.py

@@ -1,6 +1,7 @@
 """Engine and Studio management commands for DHT CLI."""
 
 import json
+import os
 import re
 import shutil
 import subprocess
@@ -365,13 +366,58 @@ def resolve_engine(name_or_id: str, engines: List[Dict]) -> Dict:
 
 
 def get_ssh_public_key() -> str:
-    """Get the user's SSH public key."""
+    """Get the user's SSH public key.
+
+    Discovery order (container-friendly):
+    1) DHT_SSH_PUBLIC_KEY env var (direct key content)
+    2) DHT_SSH_PUBLIC_KEY_PATH env var (path to a .pub file)
+    3) ssh-agent via `ssh-add -L` (requires SSH_AUTH_SOCK)
+    4) Conventional files: ~/.ssh/id_ed25519.pub, ~/.ssh/id_rsa.pub
+
+    Raises:
+        FileNotFoundError: If no public key can be discovered.
+    """
+    # 1) Direct env var content
+    env_key = os.environ.get("DHT_SSH_PUBLIC_KEY")
+    if env_key and env_key.strip():
+        return env_key.strip()
+
+    # 2) Env var path
+    env_path = os.environ.get("DHT_SSH_PUBLIC_KEY_PATH")
+    if env_path:
+        p = Path(env_path).expanduser()
+        if p.is_file():
+            try:
+                return p.read_text().strip()
+            except Exception:
+                pass
+
+    # 3) Agent lookup (ssh-add -L)
+    try:
+        if shutil.which("ssh-add") is not None:
+            proc = subprocess.run(["ssh-add", "-L"], capture_output=True, text=True)
+            if proc.returncode == 0 and proc.stdout:
+                keys = [line.strip() for line in proc.stdout.splitlines() if line.strip()]
+                # Prefer ed25519, then rsa
+                for pref in ("ssh-ed25519", "ssh-rsa", "ecdsa-sha2-nistp256"):
+                    for k in keys:
+                        if k.startswith(pref + " "):
+                            return k
+                # Fallback to first key if types not matched
+                if keys:
+                    return keys[0]
+    except Exception:
+        pass
+
+    # 4) Conventional files
     home = Path.home()
     key_paths = [home / ".ssh" / "id_ed25519.pub", home / ".ssh" / "id_rsa.pub"]
-
     for key_path in key_paths:
         if key_path.is_file():
-            return key_path.read_text().strip()
+            try:
+                return key_path.read_text().strip()
+            except Exception:
+                continue
 
     raise FileNotFoundError(
         "No SSH public key found. Please create one with 'ssh-keygen' first."

{dayhoff_tools-1.7.0 → dayhoff_tools-1.7.2}/dayhoff_tools/cli/main.py

@@ -1,6 +1,7 @@
 """Entry file for the CLI, which aggregates and aliases all commands."""
 
 import sys
+from importlib.metadata import PackageNotFoundError, version
 
 import typer
 
@@ -21,7 +22,20 @@ from dayhoff_tools.warehouse import (
     import_from_warehouse_typer,
 )
 
-app = typer.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(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)
@@ -50,6 +64,22 @@ app.add_typer(engine_app, name="engine", help="Manage compute engines for develo
 app.add_typer(studio_app, name="studio", help="Manage persistent development studios.")
 
 
+@app.callback()
+def _version_option(
+    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()
+
+
 @app.command("wheel")
 def build_and_upload_wheel_command(
     bump: str = typer.Option(

{dayhoff_tools-1.7.0 → dayhoff_tools-1.7.2}/dayhoff_tools/cli/utility_commands.py

@@ -265,42 +265,72 @@ def install_dependencies(
         help="Install the local project package itself (with 'full' extras) into the environment.",
     ),
 ):
-    """Install dependencies based on pyproject.toml.
-
-    Ensures uv.lock matches pyproject.toml and syncs the environment.
-    When -p is used, installs the local project with its [full] optional dependencies.
+    """Install dependencies respecting Mac devcontainer flow and the active venv.
+
+    Behavior:
+    - If running on Mac devcontainer (STUDIO_PLATFORM=mac) and `pyproject.mac.toml` exists:
+      * Ensure `.mac_uv_project/pyproject.toml` is a copy of `pyproject.mac.toml`
+      * Run `uv lock` and `uv sync` in `.mac_uv_project` and always target the active venv with `--active`
+      * If `install_project` is true, install the project from repo root into the active env (editable, [full])
+    - Otherwise (default path):
+      * Operate in repo root, ensure lock, and `uv sync --active` so we don't create `.venv` accidentally
+      * If `install_project` is true, sync without `--no-install-project` (installs project)
     """
     # ANSI color codes
     BLUE = "\033[94m"
     RESET = "\033[0m"
 
     try:
-        # Step 1: Ensure lock file matches pyproject.toml
-        print("Ensuring lock file matches pyproject.toml...")
-        lock_cmd = ["uv", "lock"]
-        print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
-        subprocess.run(lock_cmd, check=True, capture_output=True)
-
-        if install_project:
-            # Step 2a: Install the project with 'full' extras
-            print("Installing the local project with 'full' extras...")
-            # The .[full] syntax tells pip to install the current project ('.')
-            # with its 'full' optional dependencies.
-            pip_install_cmd = ["uv", "pip", "install", "-e", ".[full]"]
-            print(f"Running command: {BLUE}{' '.join(pip_install_cmd)}{RESET}")
-            subprocess.run(pip_install_cmd, check=True)
-
-            print("Project installed with 'full' extras successfully.")
+        is_mac = os.environ.get("STUDIO_PLATFORM") == "mac"
+        mac_manifest = Path("pyproject.mac.toml")
+        if is_mac and mac_manifest.exists():
+            # Mac devcontainer flow
+            mac_uv_dir = Path(".mac_uv_project")
+            mac_uv_dir.mkdir(parents=True, exist_ok=True)
+            mac_pyproject = mac_uv_dir / "pyproject.toml"
+            mac_pyproject.write_text(mac_manifest.read_text())
+
+            # Ensure lock matches manifest (in mac temp dir)
+            print("Ensuring lock file matches pyproject.mac.toml (Mac devcon)…")
+            lock_cmd = ["uv", "lock"]
+            print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
+            subprocess.run(lock_cmd, check=True, capture_output=True, cwd=str(mac_uv_dir))
+
+            # Sync into the active environment
+            if install_project:
+                print("Syncing dependencies into ACTIVE env and installing project [full]…")
+                sync_cmd = ["uv", "sync", "--all-groups", "--active"]
+                print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
+                subprocess.run(sync_cmd, check=True, cwd=str(mac_uv_dir))
+                # Install project from repo root
+                pip_install_cmd = ["uv", "pip", "install", "-e", ".[full]"]
+                print(f"Running command: {BLUE}{' '.join(pip_install_cmd)}{RESET}")
+                subprocess.run(pip_install_cmd, check=True)
+                print("Project installed with 'full' extras successfully.")
+            else:
+                print("Syncing dependencies into ACTIVE env (project not installed)…")
+                sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project", "--active"]
+                print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
+                subprocess.run(sync_cmd, check=True, cwd=str(mac_uv_dir))
+                print("Dependencies synced successfully (project not installed).")
         else:
-            # Original behavior: Sync environment without installing the project
-            print(
-                "Syncing environment with lock file (project itself will not be installed)..."
-            )
-            # --all-groups ensures all non-project dependencies (like dev) are installed
-            sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project"]
-            print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
-            subprocess.run(sync_cmd, check=True)
-            print("Dependencies synced successfully (project not installed).")
+            # Default behavior in repo root, but ensure we target the active env
+            print("Ensuring lock file matches pyproject.toml…")
+            lock_cmd = ["uv", "lock"]
+            print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
+            subprocess.run(lock_cmd, check=True, capture_output=True)
+
+            if install_project:
+                print("Syncing dependencies into ACTIVE env (installing project)…")
+                sync_cmd = ["uv", "sync", "--all-groups", "--active"]
+                print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
+                subprocess.run(sync_cmd, check=True)
+            else:
+                print("Syncing dependencies into ACTIVE env (project not installed)…")
+                sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project", "--active"]
+                print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
+                subprocess.run(sync_cmd, check=True)
+                print("Dependencies synced successfully (project not installed).")
 
     except subprocess.CalledProcessError as e:
         stderr_output = e.stderr.decode() if e.stderr else "No stderr output."
@@ -327,19 +357,27 @@ def update_dependencies(
         help="Update all dependencies instead of just dayhoff-tools.",
     ),
 ):
-    """Update dependencies to newer versions.
-
-    Default Action (no flags): Updates only 'dayhoff-tools' package to latest,
-                               updates pyproject.toml, and syncs.
-
-    Flags:
-    --all/-a: Updates all dependencies to latest compatible versions (`uv lock --upgrade`)
-              and syncs the environment. Overrides the default.
+    """Update dependencies to newer versions (Mac-aware, active venv friendly).
+
+    - Default Action (no flags): Updates only 'dayhoff-tools' package to latest,
+      updates the manifest's version constraint, and syncs.
+    - Flags:
+      --all/-a: Updates all dependencies (uv lock --upgrade) and syncs.
+
+    Mac devcontainer behavior:
+    - If STUDIO_PLATFORM=mac and `pyproject.mac.toml` exists, operate in `.mac_uv_project/`:
+      copy `pyproject.mac.toml` to `.mac_uv_project/pyproject.toml`, run uv there, and always
+      use `--active` for sync so installs target the active venv.
+    - Update the constraint inside `pyproject.mac.toml`. If not found, try `pyproject.toml`.
+    Otherwise (non-Mac), operate in repo root and also target the active venv during sync.
     """
     # ANSI color codes
     BLUE = "\033[94m"
     RESET = "\033[0m"
 
+    is_mac = os.environ.get("STUDIO_PLATFORM") == "mac"
+    mac_manifest = Path("pyproject.mac.toml")
+    mac_uv_dir = Path(".mac_uv_project")
     lock_file_path = Path("uv.lock")
     pyproject_path = Path("pyproject.toml")
 
@@ -363,10 +401,19 @@ def update_dependencies(
         )
 
     try:
+        # Choose working directory for uv operations
+        uv_cwd = None
+        manifest_path_for_constraint = pyproject_path
+        if is_mac and mac_manifest.exists():
+            mac_uv_dir.mkdir(parents=True, exist_ok=True)
+            (mac_uv_dir / "pyproject.toml").write_text(mac_manifest.read_text())
+            uv_cwd = str(mac_uv_dir)
+            lock_file_path = mac_uv_dir / "uv.lock"
+            manifest_path_for_constraint = mac_manifest
         # Step 1: Run the update lock command
         print(action_description)
         print(f"Running command: {BLUE}{' '.join(lock_cmd)}{RESET}")
-        subprocess.run(lock_cmd, check=True, capture_output=True)
+        subprocess.run(lock_cmd, check=True, capture_output=True, cwd=uv_cwd)
 
         # Step 2: Update pyproject.toml only if doing the dayhoff update (default)
         if run_pyproject_update:
@@ -395,9 +442,9 @@ def update_dependencies(
                 return
 
             print(f"Found dayhoff-tools version {locked_version} in lock file.")
-            print(f"Updating {pyproject_path} version constraint...")
+            print(f"Updating {manifest_path_for_constraint} version constraint...")
             try:
-                content = pyproject_path.read_text()
+                content = manifest_path_for_constraint.read_text()
 
                 package_name = "dayhoff-tools"
                 package_name_esc = re.escape(package_name)
@@ -420,27 +467,41 @@ def update_dependencies(
 
                 new_content, num_replacements = pattern.subn(_repl, content)
                 if num_replacements > 0:
-                    pyproject_path.write_text(new_content)
+                    manifest_path_for_constraint.write_text(new_content)
                     print(
-                        f"Updated dayhoff-tools constraint in {pyproject_path} to '{new_constraint_text}'"
+                        f"Updated dayhoff-tools constraint in {manifest_path_for_constraint} to '{new_constraint_text}'"
                     )
                 else:
-                    print(
-                        f"Warning: Could not find dayhoff-tools dependency line in {pyproject_path} to update constraint."
-                    )
+                    # Fallback: try the root pyproject if we were targeting mac manifest
+                    if manifest_path_for_constraint != pyproject_path and pyproject_path.exists():
+                        content2 = pyproject_path.read_text()
+                        new_content2, n2 = pattern.subn(_repl, content2)
+                        if n2 > 0:
+                            pyproject_path.write_text(new_content2)
+                            print(
+                                f"Updated dayhoff-tools constraint in {pyproject_path} to '{new_constraint_text}'"
+                            )
+                        else:
+                            print(
+                                f"Warning: Could not find dayhoff-tools dependency line in {manifest_path_for_constraint} or {pyproject_path} to update constraint."
+                            )
+                    else:
+                        print(
+                            f"Warning: Could not find dayhoff-tools dependency line in {manifest_path_for_constraint} to update constraint."
+                        )
             except FileNotFoundError:
-                print(f"Error: {pyproject_path} not found.")
+                print(f"Error: {manifest_path_for_constraint} not found.")
                 return
             except Exception as e:
-                print(f"Error updating {pyproject_path}: {e}")
+                print(f"Error updating {manifest_path_for_constraint}: {e}")
                 print("Proceeding with sync despite pyproject.toml update error.")
 
         # Step 3: Sync environment
         print("Syncing environment with updated lock file...")
         # Always use --no-install-project for updates
-        sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project"]
+        sync_cmd = ["uv", "sync", "--all-groups", "--no-install-project", "--active"]
         print(f"Running command: {BLUE}{' '.join(sync_cmd)}{RESET}")
-        subprocess.run(sync_cmd, check=True)
+        subprocess.run(sync_cmd, check=True, cwd=uv_cwd)
 
         # Final status message
         if update_all:

{dayhoff_tools-1.7.0 → dayhoff_tools-1.7.2}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 
 [project]
 name = "dayhoff-tools"
-version = "1.7.0"
+version = "1.7.2"
 description = "Common tools for all the repos at Dayhoff Labs"
 authors = [
     {name = "Daniel Martin-Alarcon", email = "dma@dayhofflabs.com"}