mergepythonclient 2.6.3__py3-none-any.whl → 3.0.0a1__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, filestorage, hris, knowledgebase, ticketing
+    from .resources import accounting, ats, chat, crm, email, filestorage, hris, knowledgebase, ticketing
     from .client import AsyncMerge, Merge
     from .environment import MergeEnvironment
     from .version import __version__
@@ -19,6 +19,7 @@ _dynamic_imports: typing.Dict[str, str] = {
     "ats": ".resources",
     "chat": ".resources",
     "crm": ".resources",
+    "email": ".resources",
     "filestorage": ".resources",
     "hris": ".resources",
     "knowledgebase": ".resources",
@@ -54,6 +55,7 @@ __all__ = [
     "ats",
     "chat",
     "crm",
+    "email",
     "filestorage",
     "hris",
     "knowledgebase",

merge/client.py

@@ -13,6 +13,7 @@ if typing.TYPE_CHECKING:
     from .resources.ats.client import AsyncAtsClient, AtsClient
     from .resources.chat.client import AsyncChatClient, ChatClient
     from .resources.crm.client import AsyncCrmClient, CrmClient
+    from .resources.email.client import AsyncEmailClient, EmailClient
     from .resources.filestorage.client import AsyncFilestorageClient, FilestorageClient
     from .resources.hris.client import AsyncHrisClient, HrisClient
     from .resources.knowledgebase.client import AsyncKnowledgebaseClient, KnowledgebaseClient
@@ -88,22 +89,15 @@ class Merge:
             else httpx.Client(timeout=_defaulted_timeout),
             timeout=_defaulted_timeout,
         )
-        self._chat: typing.Optional[ChatClient] = None
         self._ats: typing.Optional[AtsClient] = None
+        self._accounting: typing.Optional[AccountingClient] = None
         self._crm: typing.Optional[CrmClient] = None
         self._hris: typing.Optional[HrisClient] = None
-        self._knowledgebase: typing.Optional[KnowledgebaseClient] = None
         self._ticketing: typing.Optional[TicketingClient] = None
+        self._chat: typing.Optional[ChatClient] = None
+        self._email: typing.Optional[EmailClient] = None
         self._filestorage: typing.Optional[FilestorageClient] = None
-        self._accounting: typing.Optional[AccountingClient] = None
-
-    @property
-    def chat(self):
-        if self._chat is None:
-            from .resources.chat.client import ChatClient  # noqa: E402
-
-            self._chat = ChatClient(client_wrapper=self._client_wrapper)
-        return self._chat
+        self._knowledgebase: typing.Optional[KnowledgebaseClient] = None
 
     @property
     def ats(self):
@@ -113,6 +107,14 @@ class Merge:
             self._ats = AtsClient(client_wrapper=self._client_wrapper)
         return self._ats
 
+    @property
+    def accounting(self):
+        if self._accounting is None:
+            from .resources.accounting.client import AccountingClient  # noqa: E402
+
+            self._accounting = AccountingClient(client_wrapper=self._client_wrapper)
+        return self._accounting
+
     @property
     def crm(self):
         if self._crm is None:
@@ -129,14 +131,6 @@ class Merge:
             self._hris = HrisClient(client_wrapper=self._client_wrapper)
         return self._hris
 
-    @property
-    def knowledgebase(self):
-        if self._knowledgebase is None:
-            from .resources.knowledgebase.client import KnowledgebaseClient  # noqa: E402
-
-            self._knowledgebase = KnowledgebaseClient(client_wrapper=self._client_wrapper)
-        return self._knowledgebase
-
     @property
     def ticketing(self):
         if self._ticketing is None:
@@ -145,6 +139,22 @@ class Merge:
             self._ticketing = TicketingClient(client_wrapper=self._client_wrapper)
         return self._ticketing
 
+    @property
+    def chat(self):
+        if self._chat is None:
+            from .resources.chat.client import ChatClient  # noqa: E402
+
+            self._chat = ChatClient(client_wrapper=self._client_wrapper)
+        return self._chat
+
+    @property
+    def email(self):
+        if self._email is None:
+            from .resources.email.client import EmailClient  # noqa: E402
+
+            self._email = EmailClient(client_wrapper=self._client_wrapper)
+        return self._email
+
     @property
     def filestorage(self):
         if self._filestorage is None:
@@ -154,12 +164,12 @@ class Merge:
         return self._filestorage
 
     @property
-    def accounting(self):
-        if self._accounting is None:
-            from .resources.accounting.client import AccountingClient  # noqa: E402
+    def knowledgebase(self):
+        if self._knowledgebase is None:
+            from .resources.knowledgebase.client import KnowledgebaseClient  # noqa: E402
 
-            self._accounting = AccountingClient(client_wrapper=self._client_wrapper)
-        return self._accounting
+            self._knowledgebase = KnowledgebaseClient(client_wrapper=self._client_wrapper)
+        return self._knowledgebase
 
 
 class AsyncMerge:
@@ -231,22 +241,15 @@ class AsyncMerge:
             else httpx.AsyncClient(timeout=_defaulted_timeout),
             timeout=_defaulted_timeout,
         )
-        self._chat: typing.Optional[AsyncChatClient] = None
         self._ats: typing.Optional[AsyncAtsClient] = None
+        self._accounting: typing.Optional[AsyncAccountingClient] = None
         self._crm: typing.Optional[AsyncCrmClient] = None
         self._hris: typing.Optional[AsyncHrisClient] = None
-        self._knowledgebase: typing.Optional[AsyncKnowledgebaseClient] = None
         self._ticketing: typing.Optional[AsyncTicketingClient] = None
+        self._chat: typing.Optional[AsyncChatClient] = None
+        self._email: typing.Optional[AsyncEmailClient] = None
         self._filestorage: typing.Optional[AsyncFilestorageClient] = None
-        self._accounting: typing.Optional[AsyncAccountingClient] = None
-
-    @property
-    def chat(self):
-        if self._chat is None:
-            from .resources.chat.client import AsyncChatClient  # noqa: E402
-
-            self._chat = AsyncChatClient(client_wrapper=self._client_wrapper)
-        return self._chat
+        self._knowledgebase: typing.Optional[AsyncKnowledgebaseClient] = None
 
     @property
     def ats(self):
@@ -256,6 +259,14 @@ class AsyncMerge:
             self._ats = AsyncAtsClient(client_wrapper=self._client_wrapper)
         return self._ats
 
+    @property
+    def accounting(self):
+        if self._accounting is None:
+            from .resources.accounting.client import AsyncAccountingClient  # noqa: E402
+
+            self._accounting = AsyncAccountingClient(client_wrapper=self._client_wrapper)
+        return self._accounting
+
     @property
     def crm(self):
         if self._crm is None:
@@ -272,14 +283,6 @@ class AsyncMerge:
             self._hris = AsyncHrisClient(client_wrapper=self._client_wrapper)
         return self._hris
 
-    @property
-    def knowledgebase(self):
-        if self._knowledgebase is None:
-            from .resources.knowledgebase.client import AsyncKnowledgebaseClient  # noqa: E402
-
-            self._knowledgebase = AsyncKnowledgebaseClient(client_wrapper=self._client_wrapper)
-        return self._knowledgebase
-
     @property
     def ticketing(self):
         if self._ticketing is None:
@@ -288,6 +291,22 @@ class AsyncMerge:
             self._ticketing = AsyncTicketingClient(client_wrapper=self._client_wrapper)
         return self._ticketing
 
+    @property
+    def chat(self):
+        if self._chat is None:
+            from .resources.chat.client import AsyncChatClient  # noqa: E402
+
+            self._chat = AsyncChatClient(client_wrapper=self._client_wrapper)
+        return self._chat
+
+    @property
+    def email(self):
+        if self._email is None:
+            from .resources.email.client import AsyncEmailClient  # noqa: E402
+
+            self._email = AsyncEmailClient(client_wrapper=self._client_wrapper)
+        return self._email
+
     @property
     def filestorage(self):
         if self._filestorage is None:
@@ -297,12 +316,12 @@ class AsyncMerge:
         return self._filestorage
 
     @property
-    def accounting(self):
-        if self._accounting is None:
-            from .resources.accounting.client import AsyncAccountingClient  # noqa: E402
+    def knowledgebase(self):
+        if self._knowledgebase is None:
+            from .resources.knowledgebase.client import AsyncKnowledgebaseClient  # noqa: E402
 
-            self._accounting = AsyncAccountingClient(client_wrapper=self._client_wrapper)
-        return self._accounting
+            self._knowledgebase = AsyncKnowledgebaseClient(client_wrapper=self._client_wrapper)
+        return self._knowledgebase
 
 
 def _get_base_url(*, base_url: typing.Optional[str] = None, environment: MergeEnvironment) -> str:

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

merge/core/query_encoder.py

@@ -30,7 +30,10 @@ def single_query_encoder(query_key: str, query_value: Any) -> List[Tuple[str, An
         else:
             obj_dict = query_value
         return traverse_query_dict(obj_dict, query_key)
-    elif isinstance(query_value, list):
+    elif isinstance(query_value, (list, tuple)):
+        if query_key == "expand" and query_value and all(isinstance(v, str) for v in query_value):
+            return [(query_key, ",".join(query_value))]
+
         encoded_values: List[Tuple[str, Any]] = []
         for value in query_value:
             if isinstance(value, pydantic.BaseModel) or isinstance(value, dict):

merge/environment.py

@@ -5,5 +5,5 @@ import enum
 
 class MergeEnvironment(enum.Enum):
     PRODUCTION = "https://api.merge.dev/api"
-    SANDBOX = "https://api-sandbox.merge.dev/api"
     PRODUCTION_EU = "https://api-eu.merge.dev/api"
+    SANDBOX = "https://api-sandbox.merge.dev/api"

merge/resources/__init__.py

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