mergepythonclient 3.0.0__py3-none-any.whl → 3.0.1__py3-none-any.whl

merge/core/client_wrapper.py

@@ -24,10 +24,10 @@ class BaseClientWrapper:
 
     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:

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

@@ -9,7 +9,7 @@ T_Result = typing.TypeVar("T_Result")
 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 @@ class MessagesListRequestExpandItem(str, enum.Enum):
         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 @@ class MessagesListRequestExpandItem(str, enum.Enum):
             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:

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

@@ -9,7 +9,7 @@ T_Result = typing.TypeVar("T_Result")
 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 @@ class MessagesRetrieveRequestExpandItem(str, enum.Enum):
         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 @@ class MessagesRetrieveRequestExpandItem(str, enum.Enum):
             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:

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

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/).

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.

{mergepythonclient-3.0.0.dist-info → mergepythonclient-3.0.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergepythonclient
-Version: 3.0.0
+Version: 3.0.1
 Summary: 
 Requires-Python: >=3.8,<4.0
 Classifier: Intended Audience :: Developers
@@ -283,3 +283,4 @@ while response.next is not None:
 
 
 
+

{mergepythonclient-3.0.0.dist-info → mergepythonclient-3.0.1.dist-info}/RECORD

@@ -2,7 +2,7 @@ merge/__init__.py,sha256=LgI_DL0Mxz094TZWY_NvQiqb15UzdB_hpi4Kl3nKwwA,1744
 merge/client.py,sha256=LOkOFCAGUnfKC3xVzQYxroDn1f46gb-ZhA3oVp2XwcU,12626
 merge/core/__init__.py,sha256=HNk-wnH_j2yAf7IroaZM9JJFe4mnkNHq06t2QmaBweg,3862
 merge/core/api_error.py,sha256=44vPoTyWN59gonCIZMdzw7M1uspygiLnr3GNFOoVL2Q,614
-merge/core/client_wrapper.py,sha256=Xhim0a-OHGBvCnHxlfvvFKjuZH-vB5bxX0JV9-QsF8k,3096
+merge/core/client_wrapper.py,sha256=ktMP7BSXdAKtqyVOvj1ZIX00-YvaIzK83rc0tNly_NI,3096
 merge/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 merge/core/file.py,sha256=d4NNbX8XvXP32z8KpK2Xovv33nFfruIrpz0QWxlgpZk,2663
 merge/core/force_multipart.py,sha256=cH981xLy0kZVKiZZkFoeUjgJ2Zuq7KXB2aRAnmHzRDc,477
@@ -1866,8 +1866,8 @@ merge/resources/email/resources/messages/__init__.py,sha256=AImXXcUbx0fVBJek3vzA
 merge/resources/email/resources/messages/client.py,sha256=ykdiTG1fk7lqFr3gFfTwmRHilUzSH7-SZgMTjbrOFS8,17806
 merge/resources/email/resources/messages/raw_client.py,sha256=BFtpynn-U1OZRuqCTiSmMU4kLtqov-wpl4Rq047SOqI,18026
 merge/resources/email/resources/messages/types/__init__.py,sha256=ly8MDvcKwBosuPJMn7hdTWycArKhG2hk07RBNmFDNbc,1316
-merge/resources/email/resources/messages/types/messages_list_request_expand_item.py,sha256=xXv0sagz6b8XFn97sEEr_IUTzgmrYNYTM3NTxFSR4M4,1481
-merge/resources/email/resources/messages/types/messages_retrieve_request_expand_item.py,sha256=t8LdjHc83eax9FXNJvENsx6SudOSunfFQLgkoe8O2hw,1517
+merge/resources/email/resources/messages/types/messages_list_request_expand_item.py,sha256=DVlvwMQbvC0B8su4s8OUxdHecdXZS-6A_r9_9N61_MU,1486
+merge/resources/email/resources/messages/types/messages_retrieve_request_expand_item.py,sha256=0fd1zgxnTcE7agdC3vUlSjgkkURe6ynJmUGRh4mMl14,1522
 merge/resources/email/resources/passthrough/__init__.py,sha256=_VhToAyIt_5axN6CLJwtxg3-CO7THa_23pbUzqhXJa4,85
 merge/resources/email/resources/passthrough/client.py,sha256=WzTSdfZwneIA2hQwImeVTnXXZs7HE0GDHTjeOmc3mjk,3643
 merge/resources/email/resources/passthrough/raw_client.py,sha256=6-k--c5tGHYEWIZJLmq4jG0eMSEP8EkgOvp8Re9YLsc,3999
@@ -1945,11 +1945,11 @@ merge/resources/email/types/issue_status_enum.py,sha256=ifuTWDBV1fWb9RhxHOkmv-Oz
 merge/resources/email/types/language_enum.py,sha256=peeKa2q73A11M1R7UPzQ26syuOdP6rlvgu4f4gTU_pM,420
 merge/resources/email/types/last_sync_result_enum.py,sha256=50ozs0cK_qFnI3LQGQbW2AsvDBS2hU-Y3XiwtmJjgDw,1136
 merge/resources/email/types/link_token.py,sha256=fYa5j3XnK01j8XHUx_A6fa95qXQ3OrRHs43vW54VU1g,663
-merge/resources/email/types/mailbox.py,sha256=XbPZgrTk8n1nMppiJTz-5v7EMJRIJHcREOZf47cscaE,3087
+merge/resources/email/types/mailbox.py,sha256=0b0PZ66EiVNMs4GQToEGQs82oa5_DpYeLBEorOccc04,2974
 merge/resources/email/types/mailbox_field_mappings.py,sha256=Wtu4T_5zrn07VEPofzuqr_jcP6o_95yKBgNXHeOG3SM,766
 merge/resources/email/types/mailbox_type.py,sha256=GCfcWdHsrI_BbcF4fPZzVyzk7-7ExjziavlxCrpYIrs,177
 merge/resources/email/types/mailbox_type_enum.py,sha256=AoWRz-G6MjwfZB6rB_tuI-44WWIuXuwFR38IOVcAvCA,459
-merge/resources/email/types/message.py,sha256=vTwH_1-pejkL88gfUWfNgVKQ6EirmGi5iIT0ophKDsw,3111
+merge/resources/email/types/message.py,sha256=gboPmXKCHLWd9aFhr2geMpv_1Q_eaIRreYBac8iMljg,3057
 merge/resources/email/types/method_enum.py,sha256=Sehmt6t0QgSLIekqWPkFdlgbP2ynXhG9gYwdHvim-rw,1110
 merge/resources/email/types/model_operation.py,sha256=43OJAKzDJO2_lza7ZpUZRweK8d467yGi7Gc61nGHHbg,976
 merge/resources/email/types/model_permission_deserializer.py,sha256=v6Zcw8iqy2BikPwjRbjFkb8XHtwRQ9dPwglVv6RRQ2w,608
@@ -1987,7 +1987,7 @@ merge/resources/email/types/status_fd_5_enum.py,sha256=7KlsoQq1FvYd2-At6aBIpRTEx
 merge/resources/email/types/sync_status.py,sha256=_cDKEc5-3mnjKq50yKrvqlNt2GnGvs9CngqOoXxDjNU,1470
 merge/resources/email/types/sync_status_last_sync_result.py,sha256=NY6veRnsfFgeHEMlj9Q35FFJCKoCOQAmtLotkPTPbSU,200
 merge/resources/email/types/sync_status_status.py,sha256=VAGVIs8Hv1VAaU0_UNCXjXLFcbMHs4P7muYSh9gkUX4,177
-merge/resources/email/types/user.py,sha256=5uO-s6vsHbTACUfz5c9MacxwocTxy2YbT5YQrMcfBwo,2704
+merge/resources/email/types/user.py,sha256=duXIYIEQDP74C9aaLsQ2aKeRoSWj6fKPBpBnX_Gwiiw,2591
 merge/resources/email/types/user_field_mappings.py,sha256=qqkRSEneh9CHGsJG1ItWqM8pVFWdHR3dgRQyl5W2owY,763
 merge/resources/email/types/user_type.py,sha256=KYjVMkz8pBy-CV1joHE4xDHKmnmvlT2gOkDDTmwmChk,165
 merge/resources/email/types/user_type_enum.py,sha256=NhDtYsdXJqmobNuYNalNPrfDEU3fgsQ2ioxYBbO-aO4,658
@@ -3087,7 +3087,7 @@ merge/resources/ticketing/types/viewer_user.py,sha256=VrOx8xWvNadSYjdErIMg2pPsHV
 merge/resources/ticketing/types/warning_validation_problem.py,sha256=RXDtt3t3FwIeGGXkIr_OHOAybDZg44L_5hOqa2sLlJ0,736
 merge/resources/ticketing/types/webhook_receiver.py,sha256=g4KQnc-vZPJGlXK-OOFIn2WGyTLKoeaq9TPWQ46VwFY,623
 merge/version.py,sha256=kLtHrVsKjnCqlIC_JtezQUWrCPQkXhjpD_2pdlcGh18,84
-mergepythonclient-3.0.0.dist-info/LICENSE.md,sha256=WKO7xLnLSUInldiq5i25eVqKAjwIUKenaS4Cgir2Iuw,3275
-mergepythonclient-3.0.0.dist-info/METADATA,sha256=UbDSYPZmaifDxH-Vc86Iu4jISJmNiZhH0-l5DzLrHMs,7655
-mergepythonclient-3.0.0.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-mergepythonclient-3.0.0.dist-info/RECORD,,
+mergepythonclient-3.0.1.dist-info/LICENSE.md,sha256=WKO7xLnLSUInldiq5i25eVqKAjwIUKenaS4Cgir2Iuw,3275
+mergepythonclient-3.0.1.dist-info/METADATA,sha256=pXpvyeVFd6M9wKRAarMeAWu1UHASrrBO-dUeMo1yuLc,7656
+mergepythonclient-3.0.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+mergepythonclient-3.0.1.dist-info/RECORD,,