Skip to content

Commit 312e696

Browse files
fern-api[bot]rmkonnur
fern-api[bot]
and
rmkonnur
authored
December 2023 Python SDK update (#62)
Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com> Co-authored-by: Rohan Konnur <rohan.konnur@merge.dev>
1 parent 2253dde commit 312e696

File tree

845 files changed

+16736
-14631
lines changed

Some content is hidden

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

845 files changed

+16736
-14631
lines changed

‎poetry.lock‎

Lines changed: 9 additions & 9 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.1"
3+
version = "1.0.2"
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
@@ -31,8 +31,8 @@ def __init__(
3131
httpx_client=httpx.Client(timeout=timeout),
3232
)
3333
self.ats = AtsClient(client_wrapper=self._client_wrapper)
34-
self.filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
3534
self.crm = CrmClient(client_wrapper=self._client_wrapper)
35+
self.filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
3636
self.hris = HrisClient(client_wrapper=self._client_wrapper)
3737
self.ticketing = TicketingClient(client_wrapper=self._client_wrapper)
3838
self.accounting = AccountingClient(client_wrapper=self._client_wrapper)
@@ -55,8 +55,8 @@ def __init__(
5555
httpx_client=httpx.AsyncClient(timeout=timeout),
5656
)
5757
self.ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
58-
self.filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
5958
self.crm = AsyncCrmClient(client_wrapper=self._client_wrapper)
59+
self.filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
6060
self.hris = AsyncHrisClient(client_wrapper=self._client_wrapper)
6161
self.ticketing = AsyncTicketingClient(client_wrapper=self._client_wrapper)
6262
self.accounting = AsyncAccountingClient(client_wrapper=self._client_wrapper)

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

‎src/merge/environment.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
class MergeEnvironment(enum.Enum):
77
PRODUCTION = "https://api.merge.dev"
88
SANDBOX = "https://api-sandbox.merge.dev"
9+
PRODUCTION_EU = "https://api-eu.merge.dev"

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

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,6 @@
2525
AccountingPeriodStatusEnum,
2626
AccountingPhoneNumber,
2727
AccountingPhoneNumberRequest,
28-
AccountsListRequestRemoteFields,
29-
AccountsListRequestShowEnumOrigins,
30-
AccountsRetrieveRequestRemoteFields,
31-
AccountsRetrieveRequestShowEnumOrigins,
3228
Address,
3329
AddressCountry,
3430
AddressRequest,
@@ -54,8 +50,6 @@
5450
CommonModelScopesBodyRequest,
5551
CompanyInfo,
5652
CompanyInfoCurrency,
57-
CompanyInfoListRequestExpand,
58-
CompanyInfoRetrieveRequestExpand,
5953
ConditionSchema,
6054
ConditionSchemaConditionType,
6155
ConditionTypeEnum,
@@ -66,8 +60,6 @@
6660
ContactRequestStatus,
6761
ContactResponse,
6862
ContactStatus,
69-
ContactsListRequestExpand,
70-
ContactsRetrieveRequestExpand,
7163
CountryEnum,
7264
CreditNote,
7365
CreditNoteAccountingPeriod,
@@ -82,12 +74,6 @@
8274
CreditNoteStatus,
8375
CreditNoteStatusEnum,
8476
CreditNoteTrackingCategoriesItem,
85-
CreditNotesListRequestExpand,
86-
CreditNotesListRequestRemoteFields,
87-
CreditNotesListRequestShowEnumOrigins,
88-
CreditNotesRetrieveRequestExpand,
89-
CreditNotesRetrieveRequestRemoteFields,
90-
CreditNotesRetrieveRequestShowEnumOrigins,
9177
CurrencyEnum,
9278
DataPassthroughRequest,
9379
DebugModeLog,
@@ -125,8 +111,6 @@
125111
ExpenseRequestTrackingCategoriesItem,
126112
ExpenseResponse,
127113
ExpenseTrackingCategoriesItem,
128-
ExpensesListRequestExpand,
129-
ExpensesRetrieveRequestExpand,
130114
IncomeStatement,
131115
IncomeStatementCompany,
132116
IncomeStatementCurrency,
@@ -155,6 +139,7 @@
155139
InvoiceRequestContact,
156140
InvoiceRequestCurrency,
157141
InvoiceRequestPaymentsItem,
142+
InvoiceRequestPurchaseOrdersItem,
158143
InvoiceRequestStatus,
159144
InvoiceRequestTrackingCategoriesItem,
160145
InvoiceRequestType,
@@ -164,22 +149,14 @@
164149
InvoiceTrackingCategoriesItem,
165150
InvoiceType,
166151
InvoiceTypeEnum,
167-
InvoicesListRequestExpand,
168-
InvoicesListRequestType,
169-
InvoicesRetrieveRequestExpand,
170152
Issue,
171153
IssueStatus,
172154
IssueStatusEnum,
173-
IssuesListRequestStatus,
174155
Item,
175156
ItemCompany,
176157
ItemPurchaseAccount,
177158
ItemSalesAccount,
178159
ItemStatus,
179-
ItemsListRequestExpand,
180-
ItemsRetrieveRequestExpand,
181-
JournalEntriesListRequestExpand,
182-
JournalEntriesRetrieveRequestExpand,
183160
JournalEntry,
184161
JournalEntryAccountingPeriod,
185162
JournalEntryAppliedPaymentsItem,
@@ -211,7 +188,6 @@
211188
LinkedAccountSelectiveSyncConfiguration,
212189
LinkedAccountSelectiveSyncConfigurationRequest,
213190
LinkedAccountStatus,
214-
LinkedAccountsListRequestCategory,
215191
MetaResponse,
216192
MethodEnum,
217193
ModelOperation,
@@ -261,8 +237,6 @@
261237
PaymentRequestTrackingCategoriesItem,
262238
PaymentResponse,
263239
PaymentTrackingCategoriesItem,
264-
PaymentsListRequestExpand,
265-
PaymentsRetrieveRequestExpand,
266240
PostingStatusEnum,
267241
PurchaseOrder,
268242
PurchaseOrderAccountingPeriod,
@@ -287,8 +261,6 @@
287261
PurchaseOrderStatusEnum,
288262
PurchaseOrderTrackingCategoriesItem,
289263
PurchaseOrderVendor,
290-
PurchaseOrdersListRequestExpand,
291-
PurchaseOrdersRetrieveRequestExpand,
292264
RemoteData,
293265
RemoteKey,
294266
RemoteResponse,
@@ -315,8 +287,6 @@
315287
TransactionLineItemCurrency,
316288
TransactionLineItemItem,
317289
TransactionTrackingCategoriesItem,
318-
TransactionsListRequestExpand,
319-
TransactionsRetrieveRequestExpand,
320290
ValidationProblemSource,
321291
VendorCredit,
322292
VendorCreditAccountingPeriod,
@@ -326,12 +296,43 @@
326296
VendorCreditLineAccount,
327297
VendorCreditTrackingCategoriesItem,
328298
VendorCreditVendor,
329-
VendorCreditsListRequestExpand,
330-
VendorCreditsRetrieveRequestExpand,
331299
WarningValidationProblem,
332300
WebhookReceiver,
333301
)
334302
from .resources import (
303+
AccountsListRequestRemoteFields,
304+
AccountsListRequestShowEnumOrigins,
305+
AccountsRetrieveRequestRemoteFields,
306+
AccountsRetrieveRequestShowEnumOrigins,
307+
CompanyInfoListRequestExpand,
308+
CompanyInfoRetrieveRequestExpand,
309+
ContactsListRequestExpand,
310+
ContactsRetrieveRequestExpand,
311+
CreditNotesListRequestExpand,
312+
CreditNotesListRequestRemoteFields,
313+
CreditNotesListRequestShowEnumOrigins,
314+
CreditNotesRetrieveRequestExpand,
315+
CreditNotesRetrieveRequestRemoteFields,
316+
CreditNotesRetrieveRequestShowEnumOrigins,
317+
ExpensesListRequestExpand,
318+
ExpensesRetrieveRequestExpand,
319+
InvoicesListRequestExpand,
320+
InvoicesListRequestType,
321+
InvoicesRetrieveRequestExpand,
322+
IssuesListRequestStatus,
323+
ItemsListRequestExpand,
324+
ItemsRetrieveRequestExpand,
325+
JournalEntriesListRequestExpand,
326+
JournalEntriesRetrieveRequestExpand,
327+
LinkedAccountsListRequestCategory,
328+
PaymentsListRequestExpand,
329+
PaymentsRetrieveRequestExpand,
330+
PurchaseOrdersListRequestExpand,
331+
PurchaseOrdersRetrieveRequestExpand,
332+
TransactionsListRequestExpand,
333+
TransactionsRetrieveRequestExpand,
334+
VendorCreditsListRequestExpand,
335+
VendorCreditsRetrieveRequestExpand,
335336
account_details,
336337
account_token,
337338
accounting_periods,
@@ -526,6 +527,7 @@
526527
"InvoiceRequestContact",
527528
"InvoiceRequestCurrency",
528529
"InvoiceRequestPaymentsItem",
530+
"InvoiceRequestPurchaseOrdersItem",
529531
"InvoiceRequestStatus",
530532
"InvoiceRequestTrackingCategoriesItem",
531533
"InvoiceRequestType",

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

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,67 @@
3939
vendor_credits,
4040
webhook_receivers,
4141
)
42+
from .accounts import (
43+
AccountsListRequestRemoteFields,
44+
AccountsListRequestShowEnumOrigins,
45+
AccountsRetrieveRequestRemoteFields,
46+
AccountsRetrieveRequestShowEnumOrigins,
47+
)
48+
from .company_info import CompanyInfoListRequestExpand, CompanyInfoRetrieveRequestExpand
49+
from .contacts import ContactsListRequestExpand, ContactsRetrieveRequestExpand
50+
from .credit_notes import (
51+
CreditNotesListRequestExpand,
52+
CreditNotesListRequestRemoteFields,
53+
CreditNotesListRequestShowEnumOrigins,
54+
CreditNotesRetrieveRequestExpand,
55+
CreditNotesRetrieveRequestRemoteFields,
56+
CreditNotesRetrieveRequestShowEnumOrigins,
57+
)
58+
from .expenses import ExpensesListRequestExpand, ExpensesRetrieveRequestExpand
59+
from .invoices import InvoicesListRequestExpand, InvoicesListRequestType, InvoicesRetrieveRequestExpand
60+
from .issues import IssuesListRequestStatus
61+
from .items import ItemsListRequestExpand, ItemsRetrieveRequestExpand
62+
from .journal_entries import JournalEntriesListRequestExpand, JournalEntriesRetrieveRequestExpand
63+
from .linked_accounts import LinkedAccountsListRequestCategory
64+
from .payments import PaymentsListRequestExpand, PaymentsRetrieveRequestExpand
65+
from .purchase_orders import PurchaseOrdersListRequestExpand, PurchaseOrdersRetrieveRequestExpand
66+
from .transactions import TransactionsListRequestExpand, TransactionsRetrieveRequestExpand
67+
from .vendor_credits import VendorCreditsListRequestExpand, VendorCreditsRetrieveRequestExpand
4268

4369
__all__ = [
70+
"AccountsListRequestRemoteFields",
71+
"AccountsListRequestShowEnumOrigins",
72+
"AccountsRetrieveRequestRemoteFields",
73+
"AccountsRetrieveRequestShowEnumOrigins",
74+
"CompanyInfoListRequestExpand",
75+
"CompanyInfoRetrieveRequestExpand",
76+
"ContactsListRequestExpand",
77+
"ContactsRetrieveRequestExpand",
78+
"CreditNotesListRequestExpand",
79+
"CreditNotesListRequestRemoteFields",
80+
"CreditNotesListRequestShowEnumOrigins",
81+
"CreditNotesRetrieveRequestExpand",
82+
"CreditNotesRetrieveRequestRemoteFields",
83+
"CreditNotesRetrieveRequestShowEnumOrigins",
84+
"ExpensesListRequestExpand",
85+
"ExpensesRetrieveRequestExpand",
86+
"InvoicesListRequestExpand",
87+
"InvoicesListRequestType",
88+
"InvoicesRetrieveRequestExpand",
89+
"IssuesListRequestStatus",
90+
"ItemsListRequestExpand",
91+
"ItemsRetrieveRequestExpand",
92+
"JournalEntriesListRequestExpand",
93+
"JournalEntriesRetrieveRequestExpand",
94+
"LinkedAccountsListRequestCategory",
95+
"PaymentsListRequestExpand",
96+
"PaymentsRetrieveRequestExpand",
97+
"PurchaseOrdersListRequestExpand",
98+
"PurchaseOrdersRetrieveRequestExpand",
99+
"TransactionsListRequestExpand",
100+
"TransactionsRetrieveRequestExpand",
101+
"VendorCreditsListRequestExpand",
102+
"VendorCreditsRetrieveRequestExpand",
44103
"account_details",
45104
"account_token",
46105
"accounting_periods",

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ def retrieve(self) -> AccountDetails:
3232
"""
3333
_response = self._client_wrapper.httpx_client.request(
3434
"GET",
35-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/account-details"),
35+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "account-details"),
3636
headers=self._client_wrapper.get_headers(),
3737
timeout=60,
3838
)
@@ -64,7 +64,7 @@ async def retrieve(self) -> AccountDetails:
6464
"""
6565
_response = await self._client_wrapper.httpx_client.request(
6666
"GET",
67-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/account-details"),
67+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "account-details"),
6868
headers=self._client_wrapper.get_headers(),
6969
timeout=60,
7070
)

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@ def retrieve(self, public_token: str) -> AccountToken:
2626
"""
2727
_response = self._client_wrapper.httpx_client.request(
2828
"GET",
29-
urllib.parse.urljoin(
30-
f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/account-token/{public_token}"
31-
),
29+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"account-token/{public_token}"),
3230
headers=self._client_wrapper.get_headers(),
3331
timeout=60,
3432
)
@@ -54,9 +52,7 @@ async def retrieve(self, public_token: str) -> AccountToken:
5452
"""
5553
_response = await self._client_wrapper.httpx_client.request(
5654
"GET",
57-
urllib.parse.urljoin(
58-
f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/account-token/{public_token}"
59-
),
55+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"account-token/{public_token}"),
6056
headers=self._client_wrapper.get_headers(),
6157
timeout=60,
6258
)

0 commit comments

Comments
 (0)