brynq-sdk-mandrill 2.0.1__tar.gz → 3.0.1__tar.gz

{brynq_sdk_mandrill-2.0.1 → brynq_sdk_mandrill-3.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq_sdk_mandrill
-Version: 2.0.1
+Version: 3.0.1
 Summary: Mandrill wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_mandrill-2.0.1 → brynq_sdk_mandrill-3.0.1}/brynq_sdk_mandrill/mail_client.py

@@ -3,29 +3,36 @@ import os
 import mandrill
 import codecs
 import base64
-from typing import Union, List, Optional, BinaryIO
+from typing import Union, List, Optional, BinaryIO, Literal
 
 
 class MailClient(BrynQ):
-    def __init__(self, label: Union[str, List] = None, debug=False):
+    def __init__(self, system_type: Optional[Literal['source', 'target']] = None, debug=False):
         # This is built in so you can use this class as a query generator for the BrynQ Agent
         super().__init__()
         self.debug = debug
-        if label is not None:
-            credentials = self.get_system_credential(system='mandrill', label=label)
+        try:
+            credentials = self.interfaces.credentials.get(system="mandrill", system_type=system_type)
+            credentials = credentials.get('data')
             self.api_token = credentials['token']
             self.email_from = 'support@brynq.com' if credentials['email_from'] is None else credentials['email_from']
             self.name_from = 'BrynQ' if credentials['name_from'] is None else credentials['name_from']
             if self.debug:
                 print('Retrieved credentials from BrynQ')
-        elif os.getenv("MANDRILL_TOKEN") is not None:
-            self.api_token = os.getenv("MANDRILL_TOKEN")
-            self.email_from = 'connect@salure.nl' if os.getenv("MANDRILL_EMAIL_FROM") is None else os.getenv("MANDRILL_EMAIL_FROM")
-            self.name_from = 'BrynQ' if os.getenv("MANDRILL_NAME_FROM") is None else os.getenv("MANDRILL_NAME_FROM")
-            if self.debug:
-                print('Retrieved credentials from environment variables')
-        else:
-            raise ValueError('No credentials found for Mandrill. Either pass a BrynQ credential label or set the environment variables MANDRILL_TOKEN, MANDRILL_EMAIL_FROM and MANDRILL_NAME_FROM')
+        except ValueError as e:
+            print("No authorization found connected to interface, falling back to environment variables")
+            self.api_token = None
+
+
+        if self.api_token is None:
+            if os.getenv("MANDRILL_TOKEN") is not None:
+                self.api_token = os.getenv("MANDRILL_TOKEN")
+                self.email_from = 'connect@salure.nl' if os.getenv("MANDRILL_EMAIL_FROM") is None else os.getenv("MANDRILL_EMAIL_FROM")
+                self.name_from = 'BrynQ' if os.getenv("MANDRILL_NAME_FROM") is None else os.getenv("MANDRILL_NAME_FROM")
+                if self.debug:
+                    print('Retrieved credentials from environment variables')
+            else:
+                raise ValueError('No credentials found for Mandrill. Either authorize Mandrill to your interface in BrynQ or set the environment variables MANDRILL_TOKEN, MANDRILL_EMAIL_FROM and MANDRILL_NAME_FROM')
 
     def send_mail(self, email_to: list, subject: str, language='NL', content:  Optional[str] = None, attachment: Optional[BinaryIO | List[BinaryIO]] = None, cc: Optional[List | str] = None) -> List[dict]:
         """

{brynq_sdk_mandrill-2.0.1 → brynq_sdk_mandrill-3.0.1}/brynq_sdk_mandrill.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: brynq-sdk-mandrill
-Version: 2.0.1
+Version: 3.0.1
 Summary: Mandrill wrapper from BrynQ
 Home-page: UNKNOWN
 Author: BrynQ

{brynq_sdk_mandrill-2.0.1 → brynq_sdk_mandrill-3.0.1}/brynq_sdk_mandrill.egg-info/requires.txt

@@ -1,2 +1,2 @@
-brynq-sdk-brynq>=2
+brynq-sdk-brynq<5,>=4
 mandrill-really-maintained<=2,>=1

{brynq_sdk_mandrill-2.0.1 → brynq_sdk_mandrill-3.0.1}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_namespace_packages
 
 setup(
     name='brynq_sdk_mandrill',
-    version='2.0.1',
+    version='3.0.1',
     description='Mandrill wrapper from BrynQ',
     long_description='Mandrill wrapper from BrynQ',
     author='BrynQ',
@@ -11,7 +11,7 @@ setup(
     package_data={'brynq_sdk_mandrill': ['templates/*']},
     license='BrynQ License',
     install_requires=[
-        'brynq-sdk-brynq>=2',
+        'brynq-sdk-brynq>=4,<5',
         'mandrill-really-maintained>=1,<=2'
     ],
     zip_safe=False,