🌿 Fern Regeneration -- May 15, 2026

README.md

@@ -256,3 +256,4 @@ while response.next is not None:
 
 
 
+

pyproject.toml

@@ -3,7 +3,7 @@ name = "MergePythonClient"
 
 [tool.poetry]
 name = "MergePythonClient"
-version = "3.0.0"
+version = "3.0.1"
 description = ""
 readme = "README.md"
 authors = []

src/merge/core/client_wrapper.py

@@ -24,10 +24,10 @@ def __init__(
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "MergePythonClient/3.0.0",
+            "User-Agent": "MergePythonClient/3.0.1",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "3.0.0",
+            "X-Fern-SDK-Version": "3.0.1",
             **(self.get_custom_headers() or {}),
         }
         if self._account_token is not None:

src/merge/resources/email/resources/messages/types/messages_list_request_expand_item.py

@@ -9,7 +9,7 @@
 class MessagesListRequestExpandItem(str, enum.Enum):
     BCC = "bcc"
     CC = "cc"
-    FOLDER = "folder"
+    FOLDERS = "folders"
     FROM_ADDRESS = "from_address"
     MAILBOXES = "mailboxes"
     PERMISSIONS = "permissions"
@@ -20,7 +20,7 @@ def visit(
         self,
         bcc: typing.Callable[[], T_Result],
         cc: typing.Callable[[], T_Result],
-        folder: typing.Callable[[], T_Result],
+        folders: typing.Callable[[], T_Result],
         from_address: typing.Callable[[], T_Result],
         mailboxes: typing.Callable[[], T_Result],
         permissions: typing.Callable[[], T_Result],
@@ -31,8 +31,8 @@ def visit(
             return bcc()
         if self is MessagesListRequestExpandItem.CC:
             return cc()
-        if self is MessagesListRequestExpandItem.FOLDER:
-            return folder()
+        if self is MessagesListRequestExpandItem.FOLDERS:
+            return folders()
         if self is MessagesListRequestExpandItem.FROM_ADDRESS:
             return from_address()
         if self is MessagesListRequestExpandItem.MAILBOXES:

src/merge/resources/email/resources/messages/types/messages_retrieve_request_expand_item.py

@@ -9,7 +9,7 @@
 class MessagesRetrieveRequestExpandItem(str, enum.Enum):
     BCC = "bcc"
     CC = "cc"
-    FOLDER = "folder"
+    FOLDERS = "folders"
     FROM_ADDRESS = "from_address"
     MAILBOXES = "mailboxes"
     PERMISSIONS = "permissions"
@@ -20,7 +20,7 @@ def visit(
         self,
         bcc: typing.Callable[[], T_Result],
         cc: typing.Callable[[], T_Result],
-        folder: typing.Callable[[], T_Result],
+        folders: typing.Callable[[], T_Result],
         from_address: typing.Callable[[], T_Result],
         mailboxes: typing.Callable[[], T_Result],
         permissions: typing.Callable[[], T_Result],
@@ -31,8 +31,8 @@ def visit(
             return bcc()
         if self is MessagesRetrieveRequestExpandItem.CC:
             return cc()
-        if self is MessagesRetrieveRequestExpandItem.FOLDER:
-            return folder()
+        if self is MessagesRetrieveRequestExpandItem.FOLDERS:
+            return folders()
         if self is MessagesRetrieveRequestExpandItem.FROM_ADDRESS:
             return from_address()
         if self is MessagesRetrieveRequestExpandItem.MAILBOXES:

src/merge/resources/email/types/mailbox.py

@@ -47,11 +47,6 @@ class Mailbox(UncheckedBaseModel):
     The mailbox's type.
     """
 
-    type_native: typing.Optional[str] = pydantic.Field(default=None)
-    """
-    Remote field for type.
-    """
-
     folders: typing.Optional[typing.List[typing.Optional[str]]] = None
     groups: typing.Optional[typing.List[typing.Optional[str]]] = None
     users: typing.Optional[typing.List[typing.Optional[str]]] = None

src/merge/resources/email/types/message.py

@@ -79,11 +79,7 @@ class Message(UncheckedBaseModel):
     bcc: typing.Optional[typing.List[typing.Optional[str]]] = None
     mailboxes: typing.Optional[typing.List[typing.Optional[str]]] = None
     permissions: typing.Optional[typing.List[Permission]] = None
-    folder: typing.Optional[str] = pydantic.Field(default=None)
-    """
-    The folder that the message belongs to.
-    """
-
+    folders: typing.Optional[typing.List[typing.Optional[str]]] = None
     remote_was_deleted: typing.Optional[bool] = pydantic.Field(default=None)
     """
     Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).

src/merge/resources/email/types/user.py

@@ -46,11 +46,6 @@ class User(UncheckedBaseModel):
     The user's type.
     """
 
-    type_native: typing.Optional[str] = pydantic.Field(default=None)
-    """
-    Remote field for type.
-    """
-
     remote_created_at: typing.Optional[dt.datetime] = pydantic.Field(default=None)
     """
     When the third party's user was created.

tests/integration/test_email.py

@@ -171,8 +171,8 @@ def test_messages_list_with_expand_to(client):
     assert hasattr(response, 'results')
     assert isinstance(response.results, list)
 
-def test_messages_list_with_expand_folder(client):
-    response = client.email.messages.list(expand=MessagesListRequestExpandItem.FOLDER)
+def test_messages_list_with_expand_folders(client):
+    response = client.email.messages.list(expand=MessagesListRequestExpandItem.FOLDERS)
     assert response is not None
     assert hasattr(response, 'results')
     assert isinstance(response.results, list)