Skip to content

Commit cce82ff

Browse files
fern-api[bot]fern-api[bot]
authored
May 2024 SDK bump (#88)
Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
1 parent d021dd3 commit cce82ff

File tree

267 files changed

+1275
-4754
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

267 files changed

+1275
-4754
lines changed

‎poetry.lock

Lines changed: 115 additions & 115 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "MergePythonClient"
3-
version = "1.0.8"
3+
version = "1.0.9"
44
description = ""
55
readme = "README.md"
66
authors = []

‎src/merge/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ def __init__(
3434
self.ats = AtsClient(client_wrapper=self._client_wrapper)
3535
self.crm = CrmClient(client_wrapper=self._client_wrapper)
3636
self.filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
37-
self.hris = HrisClient(client_wrapper=self._client_wrapper)
3837
self.ticketing = TicketingClient(client_wrapper=self._client_wrapper)
38+
self.hris = HrisClient(client_wrapper=self._client_wrapper)
3939
self.accounting = AccountingClient(client_wrapper=self._client_wrapper)
4040

4141

@@ -59,8 +59,8 @@ def __init__(
5959
self.ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
6060
self.crm = AsyncCrmClient(client_wrapper=self._client_wrapper)
6161
self.filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
62-
self.hris = AsyncHrisClient(client_wrapper=self._client_wrapper)
6362
self.ticketing = AsyncTicketingClient(client_wrapper=self._client_wrapper)
63+
self.hris = AsyncHrisClient(client_wrapper=self._client_wrapper)
6464
self.accounting = AsyncAccountingClient(client_wrapper=self._client_wrapper)
6565

6666

‎src/merge/core/client_wrapper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ def get_headers(self) -> typing.Dict[str, str]:
2121
headers: typing.Dict[str, str] = {
2222
"X-Fern-Language": "Python",
2323
"X-Fern-SDK-Name": "MergePythonClient",
24-
"X-Fern-SDK-Version": "1.0.8",
24+
"X-Fern-SDK-Version": "1.0.9",
2525
}
2626
if self._account_token is not None:
2727
headers["X-Account-Token"] = self._account_token

‎src/merge/resources/accounting/__init__.py

Lines changed: 10 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@
5252
CommonModelScopesBodyRequest,
5353
CompanyInfo,
5454
CompanyInfoCurrency,
55-
ConditionSchema,
56-
ConditionSchemaConditionType,
57-
ConditionTypeEnum,
5855
Contact,
5956
ContactAddressesItem,
6057
ContactRequest,
@@ -197,10 +194,6 @@
197194
JournalLineTrackingCategoriesItem,
198195
JournalLineTrackingCategory,
199196
LinkToken,
200-
LinkedAccountCondition,
201-
LinkedAccountConditionRequest,
202-
LinkedAccountSelectiveSyncConfiguration,
203-
LinkedAccountSelectiveSyncConfigurationRequest,
204197
LinkedAccountStatus,
205198
MetaResponse,
206199
MethodEnum,
@@ -209,7 +202,6 @@
209202
ModelPermissionDeserializerRequest,
210203
MultipartFormFieldRequest,
211204
MultipartFormFieldRequestEncoding,
212-
OperatorSchema,
213205
PaginatedAccountDetailsAndActionsList,
214206
PaginatedAccountList,
215207
PaginatedAccountingAttachmentList,
@@ -218,7 +210,6 @@
218210
PaginatedBalanceSheetList,
219211
PaginatedCashFlowStatementList,
220212
PaginatedCompanyInfoList,
221-
PaginatedConditionSchemaList,
222213
PaginatedContactList,
223214
PaginatedCreditNoteList,
224215
PaginatedExpenseList,
@@ -242,6 +233,7 @@
242233
PatchedPaymentRequestContact,
243234
PatchedPaymentRequestCurrency,
244235
PatchedPaymentRequestTrackingCategoriesItem,
236+
PatchedPaymentRequestType,
245237
Payment,
246238
PaymentAccount,
247239
PaymentAccountingPeriod,
@@ -259,8 +251,11 @@
259251
PaymentRequestContact,
260252
PaymentRequestCurrency,
261253
PaymentRequestTrackingCategoriesItem,
254+
PaymentRequestType,
262255
PaymentResponse,
263256
PaymentTrackingCategoriesItem,
257+
PaymentType,
258+
PaymentTypeEnum,
264259
PostingStatusEnum,
265260
PurchaseOrder,
266261
PurchaseOrderAccountingPeriod,
@@ -288,6 +283,7 @@
288283
RemoteData,
289284
RemoteEndpointInfo,
290285
RemoteFieldApi,
286+
RemoteFieldApiCoverage,
291287
RemoteFieldApiResponse,
292288
RemoteKey,
293289
RemoteResponse,
@@ -392,7 +388,6 @@
392388
purchase_orders,
393389
regenerate_key,
394390
scopes,
395-
selective_sync,
396391
sync_status,
397392
tax_rates,
398393
tracking_categories,
@@ -459,9 +454,6 @@
459454
"CompanyInfoCurrency",
460455
"CompanyInfoListRequestExpand",
461456
"CompanyInfoRetrieveRequestExpand",
462-
"ConditionSchema",
463-
"ConditionSchemaConditionType",
464-
"ConditionTypeEnum",
465457
"Contact",
466458
"ContactAddressesItem",
467459
"ContactRequest",
@@ -622,10 +614,6 @@
622614
"JournalLineTrackingCategoriesItem",
623615
"JournalLineTrackingCategory",
624616
"LinkToken",
625-
"LinkedAccountCondition",
626-
"LinkedAccountConditionRequest",
627-
"LinkedAccountSelectiveSyncConfiguration",
628-
"LinkedAccountSelectiveSyncConfigurationRequest",
629617
"LinkedAccountStatus",
630618
"LinkedAccountsListRequestCategory",
631619
"MetaResponse",
@@ -635,7 +623,6 @@
635623
"ModelPermissionDeserializerRequest",
636624
"MultipartFormFieldRequest",
637625
"MultipartFormFieldRequestEncoding",
638-
"OperatorSchema",
639626
"PaginatedAccountDetailsAndActionsList",
640627
"PaginatedAccountList",
641628
"PaginatedAccountingAttachmentList",
@@ -644,7 +631,6 @@
644631
"PaginatedBalanceSheetList",
645632
"PaginatedCashFlowStatementList",
646633
"PaginatedCompanyInfoList",
647-
"PaginatedConditionSchemaList",
648634
"PaginatedContactList",
649635
"PaginatedCreditNoteList",
650636
"PaginatedExpenseList",
@@ -668,6 +654,7 @@
668654
"PatchedPaymentRequestContact",
669655
"PatchedPaymentRequestCurrency",
670656
"PatchedPaymentRequestTrackingCategoriesItem",
657+
"PatchedPaymentRequestType",
671658
"Payment",
672659
"PaymentAccount",
673660
"PaymentAccountingPeriod",
@@ -685,8 +672,11 @@
685672
"PaymentRequestContact",
686673
"PaymentRequestCurrency",
687674
"PaymentRequestTrackingCategoriesItem",
675+
"PaymentRequestType",
688676
"PaymentResponse",
689677
"PaymentTrackingCategoriesItem",
678+
"PaymentType",
679+
"PaymentTypeEnum",
690680
"PaymentsListRequestExpand",
691681
"PaymentsRetrieveRequestExpand",
692682
"PostingStatusEnum",
@@ -718,6 +708,7 @@
718708
"RemoteData",
719709
"RemoteEndpointInfo",
720710
"RemoteFieldApi",
711+
"RemoteFieldApiCoverage",
721712
"RemoteFieldApiResponse",
722713
"RemoteKey",
723714
"RemoteResponse",
@@ -791,7 +782,6 @@
791782
"purchase_orders",
792783
"regenerate_key",
793784
"scopes",
794-
"selective_sync",
795785
"sync_status",
796786
"tax_rates",
797787
"tracking_categories",

‎src/merge/resources/accounting/client.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
from .resources.purchase_orders.client import AsyncPurchaseOrdersClient, PurchaseOrdersClient
4040
from .resources.regenerate_key.client import AsyncRegenerateKeyClient, RegenerateKeyClient
4141
from .resources.scopes.client import AsyncScopesClient, ScopesClient
42-
from .resources.selective_sync.client import AsyncSelectiveSyncClient, SelectiveSyncClient
4342
from .resources.sync_status.client import AsyncSyncStatusClient, SyncStatusClient
4443
from .resources.tax_rates.client import AsyncTaxRatesClient, TaxRatesClient
4544
from .resources.tracking_categories.client import AsyncTrackingCategoriesClient, TrackingCategoriesClient
@@ -84,7 +83,6 @@ def __init__(self, *, client_wrapper: SyncClientWrapper):
8483
self.phone_numbers = PhoneNumbersClient(client_wrapper=self._client_wrapper)
8584
self.purchase_orders = PurchaseOrdersClient(client_wrapper=self._client_wrapper)
8685
self.regenerate_key = RegenerateKeyClient(client_wrapper=self._client_wrapper)
87-
self.selective_sync = SelectiveSyncClient(client_wrapper=self._client_wrapper)
8886
self.sync_status = SyncStatusClient(client_wrapper=self._client_wrapper)
8987
self.force_resync = ForceResyncClient(client_wrapper=self._client_wrapper)
9088
self.tax_rates = TaxRatesClient(client_wrapper=self._client_wrapper)
@@ -130,7 +128,6 @@ def __init__(self, *, client_wrapper: AsyncClientWrapper):
130128
self.phone_numbers = AsyncPhoneNumbersClient(client_wrapper=self._client_wrapper)
131129
self.purchase_orders = AsyncPurchaseOrdersClient(client_wrapper=self._client_wrapper)
132130
self.regenerate_key = AsyncRegenerateKeyClient(client_wrapper=self._client_wrapper)
133-
self.selective_sync = AsyncSelectiveSyncClient(client_wrapper=self._client_wrapper)
134131
self.sync_status = AsyncSyncStatusClient(client_wrapper=self._client_wrapper)
135132
self.force_resync = AsyncForceResyncClient(client_wrapper=self._client_wrapper)
136133
self.tax_rates = AsyncTaxRatesClient(client_wrapper=self._client_wrapper)

‎src/merge/resources/accounting/resources/__init__.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
purchase_orders,
3434
regenerate_key,
3535
scopes,
36-
selective_sync,
3736
sync_status,
3837
tax_rates,
3938
tracking_categories,
@@ -134,7 +133,6 @@
134133
"purchase_orders",
135134
"regenerate_key",
136135
"scopes",
137-
"selective_sync",
138136
"sync_status",
139137
"tax_rates",
140138
"tracking_categories",

‎src/merge/resources/accounting/resources/audit_trail/client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def list(
4040
4141
- end_date: typing.Optional[str]. If included, will only include audit trail events that occurred before this time
4242
43-
- event_type: typing.Optional[str]. If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`
43+
- event_type: typing.Optional[str]. If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
4444
4545
- page_size: typing.Optional[int]. Number of results to return per page.
4646
@@ -122,7 +122,7 @@ async def list(
122122
123123
- end_date: typing.Optional[str]. If included, will only include audit trail events that occurred before this time
124124
125-
- event_type: typing.Optional[str]. If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`
125+
- event_type: typing.Optional[str]. If included, will only include events with the given event type. Possible values include: `CREATED_REMOTE_PRODUCTION_API_KEY`, `DELETED_REMOTE_PRODUCTION_API_KEY`, `CREATED_TEST_API_KEY`, `DELETED_TEST_API_KEY`, `REGENERATED_PRODUCTION_API_KEY`, `INVITED_USER`, `TWO_FACTOR_AUTH_ENABLED`, `TWO_FACTOR_AUTH_DISABLED`, `DELETED_LINKED_ACCOUNT`, `CREATED_DESTINATION`, `DELETED_DESTINATION`, `CHANGED_DESTINATION`, `CHANGED_SCOPES`, `CHANGED_PERSONAL_INFORMATION`, `CHANGED_ORGANIZATION_SETTINGS`, `ENABLED_INTEGRATION`, `DISABLED_INTEGRATION`, `ENABLED_CATEGORY`, `DISABLED_CATEGORY`, `CHANGED_PASSWORD`, `RESET_PASSWORD`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `ENABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_ORGANIZATION`, `DISABLED_REDACT_UNMAPPED_DATA_FOR_LINKED_ACCOUNT`, `CREATED_INTEGRATION_WIDE_FIELD_MAPPING`, `CREATED_LINKED_ACCOUNT_FIELD_MAPPING`, `CHANGED_INTEGRATION_WIDE_FIELD_MAPPING`, `CHANGED_LINKED_ACCOUNT_FIELD_MAPPING`, `DELETED_INTEGRATION_WIDE_FIELD_MAPPING`, `DELETED_LINKED_ACCOUNT_FIELD_MAPPING`, `FORCED_LINKED_ACCOUNT_RESYNC`, `MUTED_ISSUE`, `GENERATED_MAGIC_LINK`, `ENABLED_MERGE_WEBHOOK`, `DISABLED_MERGE_WEBHOOK`, `MERGE_WEBHOOK_TARGET_CHANGED`
126126
127127
- page_size: typing.Optional[int]. Number of results to return per page.
128128

‎src/merge/resources/accounting/resources/field_mapping/client.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,6 @@ def field_mappings_partial_update(
244244
)
245245
client.accounting.field_mapping.field_mappings_partial_update(
246246
field_mapping_id="field_mapping_id",
247-
remote_method="GET",
248-
remote_url_path="/example-url-path",
249247
)
250248
"""
251249
_request: typing.Dict[str, typing.Any] = {}
@@ -615,8 +613,6 @@ async def field_mappings_partial_update(
615613
)
616614
await client.accounting.field_mapping.field_mappings_partial_update(
617615
field_mapping_id="field_mapping_id",
618-
remote_method="GET",
619-
remote_url_path="/example-url-path",
620616
)
621617
"""
622618
_request: typing.Dict[str, typing.Any] = {}

‎src/merge/resources/accounting/resources/link_token/client.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ def create(
4242
typing.Dict[str, typing.Optional[typing.List[IndividualCommonModelScopeDeserializerRequest]]]
4343
] = OMIT,
4444
language: typing.Optional[str] = OMIT,
45+
integration_specific_config: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
4546
request_options: typing.Optional[RequestOptions] = None,
4647
) -> LinkToken:
4748
"""
@@ -68,6 +69,8 @@ def create(
6869
6970
- language: typing.Optional[str]. The language code for the language to localize Merge Link to.
7071
72+
- integration_specific_config: typing.Optional[typing.Dict[str, typing.Any]]. A JSON object containing integration-specific configuration options.
73+
7174
- request_options: typing.Optional[RequestOptions]. Request-specific configuration.
7275
---
7376
from merge.client import Merge
@@ -102,6 +105,8 @@ def create(
102105
_request["category_common_model_scopes"] = category_common_model_scopes
103106
if language is not OMIT:
104107
_request["language"] = language
108+
if integration_specific_config is not OMIT:
109+
_request["integration_specific_config"] = integration_specific_config
105110
_response = self._client_wrapper.httpx_client.request(
106111
"POST",
107112
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "accounting/v1/link-token"),
@@ -154,6 +159,7 @@ async def create(
154159
typing.Dict[str, typing.Optional[typing.List[IndividualCommonModelScopeDeserializerRequest]]]
155160
] = OMIT,
156161
language: typing.Optional[str] = OMIT,
162+
integration_specific_config: typing.Optional[typing.Dict[str, typing.Any]] = OMIT,
157163
request_options: typing.Optional[RequestOptions] = None,
158164
) -> LinkToken:
159165
"""
@@ -180,6 +186,8 @@ async def create(
180186
181187
- language: typing.Optional[str]. The language code for the language to localize Merge Link to.
182188
189+
- integration_specific_config: typing.Optional[typing.Dict[str, typing.Any]]. A JSON object containing integration-specific configuration options.
190+
183191
- request_options: typing.Optional[RequestOptions]. Request-specific configuration.
184192
---
185193
from merge.client import AsyncMerge
@@ -214,6 +222,8 @@ async def create(
214222
_request["category_common_model_scopes"] = category_common_model_scopes
215223
if language is not OMIT:
216224
_request["language"] = language
225+
if integration_specific_config is not OMIT:
226+
_request["integration_specific_config"] = integration_specific_config
217227
_response = await self._client_wrapper.httpx_client.request(
218228
"POST",
219229
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "accounting/v1/link-token"),

0 commit comments

Comments
 (0)