From 6f4f359ae8c0a3f7f1b855721365c4bc7757e3fd Mon Sep 17 00:00:00 2001 From: "fern-api[bot]" <115122769+fern-api[bot]@users.noreply.github.com> Date: Fri, 15 May 2026 16:09:33 +0000 Subject: [PATCH 1/3] SDK regeneration --- README.md | 1 + poetry.lock | 6 +++--- pyproject.toml | 2 +- src/merge/core/client_wrapper.py | 4 ++-- .../messages/types/messages_list_request_expand_item.py | 8 ++++---- .../types/messages_retrieve_request_expand_item.py | 8 ++++---- src/merge/resources/email/types/mailbox.py | 5 ----- src/merge/resources/email/types/message.py | 6 +----- src/merge/resources/email/types/user.py | 5 ----- 9 files changed, 16 insertions(+), 29 deletions(-) diff --git a/README.md b/README.md index 1a664411..54d94648 100644 --- a/README.md +++ b/README.md @@ -256,3 +256,4 @@ while response.next is not None: + diff --git a/poetry.lock b/poetry.lock index 46f7b7b8..54c30457 100644 --- a/poetry.lock +++ b/poetry.lock @@ -133,13 +133,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "idna" -version = "3.14" +version = "3.15" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.8" files = [ - {file = "idna-3.14-py3-none-any.whl", hash = "sha256:e677eaf072e290f7b725f9acf0b3a2bd55f9fd6f7c70abe5f0e34823d0accf69"}, - {file = "idna-3.14.tar.gz", hash = "sha256:466d810d7a2cc1022bea9b037c39728d51ae7dad40d480fc9b7d7ecf98ba8ee3"}, + {file = "idna-3.15-py3-none-any.whl", hash = "sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8"}, + {file = "idna-3.15.tar.gz", hash = "sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc"}, ] [package.extras] diff --git a/pyproject.toml b/pyproject.toml index 4f9b62a5..6cfdd25e 100644 --- a/pyproject.toml +++ b/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 = [] diff --git a/src/merge/core/client_wrapper.py b/src/merge/core/client_wrapper.py index bf291996..b15f414b 100644 --- a/src/merge/core/client_wrapper.py +++ b/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: diff --git a/src/merge/resources/email/resources/messages/types/messages_list_request_expand_item.py b/src/merge/resources/email/resources/messages/types/messages_list_request_expand_item.py index 3355289d..3db2be07 100644 --- a/src/merge/resources/email/resources/messages/types/messages_list_request_expand_item.py +++ b/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: diff --git a/src/merge/resources/email/resources/messages/types/messages_retrieve_request_expand_item.py b/src/merge/resources/email/resources/messages/types/messages_retrieve_request_expand_item.py index 0ca4389f..e321b86f 100644 --- a/src/merge/resources/email/resources/messages/types/messages_retrieve_request_expand_item.py +++ b/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: diff --git a/src/merge/resources/email/types/mailbox.py b/src/merge/resources/email/types/mailbox.py index 4159c457..3fb7b6e3 100644 --- a/src/merge/resources/email/types/mailbox.py +++ b/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 diff --git a/src/merge/resources/email/types/message.py b/src/merge/resources/email/types/message.py index 7797c47c..88da9a02 100644 --- a/src/merge/resources/email/types/message.py +++ b/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/). diff --git a/src/merge/resources/email/types/user.py b/src/merge/resources/email/types/user.py index a6c96cab..9392ca2c 100644 --- a/src/merge/resources/email/types/user.py +++ b/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. From 2da6282cfedaa270c7607f43938c32998ae1258a Mon Sep 17 00:00:00 2001 From: Nitesh Sandal Date: Fri, 15 May 2026 13:41:59 -0400 Subject: [PATCH 2/3] revert idna lock-file bump to 3.14 Co-Authored-By: Claude Opus 4.7 (1M context) --- poetry.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/poetry.lock b/poetry.lock index 54c30457..46f7b7b8 100644 --- a/poetry.lock +++ b/poetry.lock @@ -133,13 +133,13 @@ zstd = ["zstandard (>=0.18.0)"] [[package]] name = "idna" -version = "3.15" +version = "3.14" description = "Internationalized Domain Names in Applications (IDNA)" optional = false python-versions = ">=3.8" files = [ - {file = "idna-3.15-py3-none-any.whl", hash = "sha256:048adeaf8c2d788c40fee287673ccaa74c24ffd8dcf09ffa555a2fbb59f10ac8"}, - {file = "idna-3.15.tar.gz", hash = "sha256:ca962446ea538f7092a95e057da437618e886f4d349216d2b1e294abfdb65fdc"}, + {file = "idna-3.14-py3-none-any.whl", hash = "sha256:e677eaf072e290f7b725f9acf0b3a2bd55f9fd6f7c70abe5f0e34823d0accf69"}, + {file = "idna-3.14.tar.gz", hash = "sha256:466d810d7a2cc1022bea9b037c39728d51ae7dad40d480fc9b7d7ecf98ba8ee3"}, ] [package.extras] From fee990d9556c6520a36e42ddf93b751c3d5e5354 Mon Sep 17 00:00:00 2001 From: Nitesh Sandal Date: Fri, 15 May 2026 14:04:17 -0400 Subject: [PATCH 3/3] fix test for renamed FOLDER -> FOLDERS expand enum Co-Authored-By: Claude Opus 4.7 (1M context) --- tests/integration/test_email.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/integration/test_email.py b/tests/integration/test_email.py index a37fac0f..c20474b5 100644 --- a/tests/integration/test_email.py +++ b/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)