brynq-sdk-mandrill 1.0.0__tar.gz → 1.1.1__tar.gz

{brynq_sdk_mandrill-1.0.0 → brynq_sdk_mandrill-1.1.1}/PKG-INFO

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

{brynq_sdk_mandrill-1.0.0 → brynq_sdk_mandrill-1.1.1}/brynq_sdk/mandrill/mail_client.py

@@ -3,7 +3,7 @@ import mandrill
 import codecs
 import base64
 from brynq_sdk.brynq import BrynQ
-from typing import Union, List
+from typing import Union, List, Optional, BinaryIO
 
 
 class MailClient(BrynQ):
@@ -27,14 +27,15 @@ class MailClient(BrynQ):
         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')
 
-    def send_mail(self, email_to: list, subject: str, language='NL', content=None, attachment=None):
+    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]:
         """
         Send a mail with the BrynQ layout and using mandrill
         :param email_to: a list with name and mailadress to who the mail must be send
         :param subject: The subject of the email
         :param language: Determines the salutation and greeting text. For example Beste or Dear
         :param content: The message of the email
-        :param attachment: The attachment of an email loaded as binary file (NOT the location of the file)
+        :param attachment: The attachment/attachments of an email loaded as binary file (NOT the location of the file)
+        :param cc: A list with name and mail address to be CC'd
         :return: If the sending of the mail is successful or not
         """
 
@@ -50,12 +51,30 @@ class MailClient(BrynQ):
             salutation = 'Dear '
             greeting_text = 'Kind regards'
 
-        # Set attachment. Do not in loop because of errors
+        # Process attachments
+        encoded_attachments = []
         if attachment is not None:
-            opened_attachment = attachment.read()
-            encoded_attachment = base64.b64encode(opened_attachment).decode('utf-8')
-        else:
-            encoded_attachment = None
+
+            # add single attachment to a list
+            if not isinstance(attachment, list):
+                attachment = [attachment]
+
+            for file in attachment:
+                opened_attachment = file.read()
+                encoded_attachments.append({
+                    'content': base64.b64encode(opened_attachment).decode('utf-8'),
+                    'name': file.name.split('/')[-1]
+                })
+
+        # Prepare CC list
+        cc_list = []
+        if cc is not None:
+            for cc_object in cc:
+                cc_list.append({
+                    'email': cc_object['mail'],
+                    'name': cc_object['name'],
+                    'type': 'cc'
+                })
 
         # Pick the configurations from the config file and create the mail
         response = []
@@ -77,14 +96,11 @@ class MailClient(BrynQ):
                 'html': new_html,
                 'to': [{'email': email_object['mail'],
                         'name': email_object['name'],
-                        'type': 'to'}]
+                        'type': 'to'}] + cc_list  # Add CC recipients
             }
-            if encoded_attachment is not None:
-                mail.update({
-                    'attachments': [{'content': encoded_attachment,
-                                     'name': attachment.name.split('/')[-1]
-                                     }]
-                })
+
+            if encoded_attachments:
+                mail['attachments'] = encoded_attachments
 
             # Send the mail and return the result per mail address
             result = {

{brynq_sdk_mandrill-1.0.0 → brynq_sdk_mandrill-1.1.1}/brynq_sdk_mandrill.egg-info/PKG-INFO

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

{brynq_sdk_mandrill-1.0.0 → brynq_sdk_mandrill-1.1.1}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup
 
 setup(
     name='brynq_sdk_mandrill',
-    version='1.0.0',
+    version='1.1.1',
     description='Mandrill wrapper from BrynQ',
     long_description='Mandrill wrapper from BrynQ',
     author='BrynQ',