mergepythonclient 2.3.1__py3-none-any.whl → 2.4.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, crm, filestorage, hris, ticketing
+    from .resources import accounting, ats, crm, filestorage, hris, knowledgebase, ticketing
     from .client import AsyncMerge, Merge
     from .environment import MergeEnvironment
     from .version import __version__
@@ -20,6 +20,7 @@ _dynamic_imports: typing.Dict[str, str] = {
     "crm": ".resources",
     "filestorage": ".resources",
     "hris": ".resources",
+    "knowledgebase": ".resources",
     "ticketing": ".resources",
 }
 
@@ -53,5 +54,6 @@ __all__ = [
     "crm",
     "filestorage",
     "hris",
+    "knowledgebase",
     "ticketing",
 ]

merge/client.py

@@ -14,6 +14,7 @@ if typing.TYPE_CHECKING:
     from .resources.crm.client import AsyncCrmClient, CrmClient
     from .resources.filestorage.client import AsyncFilestorageClient, FilestorageClient
     from .resources.hris.client import AsyncHrisClient, HrisClient
+    from .resources.knowledgebase.client import AsyncKnowledgebaseClient, KnowledgebaseClient
     from .resources.ticketing.client import AsyncTicketingClient, TicketingClient
 
 
@@ -87,8 +88,9 @@ class Merge:
             timeout=_defaulted_timeout,
         )
         self._ats: typing.Optional[AtsClient] = None
-        self._crm: typing.Optional[CrmClient] = None
         self._filestorage: typing.Optional[FilestorageClient] = None
+        self._crm: typing.Optional[CrmClient] = None
+        self._knowledgebase: typing.Optional[KnowledgebaseClient] = None
         self._hris: typing.Optional[HrisClient] = None
         self._ticketing: typing.Optional[TicketingClient] = None
         self._accounting: typing.Optional[AccountingClient] = None
@@ -101,6 +103,14 @@ class Merge:
             self._ats = AtsClient(client_wrapper=self._client_wrapper)
         return self._ats
 
+    @property
+    def filestorage(self):
+        if self._filestorage is None:
+            from .resources.filestorage.client import FilestorageClient  # noqa: E402
+
+            self._filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
+        return self._filestorage
+
     @property
     def crm(self):
         if self._crm is None:
@@ -110,12 +120,12 @@ class Merge:
         return self._crm
 
     @property
-    def filestorage(self):
-        if self._filestorage is None:
-            from .resources.filestorage.client import FilestorageClient  # noqa: E402
+    def knowledgebase(self):
+        if self._knowledgebase is None:
+            from .resources.knowledgebase.client import KnowledgebaseClient  # noqa: E402
 
-            self._filestorage = FilestorageClient(client_wrapper=self._client_wrapper)
-        return self._filestorage
+            self._knowledgebase = KnowledgebaseClient(client_wrapper=self._client_wrapper)
+        return self._knowledgebase
 
     @property
     def hris(self):
@@ -212,8 +222,9 @@ class AsyncMerge:
             timeout=_defaulted_timeout,
         )
         self._ats: typing.Optional[AsyncAtsClient] = None
-        self._crm: typing.Optional[AsyncCrmClient] = None
         self._filestorage: typing.Optional[AsyncFilestorageClient] = None
+        self._crm: typing.Optional[AsyncCrmClient] = None
+        self._knowledgebase: typing.Optional[AsyncKnowledgebaseClient] = None
         self._hris: typing.Optional[AsyncHrisClient] = None
         self._ticketing: typing.Optional[AsyncTicketingClient] = None
         self._accounting: typing.Optional[AsyncAccountingClient] = None
@@ -226,6 +237,14 @@ class AsyncMerge:
             self._ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
         return self._ats
 
+    @property
+    def filestorage(self):
+        if self._filestorage is None:
+            from .resources.filestorage.client import AsyncFilestorageClient  # noqa: E402
+
+            self._filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
+        return self._filestorage
+
     @property
     def crm(self):
         if self._crm is None:
@@ -235,12 +254,12 @@ class AsyncMerge:
         return self._crm
 
     @property
-    def filestorage(self):
-        if self._filestorage is None:
-            from .resources.filestorage.client import AsyncFilestorageClient  # noqa: E402
+    def knowledgebase(self):
+        if self._knowledgebase is None:
+            from .resources.knowledgebase.client import AsyncKnowledgebaseClient  # noqa: E402
 
-            self._filestorage = AsyncFilestorageClient(client_wrapper=self._client_wrapper)
-        return self._filestorage
+            self._knowledgebase = AsyncKnowledgebaseClient(client_wrapper=self._client_wrapper)
+        return self._knowledgebase
 
     @property
     def hris(self):

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

merge/resources/__init__.py

@@ -6,13 +6,14 @@ import typing
 from importlib import import_module
 
 if typing.TYPE_CHECKING:
-    from . import accounting, ats, crm, filestorage, hris, ticketing
+    from . import accounting, ats, crm, filestorage, hris, knowledgebase, ticketing
 _dynamic_imports: typing.Dict[str, str] = {
     "accounting": ".",
     "ats": ".",
     "crm": ".",
     "filestorage": ".",
     "hris": ".",
+    "knowledgebase": ".",
     "ticketing": ".",
 }
 
@@ -36,4 +37,4 @@ def __dir__():
     return sorted(lazy_attrs)
 
 
-__all__ = ["accounting", "ats", "crm", "filestorage", "hris", "ticketing"]
+__all__ = ["accounting", "ats", "crm", "filestorage", "hris", "knowledgebase", "ticketing"]

merge/resources/accounting/client.py

@@ -174,6 +174,10 @@ class AccountingClient:
     @property
     def async_passthrough(self):
         if self._async_passthrough is None:
+            from .resources.async_passthrough.client import (
+                AsyncPassthroughClient as resources_accounting_resources_async_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
+
             self._async_passthrough = resources_accounting_resources_async_passthrough_client_AsyncPassthroughClient(
                 client_wrapper=self._client_wrapper
             )
@@ -834,9 +838,13 @@ class AsyncAccountingClient:
     @property
     def passthrough(self):
         if self._passthrough is None:
-            from .resources.passthrough.client import AsyncPassthroughClient  # noqa: E402
+            from .resources.passthrough.client import (
+                AsyncPassthroughClient as resources_accounting_resources_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
 
-            self._passthrough = AsyncPassthroughClient(client_wrapper=self._client_wrapper)
+            self._passthrough = resources_accounting_resources_passthrough_client_AsyncPassthroughClient(
+                client_wrapper=self._client_wrapper
+            )
         return self._passthrough
 
     @property

merge/resources/ats/client.py

@@ -135,6 +135,10 @@ class AtsClient:
     @property
     def async_passthrough(self):
         if self._async_passthrough is None:
+            from .resources.async_passthrough.client import (
+                AsyncPassthroughClient as resources_ats_resources_async_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
+
             self._async_passthrough = resources_ats_resources_async_passthrough_client_AsyncPassthroughClient(
                 client_wrapper=self._client_wrapper
             )
@@ -609,9 +613,13 @@ class AsyncAtsClient:
     @property
     def passthrough(self):
         if self._passthrough is None:
-            from .resources.passthrough.client import AsyncPassthroughClient  # noqa: E402
+            from .resources.passthrough.client import (
+                AsyncPassthroughClient as resources_ats_resources_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
 
-            self._passthrough = AsyncPassthroughClient(client_wrapper=self._client_wrapper)
+            self._passthrough = resources_ats_resources_passthrough_client_AsyncPassthroughClient(
+                client_wrapper=self._client_wrapper
+            )
         return self._passthrough
 
     @property

merge/resources/crm/client.py

@@ -123,6 +123,10 @@ class CrmClient:
     @property
     def async_passthrough(self):
         if self._async_passthrough is None:
+            from .resources.async_passthrough.client import (
+                AsyncPassthroughClient as resources_crm_resources_async_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
+
             self._async_passthrough = resources_crm_resources_async_passthrough_client_AsyncPassthroughClient(
                 client_wrapper=self._client_wrapper
             )
@@ -579,9 +583,13 @@ class AsyncCrmClient:
     @property
     def passthrough(self):
         if self._passthrough is None:
-            from .resources.passthrough.client import AsyncPassthroughClient  # noqa: E402
+            from .resources.passthrough.client import (
+                AsyncPassthroughClient as resources_crm_resources_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
 
-            self._passthrough = AsyncPassthroughClient(client_wrapper=self._client_wrapper)
+            self._passthrough = resources_crm_resources_passthrough_client_AsyncPassthroughClient(
+                client_wrapper=self._client_wrapper
+            )
         return self._passthrough
 
     @property

merge/resources/filestorage/client.py

@@ -97,6 +97,10 @@ class FilestorageClient:
     @property
     def async_passthrough(self):
         if self._async_passthrough is None:
+            from .resources.async_passthrough.client import (
+                AsyncPassthroughClient as resources_filestorage_resources_async_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
+
             self._async_passthrough = resources_filestorage_resources_async_passthrough_client_AsyncPassthroughClient(
                 client_wrapper=self._client_wrapper
             )
@@ -426,9 +430,13 @@ class AsyncFilestorageClient:
     @property
     def passthrough(self):
         if self._passthrough is None:
-            from .resources.passthrough.client import AsyncPassthroughClient  # noqa: E402
+            from .resources.passthrough.client import (
+                AsyncPassthroughClient as resources_filestorage_resources_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
 
-            self._passthrough = AsyncPassthroughClient(client_wrapper=self._client_wrapper)
+            self._passthrough = resources_filestorage_resources_passthrough_client_AsyncPassthroughClient(
+                client_wrapper=self._client_wrapper
+            )
         return self._passthrough
 
     @property

merge/resources/hris/client.py

@@ -119,6 +119,10 @@ class HrisClient:
     @property
     def async_passthrough(self):
         if self._async_passthrough is None:
+            from .resources.async_passthrough.client import (
+                AsyncPassthroughClient as resources_hris_resources_async_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
+
             self._async_passthrough = resources_hris_resources_async_passthrough_client_AsyncPassthroughClient(
                 client_wrapper=self._client_wrapper
             )
@@ -593,9 +597,13 @@ class AsyncHrisClient:
     @property
     def passthrough(self):
         if self._passthrough is None:
-            from .resources.passthrough.client import AsyncPassthroughClient  # noqa: E402
+            from .resources.passthrough.client import (
+                AsyncPassthroughClient as resources_hris_resources_passthrough_client_AsyncPassthroughClient,  # noqa: E402
+            )
 
-            self._passthrough = AsyncPassthroughClient(client_wrapper=self._client_wrapper)
+            self._passthrough = resources_hris_resources_passthrough_client_AsyncPassthroughClient(
+                client_wrapper=self._client_wrapper
+            )
         return self._passthrough
 
     @property

merge/resources/hris/resources/dependents/client.py

@@ -31,6 +31,7 @@ class DependentsClient:
         created_after: typing.Optional[dt.datetime] = None,
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
+        employee_id: typing.Optional[str] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_sensitive_fields: typing.Optional[bool] = None,
@@ -55,6 +56,9 @@ class DependentsClient:
         cursor : typing.Optional[str]
             The pagination cursor value.
 
+        employee_id : typing.Optional[str]
+            If provided, will only return dependents for this employee.
+
         include_deleted_data : typing.Optional[bool]
             Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
 
@@ -103,6 +107,7 @@ class DependentsClient:
             created_after=created_after,
             created_before=created_before,
             cursor=cursor,
+            employee_id=employee_id,
             include_deleted_data=include_deleted_data,
             include_remote_data=include_remote_data,
             include_sensitive_fields=include_sensitive_fields,
@@ -191,6 +196,7 @@ class AsyncDependentsClient:
         created_after: typing.Optional[dt.datetime] = None,
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
+        employee_id: typing.Optional[str] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_sensitive_fields: typing.Optional[bool] = None,
@@ -215,6 +221,9 @@ class AsyncDependentsClient:
         cursor : typing.Optional[str]
             The pagination cursor value.
 
+        employee_id : typing.Optional[str]
+            If provided, will only return dependents for this employee.
+
         include_deleted_data : typing.Optional[bool]
             Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
 
@@ -271,6 +280,7 @@ class AsyncDependentsClient:
             created_after=created_after,
             created_before=created_before,
             cursor=cursor,
+            employee_id=employee_id,
             include_deleted_data=include_deleted_data,
             include_remote_data=include_remote_data,
             include_sensitive_fields=include_sensitive_fields,

merge/resources/hris/resources/dependents/raw_client.py

@@ -25,6 +25,7 @@ class RawDependentsClient:
         created_after: typing.Optional[dt.datetime] = None,
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
+        employee_id: typing.Optional[str] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_sensitive_fields: typing.Optional[bool] = None,
@@ -49,6 +50,9 @@ class RawDependentsClient:
         cursor : typing.Optional[str]
             The pagination cursor value.
 
+        employee_id : typing.Optional[str]
+            If provided, will only return dependents for this employee.
+
         include_deleted_data : typing.Optional[bool]
             Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
 
@@ -88,6 +92,7 @@ class RawDependentsClient:
                 "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,
+                "employee_id": employee_id,
                 "include_deleted_data": include_deleted_data,
                 "include_remote_data": include_remote_data,
                 "include_sensitive_fields": include_sensitive_fields,
@@ -183,6 +188,7 @@ class AsyncRawDependentsClient:
         created_after: typing.Optional[dt.datetime] = None,
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
+        employee_id: typing.Optional[str] = None,
         include_deleted_data: typing.Optional[bool] = None,
         include_remote_data: typing.Optional[bool] = None,
         include_sensitive_fields: typing.Optional[bool] = None,
@@ -207,6 +213,9 @@ class AsyncRawDependentsClient:
         cursor : typing.Optional[str]
             The pagination cursor value.
 
+        employee_id : typing.Optional[str]
+            If provided, will only return dependents for this employee.
+
         include_deleted_data : typing.Optional[bool]
             Indicates whether or not this object has been deleted in the third party platform. Full coverage deletion detection is a premium add-on. Native deletion detection is offered for free with limited coverage. [Learn more](https://docs.merge.dev/integrations/hris/supported-features/).
 
@@ -246,6 +255,7 @@ class AsyncRawDependentsClient:
                 "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,
+                "employee_id": employee_id,
                 "include_deleted_data": include_deleted_data,
                 "include_remote_data": include_remote_data,
                 "include_sensitive_fields": include_sensitive_fields,

merge/resources/hris/resources/employees/client.py

@@ -47,6 +47,7 @@ class EmployeesClient:
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         display_full_name: typing.Optional[str] = None,
+        employee_number: typing.Optional[str] = None,
         employment_status: typing.Optional[EmployeesListRequestEmploymentStatus] = None,
         employment_type: typing.Optional[str] = None,
         expand: typing.Optional[EmployeesListRequestExpand] = None,
@@ -97,6 +98,9 @@ class EmployeesClient:
         display_full_name : typing.Optional[str]
             If provided, will only return employees with this display name.
 
+        employee_number : typing.Optional[str]
+            If provided, will only return employees with this employee number.
+
         employment_status : typing.Optional[EmployeesListRequestEmploymentStatus]
             If provided, will only return employees with this employment status.
 
@@ -211,6 +215,7 @@ class EmployeesClient:
             created_before=created_before,
             cursor=cursor,
             display_full_name=display_full_name,
+            employee_number=employee_number,
             employment_status=employment_status,
             employment_type=employment_type,
             expand=expand,
@@ -455,6 +460,7 @@ class AsyncEmployeesClient:
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         display_full_name: typing.Optional[str] = None,
+        employee_number: typing.Optional[str] = None,
         employment_status: typing.Optional[EmployeesListRequestEmploymentStatus] = None,
         employment_type: typing.Optional[str] = None,
         expand: typing.Optional[EmployeesListRequestExpand] = None,
@@ -505,6 +511,9 @@ class AsyncEmployeesClient:
         display_full_name : typing.Optional[str]
             If provided, will only return employees with this display name.
 
+        employee_number : typing.Optional[str]
+            If provided, will only return employees with this employee number.
+
         employment_status : typing.Optional[EmployeesListRequestEmploymentStatus]
             If provided, will only return employees with this employment status.
 
@@ -627,6 +636,7 @@ class AsyncEmployeesClient:
             created_before=created_before,
             cursor=cursor,
             display_full_name=display_full_name,
+            employee_number=employee_number,
             employment_status=employment_status,
             employment_type=employment_type,
             expand=expand,

merge/resources/hris/resources/employees/raw_client.py

@@ -41,6 +41,7 @@ class RawEmployeesClient:
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         display_full_name: typing.Optional[str] = None,
+        employee_number: typing.Optional[str] = None,
         employment_status: typing.Optional[EmployeesListRequestEmploymentStatus] = None,
         employment_type: typing.Optional[str] = None,
         expand: typing.Optional[EmployeesListRequestExpand] = None,
@@ -91,6 +92,9 @@ class RawEmployeesClient:
         display_full_name : typing.Optional[str]
             If provided, will only return employees with this display name.
 
+        employee_number : typing.Optional[str]
+            If provided, will only return employees with this employee number.
+
         employment_status : typing.Optional[EmployeesListRequestEmploymentStatus]
             If provided, will only return employees with this employment status.
 
@@ -196,6 +200,7 @@ class RawEmployeesClient:
                 "created_before": serialize_datetime(created_before) if created_before is not None else None,
                 "cursor": cursor,
                 "display_full_name": display_full_name,
+                "employee_number": employee_number,
                 "employment_status": employment_status,
                 "employment_type": employment_type,
                 "expand": expand,
@@ -471,6 +476,7 @@ class AsyncRawEmployeesClient:
         created_before: typing.Optional[dt.datetime] = None,
         cursor: typing.Optional[str] = None,
         display_full_name: typing.Optional[str] = None,
+        employee_number: typing.Optional[str] = None,
         employment_status: typing.Optional[EmployeesListRequestEmploymentStatus] = None,
         employment_type: typing.Optional[str] = None,
         expand: typing.Optional[EmployeesListRequestExpand] = None,
@@ -521,6 +527,9 @@ class AsyncRawEmployeesClient:
         display_full_name : typing.Optional[str]
             If provided, will only return employees with this display name.
 
+        employee_number : typing.Optional[str]
+            If provided, will only return employees with this employee number.
+
         employment_status : typing.Optional[EmployeesListRequestEmploymentStatus]
             If provided, will only return employees with this employment status.
 
@@ -626,6 +635,7 @@ class AsyncRawEmployeesClient:
                 "created_before": serialize_datetime(created_before) if created_before is not None else None,
                 "cursor": cursor,
                 "display_full_name": display_full_name,
+                "employee_number": employee_number,
                 "employment_status": employment_status,
                 "employment_type": employment_type,
                 "expand": expand,