diff --git a/pyproject.toml b/pyproject.toml index ac6252a7..caf1a42d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "MergePythonClient" -version = "1.0.0" +version = "1.0.1" description = "" readme = "README.md" authors = [] diff --git a/src/merge/client.py b/src/merge/client.py index 87a0b8b7..b0566792 100644 --- a/src/merge/client.py +++ b/src/merge/client.py @@ -31,8 +31,8 @@ def __init__( httpx_client=httpx.Client(timeout=timeout), ) 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.crm = CrmClient(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) @@ -55,8 +55,8 @@ def __init__( httpx_client=httpx.AsyncClient(timeout=timeout), ) 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.crm = AsyncCrmClient(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) diff --git a/src/merge/core/client_wrapper.py b/src/merge/core/client_wrapper.py index 7c5b25a3..2c57509c 100644 --- a/src/merge/core/client_wrapper.py +++ b/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.0", + "X-Fern-SDK-Version": "1.0.1", } if self._account_token is not None: headers["X-Account-Token"] = self._account_token diff --git a/src/merge/resources/accounting/__init__.py b/src/merge/resources/accounting/__init__.py index e734122d..17661616 100644 --- a/src/merge/resources/accounting/__init__.py +++ b/src/merge/resources/accounting/__init__.py @@ -110,6 +110,7 @@ ExpenseLineRequest, ExpenseLineRequestAccount, ExpenseLineRequestContact, + ExpenseLineRequestCurrency, ExpenseLineRequestItem, ExpenseLineRequestTrackingCategoriesItem, ExpenseLineRequestTrackingCategory, @@ -158,6 +159,7 @@ InvoiceRequestTrackingCategoriesItem, InvoiceRequestType, InvoiceResponse, + InvoiceStatus, InvoiceStatusEnum, InvoiceTrackingCategoriesItem, InvoiceType, @@ -479,6 +481,7 @@ "ExpenseLineRequest", "ExpenseLineRequestAccount", "ExpenseLineRequestContact", + "ExpenseLineRequestCurrency", "ExpenseLineRequestItem", "ExpenseLineRequestTrackingCategoriesItem", "ExpenseLineRequestTrackingCategory", @@ -527,6 +530,7 @@ "InvoiceRequestTrackingCategoriesItem", "InvoiceRequestType", "InvoiceResponse", + "InvoiceStatus", "InvoiceStatusEnum", "InvoiceTrackingCategoriesItem", "InvoiceType", diff --git a/src/merge/resources/accounting/resources/expenses/client.py b/src/merge/resources/accounting/resources/expenses/client.py index de268f9d..57da952b 100644 --- a/src/merge/resources/accounting/resources/expenses/client.py +++ b/src/merge/resources/accounting/resources/expenses/client.py @@ -142,11 +142,7 @@ def create( - model: ExpenseRequest. --- from merge.client import Merge - from merge.resources.accounting import ( - CurrencyEnum, - ExpenseLineRequest, - ExpenseRequest, - ) + from merge.resources.accounting import ExpenseLineRequest, ExpenseRequest client = Merge( account_token="YOUR_ACCOUNT_TOKEN", @@ -162,7 +158,6 @@ def create( remote_id="121222", net_amount=25.54, company="595c8f97-2ac4-45b7-b000-41bdf43240b5", - currency=CurrencyEnum.XUA, description="MacBook Pro", exchange_rate="2.9", ) @@ -373,11 +368,7 @@ async def create( - model: ExpenseRequest. --- from merge.client import AsyncMerge - from merge.resources.accounting import ( - CurrencyEnum, - ExpenseLineRequest, - ExpenseRequest, - ) + from merge.resources.accounting import ExpenseLineRequest, ExpenseRequest client = AsyncMerge( account_token="YOUR_ACCOUNT_TOKEN", @@ -393,7 +384,6 @@ async def create( remote_id="121222", net_amount=25.54, company="595c8f97-2ac4-45b7-b000-41bdf43240b5", - currency=CurrencyEnum.XUA, description="MacBook Pro", exchange_rate="2.9", ) diff --git a/src/merge/resources/accounting/types/__init__.py b/src/merge/resources/accounting/types/__init__.py index ada224fd..f7700f7a 100644 --- a/src/merge/resources/accounting/types/__init__.py +++ b/src/merge/resources/accounting/types/__init__.py @@ -109,6 +109,7 @@ from .expense_line_request import ExpenseLineRequest from .expense_line_request_account import ExpenseLineRequestAccount from .expense_line_request_contact import ExpenseLineRequestContact +from .expense_line_request_currency import ExpenseLineRequestCurrency from .expense_line_request_item import ExpenseLineRequestItem from .expense_line_request_tracking_categories_item import ExpenseLineRequestTrackingCategoriesItem from .expense_line_request_tracking_category import ExpenseLineRequestTrackingCategory @@ -157,6 +158,7 @@ from .invoice_request_tracking_categories_item import InvoiceRequestTrackingCategoriesItem from .invoice_request_type import InvoiceRequestType from .invoice_response import InvoiceResponse +from .invoice_status import InvoiceStatus from .invoice_status_enum import InvoiceStatusEnum from .invoice_tracking_categories_item import InvoiceTrackingCategoriesItem from .invoice_type import InvoiceType @@ -438,6 +440,7 @@ "ExpenseLineRequest", "ExpenseLineRequestAccount", "ExpenseLineRequestContact", + "ExpenseLineRequestCurrency", "ExpenseLineRequestItem", "ExpenseLineRequestTrackingCategoriesItem", "ExpenseLineRequestTrackingCategory", @@ -486,6 +489,7 @@ "InvoiceRequestTrackingCategoriesItem", "InvoiceRequestType", "InvoiceResponse", + "InvoiceStatus", "InvoiceStatusEnum", "InvoiceTrackingCategoriesItem", "InvoiceType", diff --git a/src/merge/resources/accounting/types/expense_line_request.py b/src/merge/resources/accounting/types/expense_line_request.py index 9440aa1c..7738c000 100644 --- a/src/merge/resources/accounting/types/expense_line_request.py +++ b/src/merge/resources/accounting/types/expense_line_request.py @@ -4,9 +4,9 @@ import typing from ....core.datetime_utils import serialize_datetime -from .currency_enum import CurrencyEnum from .expense_line_request_account import ExpenseLineRequestAccount from .expense_line_request_contact import ExpenseLineRequestContact +from .expense_line_request_currency import ExpenseLineRequestCurrency from .expense_line_request_item import ExpenseLineRequestItem from .expense_line_request_tracking_categories_item import ExpenseLineRequestTrackingCategoriesItem from .expense_line_request_tracking_category import ExpenseLineRequestTrackingCategory @@ -33,7 +33,7 @@ class ExpenseLineRequest(pydantic.BaseModel): tracking_category: typing.Optional[ExpenseLineRequestTrackingCategory] tracking_categories: typing.Optional[typing.List[typing.Optional[ExpenseLineRequestTrackingCategoriesItem]]] company: typing.Optional[str] = pydantic.Field(description="The company the line belongs to.") - currency: typing.Optional[CurrencyEnum] = pydantic.Field( + currency: typing.Optional[ExpenseLineRequestCurrency] = pydantic.Field( description=( "The expense line item's currency.\n" "\n" diff --git a/src/merge/resources/accounting/types/expense_line_request_currency.py b/src/merge/resources/accounting/types/expense_line_request_currency.py new file mode 100644 index 00000000..2e5a0cc2 --- /dev/null +++ b/src/merge/resources/accounting/types/expense_line_request_currency.py @@ -0,0 +1,7 @@ +# This file was auto-generated by Fern from our API Definition. + +import typing + +from .currency_enum import CurrencyEnum + +ExpenseLineRequestCurrency = typing.Union[CurrencyEnum, str] diff --git a/src/merge/resources/accounting/types/invoice.py b/src/merge/resources/accounting/types/invoice.py index 284ff658..72944702 100644 --- a/src/merge/resources/accounting/types/invoice.py +++ b/src/merge/resources/accounting/types/invoice.py @@ -12,7 +12,7 @@ from .invoice_line_item import InvoiceLineItem from .invoice_payments_item import InvoicePaymentsItem from .invoice_purchase_orders_item import InvoicePurchaseOrdersItem -from .invoice_status_enum import InvoiceStatusEnum +from .invoice_status import InvoiceStatus from .invoice_tracking_categories_item import InvoiceTrackingCategoriesItem from .invoice_type import InvoiceType from .remote_data import RemoteData @@ -366,7 +366,7 @@ class Invoice(pydantic.BaseModel): description="The total discounts applied to the total cost." ) sub_total: typing.Optional[float] = pydantic.Field(description="The total amount being paid before taxes.") - status: typing.Optional[InvoiceStatusEnum] = pydantic.Field( + status: typing.Optional[InvoiceStatus] = pydantic.Field( description=( "The status of the invoice.\n" "\n" diff --git a/src/merge/resources/accounting/types/invoice_status.py b/src/merge/resources/accounting/types/invoice_status.py new file mode 100644 index 00000000..aff15936 --- /dev/null +++ b/src/merge/resources/accounting/types/invoice_status.py @@ -0,0 +1,7 @@ +# This file was auto-generated by Fern from our API Definition. + +import typing + +from .invoice_status_enum import InvoiceStatusEnum + +InvoiceStatus = typing.Union[InvoiceStatusEnum, str]