brynq-sdk-ftp 2.0.6__tar.gz → 3.0.0__tar.gz

{brynq_sdk_ftp-2.0.6 → brynq_sdk_ftp-3.0.0}/PKG-INFO

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

{brynq_sdk_ftp-2.0.6 → brynq_sdk_ftp-3.0.0}/brynq_sdk_ftp/ftps.py

@@ -3,7 +3,7 @@ import os
 import ftplib
 import time
 from ftplib import FTP
-from typing import Union, List
+from typing import Union, List, Optional, Literal
 from tenacity import retry, stop_after_attempt, wait_exponential_jitter, retry_if_exception
 
 
@@ -17,19 +17,25 @@ def is_ftp_exception(e: BaseException) -> bool:
 
 
 class FTPS(BrynQ):
-    def __init__(self, label: Union[str, List] = None, debug=False):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug=False):
         super().__init__()
-        if label is not None:
-            credentials = self.get_system_credential(system='ftps', label=label)
+        try:
+            credentials = self.interfaces.credentials.get(system="ftps", system_type=system_type)
+            credentials = credentials.get('data')
             self.host = credentials['host']
             self.username = credentials['username']
             self.password = credentials['password']
-        elif os.getenv("QLIK_HOST") is not None and os.getenv("QLIK_USER") is not None and os.getenv("QLIK_PASSWORD") is not None:
-            self.host = os.getenv("QLIK_HOST")
-            self.username = os.getenv("QLIK_USER")
-            self.password = os.getenv("QLIK_PASSWORD")
-        else:
-            raise ValueError("Set the environment variables QLIK_HOST, QLIK_USER and QLIK_PASSWORD or provide the label parameter for a credential from BrynQ")
+        except ValueError:
+            print("No FTPS credentials found")
+            self.host = None
+        # if no credentials are retrieved from the platform, fallback to Qlik FTP (can only be target, never source)
+        if self.host is None:
+            if system_type == 'target' and os.getenv("QLIK_HOST") is not None and os.getenv("QLIK_USER") is not None and os.getenv("QLIK_PASSWORD") is not None:
+                self.host = os.getenv("QLIK_HOST")
+                self.username = os.getenv("QLIK_USER")
+                self.password = os.getenv("QLIK_PASSWORD")
+            else:
+                raise ValueError("Set the environment variables QLIK_HOST, QLIK_USER and QLIK_PASSWORD or connect an FTPS authorization to your interface in BrynQ")
         self.debug = debug
 
     @retry(stop=stop_after_attempt(5), wait=wait_exponential_jitter(initial=60, max=900), retry=retry_if_exception(is_ftp_exception), reraise=True)

{brynq_sdk_ftp-2.0.6 → brynq_sdk_ftp-3.0.0}/brynq_sdk_ftp/sftp.py

@@ -4,20 +4,21 @@ from paramiko.client import SSHClient, AutoAddPolicy
 from paramiko import RSAKey
 from paramiko.sftp_attr import SFTPAttributes
 import pysftp
-from typing import Union, List
+from typing import Union, List, Literal, Optional
 from stat import S_ISREG
 import os
 
 
 class SFTP(BrynQ):
-    def __init__(self, interface_id:str ,system_type:str, debug=False):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug=False):
         """
         Init the SFTP class
         :param label: The label of the connector
         :param debug: If you want to see debug messages
         """
         super().__init__()
-        credentials = self.interfaces.credentials.get(interface_id=interface_id, system= "sftp",system_type=system_type)
+        credentials = self.interfaces.credentials.get(system="sftp", system_type=system_type)
+        credentials = credentials.get('data')
         self.debug = debug
         if self.debug:
             print(credentials)

{brynq_sdk_ftp-2.0.6 → brynq_sdk_ftp-3.0.0}/brynq_sdk_ftp.egg-info/PKG-INFO

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

{brynq_sdk_ftp-2.0.6 → brynq_sdk_ftp-3.0.0}/brynq_sdk_ftp.egg-info/requires.txt

@@ -1,4 +1,4 @@
-brynq-sdk-brynq>=2
+brynq-sdk-brynq<5,>=4
 requests<=3,>=2
 paramiko<=4,>=2
 pysftp<1,>0.2

{brynq_sdk_ftp-2.0.6 → brynq_sdk_ftp-3.0.0}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_ftp',
-    version='2.0.6',
+    version='3.0.0',
     description='FTP wrapper from BrynQ',
     long_description='FTP wrapper from Brynq',
     author='BrynQ',
@@ -10,7 +10,7 @@ setup(
     packages=find_namespace_packages(include=['brynq_sdk*']),
     license='BrynQ License',
     install_requires=[
-        'brynq-sdk-brynq>=2',
+        'brynq-sdk-brynq>=4,<5',
         'requests>=2,<=3',
         'paramiko>=2,<=4',
         'pysftp>0.2,<1',