chipfoundry-cli 0.1.4__tar.gz → 0.1.6__tar.gz

{chipfoundry_cli-0.1.4 → chipfoundry_cli-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: chipfoundry-cli
-Version: 0.1.4
+Version: 0.1.6
 Summary: CLI tool to automate ChipFoundry project submission to SFTP server
 Home-page: https://chipfoundry.io
 License: Apache-2.0

{chipfoundry_cli-0.1.4 → chipfoundry_cli-0.1.6}/chipfoundry_cli/main.py

@@ -48,6 +48,8 @@ def config_cmd():
     key_path = console.input("Enter path to your SFTP private key (leave blank for ~/.ssh/id_rsa): ").strip()
     if not key_path:
         key_path = os.path.expanduser('~/.ssh/id_rsa')
+    else:
+        key_path = os.path.abspath(os.path.expanduser(key_path))
     config = {
         "sftp_username": username,
         "sftp_key": key_path,
@@ -143,7 +145,9 @@ def push(project_root, sftp_host, sftp_username, sftp_key, sftp_password, projec
     key_path = sftp_key
     password = sftp_password
     # Always resolve key_path to absolute path if set
+    print(f"key_path: {key_path}")
     if key_path:
+        print(f"key_path: {key_path}")
         key_path = os.path.abspath(os.path.expanduser(key_path))
     if not key_path and not password:
         if os.path.exists(DEFAULT_SSH_KEY):

{chipfoundry_cli-0.1.4 → chipfoundry_cli-0.1.6}/chipfoundry_cli/utils.py

@@ -104,13 +104,30 @@ def update_or_create_project_json(
     save_project_json(project_json_path, data)
     return project_json_path 
 
+def load_private_key(key_path, password=None):
+    key_loaders = [
+        paramiko.Ed25519Key.from_private_key_file,
+        paramiko.RSAKey.from_private_key_file,
+        paramiko.ECDSAKey.from_private_key_file,
+        paramiko.DSSKey.from_private_key_file,
+    ]
+    last_exception = None
+    for loader in key_loaders:
+        try:
+            return loader(key_path, password=password)
+        except paramiko.ssh_exception.PasswordRequiredException:
+            raise  # Key is encrypted, need password
+        except Exception as e:
+            last_exception = e
+    raise RuntimeError(f"Could not load private key: {last_exception}")
+
 def sftp_connect(host: str, username: str, password: str = None, key_path: str = None):
     """
     Establish an SFTP connection using paramiko. Returns an SFTP client.
     """
     transport = paramiko.Transport((host, 22))
     if key_path:
-        private_key = paramiko.RSAKey.from_private_key_file(key_path)
+        private_key = load_private_key(key_path)
         transport.connect(username=username, pkey=private_key)
     else:
         transport.connect(username=username, password=password)

{chipfoundry_cli-0.1.4 → chipfoundry_cli-0.1.6}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "chipfoundry-cli"
-version = "0.1.4"
+version = "0.1.6"
 description = "CLI tool to automate ChipFoundry project submission to SFTP server"
 authors = ["ChipFoundry <marwan.abbas@chipfoundry.io>"]
 readme = "README.md"