Merge branch 'main' into TW-2809-TW-2866-add-fields

CHANGELOG.md

@@ -5,6 +5,9 @@ Unreleased
 ----------------
 * Added support for adding custom headers to outgoing requests
 * Added support for `provider` field in code exchange response
+* Added clean messages support
+* Added additional webhook triggers
+* Made event visibility optional to support iCloud events
 
 v6.1.1
 ----------------

nylas/models/events.py

@@ -316,12 +316,12 @@ class Event:
     calendar_id: str
     busy: bool
     participants: List[Participant]
-    visibility: Visibility
     when: When = field(metadata=config(decoder=_decode_when))
     conferencing: Optional[Conferencing] = field(
         default=None, metadata=config(decoder=_decode_conferencing)
     )
     object: str = "event"
+    visibility: Optional[Visibility] = None
     read_only: Optional[bool] = None
     description: Optional[str] = None
     location: Optional[str] = None

nylas/models/messages.py

@@ -198,3 +198,56 @@ class StopScheduledMessageResponse:
     """
 
     message: str
+
+
+class CleanMessagesRequest(TypedDict):
+    """
+    Request to clean a list of messages.
+
+    Attributes:
+        message_id: IDs of the email messages to clean.
+        ignore_links: If true, removes link-related tags (<a>) from the email message while keeping the text.
+        ignore_images: If true, removes images from the email message.
+        images_as_markdown: If true, converts images in the email message to Markdown.
+        ignore_tables: If true, removes table-related tags (<table>, <th>, <td>, <tr>) from the email message while
+            keeping rows.
+        remove_conclusion_phrases: If true, removes phrases such as "Best" and "Regards" in the email message signature.
+    """
+
+    message_id: List[str]
+    ignore_links: NotRequired[bool]
+    ignore_images: NotRequired[bool]
+    images_as_markdown: NotRequired[bool]
+    ignore_tables: NotRequired[bool]
+    remove_conclusion_phrases: NotRequired[bool]
+
+
+@dataclass_json
+@dataclass
+class CleanMessagesResponse(Message):
+    """
+    Message object with the cleaned HTML message body.
+
+    Attributes:
+        id (str): Globally unique object identifier.
+        grant_id (str): The grant that this message belongs to.
+        from_ (List[EmailName]): The sender of the message.
+        date (int): The date the message was received.
+        object: The type of object.
+        thread_id (Optional[str]): The thread that this message belongs to.
+        subject (Optional[str]): The subject of the message.
+        to (Optional[List[EmailName]]): The recipients of the message.
+        cc (Optional[List[EmailName]]): The CC recipients of the message.
+        bcc (Optional[List[EmailName]]): The BCC recipients of the message.
+        reply_to (Optional[List[EmailName]]): The reply-to recipients of the message.
+        unread (Optional[bool]): Whether the message is unread.
+        starred (Optional[bool]): Whether the message is starred.
+        snippet (Optional[str]): A snippet of the message body.
+        body (Optional[str]): The body of the message.
+        attachments (Optional[List[Attachment]]): The attachments on the message.
+        folders (Optional[List[str]]): The folders that the message is in.
+        created_at (Optional[int]): Unix timestamp of when the message was created.
+        conversation (str): The cleaned HTML message body.
+    """
+
+    conversation: str = ""

nylas/models/webhooks.py

@@ -24,6 +24,12 @@ class WebhookTriggers(str, Enum):
     GRANT_EXPIRED = "grant.expired"
     MESSAGE_SEND_SUCCESS = "message.send_success"
     MESSAGE_SEND_FAILED = "message.send_failed"
+    MESSAGE_BOUNCE_DETECTED = "message.bounce_detected"
+    MESSAGE_CREATED = "message.created"
+    MESSAGE_UPDATED = "message.updated"
+    MESSAGE_OPENED = "message.opened"
+    MESSAGE_LINK_CLICKED = "message.link_clicked"
+    THREAD_REPLIED = "thread.replied"
 
 
 @dataclass_json

nylas/resources/messages.py

@@ -14,6 +14,8 @@
     UpdateMessageRequest,
     ScheduledMessage,
     StopScheduledMessageResponse,
+    CleanMessagesRequest,
+    CleanMessagesResponse,
 )
 from nylas.models.response import Response, ListResponse, DeleteResponse
 from nylas.resources.smart_compose import SmartCompose
@@ -223,3 +225,24 @@ def stop_scheduled_message(
         )
 
         return Response.from_dict(json_response, StopScheduledMessageResponse)
+
+    def clean_messages(
+        self, identifier: str, request_body: CleanMessagesRequest
+    ) -> ListResponse[CleanMessagesResponse]:
+        """
+        Remove extra information from a list of messages.
+
+        Args:
+            identifier: The identifier of the grant to clean the message for.
+            request_body: The values to clean the message with.
+
+        Returns:
+            The list of cleaned messages.
+        """
+        json_resposne = self._http_client._execute(
+            method="PUT",
+            path=f"/v3/grants/{identifier}/messages/clean",
+            request_body=request_body,
+        )
+
+        return ListResponse.from_dict(json_resposne, CleanMessagesResponse)

tests/conftest.py

@@ -190,3 +190,32 @@ def http_client_list_scheduled_messages():
         ],
     }
     return mock_http_client
+
+
+@pytest.fixture
+def http_client_clean_messages():
+    mock_http_client = Mock()
+    mock_http_client._execute.return_value = {
+        "request_id": "dd3ec9a2-8f15-403d-b269-32b1f1beb9f5",
+        "data": [
+            {
+                "body": "Hello, I just sent a message using Nylas!",
+                "from": [
+                    {"name": "Daenerys Targaryen", "email": "[email protected]"}
+                ],
+                "grant_id": "41009df5-bf11-4c97-aa18-b285b5f2e386",
+                "id": "message-1",
+                "object": "message",
+                "conversation": "cleaned example",
+            },
+            {
+                "body": "Hello, this is a test message!",
+                "from": [{"name": "Michael Scott", "email": "[email protected]"}],
+                "grant_id": "41009df5-bf11-4c97-aa18-b285b5f2e386",
+                "id": "message-2",
+                "object": "message",
+                "conversation": "another example",
+            },
+        ],
+    }
+    return mock_http_client

tests/resources/test_messages.py

@@ -272,3 +272,37 @@ def test_stop_scheduled_message(self, http_client_response):
             method="DELETE",
             path="/v3/grants/abc-123/messages/schedules/schedule-123",
         )
+
+    def test_clean_messages(self, http_client_clean_messages):
+        messages = Messages(http_client_clean_messages)
+        request_body = {
+            "message_id": ["message-1", "message-2"],
+            "ignore_images": True,
+            "ignore_links": True,
+            "ignore_tables": True,
+            "images_as_markdown": True,
+            "remove_conclusion_phrases": True,
+        }
+
+        response = messages.clean_messages(
+            identifier="abc-123",
+            request_body=request_body,
+        )
+
+        http_client_clean_messages._execute.assert_called_once_with(
+            method="PUT",
+            path="/v3/grants/abc-123/messages/clean",
+            request_body=request_body,
+        )
+
+        # Assert the conversation field, and the typical message fields serialize properly
+        assert len(response.data) == 2
+        assert response.data[0].body == "Hello, I just sent a message using Nylas!"
+        assert response.data[0].from_ == [
+            {"name": "Daenerys Targaryen", "email": "[email protected]"}
+        ]
+        assert response.data[0].object == "message"
+        assert response.data[0].id == "message-1"
+        assert response.data[0].grant_id == "41009df5-bf11-4c97-aa18-b285b5f2e386"
+        assert response.data[0].conversation == "cleaned example"
+        assert response.data[1].conversation == "another example"