wcp-library 1.1.3__tar.gz → 1.1.5__tar.gz

{wcp_library-1.1.3 → wcp_library-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wcp-library
-Version: 1.1.3
+Version: 1.1.5
 Summary: Common utilites for internal development at WCP
 Home-page: https://github.com/Whitecap-DNA/WCP-Library
 Author: Mitch-Petersen

{wcp_library-1.1.3 → wcp_library-1.1.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wcp-library"
-version = "1.1.3"
+version = "1.1.5"
 description = "Common utilites for internal development at WCP"
 authors = ["Mitch-Petersen <mitch.petersen@wcap.ca>"]
 readme = "README.md"

{wcp_library-1.1.3 → wcp_library-1.1.5}/wcp_library/ftp/ftp.py

@@ -44,6 +44,8 @@ class FTP:
         :return:
         """
 
+        local_file.parent.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading {remote_file} to {local_file}")
         self.ftp_connection.download(remote_file, local_file)
 
@@ -56,6 +58,8 @@ class FTP:
         :return:
         """
 
+        local_dir.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading files from FTP server matching {regex_pattern} to {local_dir}")
         files = self.list_files()
         for file in files:

{wcp_library-1.1.3 → wcp_library-1.1.5}/wcp_library/ftp/sftp.py

@@ -10,17 +10,21 @@ logger = logging.getLogger(__name__)
 
 
 class SFTP:
-    def __init__(self, host: str, port: int=22):
-        self.host: str = host
-        self.port: int = port
-        self._username: Optional[str] = None
-        self._password: Optional[str] = None
+    def __init__(self, host: Optional[str]=None, port: Optional[int]=21, password_vault_dict: Optional[dict]=None):
+        self.host: str = host if not password_vault_dict else password_vault_dict['Host']
+        self.port: int = port if not password_vault_dict else password_vault_dict['Port']
+        self._username: Optional[str] = None if not password_vault_dict else password_vault_dict['UserName']
+        self._password: Optional[str] = None if not password_vault_dict else password_vault_dict['Password']
 
         self.ssh = paramiko.SSHClient()
         # AutoAddPolicy automatically adds the hostname and new host key to the local HostKeys object
         self.ssh.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 
-        self.sftp_connection: Optional[paramiko.SFTP] = None
+        if not (self._username and self._password):
+            self.sftp_connection: Optional[paramiko.SFTP] = None
+        else:
+            self.ssh.connect(self.host, self.port, self._username, self._password)
+            self.sftp_connection = self.ssh.open_sftp()
 
     def login(self, username: str, password: str) -> None:
         """
@@ -44,6 +48,8 @@ class SFTP:
         :return:
         """
 
+        local_file.parent.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading {remote_file} to {local_file}")
         self.sftp_connection.get(str(remote_file), local_file)
 
@@ -56,6 +62,8 @@ class SFTP:
         :return:
         """
 
+        local_dir.mkdir(parents=True, exist_ok=True)
+
         logger.debug(f"Downloading files from FTP server matching {regex_pattern} to {local_dir}")
         files = self.list_files()
         for file in files: