Downgrade Generator CLI for bug fix triage.

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "MergePythonClient"
-version = "1.0.2"
+version = "1.0.3"
 description = ""
 readme = "README.md"
 authors = []

src/merge/core/client_wrapper.py

@@ -21,7 +21,7 @@ def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "1.0.2",
+            "X-Fern-SDK-Version": "1.0.3",
         }
         if self._account_token is not None:
             headers["X-Account-Token"] = self._account_token

src/merge/resources/accounting/__init__.py

@@ -25,6 +25,10 @@
     AccountingPeriodStatusEnum,
     AccountingPhoneNumber,
     AccountingPhoneNumberRequest,
+    AccountsListRequestRemoteFields,
+    AccountsListRequestShowEnumOrigins,
+    AccountsRetrieveRequestRemoteFields,
+    AccountsRetrieveRequestShowEnumOrigins,
     Address,
     AddressCountry,
     AddressRequest,
@@ -50,6 +54,8 @@
     CommonModelScopesBodyRequest,
     CompanyInfo,
     CompanyInfoCurrency,
+    CompanyInfoListRequestExpand,
+    CompanyInfoRetrieveRequestExpand,
     ConditionSchema,
     ConditionSchemaConditionType,
     ConditionTypeEnum,
@@ -60,6 +66,8 @@
     ContactRequestStatus,
     ContactResponse,
     ContactStatus,
+    ContactsListRequestExpand,
+    ContactsRetrieveRequestExpand,
     CountryEnum,
     CreditNote,
     CreditNoteAccountingPeriod,
@@ -74,6 +82,12 @@
     CreditNoteStatus,
     CreditNoteStatusEnum,
     CreditNoteTrackingCategoriesItem,
+    CreditNotesListRequestExpand,
+    CreditNotesListRequestRemoteFields,
+    CreditNotesListRequestShowEnumOrigins,
+    CreditNotesRetrieveRequestExpand,
+    CreditNotesRetrieveRequestRemoteFields,
+    CreditNotesRetrieveRequestShowEnumOrigins,
     CurrencyEnum,
     DataPassthroughRequest,
     DebugModeLog,
@@ -111,6 +125,8 @@
     ExpenseRequestTrackingCategoriesItem,
     ExpenseResponse,
     ExpenseTrackingCategoriesItem,
+    ExpensesListRequestExpand,
+    ExpensesRetrieveRequestExpand,
     IncomeStatement,
     IncomeStatementCompany,
     IncomeStatementCurrency,
@@ -149,14 +165,22 @@
     InvoiceTrackingCategoriesItem,
     InvoiceType,
     InvoiceTypeEnum,
+    InvoicesListRequestExpand,
+    InvoicesListRequestType,
+    InvoicesRetrieveRequestExpand,
     Issue,
     IssueStatus,
     IssueStatusEnum,
+    IssuesListRequestStatus,
     Item,
     ItemCompany,
     ItemPurchaseAccount,
     ItemSalesAccount,
     ItemStatus,
+    ItemsListRequestExpand,
+    ItemsRetrieveRequestExpand,
+    JournalEntriesListRequestExpand,
+    JournalEntriesRetrieveRequestExpand,
     JournalEntry,
     JournalEntryAccountingPeriod,
     JournalEntryAppliedPaymentsItem,
@@ -188,6 +212,7 @@
     LinkedAccountSelectiveSyncConfiguration,
     LinkedAccountSelectiveSyncConfigurationRequest,
     LinkedAccountStatus,
+    LinkedAccountsListRequestCategory,
     MetaResponse,
     MethodEnum,
     ModelOperation,
@@ -237,6 +262,8 @@
     PaymentRequestTrackingCategoriesItem,
     PaymentResponse,
     PaymentTrackingCategoriesItem,
+    PaymentsListRequestExpand,
+    PaymentsRetrieveRequestExpand,
     PostingStatusEnum,
     PurchaseOrder,
     PurchaseOrderAccountingPeriod,
@@ -261,6 +288,8 @@
     PurchaseOrderStatusEnum,
     PurchaseOrderTrackingCategoriesItem,
     PurchaseOrderVendor,
+    PurchaseOrdersListRequestExpand,
+    PurchaseOrdersRetrieveRequestExpand,
     RemoteData,
     RemoteKey,
     RemoteResponse,
@@ -287,6 +316,8 @@
     TransactionLineItemCurrency,
     TransactionLineItemItem,
     TransactionTrackingCategoriesItem,
+    TransactionsListRequestExpand,
+    TransactionsRetrieveRequestExpand,
     ValidationProblemSource,
     VendorCredit,
     VendorCreditAccountingPeriod,
@@ -296,43 +327,12 @@
     VendorCreditLineAccount,
     VendorCreditTrackingCategoriesItem,
     VendorCreditVendor,
+    VendorCreditsListRequestExpand,
+    VendorCreditsRetrieveRequestExpand,
     WarningValidationProblem,
     WebhookReceiver,
 )
 from .resources import (
-    AccountsListRequestRemoteFields,
-    AccountsListRequestShowEnumOrigins,
-    AccountsRetrieveRequestRemoteFields,
-    AccountsRetrieveRequestShowEnumOrigins,
-    CompanyInfoListRequestExpand,
-    CompanyInfoRetrieveRequestExpand,
-    ContactsListRequestExpand,
-    ContactsRetrieveRequestExpand,
-    CreditNotesListRequestExpand,
-    CreditNotesListRequestRemoteFields,
-    CreditNotesListRequestShowEnumOrigins,
-    CreditNotesRetrieveRequestExpand,
-    CreditNotesRetrieveRequestRemoteFields,
-    CreditNotesRetrieveRequestShowEnumOrigins,
-    ExpensesListRequestExpand,
-    ExpensesRetrieveRequestExpand,
-    InvoicesListRequestExpand,
-    InvoicesListRequestType,
-    InvoicesRetrieveRequestExpand,
-    IssuesListRequestStatus,
-    ItemsListRequestExpand,
-    ItemsRetrieveRequestExpand,
-    JournalEntriesListRequestExpand,
-    JournalEntriesRetrieveRequestExpand,
-    LinkedAccountsListRequestCategory,
-    PaymentsListRequestExpand,
-    PaymentsRetrieveRequestExpand,
-    PurchaseOrdersListRequestExpand,
-    PurchaseOrdersRetrieveRequestExpand,
-    TransactionsListRequestExpand,
-    TransactionsRetrieveRequestExpand,
-    VendorCreditsListRequestExpand,
-    VendorCreditsRetrieveRequestExpand,
     account_details,
     account_token,
     accounting_periods,

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

@@ -39,67 +39,8 @@
     vendor_credits,
     webhook_receivers,
 )
-from .accounts import (
-    AccountsListRequestRemoteFields,
-    AccountsListRequestShowEnumOrigins,
-    AccountsRetrieveRequestRemoteFields,
-    AccountsRetrieveRequestShowEnumOrigins,
-)
-from .company_info import CompanyInfoListRequestExpand, CompanyInfoRetrieveRequestExpand
-from .contacts import ContactsListRequestExpand, ContactsRetrieveRequestExpand
-from .credit_notes import (
-    CreditNotesListRequestExpand,
-    CreditNotesListRequestRemoteFields,
-    CreditNotesListRequestShowEnumOrigins,
-    CreditNotesRetrieveRequestExpand,
-    CreditNotesRetrieveRequestRemoteFields,
-    CreditNotesRetrieveRequestShowEnumOrigins,
-)
-from .expenses import ExpensesListRequestExpand, ExpensesRetrieveRequestExpand
-from .invoices import InvoicesListRequestExpand, InvoicesListRequestType, InvoicesRetrieveRequestExpand
-from .issues import IssuesListRequestStatus
-from .items import ItemsListRequestExpand, ItemsRetrieveRequestExpand
-from .journal_entries import JournalEntriesListRequestExpand, JournalEntriesRetrieveRequestExpand
-from .linked_accounts import LinkedAccountsListRequestCategory
-from .payments import PaymentsListRequestExpand, PaymentsRetrieveRequestExpand
-from .purchase_orders import PurchaseOrdersListRequestExpand, PurchaseOrdersRetrieveRequestExpand
-from .transactions import TransactionsListRequestExpand, TransactionsRetrieveRequestExpand
-from .vendor_credits import VendorCreditsListRequestExpand, VendorCreditsRetrieveRequestExpand
 
 __all__ = [
-    "AccountsListRequestRemoteFields",
-    "AccountsListRequestShowEnumOrigins",
-    "AccountsRetrieveRequestRemoteFields",
-    "AccountsRetrieveRequestShowEnumOrigins",
-    "CompanyInfoListRequestExpand",
-    "CompanyInfoRetrieveRequestExpand",
-    "ContactsListRequestExpand",
-    "ContactsRetrieveRequestExpand",
-    "CreditNotesListRequestExpand",
-    "CreditNotesListRequestRemoteFields",
-    "CreditNotesListRequestShowEnumOrigins",
-    "CreditNotesRetrieveRequestExpand",
-    "CreditNotesRetrieveRequestRemoteFields",
-    "CreditNotesRetrieveRequestShowEnumOrigins",
-    "ExpensesListRequestExpand",
-    "ExpensesRetrieveRequestExpand",
-    "InvoicesListRequestExpand",
-    "InvoicesListRequestType",
-    "InvoicesRetrieveRequestExpand",
-    "IssuesListRequestStatus",
-    "ItemsListRequestExpand",
-    "ItemsRetrieveRequestExpand",
-    "JournalEntriesListRequestExpand",
-    "JournalEntriesRetrieveRequestExpand",
-    "LinkedAccountsListRequestCategory",
-    "PaymentsListRequestExpand",
-    "PaymentsRetrieveRequestExpand",
-    "PurchaseOrdersListRequestExpand",
-    "PurchaseOrdersRetrieveRequestExpand",
-    "TransactionsListRequestExpand",
-    "TransactionsRetrieveRequestExpand",
-    "VendorCreditsListRequestExpand",
-    "VendorCreditsRetrieveRequestExpand",
     "account_details",
     "account_token",
     "accounting_periods",

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

@@ -32,7 +32,7 @@ def retrieve(self) -> AccountDetails:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "account-details"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/account-details"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -64,7 +64,7 @@ async def retrieve(self) -> AccountDetails:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "account-details"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/account-details"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )

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

@@ -26,7 +26,9 @@ def retrieve(self, public_token: str) -> AccountToken:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"account-token/{public_token}"),
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/account-token/{public_token}"
+            ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -52,7 +54,9 @@ async def retrieve(self, public_token: str) -> AccountToken:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"account-token/{public_token}"),
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/account-token/{public_token}"
+            ),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )

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

@@ -50,7 +50,7 @@ def list(
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "accounting-periods"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounting-periods"),
             params=remove_none_from_dict(
                 {
                     "cursor": cursor,
@@ -91,7 +91,9 @@ def retrieve(self, id: str, *, include_remote_data: typing.Optional[bool] = None
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"accounting-periods/{id}"),
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/accounting-periods/{id}"
+            ),
             params=remove_none_from_dict({"include_remote_data": include_remote_data}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
@@ -139,7 +141,7 @@ async def list(
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "accounting-periods"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounting-periods"),
             params=remove_none_from_dict(
                 {
                     "cursor": cursor,
@@ -180,7 +182,9 @@ async def retrieve(self, id: str, *, include_remote_data: typing.Optional[bool]
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"accounting-periods/{id}"),
+            urllib.parse.urljoin(
+                f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/accounting-periods/{id}"
+            ),
             params=remove_none_from_dict({"include_remote_data": include_remote_data}),
             headers=self._client_wrapper.get_headers(),
             timeout=60,

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

@@ -1,15 +1,2 @@
 # This file was auto-generated by Fern from our API Definition.
 
-from .types import (
-    AccountsListRequestRemoteFields,
-    AccountsListRequestShowEnumOrigins,
-    AccountsRetrieveRequestRemoteFields,
-    AccountsRetrieveRequestShowEnumOrigins,
-)
-
-__all__ = [
-    "AccountsListRequestRemoteFields",
-    "AccountsListRequestShowEnumOrigins",
-    "AccountsRetrieveRequestRemoteFields",
-    "AccountsRetrieveRequestShowEnumOrigins",
-]