mergepythonclient 2.6.1__py3-none-any.whl → 2.6.3__py3-none-any.whl

merge/client.py

@@ -88,23 +88,15 @@ class Merge:
             else httpx.Client(timeout=_defaulted_timeout),
             timeout=_defaulted_timeout,
         )
-        self._ats: typing.Optional[AtsClient] = None
         self._chat: typing.Optional[ChatClient] = None
+        self._ats: typing.Optional[AtsClient] = None
         self._crm: typing.Optional[CrmClient] = None
-        self._filestorage: typing.Optional[FilestorageClient] = None
         self._hris: typing.Optional[HrisClient] = None
         self._knowledgebase: typing.Optional[KnowledgebaseClient] = None
         self._ticketing: typing.Optional[TicketingClient] = None
+        self._filestorage: typing.Optional[FilestorageClient] = None
         self._accounting: typing.Optional[AccountingClient] = None
 
-    @property
-    def ats(self):
-        if self._ats is None:
-            from .resources.ats.client import AtsClient  # noqa: E402
-
-            self._ats = AtsClient(client_wrapper=self._client_wrapper)
-        return self._ats
-
     @property
     def chat(self):
         if self._chat is None:
@@ -113,6 +105,14 @@ class Merge:
             self._chat = ChatClient(client_wrapper=self._client_wrapper)
         return self._chat
 
+    @property
+    def ats(self):
+        if self._ats is None:
+            from .resources.ats.client import AtsClient  # noqa: E402
+
+            self._ats = AtsClient(client_wrapper=self._client_wrapper)
+        return self._ats
+
     @property
     def crm(self):
         if self._crm is None:
@@ -121,14 +121,6 @@ class Merge:
             self._crm = CrmClient(client_wrapper=self._client_wrapper)
         return self._crm
 
-    @property
-    def filestorage(self):
-        if self._filestorage is None:
-            from .resources.filestorage.client import FilestorageClient  # noqa: E402
-
-            self._filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
-        return self._filestorage
-
     @property
     def hris(self):
         if self._hris is None:
@@ -153,6 +145,14 @@ class Merge:
             self._ticketing = TicketingClient(client_wrapper=self._client_wrapper)
         return self._ticketing
 
+    @property
+    def filestorage(self):
+        if self._filestorage is None:
+            from .resources.filestorage.client import FilestorageClient  # noqa: E402
+
+            self._filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
+        return self._filestorage
+
     @property
     def accounting(self):
         if self._accounting is None:
@@ -231,23 +231,15 @@ class AsyncMerge:
             else httpx.AsyncClient(timeout=_defaulted_timeout),
             timeout=_defaulted_timeout,
         )
-        self._ats: typing.Optional[AsyncAtsClient] = None
         self._chat: typing.Optional[AsyncChatClient] = None
+        self._ats: typing.Optional[AsyncAtsClient] = None
         self._crm: typing.Optional[AsyncCrmClient] = None
-        self._filestorage: typing.Optional[AsyncFilestorageClient] = None
         self._hris: typing.Optional[AsyncHrisClient] = None
         self._knowledgebase: typing.Optional[AsyncKnowledgebaseClient] = None
         self._ticketing: typing.Optional[AsyncTicketingClient] = None
+        self._filestorage: typing.Optional[AsyncFilestorageClient] = None
         self._accounting: typing.Optional[AsyncAccountingClient] = None
 
-    @property
-    def ats(self):
-        if self._ats is None:
-            from .resources.ats.client import AsyncAtsClient  # noqa: E402
-
-            self._ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
-        return self._ats
-
     @property
     def chat(self):
         if self._chat is None:
@@ -256,6 +248,14 @@ class AsyncMerge:
             self._chat = AsyncChatClient(client_wrapper=self._client_wrapper)
         return self._chat
 
+    @property
+    def ats(self):
+        if self._ats is None:
+            from .resources.ats.client import AsyncAtsClient  # noqa: E402
+
+            self._ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
+        return self._ats
+
     @property
     def crm(self):
         if self._crm is None:
@@ -264,14 +264,6 @@ class AsyncMerge:
             self._crm = AsyncCrmClient(client_wrapper=self._client_wrapper)
         return self._crm
 
-    @property
-    def filestorage(self):
-        if self._filestorage is None:
-            from .resources.filestorage.client import AsyncFilestorageClient  # noqa: E402
-
-            self._filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
-        return self._filestorage
-
     @property
     def hris(self):
         if self._hris is None:
@@ -296,6 +288,14 @@ class AsyncMerge:
             self._ticketing = AsyncTicketingClient(client_wrapper=self._client_wrapper)
         return self._ticketing
 
+    @property
+    def filestorage(self):
+        if self._filestorage is None:
+            from .resources.filestorage.client import AsyncFilestorageClient  # noqa: E402
+
+            self._filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
+        return self._filestorage
+
     @property
     def accounting(self):
         if self._accounting is None:

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/2.6.1",
+            "User-Agent": "MergePythonClient/2.6.3",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "2.6.1",
+            "X-Fern-SDK-Version": "2.6.3",
             **(self.get_custom_headers() or {}),
         }
         if self._account_token is not None:

merge/resources/accounting/types/expense_line.py

@@ -408,6 +408,16 @@ class ExpenseLine(UncheckedBaseModel):
     The tax rate that applies to this line item.
     """
 
+    quantity: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    Number of items for the expense line.
+    """
+
+    unit_price: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    Unit price of the item for the expense line.
+    """
+
     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/accounting/types/expense_line_request.py

@@ -397,6 +397,16 @@ class ExpenseLineRequest(UncheckedBaseModel):
     The tax rate that applies to this line item.
     """
 
+    quantity: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    Number of items for the expense line.
+    """
+
+    unit_price: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    Unit price of the item for the expense line.
+    """
+
     integration_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     linked_account_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     remote_fields: typing.Optional[typing.List[RemoteFieldRequest]] = None

merge/resources/chat/types/conversation.py

@@ -59,6 +59,9 @@ class Conversation(UncheckedBaseModel):
     * `PRIVATE_EXTERNAL` - PRIVATE_EXTERNAL
     * `PUBLIC_INTERNAL` - PUBLIC_INTERNAL
     * `PUBLIC_EXTERNAL` - PUBLIC_EXTERNAL
+    * `ONE_ON_ONE_CHAT` - ONE_ON_ONE_CHAT
+    * `GROUP_CHAT` - GROUP_CHAT
+    * `MEETING_CHAT` - MEETING_CHAT
     """
 
     members: typing.Optional[typing.List[typing.Optional[str]]] = None

merge/resources/chat/types/type_enum.py

@@ -12,12 +12,18 @@ class TypeEnum(str, enum.Enum):
     * `PRIVATE_EXTERNAL` - PRIVATE_EXTERNAL
     * `PUBLIC_INTERNAL` - PUBLIC_INTERNAL
     * `PUBLIC_EXTERNAL` - PUBLIC_EXTERNAL
+    * `ONE_ON_ONE_CHAT` - ONE_ON_ONE_CHAT
+    * `GROUP_CHAT` - GROUP_CHAT
+    * `MEETING_CHAT` - MEETING_CHAT
     """
 
     PRIVATE_INTERNAL = "PRIVATE_INTERNAL"
     PRIVATE_EXTERNAL = "PRIVATE_EXTERNAL"
     PUBLIC_INTERNAL = "PUBLIC_INTERNAL"
     PUBLIC_EXTERNAL = "PUBLIC_EXTERNAL"
+    ONE_ON_ONE_CHAT = "ONE_ON_ONE_CHAT"
+    GROUP_CHAT = "GROUP_CHAT"
+    MEETING_CHAT = "MEETING_CHAT"
 
     def visit(
         self,
@@ -25,6 +31,9 @@ class TypeEnum(str, enum.Enum):
         private_external: typing.Callable[[], T_Result],
         public_internal: typing.Callable[[], T_Result],
         public_external: typing.Callable[[], T_Result],
+        one_on_one_chat: typing.Callable[[], T_Result],
+        group_chat: typing.Callable[[], T_Result],
+        meeting_chat: typing.Callable[[], T_Result],
     ) -> T_Result:
         if self is TypeEnum.PRIVATE_INTERNAL:
             return private_internal()
@@ -34,3 +43,9 @@ class TypeEnum(str, enum.Enum):
             return public_internal()
         if self is TypeEnum.PUBLIC_EXTERNAL:
             return public_external()
+        if self is TypeEnum.ONE_ON_ONE_CHAT:
+            return one_on_one_chat()
+        if self is TypeEnum.GROUP_CHAT:
+            return group_chat()
+        if self is TypeEnum.MEETING_CHAT:
+            return meeting_chat()

merge/resources/filestorage/types/drive.py

@@ -49,6 +49,11 @@ class Drive(UncheckedBaseModel):
     The drive's url.
     """
 
+    size: typing.Optional[int] = pydantic.Field(default=None)
+    """
+    The drive's size, in bytes.
+    """
+
     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/).

{mergepythonclient-2.6.1.dist-info → mergepythonclient-2.6.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergepythonclient
-Version: 2.6.1
+Version: 2.6.3
 Summary: 
 Requires-Python: >=3.8,<4.0
 Classifier: Intended Audience :: Developers
@@ -70,17 +70,17 @@ Instantiate and use the client with the following:
 
 ```python
 from merge import Merge
-from merge.resources.ats import ActivityRequest
+from merge.resources.chat import DataPassthroughRequest, MethodEnum
 
 client = Merge(
     account_token="YOUR_ACCOUNT_TOKEN",
     api_key="YOUR_API_KEY",
 )
-client.ats.activities.create(
-    is_debug_mode=True,
-    run_async=True,
-    model=ActivityRequest(),
-    remote_user_id="remote_user_id",
+client.chat.async_passthrough.create(
+    request=DataPassthroughRequest(
+        method=MethodEnum.GET,
+        path="/scooters",
+    ),
 )
 ```
 
@@ -115,7 +115,7 @@ The SDK also exports an `async` client so that you can make non-blocking calls t
 import asyncio
 
 from merge import AsyncMerge
-from merge.resources.ats import ActivityRequest
+from merge.resources.chat import DataPassthroughRequest, MethodEnum
 
 client = AsyncMerge(
     account_token="YOUR_ACCOUNT_TOKEN",
@@ -124,11 +124,11 @@ client = AsyncMerge(
 
 
 async def main() -> None:
-    await client.ats.activities.create(
-        is_debug_mode=True,
-        run_async=True,
-        model=ActivityRequest(),
-        remote_user_id="remote_user_id",
+    await client.chat.async_passthrough.create(
+        request=DataPassthroughRequest(
+            method=MethodEnum.GET,
+            path="/scooters",
+        ),
     )
 
 
@@ -144,7 +144,7 @@ will be thrown.
 from merge.core.api_error import ApiError
 
 try:
-    client.ats.activities.create(...)
+    client.chat.async_passthrough.create(...)
 except ApiError as e:
     print(e.status_code)
     print(e.body)
@@ -163,7 +163,7 @@ from merge import Merge
 client = Merge(
     ...,
 )
-response = client.ats.activities.with_raw_response.create(...)
+response = client.chat.async_passthrough.with_raw_response.create(...)
 print(response.headers)  # access the response headers
 print(response.data)  # access the underlying object
 ```
@@ -183,7 +183,7 @@ A request is deemed retryable when any of the following HTTP status codes is ret
 Use the `max_retries` request option to configure this behavior.
 
 ```python
-client.ats.activities.create(..., request_options={
+client.chat.async_passthrough.create(..., request_options={
     "max_retries": 1
 })
 ```
@@ -203,7 +203,7 @@ client = Merge(
 
 
 # Override timeout for a specific method
-client.ats.activities.create(..., request_options={
+client.chat.async_passthrough.create(..., request_options={
     "timeout_in_seconds": 1
 })
 ```
@@ -288,3 +288,7 @@ while response.next is not None:
 
 
 
+
+
+
+

{mergepythonclient-2.6.1.dist-info → mergepythonclient-2.6.3.dist-info}/RECORD

@@ -1,8 +1,8 @@
 merge/__init__.py,sha256=K3KxH-H0yK6Mp-fSHYH_I6TxE3EquIdXUOeclJm6yYg,1697
-merge/client.py,sha256=_bxMTHVjU04PvdYXojUCiTwazrodJRBX9dtthm6pdYY,11937
+merge/client.py,sha256=X_HQAqKZIQzXgmzrPQhT1f2sgT1eL08EKA6R6ttbaXw,11937
 merge/core/__init__.py,sha256=HNk-wnH_j2yAf7IroaZM9JJFe4mnkNHq06t2QmaBweg,3862
 merge/core/api_error.py,sha256=44vPoTyWN59gonCIZMdzw7M1uspygiLnr3GNFOoVL2Q,614
-merge/core/client_wrapper.py,sha256=RJ__5g8UPoNTuC6rMYV1GEGBfMFNwqyrIP-hoEqSSPo,3096
+merge/core/client_wrapper.py,sha256=_nM_lm2uOiLrCI-iJh5_GHijsXVZy348aRKjpoW_Tjs,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
@@ -375,14 +375,14 @@ merge/resources/accounting/types/expense_company.py,sha256=glTlqCHP1Y2X7xrP-yDsM
 merge/resources/accounting/types/expense_contact.py,sha256=v2WJR_Olv2mgIBDjg3c4DK_fYkWobZl01K48Gh4FMAs,154
 merge/resources/accounting/types/expense_currency.py,sha256=dHd3C636Ox7A8QKVO6_apAy5byVA4c5rrQg9Vx4SYo0,205
 merge/resources/accounting/types/expense_employee.py,sha256=S3sA6dB-WyIkL7y_0zy87bSVebNNl12NXVAwOEmCJhg,158
-merge/resources/accounting/types/expense_line.py,sha256=-byfMRjCwIYfLHFJoTcV5YFgIP7OYTMXgEQxKJejLbQ,14202
+merge/resources/accounting/types/expense_line.py,sha256=pHstgkkrc3OIcMweFHnPY_uf-cnHBzNyWuwCU1ivNvw,14461
 merge/resources/accounting/types/expense_line_account.py,sha256=wTUrDpQPDny2ra3HOtJHqxHORL4y35uGVzEt2PNsSrE,158
 merge/resources/accounting/types/expense_line_contact.py,sha256=NAKcWM9_Sx_ARbBjIzrzav-Ze6dTu2D_OrNz_rI5iX8,158
 merge/resources/accounting/types/expense_line_currency.py,sha256=nrMWy_mCLbCvRETnX25hNFm_nS_1hXbzJkCpyPRp6QI,209
 merge/resources/accounting/types/expense_line_employee.py,sha256=2bM0YYOHOTT-xHYCLr9BskDe8ELCSVX6E8BGZrsjuC0,162
 merge/resources/accounting/types/expense_line_item.py,sha256=b-aJtnORuLKOGyTku1hRjzhs6YOGdgTOQxDr2qOvtjE,146
 merge/resources/accounting/types/expense_line_project.py,sha256=At1oso7pSTcIxELj0jS2NJf1Slyl4MaSwqOl9noOx4A,158
-merge/resources/accounting/types/expense_line_request.py,sha256=CurXFn2-8mL9hoFQVjvSGz0x4vdj4ZyLEL5-J9ck-YM,13967
+merge/resources/accounting/types/expense_line_request.py,sha256=xPtSoxCgmjBD98WG7D6SClQA7z7al5WLpfaAHHI3Tkg,14226
 merge/resources/accounting/types/expense_line_request_account.py,sha256=ijRKpEyGlkSaq7RihyEVS2Wap-5_Cri3M99D6UY6uds,165
 merge/resources/accounting/types/expense_line_request_contact.py,sha256=v151IzW49Juu6dQ9e1yJJVvT1G6Ychh4d4xcuLUC4wM,165
 merge/resources/accounting/types/expense_line_request_currency.py,sha256=-e9s-a9vAgHdXP5BkAtcXl7UNZwhWnCJ2Rt17_ovlgc,216
@@ -1212,7 +1212,7 @@ merge/resources/chat/types/category_enum.py,sha256=7hv-PXVE1JmNQD7yjp16POyeGfZQS
 merge/resources/chat/types/common_model_scope_api.py,sha256=iikeXuknnlFYmnwoRcQ34AnBwbpAPIYhgmov3HpeBGg,812
 merge/resources/chat/types/common_model_scopes_body_request.py,sha256=KMnJBN-wDY0eQNjXYAgoiyoyXY74T9pzZum_2BIiUhU,726
 merge/resources/chat/types/completed_account_initial_screen_enum.py,sha256=O8ZkUxzZ79KqliNtuFiA2dhVSsYCysziBgyRDG3pGZI,149
-merge/resources/chat/types/conversation.py,sha256=TSwVvPJdqlkQ-iRY-sSjg4v6edtcSVScn6-SHDrH-8o,2962
+merge/resources/chat/types/conversation.py,sha256=WTLOcRPdRX9Tm3tzHCf_X4XuMSAOYXLTNOI0tJ1NjAg,3072
 merge/resources/chat/types/conversation_type.py,sha256=r2ju7rTTCvCaSzTxV17fFjubI0GKTVDwpHN5G3tLg6s,160
 merge/resources/chat/types/data_passthrough_request.py,sha256=arL5gXYjwGtbdAcjx3hggnoLmZsiRITvn9lXPn08sNw,2533
 merge/resources/chat/types/data_passthrough_request_method.py,sha256=pPQyuc3sRVbGsvXWrtdwzNYsosT3CzBjXEFLVkGWolo,178
@@ -1276,7 +1276,7 @@ merge/resources/chat/types/status_fd_5_enum.py,sha256=9uFhTnWd-OPGZ-HbAwKZp_FL2w
 merge/resources/chat/types/sync_status.py,sha256=dSf0uOh8TCgMJ7S3YeU6KyFIOqzgKJDGxqr2XwoT67Q,1469
 merge/resources/chat/types/sync_status_last_sync_result.py,sha256=NY6veRnsfFgeHEMlj9Q35FFJCKoCOQAmtLotkPTPbSU,200
 merge/resources/chat/types/sync_status_status.py,sha256=VAGVIs8Hv1VAaU0_UNCXjXLFcbMHs4P7muYSh9gkUX4,177
-merge/resources/chat/types/type_enum.py,sha256=MJmuA-T921SdmeMWqLbkYbCNYMvsiyhESCn16UHQKrk,1124
+merge/resources/chat/types/type_enum.py,sha256=Sg8hJZZ_0RyyyDRILNQEbU_6eQVmVG9y2VINeda7YGU,1728
 merge/resources/chat/types/user.py,sha256=uVxNSjRnMJgN8IOsWl14s_EDe7wn0-J-7rKei_AIrIg,2868
 merge/resources/chat/types/validation_problem_source.py,sha256=0ayE7x_uM8R0pzVRz9ZZEc6WS1RUZO3VW3zXjh61RVs,576
 merge/resources/chat/types/warning_validation_problem.py,sha256=t9CzZaDPK9NykBCj9ok4cJoOXNixtxQCf_DuQg48xDc,787
@@ -1731,7 +1731,7 @@ merge/resources/filestorage/types/data_passthrough_request.py,sha256=gG8yqvRRpSD
 merge/resources/filestorage/types/debug_mode_log.py,sha256=_aDyb6W3eB98mw4lcnG-oXwpOx99KbuBnrUXP6IwdTc,684
 merge/resources/filestorage/types/debug_model_log_summary.py,sha256=Ab0MWIdzb7pBW6U6lJwhN1VL6H9qDcXnNmUAd1pZuE8,606
 merge/resources/filestorage/types/download_request_meta.py,sha256=hzPprsRMUhXu15znpQoFA02XoGCtOOKQtDuVPri5DWQ,655
-merge/resources/filestorage/types/drive.py,sha256=NYZ49KG8hBTDy2hjX3A65yA2NbScsfkGKxPMw2kjzTs,2236
+merge/resources/filestorage/types/drive.py,sha256=71b7TbtdEhEB-hANdlG1cnR3mU4UFbHIydpZ03r0iDg,2347
 merge/resources/filestorage/types/enabled_actions_enum.py,sha256=RBwvCMjrrdPPAbnQXAwKczXklo0uxpgYVrfcDs6lSRo,522
 merge/resources/filestorage/types/encoding_enum.py,sha256=ervs42mwv6m0bBeWe-QKdG02RRVLIlFhLOVjzmqen3c,739
 merge/resources/filestorage/types/error_validation_problem.py,sha256=kTcN_MW8qd0YV5bMdeQfhxCyx5z3RYSfQkjjhrQcX0Y,734
@@ -2682,7 +2682,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-2.6.1.dist-info/LICENSE.md,sha256=WKO7xLnLSUInldiq5i25eVqKAjwIUKenaS4Cgir2Iuw,3275
-mergepythonclient-2.6.1.dist-info/METADATA,sha256=ZOPZske7tphDGl4V4OaXJLRmt0UhNG-QiJZEYqXmP_g,7902
-mergepythonclient-2.6.1.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-mergepythonclient-2.6.1.dist-info/RECORD,,
+mergepythonclient-2.6.3.dist-info/LICENSE.md,sha256=WKO7xLnLSUInldiq5i25eVqKAjwIUKenaS4Cgir2Iuw,3275
+mergepythonclient-2.6.3.dist-info/METADATA,sha256=UFKiu9VXHRFjx6z1orD9tq7FyRJCdwde4mRk8TiwHsQ,7974
+mergepythonclient-2.6.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+mergepythonclient-2.6.3.dist-info/RECORD,,