Sync monorepo state at "Support data bulk upload of file to ExecuteMutator via S3 buckets" (#98)

Author: uc-build-user

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.6.1
+
+- Add SDK method for data import via ExecuteMutator
+
 ## 1.6.0 - 25-03-2025
 
 - Add methods to retrieve and set external OIDC issuers for a tenant

src/usercloudssdk/asyncclient.py

@@ -969,6 +969,23 @@ async def GetExternalOIDCIssuersAsync(self) -> list[str]:
     async def UpdateExternalOIDCIssuersAsync(self, issuers: list[str]) -> list[str]:
         return await self._put_async("/userstore/oidcissuers", json_data=issuers)
 
+    async def UploadDataImportFileAsync(
+        self, file_path: Path, import_type: str = "executemutator"
+    ) -> uuid.UUID:
+        json_data = await self._get_async(
+            f"/userstore/upload/dataimport?import_type={import_type}"
+        )
+        import_id = uuid.UUID(json_data["import_id"])
+        with open(file_path, "rb") as f:
+            resp = await self._client.put_async(json_data["presigned_url"], content=f)
+            if resp.status_code >= 400:
+                raise UserCloudsSDKError.from_response(resp)
+        return import_id
+
+    async def CheckDataImportStatusAsync(self, import_id: uuid.UUID) -> dict:
+        json_data = await self._get_async(f"/userstore/upload/dataimport/{import_id}")
+        return json_data
+
     # Access Token Helpers
 
     async def _get_access_token_async(self) -> str:

src/usercloudssdk/client.py

@@ -929,6 +929,21 @@ def GetExternalOIDCIssuers(self) -> list[str]:
     def UpdateExternalOIDCIssuers(self, issuers: list[str]) -> list[str]:
         return self._put("/userstore/oidcissuers", json_data=issuers)
 
+    def UploadDataImportFile(
+        self, file_path: Path, import_type: str = "executemutator"
+    ) -> uuid.UUID:
+        json_data = self._get(f"/userstore/upload/dataimport?import_type={import_type}")
+        import_id = uuid.UUID(json_data["import_id"])
+        with open(file_path, "rb") as f:
+            resp = self._client.put(json_data["presigned_url"], content=f)
+            if resp.status_code >= 400:
+                raise UserCloudsSDKError.from_response(resp)
+        return import_id
+
+    def CheckDataImportStatus(self, import_id: uuid.UUID) -> dict:
+        json_data = self._get(f"/userstore/upload/dataimport/{import_id}")
+        return json_data
+
     # Access Token Helpers
 
     def _get_access_token(self) -> str:

src/usercloudssdk/ucjson.py

@@ -17,7 +17,7 @@ def serializer(obj):
 
 
 def loads(data: str) -> dict:
-    return json.loads(data)
+    return json.loads(data) if data else {}
 
 
 def dumps(data: dict) -> str:

tools/genasyncclient.py

@@ -213,12 +213,24 @@ async def _download_async(self, url) -> str:
         )
         # replace self._get with await self._get_async
         line = re.sub(r"\sself\._get\(", r" await self._get_async(", line)
+        # replace self._client.get with await self._client.get_async
+        line = re.sub(r"\sself\._client.get\(", r" await self._client.get_async(", line)
         # replace self._post with await self._post_async
         line = re.sub(r"\sself\._post\(", r" await self._post_async(", line)
+        # replace self._client.post with await self._client.post_async
+        line = re.sub(
+            r"\sself\._client.post\(", r" await self._client.post_async(", line
+        )
         # replace self._put with await self._put_async
         line = re.sub(r"\sself\._put\(", r" await self._put_async(", line)
+        # replace self._client.put with await self._client.put_async
+        line = re.sub(r"\sself\._client.put\(", r" await self._client.put_async(", line)
         # replace self._delete with await self._delete_async
         line = re.sub(r"\sself\._delete\(", r" await self._delete_async(", line)
+        # replace self._client.delete with await self._client.delete_async
+        line = re.sub(
+            r"\sself\._client.delete\(", r" await self._client.delete_async(", line
+        )
         # replace self._download with await self._download_async
         line = re.sub(r"\sself\._download\(", r" await self._download_async(", line)
         # replace self._download with await self._download_async