brynq-sdk-ftp 2.0.2__tar.gz → 2.0.5__tar.gz

{brynq_sdk_ftp-2.0.2 → brynq_sdk_ftp-2.0.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_ftp
-Version: 2.0.2
+Version: 2.0.5
 Summary: FTP wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_ftp-2.0.2 → brynq_sdk_ftp-2.0.5}/brynq_sdk_ftp/sftp.py

@@ -6,6 +6,7 @@ from paramiko.sftp_attr import SFTPAttributes
 import pysftp
 from typing import Union, List
 from stat import S_ISREG
+import os
 
 
 class SFTP(BrynQ):
@@ -26,16 +27,18 @@ class SFTP(BrynQ):
         self.password = credentials['password']
         self.cnopts = pysftp.CnOpts()
         self.cnopts.hostkeys = None
-        self.private_key_path = None
-        self.private_key = None
-        if credentials['private_key_path'] is not None:
-            self.private_key_path = credentials['private_key_path']
-            self.private_key_pass = credentials['private_key_password']
-        if credentials['private_key'] is not None:
-            self.private_key = RSAKey(file_obj=StringIO(credentials['private_key']))
+        self.private_key_path = credentials.get('private_key_password', None)
+        self.private_key_passphrase = credentials.get('private_key_password', None)
+        self.private_key = credentials.get('private_key', None)
+        if self.private_key:
+            self.private_key = RSAKey(file_obj=StringIO(credentials.get('private_key')), password=self.private_key_passphrase)
         self.client = SSHClient()
         self.client.set_missing_host_key_policy(AutoAddPolicy())
 
+
+
+
+
     def upload_file(self, local_filepath, remote_filepath, confirm=True) -> SFTPAttributes:
         """
         Upload a single file to a remote location. If there is no Private key
@@ -44,10 +47,7 @@ class SFTP(BrynQ):
         :param confirm: If you want to confirm the upload
         :return: status
         """
-        if self.private_key is None:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, password=self.password)
-        else:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key)
+        self.client.connect(hostname=self.host, port=self.port, username=self.username, password=self.password, pkey=self.private_key, passphrase=self.private_key_passphrase)
         sftp = self.client.open_sftp()
         response = sftp.put(local_filepath, remote_filepath, confirm=confirm)
         self.client.close()
@@ -60,14 +60,7 @@ class SFTP(BrynQ):
         :param remote_filepath: The full path where you want to get the content from
         :return: a list with files and folders in the given location
         """
-        if self.private_key is None:
-            if self.debug:
-                print('No private key')
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, password=self.password)
-        else:
-            if self.debug:
-                print('Private key')
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key)
+        self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key, password=self.password)
         sftp = self.client.open_sftp()
         sftp.chdir(remote_filepath)
         list_files = sftp.listdir_attr()
@@ -84,10 +77,7 @@ class SFTP(BrynQ):
         :param local_path: the path where the file needs to be downloaded to
         :return: a file object
         """
-        if self.private_key is None:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, password=self.password)
-        else:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key)
+        self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key, password=self.password)
         sftp = self.client.open_sftp()
         sftp.get(remotepath=f'{remote_path}{remote_file}', localpath=f'{local_path}/{remote_file}')
         self.client.close()
@@ -99,10 +89,7 @@ class SFTP(BrynQ):
         :param new_dir_name: The name of the new folder
         :return: a status if creating succeeded or not
         """
-        if self.private_key is None:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, password=self.password)
-        else:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key)
+        self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key, password=self.password)
         sftp = self.client.open_sftp()
         sftp.chdir(remote_path)
         sftp.mkdir(new_dir_name)
@@ -114,10 +101,7 @@ class SFTP(BrynQ):
         :param remote_file: the full path of the file that needs to be removed
         :return: a status if deleting succeeded or not
         """
-        if self.private_key is None:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, password=self.password)
-        else:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key)
+        self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key, password=self.password)
         sftp = self.client.open_sftp()
         sftp.remove(remote_file)
         self.client.close()
@@ -129,10 +113,7 @@ class SFTP(BrynQ):
         :param new_file_path: the full path of the new location of the file
         :return:
         """
-        if self.private_key is None:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, password=self.password)
-        else:
-            self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key)
+        self.client.connect(hostname=self.host, port=self.port, username=self.username, pkey=self.private_key, password=self.password)
         sftp = self.client.open_sftp()
         sftp.rename(oldpath=old_file_path, newpath=new_file_path)
         self.client.close()

{brynq_sdk_ftp-2.0.2 → brynq_sdk_ftp-2.0.5}/brynq_sdk_ftp.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-ftp
-Version: 2.0.2
+Version: 2.0.5
 Summary: FTP wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_ftp-2.0.2 → brynq_sdk_ftp-2.0.5}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_ftp',
-    version='2.0.2',
+    version='2.0.5',
     description='FTP wrapper from BrynQ',
     long_description='FTP wrapper from Brynq',
     author='BrynQ',