mergepythonclient 3.0.0a1__py3-none-any.whl → 3.1.0__py3-none-any.whl

merge/__init__.py

@@ -6,7 +6,7 @@ import typing
 from importlib import import_module
 
 if typing.TYPE_CHECKING:
-    from .resources import accounting, ats, chat, crm, email, filestorage, hris, knowledgebase, ticketing
+    from .resources import accounting, ats, calendar, chat, crm, email, filestorage, hris, knowledgebase, ticketing
     from .client import AsyncMerge, Merge
     from .environment import MergeEnvironment
     from .version import __version__
@@ -17,6 +17,7 @@ _dynamic_imports: typing.Dict[str, str] = {
     "__version__": ".version",
     "accounting": ".resources",
     "ats": ".resources",
+    "calendar": ".resources",
     "chat": ".resources",
     "crm": ".resources",
     "email": ".resources",
@@ -53,6 +54,7 @@ __all__ = [
     "__version__",
     "accounting",
     "ats",
+    "calendar",
     "chat",
     "crm",
     "email",

merge/client.py

@@ -11,6 +11,7 @@ from .environment import MergeEnvironment
 if typing.TYPE_CHECKING:
     from .resources.accounting.client import AccountingClient, AsyncAccountingClient
     from .resources.ats.client import AsyncAtsClient, AtsClient
+    from .resources.calendar.client import AsyncCalendarClient, CalendarClient
     from .resources.chat.client import AsyncChatClient, ChatClient
     from .resources.crm.client import AsyncCrmClient, CrmClient
     from .resources.email.client import AsyncEmailClient, EmailClient
@@ -94,6 +95,7 @@ class Merge:
         self._crm: typing.Optional[CrmClient] = None
         self._hris: typing.Optional[HrisClient] = None
         self._ticketing: typing.Optional[TicketingClient] = None
+        self._calendar: typing.Optional[CalendarClient] = None
         self._chat: typing.Optional[ChatClient] = None
         self._email: typing.Optional[EmailClient] = None
         self._filestorage: typing.Optional[FilestorageClient] = None
@@ -139,6 +141,14 @@ class Merge:
             self._ticketing = TicketingClient(client_wrapper=self._client_wrapper)
         return self._ticketing
 
+    @property
+    def calendar(self):
+        if self._calendar is None:
+            from .resources.calendar.client import CalendarClient  # noqa: E402
+
+            self._calendar = CalendarClient(client_wrapper=self._client_wrapper)
+        return self._calendar
+
     @property
     def chat(self):
         if self._chat is None:
@@ -246,6 +256,7 @@ class AsyncMerge:
         self._crm: typing.Optional[AsyncCrmClient] = None
         self._hris: typing.Optional[AsyncHrisClient] = None
         self._ticketing: typing.Optional[AsyncTicketingClient] = None
+        self._calendar: typing.Optional[AsyncCalendarClient] = None
         self._chat: typing.Optional[AsyncChatClient] = None
         self._email: typing.Optional[AsyncEmailClient] = None
         self._filestorage: typing.Optional[AsyncFilestorageClient] = None
@@ -291,6 +302,14 @@ class AsyncMerge:
             self._ticketing = AsyncTicketingClient(client_wrapper=self._client_wrapper)
         return self._ticketing
 
+    @property
+    def calendar(self):
+        if self._calendar is None:
+            from .resources.calendar.client import AsyncCalendarClient  # noqa: E402
+
+            self._calendar = AsyncCalendarClient(client_wrapper=self._client_wrapper)
+        return self._calendar
+
     @property
     def chat(self):
         if self._chat is None:

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/3.0.0a1",
+            "User-Agent": "MergePythonClient/3.1.0",
             "X-Fern-Language": "Python",
             "X-Fern-SDK-Name": "MergePythonClient",
-            "X-Fern-SDK-Version": "3.0.0a1",
+            "X-Fern-SDK-Version": "3.1.0",
             **(self.get_custom_headers() or {}),
         }
         if self._account_token is not None:

merge/resources/__init__.py

@@ -6,10 +6,11 @@ import typing
 from importlib import import_module
 
 if typing.TYPE_CHECKING:
-    from . import accounting, ats, chat, crm, email, filestorage, hris, knowledgebase, ticketing
+    from . import accounting, ats, calendar, chat, crm, email, filestorage, hris, knowledgebase, ticketing
 _dynamic_imports: typing.Dict[str, str] = {
     "accounting": ".",
     "ats": ".",
+    "calendar": ".",
     "chat": ".",
     "crm": ".",
     "email": ".",
@@ -39,4 +40,4 @@ def __dir__():
     return sorted(lazy_attrs)
 
 
-__all__ = ["accounting", "ats", "chat", "crm", "email", "filestorage", "hris", "knowledgebase", "ticketing"]
+__all__ = ["accounting", "ats", "calendar", "chat", "crm", "email", "filestorage", "hris", "knowledgebase", "ticketing"]

merge/resources/accounting/types/account.py

@@ -31,6 +31,11 @@ class Account(UncheckedBaseModel):
     Fetch from the `LIST Accounts` endpoint and view a company's accounts.
     """
 
+    account_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the account.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/account_details.py

@@ -30,6 +30,9 @@ class AccountDetails(UncheckedBaseModel):
     The time at which account completes the linking flow.
     """
 
+    instance_id: typing.Optional[str] = None
+    instance_display_value: typing.Optional[str] = None
+
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
     else:

merge/resources/accounting/types/account_request.py

@@ -29,6 +29,11 @@ class AccountRequest(UncheckedBaseModel):
     Fetch from the `LIST Accounts` endpoint and view a company's accounts.
     """
 
+    account_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the account.
+    """
+
     name: typing.Optional[str] = pydantic.Field(default=None)
     """
     The account's name.

merge/resources/accounting/types/accounting_period.py

@@ -20,6 +20,11 @@ class AccountingPeriod(UncheckedBaseModel):
     Common models like `Invoice` and `Transaction` will have `AccountingPeriod` objects which will denote when they occurred.
     """
 
+    accounting_period_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the accounting period.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/bank_feed_account.py

@@ -22,6 +22,11 @@ class BankFeedAccount(UncheckedBaseModel):
     Fetch from the `GET BankFeedAccount` endpoint to view details of a bank feed account.
     """
 
+    bank_feed_account_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the bank feed account.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/bank_feed_account_request.py

@@ -21,6 +21,11 @@ class BankFeedAccountRequest(UncheckedBaseModel):
     Fetch from the `GET BankFeedAccount` endpoint to view details of a bank feed account.
     """
 
+    bank_feed_account_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the bank feed account.
+    """
+
     source_account_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The unique identifier of the source account from our customer’s platform.

merge/resources/accounting/types/bank_feed_transaction.py

@@ -20,6 +20,11 @@ class BankFeedTransaction(UncheckedBaseModel):
     Fetch from the `GET BankFeedTransaction` endpoint to view details of a transaction associated with a bank feed account.
     """
 
+    bank_feed_transaction_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the bank feed transaction.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/company_info.py

@@ -22,6 +22,11 @@ class CompanyInfo(UncheckedBaseModel):
     Fetch from the `GET CompanyInfo` endpoint and view a company's information.
     """
 
+    company_info_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the company info.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/contact.py

@@ -26,6 +26,11 @@ class Contact(UncheckedBaseModel):
     Fetch from the `LIST Contacts` endpoint and view a company's contacts.
     """
 
+    contact_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the contact.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/contact_request.py

@@ -24,6 +24,11 @@ class ContactRequest(UncheckedBaseModel):
     Fetch from the `LIST Contacts` endpoint and view a company's contacts.
     """
 
+    contact_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the contact.
+    """
+
     name: typing.Optional[str] = pydantic.Field(default=None)
     """
     The contact's name.

merge/resources/accounting/types/credit_note.py

@@ -30,6 +30,11 @@ class CreditNote(UncheckedBaseModel):
     Fetch from the `LIST CreditNotes` endpoint and view a company's credit notes.
     """
 
+    credit_note_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the credit note.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/employee.py

@@ -23,6 +23,11 @@ class Employee(UncheckedBaseModel):
     Fetch from the `LIST Employees` endpoint and view a company's employees.
     """
 
+    employee_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the employee.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/expense_report.py

@@ -27,6 +27,11 @@ class ExpenseReport(UncheckedBaseModel):
     Fetch from the `GET ExpenseReport` endpoint to view details of expense reports and their line items.
     """
 
+    expense_report_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the expense report.
+    """
+
     id: typing.Optional[str] = None
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """

merge/resources/accounting/types/expense_report_request.py

@@ -25,6 +25,11 @@ class ExpenseReportRequest(UncheckedBaseModel):
     Fetch from the `GET ExpenseReport` endpoint to view details of expense reports and their line items.
     """
 
+    expense_report_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the expense report.
+    """
+
     report_date: typing.Optional[dt.datetime] = pydantic.Field(default=None)
     """
     The date of the expense report.

merge/resources/accounting/types/invoice.py

@@ -40,6 +40,11 @@ class Invoice(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    invoice_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the invoice.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/item.py

@@ -27,6 +27,11 @@ class Item(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    item_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the item.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/item_fulfillment.py

@@ -26,6 +26,11 @@ class ItemFulfillment(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    item_fulfillment_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the item fulfillment.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/journal_entry.py

@@ -33,6 +33,11 @@ class JournalEntry(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    journal_entry_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the journal entry.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/patched_contact_request.py

@@ -24,6 +24,11 @@ class PatchedContactRequest(UncheckedBaseModel):
     Fetch from the `LIST Contacts` endpoint and view a company's contacts.
     """
 
+    contact_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the contact.
+    """
+
     name: typing.Optional[str] = pydantic.Field(default=None)
     """
     The contact's name.

merge/resources/accounting/types/patched_payment_request.py

@@ -28,6 +28,11 @@ class PatchedPaymentRequest(UncheckedBaseModel):
     Fetch from the `GET Payment` endpoint and view an invoice's payment.
     """
 
+    payment_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the payment.
+    """
+
     transaction_date: typing.Optional[dt.datetime] = pydantic.Field(default=None)
     """
     The payment's transaction date.

merge/resources/accounting/types/patched_vendor_credit_request.py

@@ -367,6 +367,10 @@ class PatchedVendorCreditRequest(UncheckedBaseModel):
     tracking_categories: typing.Optional[typing.List[PatchedVendorCreditRequestTrackingCategoriesItem]] = None
     integration_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     linked_account_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    vendor_credit_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the vendor credit.
+    """
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/accounting/types/payment.py

@@ -30,6 +30,11 @@ class Payment(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    payment_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the payment.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/payment_method.py

@@ -21,6 +21,11 @@ class PaymentMethod(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    payment_method_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the payment method.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/payment_request.py

@@ -28,6 +28,11 @@ class PaymentRequest(UncheckedBaseModel):
     Fetch from the `GET Payment` endpoint and view an invoice's payment.
     """
 
+    payment_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the payment.
+    """
+
     transaction_date: typing.Optional[dt.datetime] = pydantic.Field(default=None)
     """
     The payment's transaction date.

merge/resources/accounting/types/payment_term.py

@@ -22,6 +22,11 @@ class PaymentTerm(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    payment_term_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the payment term.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/project.py

@@ -23,6 +23,11 @@ class Project(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    project_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the project.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/purchase_order.py

@@ -32,6 +32,11 @@ class PurchaseOrder(UncheckedBaseModel):
     """
 
     id: typing.Optional[str] = None
+    purchase_order_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the purchase order.
+    """
+
     remote_id: typing.Optional[str] = pydantic.Field(default=None)
     """
     The third-party API ID of the matching object.

merge/resources/accounting/types/sales_order.py

@@ -371,6 +371,11 @@ class SalesOrder(UncheckedBaseModel):
     The subsidiary associated with the order.
     """
 
+    sales_order_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the sales order.
+    """
+
     status: typing.Optional[SalesOrderStatus] = pydantic.Field(default=None)
     """
     The status of the sales order.

merge/resources/accounting/types/tracking_category.py

@@ -70,6 +70,10 @@ class TrackingCategory(UncheckedBaseModel):
     """
 
     field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    tracking_category_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the tracking category.
+    """
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/accounting/types/transaction.py

@@ -420,6 +420,10 @@ class Transaction(UncheckedBaseModel):
 
     field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     remote_data: typing.Optional[typing.List[RemoteData]] = None
+    transaction_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the transaction.
+    """
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/accounting/types/vendor_credit.py

@@ -411,6 +411,10 @@ class VendorCredit(UncheckedBaseModel):
 
     field_mappings: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     remote_data: typing.Optional[typing.List[RemoteData]] = None
+    vendor_credit_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the vendor credit.
+    """
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/accounting/types/vendor_credit_request.py

@@ -388,6 +388,10 @@ class VendorCreditRequest(UncheckedBaseModel):
 
     integration_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
     linked_account_params: typing.Optional[typing.Dict[str, typing.Optional[typing.Any]]] = None
+    vendor_credit_url: typing.Optional[str] = pydantic.Field(default=None)
+    """
+    The 3rd party URL of the vendor credit.
+    """
 
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2

merge/resources/ats/types/account_details.py

@@ -30,6 +30,9 @@ class AccountDetails(UncheckedBaseModel):
     The time at which account completes the linking flow.
     """
 
+    instance_id: typing.Optional[str] = None
+    instance_display_value: typing.Optional[str] = None
+
     if IS_PYDANTIC_V2:
         model_config: typing.ClassVar[pydantic.ConfigDict] = pydantic.ConfigDict(extra="allow", frozen=True)  # type: ignore # Pydantic v2
     else: