mergepythonclient 0.2.3__py3-none-any.whl → 0.2.4__py3-none-any.whl

merge/client.py

@@ -30,9 +30,9 @@ class Merge:
         self.ats = AtsClient(environment=environment, client_wrapper=self._client_wrapper)
         self.crm = CrmClient(environment=environment, client_wrapper=self._client_wrapper)
         self.filestorage = FilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
+        self.hris = HrisClient(environment=environment, client_wrapper=self._client_wrapper)
         self.ticketing = TicketingClient(environment=environment, client_wrapper=self._client_wrapper)
         self.accounting = AccountingClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.hris = HrisClient(environment=environment, client_wrapper=self._client_wrapper)
 
 
 class AsyncMerge:
@@ -51,6 +51,6 @@ class AsyncMerge:
         self.ats = AsyncAtsClient(environment=environment, client_wrapper=self._client_wrapper)
         self.crm = AsyncCrmClient(environment=environment, client_wrapper=self._client_wrapper)
         self.filestorage = AsyncFilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
+        self.hris = AsyncHrisClient(environment=environment, client_wrapper=self._client_wrapper)
         self.ticketing = AsyncTicketingClient(environment=environment, client_wrapper=self._client_wrapper)
         self.accounting = AsyncAccountingClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.hris = AsyncHrisClient(environment=environment, client_wrapper=self._client_wrapper)

merge/core/client_wrapper.py

@@ -16,7 +16,7 @@ class BaseClientWrapper:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "0.2.3",
+            "X-Fern-SDK-Version": "0.2.4",
         }
         if self._account_token is not None:
             headers["X-Account-Token"] = self._account_token

merge/resources/crm/__init__.py

@@ -177,6 +177,7 @@ from .types import (
     RemoteFieldClassForCustomObjectClassFieldFormat,
     RemoteFieldClassForCustomObjectClassFieldType,
     RemoteFieldClassForCustomObjectClassItemSchema,
+    RemoteFieldRemoteFieldClass,
     RemoteFieldRequest,
     RemoteFieldRequestRemoteFieldClass,
     RemoteKey,
@@ -415,6 +416,7 @@ __all__ = [
     "RemoteFieldClassForCustomObjectClassFieldFormat",
     "RemoteFieldClassForCustomObjectClassFieldType",
     "RemoteFieldClassForCustomObjectClassItemSchema",
+    "RemoteFieldRemoteFieldClass",
     "RemoteFieldRequest",
     "RemoteFieldRequestRemoteFieldClass",
     "RemoteKey",

merge/resources/crm/types/__init__.py

@@ -178,6 +178,7 @@ from .remote_field_class_for_custom_object_class_field_choices_item import (
 from .remote_field_class_for_custom_object_class_field_format import RemoteFieldClassForCustomObjectClassFieldFormat
 from .remote_field_class_for_custom_object_class_field_type import RemoteFieldClassForCustomObjectClassFieldType
 from .remote_field_class_for_custom_object_class_item_schema import RemoteFieldClassForCustomObjectClassItemSchema
+from .remote_field_remote_field_class import RemoteFieldRemoteFieldClass
 from .remote_field_request import RemoteFieldRequest
 from .remote_field_request_remote_field_class import RemoteFieldRequestRemoteFieldClass
 from .remote_key import RemoteKey
@@ -384,6 +385,7 @@ __all__ = [
     "RemoteFieldClassForCustomObjectClassFieldFormat",
     "RemoteFieldClassForCustomObjectClassFieldType",
     "RemoteFieldClassForCustomObjectClassItemSchema",
+    "RemoteFieldRemoteFieldClass",
     "RemoteFieldRequest",
     "RemoteFieldRequestRemoteFieldClass",
     "RemoteKey",

merge/resources/crm/types/remote_field.py

@@ -6,12 +6,12 @@ import typing
 import pydantic
 
 from ....core.datetime_utils import serialize_datetime
-from .remote_field_class import RemoteFieldClass
+from .remote_field_remote_field_class import RemoteFieldRemoteFieldClass
 
 
 class RemoteField(pydantic.BaseModel):
-    remote_field_class: RemoteFieldClass
-    value: typing.Optional[typing.Dict[str, typing.Any]]
+    remote_field_class: RemoteFieldRemoteFieldClass
+    value: typing.Optional[typing.Any]
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

merge/resources/crm/types/remote_field_remote_field_class.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .remote_field_class import RemoteFieldClass
+
+RemoteFieldRemoteFieldClass = typing.Union[str, RemoteFieldClass]

merge/resources/ticketing/__init__.py

@@ -96,6 +96,7 @@ from .types import (
     RemoteFieldClassFieldChoicesItem,
     RemoteFieldClassFieldFormat,
     RemoteFieldClassFieldType,
+    RemoteFieldRemoteFieldClass,
     RemoteFieldRequest,
     RemoteFieldRequestRemoteFieldClass,
     RemoteKey,
@@ -271,6 +272,7 @@ __all__ = [
     "RemoteFieldClassFieldChoicesItem",
     "RemoteFieldClassFieldFormat",
     "RemoteFieldClassFieldType",
+    "RemoteFieldRemoteFieldClass",
     "RemoteFieldRequest",
     "RemoteFieldRequestRemoteFieldClass",
     "RemoteKey",

merge/resources/ticketing/types/__init__.py

@@ -95,6 +95,7 @@ from .remote_field_class import RemoteFieldClass
 from .remote_field_class_field_choices_item import RemoteFieldClassFieldChoicesItem
 from .remote_field_class_field_format import RemoteFieldClassFieldFormat
 from .remote_field_class_field_type import RemoteFieldClassFieldType
+from .remote_field_remote_field_class import RemoteFieldRemoteFieldClass
 from .remote_field_request import RemoteFieldRequest
 from .remote_field_request_remote_field_class import RemoteFieldRequestRemoteFieldClass
 from .remote_key import RemoteKey
@@ -242,6 +243,7 @@ __all__ = [
     "RemoteFieldClassFieldChoicesItem",
     "RemoteFieldClassFieldFormat",
     "RemoteFieldClassFieldType",
+    "RemoteFieldRemoteFieldClass",
     "RemoteFieldRequest",
     "RemoteFieldRequestRemoteFieldClass",
     "RemoteKey",

merge/resources/ticketing/types/remote_field.py

@@ -6,12 +6,12 @@ import typing
 import pydantic
 
 from ....core.datetime_utils import serialize_datetime
-from .remote_field_class import RemoteFieldClass
+from .remote_field_remote_field_class import RemoteFieldRemoteFieldClass
 
 
 class RemoteField(pydantic.BaseModel):
-    remote_field_class: RemoteFieldClass
-    value: typing.Optional[typing.Dict[str, typing.Any]]
+    remote_field_class: RemoteFieldRemoteFieldClass
+    value: typing.Optional[typing.Any]
 
     def json(self, **kwargs: typing.Any) -> str:
         kwargs_with_defaults: typing.Any = {"by_alias": True, "exclude_unset": True, **kwargs}

merge/resources/ticketing/types/remote_field_remote_field_class.py

@@ -0,0 +1,7 @@
+# This file was auto-generated by Fern from our API Definition.
+
+import typing
+
+from .remote_field_class import RemoteFieldClass
+
+RemoteFieldRemoteFieldClass = typing.Union[str, RemoteFieldClass]

{mergepythonclient-0.2.3.dist-info → mergepythonclient-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mergepythonclient
-Version: 0.2.3
+Version: 0.2.4
 Summary: 
 Requires-Python: >=3.7,<4.0
 Classifier: Programming Language :: Python :: 3

{mergepythonclient-0.2.3.dist-info → mergepythonclient-0.2.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 merge/__init__.py,sha256=kCutiAeK1wG6JWNnryGRbPgG1_H9H8HY7gk1LkHwWHU,277
-merge/client.py,sha256=-MjY2KjXcv2mcLtONHz9Dp0twZKeJJdG7zbVUbrxlZ8,2842
+merge/client.py,sha256=k1PDUYfgQOPPoz6xleAlKGt6dRF52-rhWya_iXe8uPg,2842
 merge/core/__init__.py,sha256=QJS3CJ2TYP2E1Tge0CS6Z7r8LTNzJHQVX1hD3558eP0,519
 merge/core/api_error.py,sha256=RE8LELok2QCjABadECTvtDp7qejA1VmINCh6TbqPwSE,426
-merge/core/client_wrapper.py,sha256=p1eNdvSIMA9EWBIQZ3-YKGFL38mrs3Gmf5XoEomGBKM,1655
+merge/core/client_wrapper.py,sha256=y972JHOFElIIBoDhTSPTDTCTNHpymJyeNiPNkjDqmvc,1655
 merge/core/datetime_utils.py,sha256=nBys2IsYrhPdszxGKCNRPSOCwa-5DWOHG95FB8G9PKo,1047
 merge/core/jsonable_encoder.py,sha256=yHrx0C19n1H77G-GanO-HsFyBPVMlsJz7WffsHwXEVI,3710
 merge/core/remove_none_from_dict.py,sha256=8m91FC3YuVem0Gm9_sXhJ2tGvP33owJJdrqCLEdowGw,330
@@ -626,7 +626,7 @@ merge/resources/ats/types/veteran_status_enum.py,sha256=SiiRJPvP11x6q2EWojgvD8ni
 merge/resources/ats/types/visibility_enum.py,sha256=c2n5A9Y267-9PpEqpNZaSCL-_-do51MdUJpTvtu-JC0,760
 merge/resources/ats/types/warning_validation_problem.py,sha256=EWFbHYkaLM65xitbGEbzk4dK504kqziiLAFaeCvkza8,915
 merge/resources/ats/types/webhook_receiver.py,sha256=723DFZBDkBj8WJ2fInCYF_05lVnJTRudvdtqUcuZ_KE,802
-merge/resources/crm/__init__.py,sha256=tEdbDmAs_Ot5-AvUIgFLv6kuK1vUzM-CTk95XktHyHM,12114
+merge/resources/crm/__init__.py,sha256=1YlaobcUMWj02tyCQmYQWeHjrgGagxZ7tVsct6kpoyc,12182
 merge/resources/crm/client.py,sha256=zd1sbcBu1B5Pjj6i-WZ2F1hYzeTAcHD2pK41Ei8b6GU,10692
 merge/resources/crm/resources/__init__.py,sha256=TiX_TqExPFTb1RVabR-FXok8Hde8wF5yKW81Fa0jbTA,1192
 merge/resources/crm/resources/account_details/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
@@ -687,7 +687,7 @@ merge/resources/crm/resources/users/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRY
 merge/resources/crm/resources/users/client.py,sha256=k7Nym_WFNE9OeeAR6sAIdVrBMA_6i85SHklIct4-1cY,17892
 merge/resources/crm/resources/webhook_receivers/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
 merge/resources/crm/resources/webhook_receivers/client.py,sha256=ywIeRt5xNTzx2EDvASEP-4HOwxPJ1AFcS1XaE5M4ea4,5243
-merge/resources/crm/types/__init__.py,sha256=MpDdMmEkeg0PI5qucz5glP7g84zJ5XRQgVfGH81zYaY,17255
+merge/resources/crm/types/__init__.py,sha256=EReT27wHVdZz_BwFi7T3BLYPViNrZEA0MG78l3eDAdg,17363
 merge/resources/crm/types/account.py,sha256=E3yAbwNA6c6UYi5zG4gge4Ce7PbTrPhfoQl47RVjcUg,2803
 merge/resources/crm/types/account_details.py,sha256=vx6IKZqpYio_HkY9bcje4h1d6D343YRxLdFAPB_yZQE,1483
 merge/resources/crm/types/account_details_and_actions.py,sha256=NRnHozK3tgfXvXCeWbZ5KqHmnF5q_MT7PBMCiB16B5Y,1900
@@ -854,7 +854,7 @@ merge/resources/crm/types/phone_number.py,sha256=MyTeG7xRYo5qEI1Llxu_zDrmwCjWCqh
 merge/resources/crm/types/phone_number_request.py,sha256=9g-V6KIEhYls8FW1Oc_4tYxj_IxaEt5KEG6Z5KctpIU,1309
 merge/resources/crm/types/reason_enum.py,sha256=_8cpQd1CZP5n2v2a0zPKQHrMb8x2zZNFm-xeM-V0FFE,814
 merge/resources/crm/types/remote_data.py,sha256=GWKTaQ8vzPrIVnsFYQRk9zg2OE4ytRfOTUIIu4TkCaQ,802
-merge/resources/crm/types/remote_field.py,sha256=zBVDwumAiKBv3erpSXkB0_BbbTfiCB1C_FC6pasyi0c,880
+merge/resources/crm/types/remote_field.py,sha256=WLsTK2H6SH572UsZz5grZWsTsAn31lIshN0lEoE7Fj8,897
 merge/resources/crm/types/remote_field_class.py,sha256=3ApvmwWNiJ_6Ibvr3UmB1jILNhOsmIl-CvyEJJRfpMU,1473
 merge/resources/crm/types/remote_field_class_field_choices_item.py,sha256=wTrwlJYQhAg_tH4mx8Byir0MJKs9jr3UqX7zWBPrcD0,832
 merge/resources/crm/types/remote_field_class_field_format.py,sha256=SiD46GD6y9f5y1xOJ51_r7BZJBfsTjT4ChetGIzikEw,193
@@ -864,6 +864,7 @@ merge/resources/crm/types/remote_field_class_for_custom_object_class_field_choic
 merge/resources/crm/types/remote_field_class_for_custom_object_class_field_format.py,sha256=mOLvgJ0iedsjIiSInJ-uNQ6M2cb_qjbOUPJZ2lAJbJ0,213
 merge/resources/crm/types/remote_field_class_for_custom_object_class_field_type.py,sha256=GtqLWPazfTTsYDRsg2A3w_OzBxv0aAOzmZNJbRG6VP8,205
 merge/resources/crm/types/remote_field_class_for_custom_object_class_item_schema.py,sha256=WIggHK3XToyfH1E5ll4oeEAuxE7KK4q-k-fnnUEKPZ4,911
+merge/resources/crm/types/remote_field_remote_field_class.py,sha256=hO2WF1YOop9W_KViuHPjwdvK2sYjq8Wh43U87C9hEso,196
 merge/resources/crm/types/remote_field_request.py,sha256=N5sJGWPrHawAyeUDVH7QjLxMi4nNFWmicV_obrhLDE8,944
 merge/resources/crm/types/remote_field_request_remote_field_class.py,sha256=CF0MIbwvcvBlT3_Pw_KmUD8f5_JyOY8hn-ajehwOrlo,203
 merge/resources/crm/types/remote_key.py,sha256=YSBpK-N4nJ-FnpxtIXldbUdv1BhniDhIQ_F1NW9796k,986
@@ -1273,7 +1274,7 @@ merge/resources/hris/types/units_enum.py,sha256=XIZYjVmI4pBqviS_FDF9jQ4pJ8Nmn-K8
 merge/resources/hris/types/validation_problem_source.py,sha256=bXDELVNGedfF0Aq-Yfqlm9e7i8cej9ro4Pg-zSQSyRE,762
 merge/resources/hris/types/warning_validation_problem.py,sha256=EWFbHYkaLM65xitbGEbzk4dK504kqziiLAFaeCvkza8,915
 merge/resources/hris/types/webhook_receiver.py,sha256=723DFZBDkBj8WJ2fInCYF_05lVnJTRudvdtqUcuZ_KE,802
-merge/resources/ticketing/__init__.py,sha256=uEFdRElUcV1RhM3QEfp2sEA5aIyCzCmrhU_D87rDdNo,8786
+merge/resources/ticketing/__init__.py,sha256=0Qg7G2lc5FZ9zGI_JbfJ81jhKKspxYh55Y3Ugq_bi5g,8854
 merge/resources/ticketing/client.py,sha256=8jhZgGClufFubf7YW3uY2hva1MmrsRUIdT7qyou60Ko,9123
 merge/resources/ticketing/resources/__init__.py,sha256=pZW5QH4ROJGPlfppIBPIRT1CZRjklE6YvvphNV_vvVg,994
 merge/resources/ticketing/resources/account_details/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
@@ -1326,7 +1327,7 @@ merge/resources/ticketing/resources/users/__init__.py,sha256=FTtvy8EDg9nNNg9WCat
 merge/resources/ticketing/resources/users/client.py,sha256=Wx21tZMhZO3dIwljC1vNDDkkJ_JLiHbvQqOh1hSPOG4,11536
 merge/resources/ticketing/resources/webhook_receivers/__init__.py,sha256=FTtvy8EDg9nNNg9WCatVgKTRYV8-_v1roeGPAKoa_pw,65
 merge/resources/ticketing/resources/webhook_receivers/client.py,sha256=BMdl-Gdndl65MQJg5qdo6eK_NpMtIgMQ_U0HFP2UVM0,5267
-merge/resources/ticketing/types/__init__.py,sha256=QMVDBfqN4qvG3U40AcFIXU47-yAF8ey1y8OeQt7SeAY,12315
+merge/resources/ticketing/types/__init__.py,sha256=1ZdF-Z6Z7N1CfMIQp78gFcOIPDn3sxEVcShlHEEPMD8,12423
 merge/resources/ticketing/types/access_level_enum.py,sha256=-fDX1Px7mp2AExHyOr9cnsQbFfW1qSw2ynTfu0sq8jE,743
 merge/resources/ticketing/types/account.py,sha256=4GvFJXgz3ojNdk5UzDDU_PDNZW_9EaxVjoBPgJQFxxU,1887
 merge/resources/ticketing/types/account_details.py,sha256=vx6IKZqpYio_HkY9bcje4h1d6D343YRxLdFAPB_yZQE,1483
@@ -1417,11 +1418,12 @@ merge/resources/ticketing/types/priority_enum.py,sha256=acnkqUZdEKYNA109BL65Mq-k
 merge/resources/ticketing/types/project.py,sha256=gkvkEPSdZBIJCsE38VbwiMfYiz7PUC_2swSHC-e2R3k,1712
 merge/resources/ticketing/types/projects_users_list_request_expand.py,sha256=OLtNd0uNab7xwrGpL3_BZsMZqwIpJEjRt9MahqSmdvs,715
 merge/resources/ticketing/types/remote_data.py,sha256=GWKTaQ8vzPrIVnsFYQRk9zg2OE4ytRfOTUIIu4TkCaQ,802
-merge/resources/ticketing/types/remote_field.py,sha256=zBVDwumAiKBv3erpSXkB0_BbbTfiCB1C_FC6pasyi0c,880
+merge/resources/ticketing/types/remote_field.py,sha256=WLsTK2H6SH572UsZz5grZWsTsAn31lIshN0lEoE7Fj8,897
 merge/resources/ticketing/types/remote_field_class.py,sha256=3ApvmwWNiJ_6Ibvr3UmB1jILNhOsmIl-CvyEJJRfpMU,1473
 merge/resources/ticketing/types/remote_field_class_field_choices_item.py,sha256=wTrwlJYQhAg_tH4mx8Byir0MJKs9jr3UqX7zWBPrcD0,832
 merge/resources/ticketing/types/remote_field_class_field_format.py,sha256=PR-0fMwHrlYE34w2JhFMjoPyk-LuwcAmzzVRt3eF2mM,193
 merge/resources/ticketing/types/remote_field_class_field_type.py,sha256=1lWymJnLa1XuEzd3rMlAb1S5KmTtqm8Z24-EGqby9oQ,185
+merge/resources/ticketing/types/remote_field_remote_field_class.py,sha256=hO2WF1YOop9W_KViuHPjwdvK2sYjq8Wh43U87C9hEso,196
 merge/resources/ticketing/types/remote_field_request.py,sha256=N5sJGWPrHawAyeUDVH7QjLxMi4nNFWmicV_obrhLDE8,944
 merge/resources/ticketing/types/remote_field_request_remote_field_class.py,sha256=CF0MIbwvcvBlT3_Pw_KmUD8f5_JyOY8hn-ajehwOrlo,203
 merge/resources/ticketing/types/remote_key.py,sha256=YSBpK-N4nJ-FnpxtIXldbUdv1BhniDhIQ_F1NW9796k,986
@@ -1472,7 +1474,7 @@ merge/resources/ticketing/types/users_retrieve_request_expand.py,sha256=01JMChGj
 merge/resources/ticketing/types/validation_problem_source.py,sha256=bXDELVNGedfF0Aq-Yfqlm9e7i8cej9ro4Pg-zSQSyRE,762
 merge/resources/ticketing/types/warning_validation_problem.py,sha256=EWFbHYkaLM65xitbGEbzk4dK504kqziiLAFaeCvkza8,915
 merge/resources/ticketing/types/webhook_receiver.py,sha256=723DFZBDkBj8WJ2fInCYF_05lVnJTRudvdtqUcuZ_KE,802
-mergepythonclient-0.2.3.dist-info/LICENSE.md,sha256=WKO7xLnLSUInldiq5i25eVqKAjwIUKenaS4Cgir2Iuw,3275
-mergepythonclient-0.2.3.dist-info/METADATA,sha256=Jl865Mte6nb0Vavs-oJggIXyC9t0iXoZAojfembgCsg,5989
-mergepythonclient-0.2.3.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
-mergepythonclient-0.2.3.dist-info/RECORD,,
+mergepythonclient-0.2.4.dist-info/LICENSE.md,sha256=WKO7xLnLSUInldiq5i25eVqKAjwIUKenaS4Cgir2Iuw,3275
+mergepythonclient-0.2.4.dist-info/METADATA,sha256=u_r-QCab-cdTRkXD7UeJI0CMudaAxuCbN5SMyRuAmVo,5989
+mergepythonclient-0.2.4.dist-info/WHEEL,sha256=Zb28QaM1gQi8f4VCBhsUklF61CTlNYfs9YAZn-TOGFk,88
+mergepythonclient-0.2.4.dist-info/RECORD,,