Fixed issue where attachments < 3mb were not being encoded correctly (#362)

Fixed issue where attachments < 3mb were not being encoded correctly

Author: mrashed-dev

CHANGELOG.md

@@ -8,6 +8,7 @@ Unreleased
 * Added clean messages support
 * Added additional webhook triggers
 * Made event visibility optional to support iCloud events
+* Fixed issue where attachments < 3mb were not being encoded correctly
 
 v6.1.1
 ----------------

nylas/resources/drafts.py

@@ -1,3 +1,4 @@
+import io
 from typing import Optional
 
 from nylas.handler.api_resources import (
@@ -15,7 +16,11 @@
 )
 from nylas.models.messages import Message
 from nylas.models.response import ListResponse, Response, DeleteResponse
-from nylas.utils.file_utils import _build_form_request, MAXIMUM_JSON_ATTACHMENT_SIZE
+from nylas.utils.file_utils import (
+    _build_form_request,
+    MAXIMUM_JSON_ATTACHMENT_SIZE,
+    encode_stream_to_base64,
+)
 
 
 class Drafts(
@@ -99,6 +104,11 @@ def create(
 
             return Response.from_dict(json_response, Draft)
 
+        # Encode the content of the attachments to base64
+        for attachment in request_body.get("attachments", []):
+            if issubclass(type(attachment["content"]), io.IOBase):
+                attachment["content"] = encode_stream_to_base64(attachment["content"])
+
         return super().create(
             path=path,
             response_type=Draft,
@@ -138,6 +148,11 @@ def update(
 
             return Response.from_dict(json_response, Draft)
 
+        # Encode the content of the attachments to base64
+        for attachment in request_body.get("attachments", []):
+            if issubclass(type(attachment["content"]), io.IOBase):
+                attachment["content"] = encode_stream_to_base64(attachment["content"])
+
         return super().update(
             path=path,
             response_type=Draft,

nylas/resources/messages.py

@@ -1,3 +1,4 @@
+import io
 from typing import Optional, List
 
 from nylas.handler.api_resources import (
@@ -19,7 +20,11 @@
 )
 from nylas.models.response import Response, ListResponse, DeleteResponse
 from nylas.resources.smart_compose import SmartCompose
-from nylas.utils.file_utils import _build_form_request, MAXIMUM_JSON_ATTACHMENT_SIZE
+from nylas.utils.file_utils import (
+    _build_form_request,
+    MAXIMUM_JSON_ATTACHMENT_SIZE,
+    encode_stream_to_base64,
+)
 
 
 class Messages(
@@ -151,6 +156,13 @@ def send(
         if attachment_size >= MAXIMUM_JSON_ATTACHMENT_SIZE:
             form_data = _build_form_request(request_body)
         else:
+            # Encode the content of the attachments to base64
+            for attachment in request_body.get("attachments", []):
+                if issubclass(type(attachment["content"]), io.IOBase):
+                    attachment["content"] = encode_stream_to_base64(
+                        attachment["content"]
+                    )
+
             json_body = request_body
 
         json_response = self._http_client._execute(

nylas/utils/file_utils.py

@@ -1,7 +1,9 @@
+import base64
 import json
 import mimetypes
 import os
 from pathlib import Path
+from typing import BinaryIO
 
 from requests_toolbelt import MultipartEncoder
 
@@ -36,6 +38,21 @@ def attach_file_request_builder(file_path) -> CreateAttachmentRequest:
     }
 
 
+def encode_stream_to_base64(binary_stream: BinaryIO) -> str:
+    """
+    Encode the content of a binary stream to a base64 string.
+
+    Attributes:
+        binary_stream: The binary stream to encode.
+
+    Returns:
+        The base64 encoded content of the binary stream.
+    """
+    binary_stream.seek(0)
+    binary_content = binary_stream.read()
+    return base64.b64encode(binary_content).decode("utf-8")
+
+
 def _build_form_request(request_body: dict) -> MultipartEncoder:
     """
     Build a form-data request.