Skip to content

Commit a743df1

Browse files
Sync SDK with updates to Merge API, fix PermissionRequest object typing (#80)
Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
1 parent 18e8e7b commit a743df1

File tree

223 files changed

+11204
-240
lines changed

Some content is hidden

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

223 files changed

+11204
-240
lines changed

poetry.lock

+94-94
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "MergePythonClient"
3-
version = "1.0.6"
3+
version = "1.0.7"
44
description = ""
55
readme = "README.md"
66
authors = []

src/merge/core/client_wrapper.py

+1-1
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.6",
24+
"X-Fern-SDK-Version": "1.0.7",
2525
}
2626
if self._account_token is not None:
2727
headers["X-Account-Token"] = self._account_token

src/merge/resources/accounting/__init__.py

+42
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
AddressRequestType,
3333
AddressType,
3434
AddressTypeEnum,
35+
AdvancedMetadata,
3536
AsyncPassthroughReciept,
3637
AuditLogEvent,
3738
AuditLogEventEventType,
@@ -47,6 +48,7 @@
4748
CategoryEnum,
4849
CategoryTypeEnum,
4950
ClassificationEnum,
51+
CommonModelScopeApi,
5052
CommonModelScopesBodyRequest,
5153
CompanyInfo,
5254
CompanyInfoCurrency,
@@ -111,9 +113,21 @@
111113
ExpenseRequestTrackingCategoriesItem,
112114
ExpenseResponse,
113115
ExpenseTrackingCategoriesItem,
116+
ExternalTargetFieldApi,
117+
ExternalTargetFieldApiResponse,
118+
FieldMappingApiInstance,
119+
FieldMappingApiInstanceRemoteField,
120+
FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo,
121+
FieldMappingApiInstanceResponse,
122+
FieldMappingApiInstanceTargetField,
123+
FieldMappingInstanceResponse,
124+
FieldPermissionDeserializer,
125+
FieldPermissionDeserializerRequest,
114126
IncomeStatement,
115127
IncomeStatementCompany,
116128
IncomeStatementCurrency,
129+
IndividualCommonModelScopeDeserializer,
130+
IndividualCommonModelScopeDeserializerRequest,
117131
Invoice,
118132
InvoiceAccountingPeriod,
119133
InvoiceAppliedPaymentsItem,
@@ -191,6 +205,8 @@
191205
MetaResponse,
192206
MethodEnum,
193207
ModelOperation,
208+
ModelPermissionDeserializer,
209+
ModelPermissionDeserializerRequest,
194210
MultipartFormFieldRequest,
195211
MultipartFormFieldRequestEncoding,
196212
OperatorSchema,
@@ -262,6 +278,9 @@
262278
PurchaseOrderTrackingCategoriesItem,
263279
PurchaseOrderVendor,
264280
RemoteData,
281+
RemoteEndpointInfo,
282+
RemoteFieldApi,
283+
RemoteFieldApiResponse,
265284
RemoteKey,
266285
RemoteResponse,
267286
ReportItem,
@@ -349,6 +368,7 @@
349368
credit_notes,
350369
delete_account,
351370
expenses,
371+
field_mapping,
352372
force_resync,
353373
generate_key,
354374
income_statements,
@@ -363,6 +383,7 @@
363383
phone_numbers,
364384
purchase_orders,
365385
regenerate_key,
386+
scopes,
366387
selective_sync,
367388
sync_status,
368389
tax_rates,
@@ -408,6 +429,7 @@
408429
"AddressRequestType",
409430
"AddressType",
410431
"AddressTypeEnum",
432+
"AdvancedMetadata",
411433
"AsyncPassthroughReciept",
412434
"AuditLogEvent",
413435
"AuditLogEventEventType",
@@ -423,6 +445,7 @@
423445
"CategoryEnum",
424446
"CategoryTypeEnum",
425447
"ClassificationEnum",
448+
"CommonModelScopeApi",
426449
"CommonModelScopesBodyRequest",
427450
"CompanyInfo",
428451
"CompanyInfoCurrency",
@@ -499,9 +522,21 @@
499522
"ExpenseTrackingCategoriesItem",
500523
"ExpensesListRequestExpand",
501524
"ExpensesRetrieveRequestExpand",
525+
"ExternalTargetFieldApi",
526+
"ExternalTargetFieldApiResponse",
527+
"FieldMappingApiInstance",
528+
"FieldMappingApiInstanceRemoteField",
529+
"FieldMappingApiInstanceRemoteFieldRemoteEndpointInfo",
530+
"FieldMappingApiInstanceResponse",
531+
"FieldMappingApiInstanceTargetField",
532+
"FieldMappingInstanceResponse",
533+
"FieldPermissionDeserializer",
534+
"FieldPermissionDeserializerRequest",
502535
"IncomeStatement",
503536
"IncomeStatementCompany",
504537
"IncomeStatementCurrency",
538+
"IndividualCommonModelScopeDeserializer",
539+
"IndividualCommonModelScopeDeserializerRequest",
505540
"Invoice",
506541
"InvoiceAccountingPeriod",
507542
"InvoiceAppliedPaymentsItem",
@@ -588,6 +623,8 @@
588623
"MetaResponse",
589624
"MethodEnum",
590625
"ModelOperation",
626+
"ModelPermissionDeserializer",
627+
"ModelPermissionDeserializerRequest",
591628
"MultipartFormFieldRequest",
592629
"MultipartFormFieldRequestEncoding",
593630
"OperatorSchema",
@@ -663,6 +700,9 @@
663700
"PurchaseOrdersListRequestExpand",
664701
"PurchaseOrdersRetrieveRequestExpand",
665702
"RemoteData",
703+
"RemoteEndpointInfo",
704+
"RemoteFieldApi",
705+
"RemoteFieldApiResponse",
666706
"RemoteKey",
667707
"RemoteResponse",
668708
"ReportItem",
@@ -719,6 +759,7 @@
719759
"credit_notes",
720760
"delete_account",
721761
"expenses",
762+
"field_mapping",
722763
"force_resync",
723764
"generate_key",
724765
"income_statements",
@@ -733,6 +774,7 @@
733774
"phone_numbers",
734775
"purchase_orders",
735776
"regenerate_key",
777+
"scopes",
736778
"selective_sync",
737779
"sync_status",
738780
"tax_rates",

src/merge/resources/accounting/client.py

+6
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
from .resources.credit_notes.client import AsyncCreditNotesClient, CreditNotesClient
2121
from .resources.delete_account.client import AsyncDeleteAccountClient, DeleteAccountClient
2222
from .resources.expenses.client import AsyncExpensesClient, ExpensesClient
23+
from .resources.field_mapping.client import AsyncFieldMappingClient, FieldMappingClient
2324
from .resources.force_resync.client import AsyncForceResyncClient, ForceResyncClient
2425
from .resources.generate_key.client import AsyncGenerateKeyClient, GenerateKeyClient
2526
from .resources.income_statements.client import AsyncIncomeStatementsClient, IncomeStatementsClient
@@ -37,6 +38,7 @@
3738
from .resources.phone_numbers.client import AsyncPhoneNumbersClient, PhoneNumbersClient
3839
from .resources.purchase_orders.client import AsyncPurchaseOrdersClient, PurchaseOrdersClient
3940
from .resources.regenerate_key.client import AsyncRegenerateKeyClient, RegenerateKeyClient
41+
from .resources.scopes.client import AsyncScopesClient, ScopesClient
4042
from .resources.selective_sync.client import AsyncSelectiveSyncClient, SelectiveSyncClient
4143
from .resources.sync_status.client import AsyncSyncStatusClient, SyncStatusClient
4244
from .resources.tax_rates.client import AsyncTaxRatesClient, TaxRatesClient
@@ -65,8 +67,10 @@ def __init__(self, *, client_wrapper: SyncClientWrapper):
6567
self.company_info = CompanyInfoClient(client_wrapper=self._client_wrapper)
6668
self.contacts = ContactsClient(client_wrapper=self._client_wrapper)
6769
self.credit_notes = CreditNotesClient(client_wrapper=self._client_wrapper)
70+
self.scopes = ScopesClient(client_wrapper=self._client_wrapper)
6871
self.delete_account = DeleteAccountClient(client_wrapper=self._client_wrapper)
6972
self.expenses = ExpensesClient(client_wrapper=self._client_wrapper)
73+
self.field_mapping = FieldMappingClient(client_wrapper=self._client_wrapper)
7074
self.generate_key = GenerateKeyClient(client_wrapper=self._client_wrapper)
7175
self.income_statements = IncomeStatementsClient(client_wrapper=self._client_wrapper)
7276
self.invoices = InvoicesClient(client_wrapper=self._client_wrapper)
@@ -107,8 +111,10 @@ def __init__(self, *, client_wrapper: AsyncClientWrapper):
107111
self.company_info = AsyncCompanyInfoClient(client_wrapper=self._client_wrapper)
108112
self.contacts = AsyncContactsClient(client_wrapper=self._client_wrapper)
109113
self.credit_notes = AsyncCreditNotesClient(client_wrapper=self._client_wrapper)
114+
self.scopes = AsyncScopesClient(client_wrapper=self._client_wrapper)
110115
self.delete_account = AsyncDeleteAccountClient(client_wrapper=self._client_wrapper)
111116
self.expenses = AsyncExpensesClient(client_wrapper=self._client_wrapper)
117+
self.field_mapping = AsyncFieldMappingClient(client_wrapper=self._client_wrapper)
112118
self.generate_key = AsyncGenerateKeyClient(client_wrapper=self._client_wrapper)
113119
self.income_statements = AsyncIncomeStatementsClient(client_wrapper=self._client_wrapper)
114120
self.invoices = AsyncInvoicesClient(client_wrapper=self._client_wrapper)

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

+4
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
credit_notes,
1818
delete_account,
1919
expenses,
20+
field_mapping,
2021
force_resync,
2122
generate_key,
2223
income_statements,
@@ -31,6 +32,7 @@
3132
phone_numbers,
3233
purchase_orders,
3334
regenerate_key,
35+
scopes,
3436
selective_sync,
3537
sync_status,
3638
tax_rates,
@@ -116,6 +118,7 @@
116118
"credit_notes",
117119
"delete_account",
118120
"expenses",
121+
"field_mapping",
119122
"force_resync",
120123
"generate_key",
121124
"income_statements",
@@ -130,6 +133,7 @@
130133
"phone_numbers",
131134
"purchase_orders",
132135
"regenerate_key",
136+
"scopes",
133137
"selective_sync",
134138
"sync_status",
135139
"tax_rates",

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

+2-2
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_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`
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`
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_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`
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`
126126
127127
- page_size: typing.Optional[int]. Number of results to return per page.
128128
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# This file was auto-generated by Fern from our API Definition.
2+

0 commit comments

Comments
 (0)