refactor: extract _build_multipart helper and fix json/data mutual exclusion in http clients

Author: drish

resend/contacts/imports/_contact_imports.py

@@ -90,21 +90,12 @@ class ListParams(TypedDict):
         Cursor for backward pagination (exclusive).
         """
 
-    @classmethod
-    def create(cls, params: CreateParams) -> CreateContactImportResponse:
-        """
-        Create a new contact import from a CSV file.
-        see more: https://resend.com/docs/api-reference/contacts/create-contact-import
-
-        Args:
-            params (CreateParams): Import parameters including the CSV file content.
-
-        Returns:
-            CreateContactImportResponse: The created import job with its ID.
-        """
+    @staticmethod
+    def _build_multipart(
+        params: "ContactImports.CreateParams",
+    ) -> tuple:
         if not params.get("file"):
             raise ValueError("file is required")
-
         filename = params.get("filename", "import.csv")
         files: Dict[str, Any] = {
             "file": (filename, params["file"], "text/csv"),
@@ -120,7 +111,21 @@ def create(cls, params: CreateParams) -> CreateContactImportResponse:
             )
         if "topics" in params:
             form_data["topics"] = json_lib.dumps(params["topics"])
+        return files, form_data
+
+    @classmethod
+    def create(cls, params: CreateParams) -> CreateContactImportResponse:
+        """
+        Create a new contact import from a CSV file.
+        see more: https://resend.com/docs/api-reference/contacts/create-contact-import
+
+        Args:
+            params (CreateParams): Import parameters including the CSV file content.
 
+        Returns:
+            CreateContactImportResponse: The created import job with its ID.
+        """
+        files, form_data = cls._build_multipart(params)
         resp = request.Request[ContactImports.CreateContactImportResponse](
             path="/contacts/imports",
             params={},
@@ -185,25 +190,7 @@ async def create_async(cls, params: CreateParams) -> CreateContactImportResponse
         Returns:
             CreateContactImportResponse: The created import job with its ID.
         """
-        if not params.get("file"):
-            raise ValueError("file is required")
-
-        filename = params.get("filename", "import.csv")
-        files: Dict[str, Any] = {
-            "file": (filename, params["file"], "text/csv"),
-        }
-        form_data: Dict[str, str] = {}
-        if "column_map" in params:
-            form_data["column_map"] = json_lib.dumps(params["column_map"])
-        if "on_conflict" in params:
-            form_data["on_conflict"] = params["on_conflict"]
-        if "segments" in params:
-            form_data["segments"] = json_lib.dumps(
-                [{"id": sid} for sid in params["segments"]]
-            )
-        if "topics" in params:
-            form_data["topics"] = json_lib.dumps(params["topics"])
-
+        files, form_data = cls._build_multipart(params)
         resp = await AsyncRequest[ContactImports.CreateContactImportResponse](
             path="/contacts/imports",
             params={},

resend/http_client_httpx.py

@@ -37,7 +37,7 @@ async def request(
                         method=method,
                         url=url,
                         headers=headers,
-                        json=json,
+                        json=json if data is None else None,
                         data=data,
                     )
                 return resp.content, resp.status_code, resp.headers

resend/http_client_requests.py

@@ -37,7 +37,7 @@ def request(
                     method=method,
                     url=url,
                     headers=headers,
-                    json=json,
+                    json=json if data is None else None,
                     data=data,
                     timeout=self._timeout,
                 )