Skip to content

Commit 92a2bfd

Browse files
Downgrade Generator CLI for bug fix triage. (#63)
Co-authored-by: fern-api <115122769+fern-api[bot]@users.noreply.github.com>
1 parent 312e696 commit 92a2bfd

File tree

825 files changed

+14635
-15878
lines changed

Some content is hidden

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

825 files changed

+14635
-15878
lines changed

poetry.lock

Lines changed: 3 additions & 3 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.2"
3+
version = "1.0.3"
44
description = ""
55
readme = "README.md"
66
authors = []

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.2",
24+
"X-Fern-SDK-Version": "1.0.3",
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: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
AccountingPeriodStatusEnum,
2626
AccountingPhoneNumber,
2727
AccountingPhoneNumberRequest,
28+
AccountsListRequestRemoteFields,
29+
AccountsListRequestShowEnumOrigins,
30+
AccountsRetrieveRequestRemoteFields,
31+
AccountsRetrieveRequestShowEnumOrigins,
2832
Address,
2933
AddressCountry,
3034
AddressRequest,
@@ -50,6 +54,8 @@
5054
CommonModelScopesBodyRequest,
5155
CompanyInfo,
5256
CompanyInfoCurrency,
57+
CompanyInfoListRequestExpand,
58+
CompanyInfoRetrieveRequestExpand,
5359
ConditionSchema,
5460
ConditionSchemaConditionType,
5561
ConditionTypeEnum,
@@ -60,6 +66,8 @@
6066
ContactRequestStatus,
6167
ContactResponse,
6268
ContactStatus,
69+
ContactsListRequestExpand,
70+
ContactsRetrieveRequestExpand,
6371
CountryEnum,
6472
CreditNote,
6573
CreditNoteAccountingPeriod,
@@ -74,6 +82,12 @@
7482
CreditNoteStatus,
7583
CreditNoteStatusEnum,
7684
CreditNoteTrackingCategoriesItem,
85+
CreditNotesListRequestExpand,
86+
CreditNotesListRequestRemoteFields,
87+
CreditNotesListRequestShowEnumOrigins,
88+
CreditNotesRetrieveRequestExpand,
89+
CreditNotesRetrieveRequestRemoteFields,
90+
CreditNotesRetrieveRequestShowEnumOrigins,
7791
CurrencyEnum,
7892
DataPassthroughRequest,
7993
DebugModeLog,
@@ -111,6 +125,8 @@
111125
ExpenseRequestTrackingCategoriesItem,
112126
ExpenseResponse,
113127
ExpenseTrackingCategoriesItem,
128+
ExpensesListRequestExpand,
129+
ExpensesRetrieveRequestExpand,
114130
IncomeStatement,
115131
IncomeStatementCompany,
116132
IncomeStatementCurrency,
@@ -149,14 +165,22 @@
149165
InvoiceTrackingCategoriesItem,
150166
InvoiceType,
151167
InvoiceTypeEnum,
168+
InvoicesListRequestExpand,
169+
InvoicesListRequestType,
170+
InvoicesRetrieveRequestExpand,
152171
Issue,
153172
IssueStatus,
154173
IssueStatusEnum,
174+
IssuesListRequestStatus,
155175
Item,
156176
ItemCompany,
157177
ItemPurchaseAccount,
158178
ItemSalesAccount,
159179
ItemStatus,
180+
ItemsListRequestExpand,
181+
ItemsRetrieveRequestExpand,
182+
JournalEntriesListRequestExpand,
183+
JournalEntriesRetrieveRequestExpand,
160184
JournalEntry,
161185
JournalEntryAccountingPeriod,
162186
JournalEntryAppliedPaymentsItem,
@@ -188,6 +212,7 @@
188212
LinkedAccountSelectiveSyncConfiguration,
189213
LinkedAccountSelectiveSyncConfigurationRequest,
190214
LinkedAccountStatus,
215+
LinkedAccountsListRequestCategory,
191216
MetaResponse,
192217
MethodEnum,
193218
ModelOperation,
@@ -237,6 +262,8 @@
237262
PaymentRequestTrackingCategoriesItem,
238263
PaymentResponse,
239264
PaymentTrackingCategoriesItem,
265+
PaymentsListRequestExpand,
266+
PaymentsRetrieveRequestExpand,
240267
PostingStatusEnum,
241268
PurchaseOrder,
242269
PurchaseOrderAccountingPeriod,
@@ -261,6 +288,8 @@
261288
PurchaseOrderStatusEnum,
262289
PurchaseOrderTrackingCategoriesItem,
263290
PurchaseOrderVendor,
291+
PurchaseOrdersListRequestExpand,
292+
PurchaseOrdersRetrieveRequestExpand,
264293
RemoteData,
265294
RemoteKey,
266295
RemoteResponse,
@@ -287,6 +316,8 @@
287316
TransactionLineItemCurrency,
288317
TransactionLineItemItem,
289318
TransactionTrackingCategoriesItem,
319+
TransactionsListRequestExpand,
320+
TransactionsRetrieveRequestExpand,
290321
ValidationProblemSource,
291322
VendorCredit,
292323
VendorCreditAccountingPeriod,
@@ -296,43 +327,12 @@
296327
VendorCreditLineAccount,
297328
VendorCreditTrackingCategoriesItem,
298329
VendorCreditVendor,
330+
VendorCreditsListRequestExpand,
331+
VendorCreditsRetrieveRequestExpand,
299332
WarningValidationProblem,
300333
WebhookReceiver,
301334
)
302335
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,
336336
account_details,
337337
account_token,
338338
accounting_periods,

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

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -39,67 +39,8 @@
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
6842

6943
__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",
10344
"account_details",
10445
"account_token",
10546
"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()}/", "account-details"),
35+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/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()}/", "account-details"),
67+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/account-details"),
6868
headers=self._client_wrapper.get_headers(),
6969
timeout=60,
7070
)

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

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,9 @@ def retrieve(self, public_token: str) -> AccountToken:
2626
"""
2727
_response = self._client_wrapper.httpx_client.request(
2828
"GET",
29-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"account-token/{public_token}"),
29+
urllib.parse.urljoin(
30+
f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/account-token/{public_token}"
31+
),
3032
headers=self._client_wrapper.get_headers(),
3133
timeout=60,
3234
)
@@ -52,7 +54,9 @@ async def retrieve(self, public_token: str) -> AccountToken:
5254
"""
5355
_response = await self._client_wrapper.httpx_client.request(
5456
"GET",
55-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"account-token/{public_token}"),
57+
urllib.parse.urljoin(
58+
f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/account-token/{public_token}"
59+
),
5660
headers=self._client_wrapper.get_headers(),
5761
timeout=60,
5862
)

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def list(
5050
"""
5151
_response = self._client_wrapper.httpx_client.request(
5252
"GET",
53-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "accounting-periods"),
53+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounting-periods"),
5454
params=remove_none_from_dict(
5555
{
5656
"cursor": cursor,
@@ -91,7 +91,9 @@ def retrieve(self, id: str, *, include_remote_data: typing.Optional[bool] = None
9191
"""
9292
_response = self._client_wrapper.httpx_client.request(
9393
"GET",
94-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"accounting-periods/{id}"),
94+
urllib.parse.urljoin(
95+
f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/accounting-periods/{id}"
96+
),
9597
params=remove_none_from_dict({"include_remote_data": include_remote_data}),
9698
headers=self._client_wrapper.get_headers(),
9799
timeout=60,
@@ -139,7 +141,7 @@ async def list(
139141
"""
140142
_response = await self._client_wrapper.httpx_client.request(
141143
"GET",
142-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "accounting-periods"),
144+
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounting-periods"),
143145
params=remove_none_from_dict(
144146
{
145147
"cursor": cursor,
@@ -180,7 +182,9 @@ async def retrieve(self, id: str, *, include_remote_data: typing.Optional[bool]
180182
"""
181183
_response = await self._client_wrapper.httpx_client.request(
182184
"GET",
183-
urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"accounting-periods/{id}"),
185+
urllib.parse.urljoin(
186+
f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/accounting-periods/{id}"
187+
),
184188
params=remove_none_from_dict({"include_remote_data": include_remote_data}),
185189
headers=self._client_wrapper.get_headers(),
186190
timeout=60,
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,2 @@
11
# This file was auto-generated by Fern from our API Definition.
22

3-
from .types import (
4-
AccountsListRequestRemoteFields,
5-
AccountsListRequestShowEnumOrigins,
6-
AccountsRetrieveRequestRemoteFields,
7-
AccountsRetrieveRequestShowEnumOrigins,
8-
)
9-
10-
__all__ = [
11-
"AccountsListRequestRemoteFields",
12-
"AccountsListRequestShowEnumOrigins",
13-
"AccountsRetrieveRequestRemoteFields",
14-
"AccountsRetrieveRequestShowEnumOrigins",
15-
]

0 commit comments

Comments
 (0)