mergepythonclient 0.2.6__py3-none-any.whl → 0.2.8__py3-none-any.whl

merge/client.py

@@ -18,39 +18,54 @@ class Merge:
     def __init__(
         self,
         *,
+        base_url: typing.Optional[str] = None,
         environment: MergeEnvironment = MergeEnvironment.PRODUCTION,
         account_token: typing.Optional[str] = None,
         api_key: typing.Union[str, typing.Callable[[], str]],
         timeout: typing.Optional[float] = 60
     ):
-        self._environment = environment
         self._client_wrapper = SyncClientWrapper(
-            account_token=account_token, api_key=api_key, httpx_client=httpx.Client(timeout=timeout)
+            base_url=_get_base_url(base_url=base_url, environment=environment),
+            account_token=account_token,
+            api_key=api_key,
+            httpx_client=httpx.Client(timeout=timeout),
         )
-        self.ats = AtsClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.crm = CrmClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.filestorage = FilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.hris = HrisClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.ticketing = TicketingClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.accounting = AccountingClient(environment=environment, client_wrapper=self._client_wrapper)
+        self.ats = AtsClient(client_wrapper=self._client_wrapper)
+        self.crm = CrmClient(client_wrapper=self._client_wrapper)
+        self.filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
+        self.hris = HrisClient(client_wrapper=self._client_wrapper)
+        self.ticketing = TicketingClient(client_wrapper=self._client_wrapper)
+        self.accounting = AccountingClient(client_wrapper=self._client_wrapper)
 
 
 class AsyncMerge:
     def __init__(
         self,
         *,
+        base_url: typing.Optional[str] = None,
         environment: MergeEnvironment = MergeEnvironment.PRODUCTION,
         account_token: typing.Optional[str] = None,
         api_key: typing.Union[str, typing.Callable[[], str]],
         timeout: typing.Optional[float] = 60
     ):
-        self._environment = environment
         self._client_wrapper = AsyncClientWrapper(
-            account_token=account_token, api_key=api_key, httpx_client=httpx.AsyncClient(timeout=timeout)
+            base_url=_get_base_url(base_url=base_url, environment=environment),
+            account_token=account_token,
+            api_key=api_key,
+            httpx_client=httpx.AsyncClient(timeout=timeout),
         )
-        self.ats = AsyncAtsClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.crm = AsyncCrmClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.filestorage = AsyncFilestorageClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.hris = AsyncHrisClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.ticketing = AsyncTicketingClient(environment=environment, client_wrapper=self._client_wrapper)
-        self.accounting = AsyncAccountingClient(environment=environment, client_wrapper=self._client_wrapper)
+        self.ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
+        self.crm = AsyncCrmClient(client_wrapper=self._client_wrapper)
+        self.filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
+        self.hris = AsyncHrisClient(client_wrapper=self._client_wrapper)
+        self.ticketing = AsyncTicketingClient(client_wrapper=self._client_wrapper)
+        self.accounting = AsyncAccountingClient(client_wrapper=self._client_wrapper)
+
+
+def _get_base_url(*, base_url: typing.Optional[str] = None, environment: MergeEnvironment) -> str:
+    if base_url is not None:
+        return base_url
+    elif environment is not None:
+        return environment.value
+    else:
+        raise Exception("Please pass in either base_url or environment to construct the client")

merge/core/client_wrapper.py

@@ -7,16 +7,21 @@ import httpx
 
 class BaseClientWrapper:
     def __init__(
-        self, *, account_token: typing.Optional[str] = None, api_key: typing.Union[str, typing.Callable[[], str]]
+        self,
+        *,
+        account_token: typing.Optional[str] = None,
+        api_key: typing.Union[str, typing.Callable[[], str]],
+        base_url: str,
     ):
         self._account_token = account_token
         self._api_key = api_key
+        self._base_url = base_url
 
     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": "0.2.6",
+            "X-Fern-SDK-Version": "0.2.8",
         }
         if self._account_token is not None:
             headers["X-Account-Token"] = self._account_token
@@ -29,6 +34,9 @@ class BaseClientWrapper:
         else:
             return self._api_key()
 
+    def get_base_url(self) -> str:
+        return self._base_url
+
 
 class SyncClientWrapper(BaseClientWrapper):
     def __init__(
@@ -36,9 +44,10 @@ class SyncClientWrapper(BaseClientWrapper):
         *,
         account_token: typing.Optional[str] = None,
         api_key: typing.Union[str, typing.Callable[[], str]],
+        base_url: str,
         httpx_client: httpx.Client,
     ):
-        super().__init__(account_token=account_token, api_key=api_key)
+        super().__init__(account_token=account_token, api_key=api_key, base_url=base_url)
         self.httpx_client = httpx_client
 
 
@@ -48,7 +57,8 @@ class AsyncClientWrapper(BaseClientWrapper):
         *,
         account_token: typing.Optional[str] = None,
         api_key: typing.Union[str, typing.Callable[[], str]],
+        base_url: str,
         httpx_client: httpx.AsyncClient,
     ):
-        super().__init__(account_token=account_token, api_key=api_key)
+        super().__init__(account_token=account_token, api_key=api_key, base_url=base_url)
         self.httpx_client = httpx_client

merge/core/jsonable_encoder.py

@@ -16,8 +16,10 @@ from pathlib import PurePath
 from types import GeneratorType
 from typing import Any, Callable, Dict, List, Optional, Set, Tuple, Union
 
-from pydantic import BaseModel
-from pydantic.json import ENCODERS_BY_TYPE
+try:
+    import pydantic.v1 as pydantic  # type: ignore
+except ImportError:
+    import pydantic  # type: ignore
 
 from .datetime_utils import serialize_datetime
 
@@ -34,7 +36,7 @@ def generate_encoders_by_class_tuples(
     return encoders_by_class_tuples
 
 
-encoders_by_class_tuples = generate_encoders_by_class_tuples(ENCODERS_BY_TYPE)
+encoders_by_class_tuples = generate_encoders_by_class_tuples(pydantic.json.ENCODERS_BY_TYPE)
 
 
 def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any], Any]]] = None) -> Any:
@@ -46,7 +48,7 @@ def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any]
             for encoder_type, encoder_instance in custom_encoder.items():
                 if isinstance(obj, encoder_type):
                     return encoder_instance(obj)
-    if isinstance(obj, BaseModel):
+    if isinstance(obj, pydantic.BaseModel):
         encoder = getattr(obj.__config__, "json_encoders", {})
         if custom_encoder:
             encoder.update(custom_encoder)
@@ -82,8 +84,8 @@ def jsonable_encoder(obj: Any, custom_encoder: Optional[Dict[Any, Callable[[Any]
             encoded_list.append(jsonable_encoder(item, custom_encoder=custom_encoder))
         return encoded_list
 
-    if type(obj) in ENCODERS_BY_TYPE:
-        return ENCODERS_BY_TYPE[type(obj)](obj)
+    if type(obj) in pydantic.json.ENCODERS_BY_TYPE:
+        return pydantic.json.ENCODERS_BY_TYPE[type(obj)](obj)
     for encoder, classes_tuple in encoders_by_class_tuples.items():
         if isinstance(obj, classes_tuple):
             return encoder(obj)

merge/resources/accounting/__init__.py

@@ -51,7 +51,9 @@ from .types import (
     ConditionSchemaConditionType,
     ConditionTypeEnum,
     Contact,
+    ContactAddressesItem,
     ContactRequest,
+    ContactRequestAddressesItem,
     ContactRequestStatus,
     ContactResponse,
     ContactStatus,
@@ -392,7 +394,9 @@ __all__ = [
     "ConditionSchemaConditionType",
     "ConditionTypeEnum",
     "Contact",
+    "ContactAddressesItem",
     "ContactRequest",
+    "ContactRequestAddressesItem",
     "ContactRequestStatus",
     "ContactResponse",
     "ContactStatus",

merge/resources/accounting/client.py

@@ -1,7 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
 from ...core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from ...environment import MergeEnvironment
 from .resources.account_details.client import AccountDetailsClient, AsyncAccountDetailsClient
 from .resources.account_token.client import AccountTokenClient, AsyncAccountTokenClient
 from .resources.accounts.client import AccountsClient, AsyncAccountsClient
@@ -46,130 +45,84 @@ from .resources.webhook_receivers.client import AsyncWebhookReceiversClient, Web
 
 
 class AccountingClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: SyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
-        self.account_details = AccountDetailsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.account_token = AccountTokenClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.accounts = AccountsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.addresses = AddressesClient(environment=self._environment, client_wrapper=self._client_wrapper)
+        self.account_details = AccountDetailsClient(client_wrapper=self._client_wrapper)
+        self.account_token = AccountTokenClient(client_wrapper=self._client_wrapper)
+        self.accounts = AccountsClient(client_wrapper=self._client_wrapper)
+        self.addresses = AddressesClient(client_wrapper=self._client_wrapper)
         self.async_passthrough = resources_accounting_resources_async_passthrough_client_AsyncPassthroughClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.attachments = AttachmentsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.available_actions = AvailableActionsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.balance_sheets = BalanceSheetsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.cash_flow_statements = CashFlowStatementsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.company_info = CompanyInfoClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.contacts = ContactsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.credit_notes = CreditNotesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.delete_account = DeleteAccountClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.expenses = ExpensesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.generate_key = GenerateKeyClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.income_statements = IncomeStatementsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.invoices = InvoicesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.issues = IssuesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.items = ItemsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.journal_entries = JournalEntriesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.link_token = LinkTokenClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.linked_accounts = LinkedAccountsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.passthrough = PassthroughClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.payments = PaymentsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.phone_numbers = PhoneNumbersClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.purchase_orders = PurchaseOrdersClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.regenerate_key = RegenerateKeyClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.selective_sync = SelectiveSyncClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.sync_status = SyncStatusClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.force_resync = ForceResyncClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.tax_rates = TaxRatesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.tracking_categories = TrackingCategoriesClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.transactions = TransactionsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.vendor_credits = VendorCreditsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.webhook_receivers = WebhookReceiversClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
+            client_wrapper=self._client_wrapper
+        )
+        self.attachments = AttachmentsClient(client_wrapper=self._client_wrapper)
+        self.available_actions = AvailableActionsClient(client_wrapper=self._client_wrapper)
+        self.balance_sheets = BalanceSheetsClient(client_wrapper=self._client_wrapper)
+        self.cash_flow_statements = CashFlowStatementsClient(client_wrapper=self._client_wrapper)
+        self.company_info = CompanyInfoClient(client_wrapper=self._client_wrapper)
+        self.contacts = ContactsClient(client_wrapper=self._client_wrapper)
+        self.credit_notes = CreditNotesClient(client_wrapper=self._client_wrapper)
+        self.delete_account = DeleteAccountClient(client_wrapper=self._client_wrapper)
+        self.expenses = ExpensesClient(client_wrapper=self._client_wrapper)
+        self.generate_key = GenerateKeyClient(client_wrapper=self._client_wrapper)
+        self.income_statements = IncomeStatementsClient(client_wrapper=self._client_wrapper)
+        self.invoices = InvoicesClient(client_wrapper=self._client_wrapper)
+        self.issues = IssuesClient(client_wrapper=self._client_wrapper)
+        self.items = ItemsClient(client_wrapper=self._client_wrapper)
+        self.journal_entries = JournalEntriesClient(client_wrapper=self._client_wrapper)
+        self.link_token = LinkTokenClient(client_wrapper=self._client_wrapper)
+        self.linked_accounts = LinkedAccountsClient(client_wrapper=self._client_wrapper)
+        self.passthrough = PassthroughClient(client_wrapper=self._client_wrapper)
+        self.payments = PaymentsClient(client_wrapper=self._client_wrapper)
+        self.phone_numbers = PhoneNumbersClient(client_wrapper=self._client_wrapper)
+        self.purchase_orders = PurchaseOrdersClient(client_wrapper=self._client_wrapper)
+        self.regenerate_key = RegenerateKeyClient(client_wrapper=self._client_wrapper)
+        self.selective_sync = SelectiveSyncClient(client_wrapper=self._client_wrapper)
+        self.sync_status = SyncStatusClient(client_wrapper=self._client_wrapper)
+        self.force_resync = ForceResyncClient(client_wrapper=self._client_wrapper)
+        self.tax_rates = TaxRatesClient(client_wrapper=self._client_wrapper)
+        self.tracking_categories = TrackingCategoriesClient(client_wrapper=self._client_wrapper)
+        self.transactions = TransactionsClient(client_wrapper=self._client_wrapper)
+        self.vendor_credits = VendorCreditsClient(client_wrapper=self._client_wrapper)
+        self.webhook_receivers = WebhookReceiversClient(client_wrapper=self._client_wrapper)
 
 
 class AsyncAccountingClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: AsyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
-        self.account_details = AsyncAccountDetailsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.account_token = AsyncAccountTokenClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.accounts = AsyncAccountsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.addresses = AsyncAddressesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.async_passthrough = AsyncAsyncPassthroughClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.attachments = AsyncAttachmentsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.available_actions = AsyncAvailableActionsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.balance_sheets = AsyncBalanceSheetsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.cash_flow_statements = AsyncCashFlowStatementsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.company_info = AsyncCompanyInfoClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.contacts = AsyncContactsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.credit_notes = AsyncCreditNotesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.delete_account = AsyncDeleteAccountClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.expenses = AsyncExpensesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.generate_key = AsyncGenerateKeyClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.income_statements = AsyncIncomeStatementsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.invoices = AsyncInvoicesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.issues = AsyncIssuesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.items = AsyncItemsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.journal_entries = AsyncJournalEntriesClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.link_token = AsyncLinkTokenClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.linked_accounts = AsyncLinkedAccountsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
+        self.account_details = AsyncAccountDetailsClient(client_wrapper=self._client_wrapper)
+        self.account_token = AsyncAccountTokenClient(client_wrapper=self._client_wrapper)
+        self.accounts = AsyncAccountsClient(client_wrapper=self._client_wrapper)
+        self.addresses = AsyncAddressesClient(client_wrapper=self._client_wrapper)
+        self.async_passthrough = AsyncAsyncPassthroughClient(client_wrapper=self._client_wrapper)
+        self.attachments = AsyncAttachmentsClient(client_wrapper=self._client_wrapper)
+        self.available_actions = AsyncAvailableActionsClient(client_wrapper=self._client_wrapper)
+        self.balance_sheets = AsyncBalanceSheetsClient(client_wrapper=self._client_wrapper)
+        self.cash_flow_statements = AsyncCashFlowStatementsClient(client_wrapper=self._client_wrapper)
+        self.company_info = AsyncCompanyInfoClient(client_wrapper=self._client_wrapper)
+        self.contacts = AsyncContactsClient(client_wrapper=self._client_wrapper)
+        self.credit_notes = AsyncCreditNotesClient(client_wrapper=self._client_wrapper)
+        self.delete_account = AsyncDeleteAccountClient(client_wrapper=self._client_wrapper)
+        self.expenses = AsyncExpensesClient(client_wrapper=self._client_wrapper)
+        self.generate_key = AsyncGenerateKeyClient(client_wrapper=self._client_wrapper)
+        self.income_statements = AsyncIncomeStatementsClient(client_wrapper=self._client_wrapper)
+        self.invoices = AsyncInvoicesClient(client_wrapper=self._client_wrapper)
+        self.issues = AsyncIssuesClient(client_wrapper=self._client_wrapper)
+        self.items = AsyncItemsClient(client_wrapper=self._client_wrapper)
+        self.journal_entries = AsyncJournalEntriesClient(client_wrapper=self._client_wrapper)
+        self.link_token = AsyncLinkTokenClient(client_wrapper=self._client_wrapper)
+        self.linked_accounts = AsyncLinkedAccountsClient(client_wrapper=self._client_wrapper)
         self.passthrough = resources_accounting_resources_passthrough_client_AsyncPassthroughClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.payments = AsyncPaymentsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.phone_numbers = AsyncPhoneNumbersClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.purchase_orders = AsyncPurchaseOrdersClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.regenerate_key = AsyncRegenerateKeyClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.selective_sync = AsyncSelectiveSyncClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.sync_status = AsyncSyncStatusClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.force_resync = AsyncForceResyncClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.tax_rates = AsyncTaxRatesClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.tracking_categories = AsyncTrackingCategoriesClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.transactions = AsyncTransactionsClient(environment=self._environment, client_wrapper=self._client_wrapper)
-        self.vendor_credits = AsyncVendorCreditsClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
-        self.webhook_receivers = AsyncWebhookReceiversClient(
-            environment=self._environment, client_wrapper=self._client_wrapper
-        )
+            client_wrapper=self._client_wrapper
+        )
+        self.payments = AsyncPaymentsClient(client_wrapper=self._client_wrapper)
+        self.phone_numbers = AsyncPhoneNumbersClient(client_wrapper=self._client_wrapper)
+        self.purchase_orders = AsyncPurchaseOrdersClient(client_wrapper=self._client_wrapper)
+        self.regenerate_key = AsyncRegenerateKeyClient(client_wrapper=self._client_wrapper)
+        self.selective_sync = AsyncSelectiveSyncClient(client_wrapper=self._client_wrapper)
+        self.sync_status = AsyncSyncStatusClient(client_wrapper=self._client_wrapper)
+        self.force_resync = AsyncForceResyncClient(client_wrapper=self._client_wrapper)
+        self.tax_rates = AsyncTaxRatesClient(client_wrapper=self._client_wrapper)
+        self.tracking_categories = AsyncTrackingCategoriesClient(client_wrapper=self._client_wrapper)
+        self.transactions = AsyncTransactionsClient(client_wrapper=self._client_wrapper)
+        self.vendor_credits = AsyncVendorCreditsClient(client_wrapper=self._client_wrapper)
+        self.webhook_receivers = AsyncWebhookReceiversClient(client_wrapper=self._client_wrapper)

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

@@ -3,19 +3,18 @@
 import urllib.parse
 from json.decoder import JSONDecodeError
 
-import pydantic
-
 from .....core.api_error import ApiError
 from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from .....environment import MergeEnvironment
 from ...types.account_details import AccountDetails
 
+try:
+    import pydantic.v1 as pydantic  # type: ignore
+except ImportError:
+    import pydantic  # type: ignore
+
 
 class AccountDetailsClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: SyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     def retrieve(self) -> AccountDetails:
@@ -24,7 +23,7 @@ class AccountDetailsClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/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,
         )
@@ -38,10 +37,7 @@ class AccountDetailsClient:
 
 
 class AsyncAccountDetailsClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: AsyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     async def retrieve(self) -> AccountDetails:
@@ -50,7 +46,7 @@ class AsyncAccountDetailsClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/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,
         )

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

@@ -3,19 +3,18 @@
 import urllib.parse
 from json.decoder import JSONDecodeError
 
-import pydantic
-
 from .....core.api_error import ApiError
 from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
-from .....environment import MergeEnvironment
 from ...types.account_token import AccountToken
 
+try:
+    import pydantic.v1 as pydantic  # type: ignore
+except ImportError:
+    import pydantic  # type: ignore
+
 
 class AccountTokenClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: SyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     def retrieve(self, public_token: str) -> AccountToken:
@@ -27,7 +26,9 @@ class AccountTokenClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", f"api/accounting/v1/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,
         )
@@ -41,10 +42,7 @@ class AccountTokenClient:
 
 
 class AsyncAccountTokenClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: AsyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     async def retrieve(self, public_token: str) -> AccountToken:
@@ -56,7 +54,9 @@ class AsyncAccountTokenClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", f"api/accounting/v1/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,
         )

merge/resources/accounting/resources/accounts/client.py

@@ -5,7 +5,6 @@ import typing
 import urllib.parse
 from json.decoder import JSONDecodeError
 
-import pydantic
 import typing_extensions
 
 from .....core.api_error import ApiError
@@ -13,7 +12,6 @@ from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
 from .....core.datetime_utils import serialize_datetime
 from .....core.jsonable_encoder import jsonable_encoder
 from .....core.remove_none_from_dict import remove_none_from_dict
-from .....environment import MergeEnvironment
 from ...types.account import Account
 from ...types.account_request import AccountRequest
 from ...types.account_response import AccountResponse
@@ -24,15 +22,17 @@ from ...types.accounts_retrieve_request_show_enum_origins import AccountsRetriev
 from ...types.meta_response import MetaResponse
 from ...types.paginated_account_list import PaginatedAccountList
 
+try:
+    import pydantic.v1 as pydantic  # type: ignore
+except ImportError:
+    import pydantic  # type: ignore
+
 # this is used as the default value for optional parameters
 OMIT = typing.cast(typing.Any, ...)
 
 
 class AccountsClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: SyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: SyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     def list(
@@ -84,7 +84,7 @@ class AccountsClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/accounts"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounts"),
             params=remove_none_from_dict(
                 {
                     "company_id": company_id,
@@ -132,7 +132,7 @@ class AccountsClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/accounts"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounts"),
             params=remove_none_from_dict({"is_debug_mode": is_debug_mode, "run_async": run_async}),
             json=jsonable_encoder({"model": model}),
             headers=self._client_wrapper.get_headers(),
@@ -171,7 +171,7 @@ class AccountsClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", f"api/accounting/v1/accounts/{id}"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/accounts/{id}"),
             params=remove_none_from_dict(
                 {
                     "expand": expand,
@@ -197,7 +197,7 @@ class AccountsClient:
         """
         _response = self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/accounts/meta/post"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounts/meta/post"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )
@@ -211,10 +211,7 @@ class AccountsClient:
 
 
 class AsyncAccountsClient:
-    def __init__(
-        self, *, environment: MergeEnvironment = MergeEnvironment.PRODUCTION, client_wrapper: AsyncClientWrapper
-    ):
-        self._environment = environment
+    def __init__(self, *, client_wrapper: AsyncClientWrapper):
         self._client_wrapper = client_wrapper
 
     async def list(
@@ -266,7 +263,7 @@ class AsyncAccountsClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/accounts"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounts"),
             params=remove_none_from_dict(
                 {
                     "company_id": company_id,
@@ -314,7 +311,7 @@ class AsyncAccountsClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "POST",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/accounts"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounts"),
             params=remove_none_from_dict({"is_debug_mode": is_debug_mode, "run_async": run_async}),
             json=jsonable_encoder({"model": model}),
             headers=self._client_wrapper.get_headers(),
@@ -353,7 +350,7 @@ class AsyncAccountsClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", f"api/accounting/v1/accounts/{id}"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", f"api/accounting/v1/accounts/{id}"),
             params=remove_none_from_dict(
                 {
                     "expand": expand,
@@ -379,7 +376,7 @@ class AsyncAccountsClient:
         """
         _response = await self._client_wrapper.httpx_client.request(
             "GET",
-            urllib.parse.urljoin(f"{self._environment.value}/", "api/accounting/v1/accounts/meta/post"),
+            urllib.parse.urljoin(f"{self._client_wrapper.get_base_url()}/", "api/accounting/v1/accounts/meta/post"),
             headers=self._client_wrapper.get_headers(),
             timeout=60,
         )