mergepythonclient 2.1.0__py3-none-any.whl → 2.1.1__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.1.1",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "2.1.0",
+            "X-Fern-SDK-Version": "2.1.1",
             **(self.get_custom_headers() or {}),
         }
         if self._account_token is not None:

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

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,
@@ -508,6 +534,9 @@ from .resources import (
     CreditNotesRetrieveRequestRemoteFields,
     CreditNotesRetrieveRequestShowEnumOrigins,
     EndUserDetailsRequestLanguage,
+    ExpenseReportsLinesListRequestExpand,
+    ExpenseReportsListRequestExpand,
+    ExpenseReportsRetrieveRequestExpand,
     ExpensesListRequestExpand,
     ExpensesRetrieveRequestExpand,
     GeneralLedgerTransactionsListRequestExpand,
@@ -551,6 +580,7 @@ from .resources import (
     credit_notes,
     delete_account,
     employees,
+    expense_reports,
     expenses,
     field_mapping,
     force_resync,
@@ -757,6 +787,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 +934,7 @@ __all__ = [
     "ItemSalesTaxRate",
     "ItemSchema",
     "ItemStatus",
+    "ItemType",
     "ItemTypeEnum",
     "ItemsListRequestExpand",
     "ItemsRetrieveRequestExpand",
@@ -937,6 +994,8 @@ __all__ = [
     "PaginatedCreditNoteList",
     "PaginatedEmployeeList",
     "PaginatedExpenseList",
+    "PaginatedExpenseReportLineList",
+    "PaginatedExpenseReportList",
     "PaginatedGeneralLedgerTransactionList",
     "PaginatedIncomeStatementList",
     "PaginatedInvoiceList",
@@ -1127,6 +1186,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/employees/client.py

@@ -1,5 +1,6 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import datetime as dt
 import typing
 
 from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
@@ -27,12 +28,18 @@ class EmployeesClient:
     def list(
         self,
         *,
+        company_id: typing.Optional[str] = None,
+        created_after: typing.Optional[dt.datetime] = None,
+        created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         expand: typing.Optional[typing.Literal["company"]] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_shell_data: typing.Optional[bool] = None,
+        modified_after: typing.Optional[dt.datetime] = None,
+        modified_before: typing.Optional[dt.datetime] = None,
         page_size: typing.Optional[int] = None,
+        remote_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> PaginatedEmployeeList:
         """
@@ -40,6 +47,15 @@ class EmployeesClient:
 
         Parameters
         ----------
+        company_id : typing.Optional[str]
+            If provided, will only return employees for this company.
+
+        created_after : typing.Optional[dt.datetime]
+            If provided, will only return objects created after this datetime.
+
+        created_before : typing.Optional[dt.datetime]
+            If provided, will only return objects created before this datetime.
+
         cursor : typing.Optional[str]
             The pagination cursor value.
 
@@ -55,9 +71,18 @@ class EmployeesClient:
         include_shell_data : typing.Optional[bool]
             Whether to include shell records. Shell records are empty records (they may contain some metadata but all other fields are null).
 
+        modified_after : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge after this date time will be returned.
+
+        modified_before : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge before this date time will be returned.
+
         page_size : typing.Optional[int]
             Number of results to return per page.
 
+        remote_id : typing.Optional[str]
+            The API provider's ID for the given object.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -77,12 +102,18 @@ class EmployeesClient:
         client.accounting.employees.list()
         """
         _response = self._raw_client.list(
+            company_id=company_id,
+            created_after=created_after,
+            created_before=created_before,
             cursor=cursor,
             expand=expand,
             include_deleted_data=include_deleted_data,
             include_remote_data=include_remote_data,
             include_shell_data=include_shell_data,
+            modified_after=modified_after,
+            modified_before=modified_before,
             page_size=page_size,
+            remote_id=remote_id,
             request_options=request_options,
         )
         return _response.data
@@ -160,12 +191,18 @@ class AsyncEmployeesClient:
     async def list(
         self,
         *,
+        company_id: typing.Optional[str] = None,
+        created_after: typing.Optional[dt.datetime] = None,
+        created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         expand: typing.Optional[typing.Literal["company"]] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_shell_data: typing.Optional[bool] = None,
+        modified_after: typing.Optional[dt.datetime] = None,
+        modified_before: typing.Optional[dt.datetime] = None,
         page_size: typing.Optional[int] = None,
+        remote_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> PaginatedEmployeeList:
         """
@@ -173,6 +210,15 @@ class AsyncEmployeesClient:
 
         Parameters
         ----------
+        company_id : typing.Optional[str]
+            If provided, will only return employees for this company.
+
+        created_after : typing.Optional[dt.datetime]
+            If provided, will only return objects created after this datetime.
+
+        created_before : typing.Optional[dt.datetime]
+            If provided, will only return objects created before this datetime.
+
         cursor : typing.Optional[str]
             The pagination cursor value.
 
@@ -188,9 +234,18 @@ class AsyncEmployeesClient:
         include_shell_data : typing.Optional[bool]
             Whether to include shell records. Shell records are empty records (they may contain some metadata but all other fields are null).
 
+        modified_after : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge after this date time will be returned.
+
+        modified_before : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge before this date time will be returned.
+
         page_size : typing.Optional[int]
             Number of results to return per page.
 
+        remote_id : typing.Optional[str]
+            The API provider's ID for the given object.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -218,12 +273,18 @@ class AsyncEmployeesClient:
         asyncio.run(main())
         """
         _response = await self._raw_client.list(
+            company_id=company_id,
+            created_after=created_after,
+            created_before=created_before,
             cursor=cursor,
             expand=expand,
             include_deleted_data=include_deleted_data,
             include_remote_data=include_remote_data,
             include_shell_data=include_shell_data,
+            modified_after=modified_after,
+            modified_before=modified_before,
             page_size=page_size,
+            remote_id=remote_id,
             request_options=request_options,
         )
         return _response.data

merge/resources/accounting/resources/employees/raw_client.py

@@ -1,10 +1,12 @@
 # This file was auto-generated by Fern from our API Definition.
 
+import datetime as dt
 import typing
 from json.decoder import JSONDecodeError
 
 from .....core.api_error import ApiError
 from .....core.client_wrapper import AsyncClientWrapper, SyncClientWrapper
+from .....core.datetime_utils import serialize_datetime
 from .....core.http_response import AsyncHttpResponse, HttpResponse
 from .....core.jsonable_encoder import jsonable_encoder
 from .....core.request_options import RequestOptions
@@ -20,12 +22,18 @@ class RawEmployeesClient:
     def list(
         self,
         *,
+        company_id: typing.Optional[str] = None,
+        created_after: typing.Optional[dt.datetime] = None,
+        created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         expand: typing.Optional[typing.Literal["company"]] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_shell_data: typing.Optional[bool] = None,
+        modified_after: typing.Optional[dt.datetime] = None,
+        modified_before: typing.Optional[dt.datetime] = None,
         page_size: typing.Optional[int] = None,
+        remote_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> HttpResponse[PaginatedEmployeeList]:
         """
@@ -33,6 +41,15 @@ class RawEmployeesClient:
 
         Parameters
         ----------
+        company_id : typing.Optional[str]
+            If provided, will only return employees for this company.
+
+        created_after : typing.Optional[dt.datetime]
+            If provided, will only return objects created after this datetime.
+
+        created_before : typing.Optional[dt.datetime]
+            If provided, will only return objects created before this datetime.
+
         cursor : typing.Optional[str]
             The pagination cursor value.
 
@@ -48,9 +65,18 @@ class RawEmployeesClient:
         include_shell_data : typing.Optional[bool]
             Whether to include shell records. Shell records are empty records (they may contain some metadata but all other fields are null).
 
+        modified_after : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge after this date time will be returned.
+
+        modified_before : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge before this date time will be returned.
+
         page_size : typing.Optional[int]
             Number of results to return per page.
 
+        remote_id : typing.Optional[str]
+            The API provider's ID for the given object.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -63,12 +89,18 @@ class RawEmployeesClient:
             "accounting/v1/employees",
             method="GET",
             params={
+                "company_id": company_id,
+                "created_after": serialize_datetime(created_after) if created_after is not None else None,
+                "created_before": serialize_datetime(created_before) if created_before is not None else None,
                 "cursor": cursor,
                 "expand": expand,
                 "include_deleted_data": include_deleted_data,
                 "include_remote_data": include_remote_data,
                 "include_shell_data": include_shell_data,
+                "modified_after": serialize_datetime(modified_after) if modified_after is not None else None,
+                "modified_before": serialize_datetime(modified_before) if modified_before is not None else None,
                 "page_size": page_size,
+                "remote_id": remote_id,
             },
             request_options=request_options,
         )
@@ -153,12 +185,18 @@ class AsyncRawEmployeesClient:
     async def list(
         self,
         *,
+        company_id: typing.Optional[str] = None,
+        created_after: typing.Optional[dt.datetime] = None,
+        created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         expand: typing.Optional[typing.Literal["company"]] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_shell_data: typing.Optional[bool] = None,
+        modified_after: typing.Optional[dt.datetime] = None,
+        modified_before: typing.Optional[dt.datetime] = None,
         page_size: typing.Optional[int] = None,
+        remote_id: typing.Optional[str] = None,
         request_options: typing.Optional[RequestOptions] = None,
     ) -> AsyncHttpResponse[PaginatedEmployeeList]:
         """
@@ -166,6 +204,15 @@ class AsyncRawEmployeesClient:
 
         Parameters
         ----------
+        company_id : typing.Optional[str]
+            If provided, will only return employees for this company.
+
+        created_after : typing.Optional[dt.datetime]
+            If provided, will only return objects created after this datetime.
+
+        created_before : typing.Optional[dt.datetime]
+            If provided, will only return objects created before this datetime.
+
         cursor : typing.Optional[str]
             The pagination cursor value.
 
@@ -181,9 +228,18 @@ class AsyncRawEmployeesClient:
         include_shell_data : typing.Optional[bool]
             Whether to include shell records. Shell records are empty records (they may contain some metadata but all other fields are null).
 
+        modified_after : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge after this date time will be returned.
+
+        modified_before : typing.Optional[dt.datetime]
+            If provided, only objects synced by Merge before this date time will be returned.
+
         page_size : typing.Optional[int]
             Number of results to return per page.
 
+        remote_id : typing.Optional[str]
+            The API provider's ID for the given object.
+
         request_options : typing.Optional[RequestOptions]
             Request-specific configuration.
 
@@ -196,12 +252,18 @@ class AsyncRawEmployeesClient:
             "accounting/v1/employees",
             method="GET",
             params={
+                "company_id": company_id,
+                "created_after": serialize_datetime(created_after) if created_after is not None else None,
+                "created_before": serialize_datetime(created_before) if created_before is not None else None,
                 "cursor": cursor,
                 "expand": expand,
                 "include_deleted_data": include_deleted_data,
                 "include_remote_data": include_remote_data,
                 "include_shell_data": include_shell_data,
+                "modified_after": serialize_datetime(modified_after) if modified_after is not None else None,
+                "modified_before": serialize_datetime(modified_before) if modified_before is not None else None,
                 "page_size": page_size,
+                "remote_id": remote_id,
             },
             request_options=request_options,
         )

merge/resources/accounting/resources/expense_reports/__init__.py

@@ -0,0 +1,15 @@
+# This file was auto-generated by Fern from our API Definition.
+
+# isort: skip_file
+
+from .types import (
+    ExpenseReportsLinesListRequestExpand,
+    ExpenseReportsListRequestExpand,
+    ExpenseReportsRetrieveRequestExpand,
+)
+
+__all__ = [
+    "ExpenseReportsLinesListRequestExpand",
+    "ExpenseReportsListRequestExpand",
+    "ExpenseReportsRetrieveRequestExpand",
+]