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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: dayhoff-tools
-Version: 1.7.0
+Version: 1.7.1
 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.1}/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.1}/pyproject.toml

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