mergepythonclient 2.1.0__py3-none-any.whl → 2.2.0__py3-none-any.whl

merge/core/client_wrapper.py

@@ -24,10 +24,10 @@ class BaseClientWrapper:
 
     def get_headers(self) -> typing.Dict[str, str]:
         headers: typing.Dict[str, str] = {
-            "User-Agent": "MergePythonClient/2.1.0",
+            "User-Agent": "MergePythonClient/2.2.0",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "2.1.0",
+            "X-Fern-SDK-Version": "2.2.0",
             **(self.get_custom_headers() or {}),
         }
         if self._account_token is not None:

merge/core/force_multipart.py

@@ -1,7 +1,9 @@
 # This file was auto-generated by Fern from our API Definition.
 
+from typing import Any, Dict
 
-class ForceMultipartDict(dict):
+
+class ForceMultipartDict(Dict[str, Any]):
     """
     A dictionary subclass that always evaluates to True in boolean contexts.
 
@@ -9,7 +11,7 @@ class ForceMultipartDict(dict):
     the dictionary is empty, which would normally evaluate to False.
     """
 
-    def __bool__(self):
+    def __bool__(self) -> bool:
         return True
 
 

merge/core/http_response.py

@@ -4,8 +4,8 @@ from typing import Dict, Generic, TypeVar
 
 import httpx
 
+# Generic to represent the underlying type of the data wrapped by the HTTP response.
 T = TypeVar("T")
-"""Generic to represent the underlying type of the data wrapped by the HTTP response."""
 
 
 class BaseHttpResponse:

merge/core/unchecked_base_model.py

@@ -124,12 +124,50 @@ class UncheckedBaseModel(UniversalBaseModel):
         return m
 
 
+def _validate_collection_items_compatible(collection: typing.Any, target_type: typing.Type[typing.Any]) -> bool:
+    """
+    Validate that all items in a collection are compatible with the target type.
+
+    Args:
+        collection: The collection to validate (list, set, or dict values)
+        target_type: The target type to validate against
+
+    Returns:
+        True if all items are compatible, False otherwise
+    """
+    if inspect.isclass(target_type) and issubclass(target_type, pydantic.BaseModel):
+        for item in collection:
+            try:
+                # Try to validate the item against the target type
+                if isinstance(item, dict):
+                    parse_obj_as(target_type, item)
+                else:
+                    # If it's not a dict, it might already be the right type
+                    if not isinstance(item, target_type):
+                        return False
+            except Exception:
+                return False
+    return True
+
+
 def _convert_undiscriminated_union_type(union_type: typing.Type[typing.Any], object_: typing.Any) -> typing.Any:
     inner_types = get_args(union_type)
     if typing.Any in inner_types:
         return object_
 
     for inner_type in inner_types:
+        # Handle lists of objects that need parsing
+        if get_origin(inner_type) is list and isinstance(object_, list):
+            list_inner_type = get_args(inner_type)[0]
+            try:
+                if inspect.isclass(list_inner_type) and issubclass(list_inner_type, pydantic.BaseModel):
+                    # Validate that all items in the list are compatible with the target type
+                    if _validate_collection_items_compatible(object_, list_inner_type):
+                        parsed_list = [parse_obj_as(object_=item, type_=list_inner_type) for item in object_]
+                        return parsed_list
+            except Exception:
+                pass
+
         try:
             if inspect.isclass(inner_type) and issubclass(inner_type, pydantic.BaseModel):
                 # Attempt a validated parse until one works
@@ -148,7 +186,7 @@ def _convert_undiscriminated_union_type(union_type: typing.Type[typing.Any], obj
 def _convert_union_type(type_: typing.Type[typing.Any], object_: typing.Any) -> typing.Any:
     base_type = get_origin(type_) or type_
     union_type = type_
-    if base_type == typing_extensions.Annotated:
+    if base_type == typing_extensions.Annotated:  # type: ignore[comparison-overlap]
         union_type = get_args(type_)[0]
         annotated_metadata = get_args(type_)[1:]
         for metadata in annotated_metadata:
@@ -179,11 +217,11 @@ def construct_type(*, type_: typing.Type[typing.Any], object_: typing.Any) -> ty
         return None
 
     base_type = get_origin(type_) or type_
-    is_annotated = base_type == typing_extensions.Annotated
+    is_annotated = base_type == typing_extensions.Annotated  # type: ignore[comparison-overlap]
     maybe_annotation_members = get_args(type_)
     is_annotated_union = is_annotated and is_union(get_origin(maybe_annotation_members[0]))
 
-    if base_type == typing.Any:
+    if base_type == typing.Any:  # type: ignore[comparison-overlap]
         return object_
 
     if base_type == dict:

merge/resources/accounting/__init__.py

@@ -163,6 +163,29 @@ from .types import (
     ExpenseLineRequestTrackingCategory,
     ExpenseLineTrackingCategoriesItem,
     ExpenseLineTrackingCategory,
+    ExpenseReport,
+    ExpenseReportCompany,
+    ExpenseReportLine,
+    ExpenseReportLineAccount,
+    ExpenseReportLineCompany,
+    ExpenseReportLineContact,
+    ExpenseReportLineEmployee,
+    ExpenseReportLineProject,
+    ExpenseReportLineRequest,
+    ExpenseReportLineRequestAccount,
+    ExpenseReportLineRequestCompany,
+    ExpenseReportLineRequestContact,
+    ExpenseReportLineRequestEmployee,
+    ExpenseReportLineRequestProject,
+    ExpenseReportLineRequestTaxRate,
+    ExpenseReportLineTaxRate,
+    ExpenseReportRequest,
+    ExpenseReportRequestAccountingPeriod,
+    ExpenseReportRequestCompany,
+    ExpenseReportRequestEmployee,
+    ExpenseReportResponse,
+    ExpenseReportStatus,
+    ExpenseReportStatusEnum,
     ExpenseRequest,
     ExpenseRequestAccount,
     ExpenseRequestAccountingPeriod,
@@ -275,6 +298,7 @@ from .types import (
     ItemSalesTaxRate,
     ItemSchema,
     ItemStatus,
+    ItemType,
     ItemTypeEnum,
     JournalEntry,
     JournalEntryAccountingPeriod,
@@ -329,6 +353,8 @@ from .types import (
     PaginatedCreditNoteList,
     PaginatedEmployeeList,
     PaginatedExpenseList,
+    PaginatedExpenseReportLineList,
+    PaginatedExpenseReportList,
     PaginatedGeneralLedgerTransactionList,
     PaginatedIncomeStatementList,
     PaginatedInvoiceList,
@@ -346,6 +372,8 @@ from .types import (
     PaginatedTrackingCategoryList,
     PaginatedTransactionList,
     PaginatedVendorCreditList,
+    PatchedContactRequest,
+    PatchedContactRequestAddressesItem,
     PatchedItemRequestRequest,
     PatchedItemRequestRequestStatus,
     PatchedItemRequestRequestType,
@@ -508,6 +536,9 @@ from .resources import (
     CreditNotesRetrieveRequestRemoteFields,
     CreditNotesRetrieveRequestShowEnumOrigins,
     EndUserDetailsRequestLanguage,
+    ExpenseReportsLinesListRequestExpand,
+    ExpenseReportsListRequestExpand,
+    ExpenseReportsRetrieveRequestExpand,
     ExpensesListRequestExpand,
     ExpensesRetrieveRequestExpand,
     GeneralLedgerTransactionsListRequestExpand,
@@ -551,6 +582,7 @@ from .resources import (
     credit_notes,
     delete_account,
     employees,
+    expense_reports,
     expenses,
     field_mapping,
     force_resync,
@@ -757,6 +789,32 @@ __all__ = [
     "ExpenseLineRequestTrackingCategory",
     "ExpenseLineTrackingCategoriesItem",
     "ExpenseLineTrackingCategory",
+    "ExpenseReport",
+    "ExpenseReportCompany",
+    "ExpenseReportLine",
+    "ExpenseReportLineAccount",
+    "ExpenseReportLineCompany",
+    "ExpenseReportLineContact",
+    "ExpenseReportLineEmployee",
+    "ExpenseReportLineProject",
+    "ExpenseReportLineRequest",
+    "ExpenseReportLineRequestAccount",
+    "ExpenseReportLineRequestCompany",
+    "ExpenseReportLineRequestContact",
+    "ExpenseReportLineRequestEmployee",
+    "ExpenseReportLineRequestProject",
+    "ExpenseReportLineRequestTaxRate",
+    "ExpenseReportLineTaxRate",
+    "ExpenseReportRequest",
+    "ExpenseReportRequestAccountingPeriod",
+    "ExpenseReportRequestCompany",
+    "ExpenseReportRequestEmployee",
+    "ExpenseReportResponse",
+    "ExpenseReportStatus",
+    "ExpenseReportStatusEnum",
+    "ExpenseReportsLinesListRequestExpand",
+    "ExpenseReportsListRequestExpand",
+    "ExpenseReportsRetrieveRequestExpand",
     "ExpenseRequest",
     "ExpenseRequestAccount",
     "ExpenseRequestAccountingPeriod",
@@ -878,6 +936,7 @@ __all__ = [
     "ItemSalesTaxRate",
     "ItemSchema",
     "ItemStatus",
+    "ItemType",
     "ItemTypeEnum",
     "ItemsListRequestExpand",
     "ItemsRetrieveRequestExpand",
@@ -937,6 +996,8 @@ __all__ = [
     "PaginatedCreditNoteList",
     "PaginatedEmployeeList",
     "PaginatedExpenseList",
+    "PaginatedExpenseReportLineList",
+    "PaginatedExpenseReportList",
     "PaginatedGeneralLedgerTransactionList",
     "PaginatedIncomeStatementList",
     "PaginatedInvoiceList",
@@ -954,6 +1015,8 @@ __all__ = [
     "PaginatedTrackingCategoryList",
     "PaginatedTransactionList",
     "PaginatedVendorCreditList",
+    "PatchedContactRequest",
+    "PatchedContactRequestAddressesItem",
     "PatchedItemRequestRequest",
     "PatchedItemRequestRequestStatus",
     "PatchedItemRequestRequestType",
@@ -1127,6 +1190,7 @@ __all__ = [
     "credit_notes",
     "delete_account",
     "employees",
+    "expense_reports",
     "expenses",
     "field_mapping",
     "force_resync",

merge/resources/accounting/client.py

@@ -24,6 +24,7 @@ from .resources.contacts.client import AsyncContactsClient, ContactsClient
 from .resources.credit_notes.client import AsyncCreditNotesClient, CreditNotesClient
 from .resources.delete_account.client import AsyncDeleteAccountClient, DeleteAccountClient
 from .resources.employees.client import AsyncEmployeesClient, EmployeesClient
+from .resources.expense_reports.client import AsyncExpenseReportsClient, ExpenseReportsClient
 from .resources.expenses.client import AsyncExpensesClient, ExpensesClient
 from .resources.field_mapping.client import AsyncFieldMappingClient, FieldMappingClient
 from .resources.force_resync.client import AsyncForceResyncClient, ForceResyncClient
@@ -104,6 +105,8 @@ class AccountingClient:
 
         self.employees = EmployeesClient(client_wrapper=client_wrapper)
 
+        self.expense_reports = ExpenseReportsClient(client_wrapper=client_wrapper)
+
         self.expenses = ExpensesClient(client_wrapper=client_wrapper)
 
         self.field_mapping = FieldMappingClient(client_wrapper=client_wrapper)
@@ -211,6 +214,8 @@ class AsyncAccountingClient:
 
         self.employees = AsyncEmployeesClient(client_wrapper=client_wrapper)
 
+        self.expense_reports = AsyncExpenseReportsClient(client_wrapper=client_wrapper)
+
         self.expenses = AsyncExpensesClient(client_wrapper=client_wrapper)
 
         self.field_mapping = AsyncFieldMappingClient(client_wrapper=client_wrapper)

merge/resources/accounting/resources/__init__.py

@@ -22,6 +22,7 @@ from . import (
     credit_notes,
     delete_account,
     employees,
+    expense_reports,
     expenses,
     field_mapping,
     force_resync,
@@ -67,6 +68,11 @@ from .credit_notes import (
     CreditNotesRetrieveRequestRemoteFields,
     CreditNotesRetrieveRequestShowEnumOrigins,
 )
+from .expense_reports import (
+    ExpenseReportsLinesListRequestExpand,
+    ExpenseReportsListRequestExpand,
+    ExpenseReportsRetrieveRequestExpand,
+)
 from .expenses import ExpensesListRequestExpand, ExpensesRetrieveRequestExpand
 from .general_ledger_transactions import (
     GeneralLedgerTransactionsListRequestExpand,
@@ -106,6 +112,9 @@ __all__ = [
     "CreditNotesRetrieveRequestRemoteFields",
     "CreditNotesRetrieveRequestShowEnumOrigins",
     "EndUserDetailsRequestLanguage",
+    "ExpenseReportsLinesListRequestExpand",
+    "ExpenseReportsListRequestExpand",
+    "ExpenseReportsRetrieveRequestExpand",
     "ExpensesListRequestExpand",
     "ExpensesRetrieveRequestExpand",
     "GeneralLedgerTransactionsListRequestExpand",
@@ -149,6 +158,7 @@ __all__ = [
     "credit_notes",
     "delete_account",
     "employees",
+    "expense_reports",
     "expenses",
     "field_mapping",
     "force_resync",

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

@@ -70,7 +70,9 @@ class AccountingPeriodsClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.accounting_periods.list()
+        client.accounting.accounting_periods.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             cursor=cursor,
@@ -198,7 +200,9 @@ class AsyncAccountingPeriodsClient:
 
 
         async def main() -> None:
-            await client.accounting.accounting_periods.list()
+            await client.accounting.accounting_periods.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

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

@@ -133,7 +133,9 @@ class AccountsClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.accounts.list()
+        client.accounting.accounts.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             account_type=account_type,
@@ -415,7 +417,9 @@ class AsyncAccountsClient:
 
 
         async def main() -> None:
-            await client.accounting.accounts.list()
+            await client.accounting.accounts.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

merge/resources/accounting/resources/attachments/client.py

@@ -101,7 +101,9 @@ class AttachmentsClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.attachments.list()
+        client.accounting.attachments.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             company_id=company_id,
@@ -333,7 +335,9 @@ class AsyncAttachmentsClient:
 
 
         async def main() -> None:
-            await client.accounting.attachments.list()
+            await client.accounting.attachments.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

merge/resources/accounting/resources/audit_trail/client.py

@@ -73,7 +73,9 @@ class AuditTrailClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.audit_trail.list()
+        client.accounting.audit_trail.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             cursor=cursor,
@@ -157,7 +159,9 @@ class AsyncAuditTrailClient:
 
 
         async def main() -> None:
-            await client.accounting.audit_trail.list()
+            await client.accounting.audit_trail.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

merge/resources/accounting/resources/balance_sheets/client.py

@@ -99,7 +99,9 @@ class BalanceSheetsClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.balance_sheets.list()
+        client.accounting.balance_sheets.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             company_id=company_id,
@@ -267,7 +269,9 @@ class AsyncBalanceSheetsClient:
 
 
         async def main() -> None:
-            await client.accounting.balance_sheets.list()
+            await client.accounting.balance_sheets.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

merge/resources/accounting/resources/bank_feed_accounts/client.py

@@ -76,7 +76,9 @@ class BankFeedAccountsClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.bank_feed_accounts.list()
+        client.accounting.bank_feed_accounts.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             cursor=cursor,
@@ -278,7 +280,9 @@ class AsyncBankFeedAccountsClient:
 
 
         async def main() -> None:
-            await client.accounting.bank_feed_accounts.list()
+            await client.accounting.bank_feed_accounts.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

merge/resources/accounting/resources/bank_feed_transactions/client.py

@@ -105,7 +105,9 @@ class BankFeedTransactionsClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.bank_feed_transactions.list()
+        client.accounting.bank_feed_transactions.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             created_after=created_after,
@@ -347,7 +349,9 @@ class AsyncBankFeedTransactionsClient:
 
 
         async def main() -> None:
-            await client.accounting.bank_feed_transactions.list()
+            await client.accounting.bank_feed_transactions.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

merge/resources/accounting/resources/cash_flow_statements/client.py

@@ -99,7 +99,9 @@ class CashFlowStatementsClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.cash_flow_statements.list()
+        client.accounting.cash_flow_statements.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             company_id=company_id,
@@ -267,7 +269,9 @@ class AsyncCashFlowStatementsClient:
 
 
         async def main() -> None:
-            await client.accounting.cash_flow_statements.list()
+            await client.accounting.cash_flow_statements.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())

merge/resources/accounting/resources/company_info/client.py

@@ -97,7 +97,9 @@ class CompanyInfoClient:
             account_token="YOUR_ACCOUNT_TOKEN",
             api_key="YOUR_API_KEY",
         )
-        client.accounting.company_info.list()
+        client.accounting.company_info.list(
+            cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+        )
         """
         _response = self._raw_client.list(
             created_after=created_after,
@@ -260,7 +262,9 @@ class AsyncCompanyInfoClient:
 
 
         async def main() -> None:
-            await client.accounting.company_info.list()
+            await client.accounting.company_info.list(
+                cursor="cD0yMDIxLTAxLTA2KzAzJTNBMjQlM0E1My40MzQzMjYlMkIwMCUzQTAw",
+            )
 
 
         asyncio.run(main())