pangea-sdk 3.3.0__tar.gz → 3.4.0__tar.gz

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pangea-sdk
-Version: 3.3.0
+Version: 3.4.0
 Summary: Pangea API SDK
 License: MIT
 Keywords: Pangea,SDK,Audit

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/pangea/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "3.3.0"
+__version__ = "3.4.0"
 
 from pangea.asyncio.request import PangeaRequestAsync
 from pangea.config import PangeaConfig

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/pangea/asyncio/request.py

@@ -53,11 +53,7 @@ class PangeaRequestAsync(PangeaRequestBase):
 
         transfer_method = data.get("transfer_method", None)
 
-        if (
-            files is not None
-            and type(data) is dict
-            and (transfer_method == TransferMethod.DIRECT.value or transfer_method == TransferMethod.POST_URL.value)
-        ):
+        if files is not None and type(data) is dict and (transfer_method == TransferMethod.POST_URL.value):
             requests_response = await self._full_post_presigned_url(
                 endpoint, result_class=result_class, data=data, files=files
             )
@@ -66,9 +62,10 @@ class PangeaRequestAsync(PangeaRequestBase):
                 url, headers=self._headers(), data=data, files=files, presigned_url_post=False
             )
 
-        pangea_response = PangeaResponse(
-            requests_response, result_class=result_class, json=await requests_response.json()
-        )
+        json_resp = await requests_response.json()
+        self.logger.debug(json.dumps({"service": self.service, "action": "post", "url": url, "response": json_resp}))
+
+        pangea_response = PangeaResponse(requests_response, result_class=result_class, json=json_resp)
         if poll_result:
             pangea_response = await self._handle_queued_result(pangea_response)
 
@@ -143,13 +140,13 @@ class PangeaRequestAsync(PangeaRequestBase):
         resp = await self._http_put(url=url, files=files)
         self.logger.debug(
             json.dumps(
-                {"service": self.service, "action": "put presigned", "url": url, "response": resp.text},
+                {"service": self.service, "action": "put presigned", "url": url, "response": await resp.text()},
                 default=default_encoder,
             )
         )
 
-        if resp.status_code < 200 or resp.status_code >= 300:
-            raise pe.PresignedUploadError(f"presigned PUT failure: {resp.status_code}", resp.text)
+        if resp.status < 200 or resp.status >= 300:
+            raise pe.PresignedUploadError(f"presigned PUT failure: {resp.status}", await resp.text())
 
     async def _http_post(
         self,
@@ -196,7 +193,7 @@ class PangeaRequestAsync(PangeaRequestBase):
         form = FormData()
         name, value = files[0]
         form.add_field(name, value[1], filename=value[0], content_type=value[2])
-        return self.session.put(url, headers=headers, data=form)
+        return await self.session.put(url, headers=headers, data=form)
 
     async def _full_post_presigned_url(
         self,
@@ -209,8 +206,8 @@ class PangeaRequestAsync(PangeaRequestBase):
             raise AttributeError("files attribute should have at least 1 file")
 
         response = await self.request_presigned_url(endpoint=endpoint, result_class=result_class, data=data)
-        data_to_presigned = response.accepted_result.accepted_status.upload_details
-        presigned_url = response.accepted_result.accepted_status.upload_url
+        data_to_presigned = response.accepted_result.post_form_data
+        presigned_url = response.accepted_result.post_url
 
         await self.post_presigned_url(url=presigned_url, data=data_to_presigned, files=files)
         return response.raw_response
@@ -231,14 +228,14 @@ class PangeaRequestAsync(PangeaRequestBase):
         except Exception as e:
             raise e
 
-        # Receive 202 with accepted_status
+        # Receive 202
         return await self._poll_presigned_url(accepted_exception.response)
 
     async def _poll_presigned_url(self, response: PangeaResponse) -> AcceptedResult:
         if response.http_status != 202:
             raise AttributeError("Response should be 202")
 
-        if response.accepted_result.accepted_status.upload_url:
+        if response.accepted_result is not None and response.accepted_result.has_upload_url:
             return response
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "start"}))
@@ -248,7 +245,7 @@ class PangeaRequestAsync(PangeaRequestBase):
 
         while (
             loop_resp.accepted_result is not None
-            and not loop_resp.accepted_result.accepted_status.upload_url
+            and not loop_resp.accepted_result.has_upload_url
             and not self._reach_timeout(start)
         ):
             await asyncio.sleep(self._get_delay(retry_count, start))
@@ -275,7 +272,7 @@ class PangeaRequestAsync(PangeaRequestBase):
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "exit"}))
 
-        if loop_resp.accepted_result is not None and not loop_resp.accepted_result.accepted_status.upload_url:
+        if loop_resp.accepted_result is not None and not loop_resp.accepted_result.has_upload_url:
             return loop_resp
         else:
             raise loop_exc

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/pangea/asyncio/services/file_scan.py

@@ -49,7 +49,8 @@ class FileScanAsync(ServiceBaseAsync):
         raw: Optional[bool] = None,
         provider: Optional[str] = None,
         sync_call: bool = True,
-        transfer_method: TransferMethod = TransferMethod.DIRECT,
+        transfer_method: TransferMethod = TransferMethod.POST_URL,
+        source_url: Optional[str] = None,
     ) -> PangeaResponse[m.FileScanResult]:
         """
         Scan
@@ -88,7 +89,7 @@ class FileScanAsync(ServiceBaseAsync):
         if file or file_path:
             if file_path:
                 file = open(file_path, "rb")
-            if transfer_method == TransferMethod.DIRECT or transfer_method == TransferMethod.POST_URL:
+            if transfer_method == TransferMethod.POST_URL:
                 params = get_file_upload_params(file)
                 crc = params.crc_hex
                 sha = params.sha256_hex
@@ -103,10 +104,11 @@ class FileScanAsync(ServiceBaseAsync):
             verbose=verbose,
             raw=raw,
             provider=provider,
-            transfer_crc32c=crc,
-            transfer_sha256=sha,
-            transfer_size=size,
+            crc32c=crc,
+            sha256=sha,
+            size=size,
             transfer_method=transfer_method,
+            source_url=source_url,
         )
         data = input.dict(exclude_none=True)
         return await self.request.post("v1/scan", m.FileScanResult, data=data, files=files, poll_result=sync_call)
@@ -125,12 +127,10 @@ class FileScanAsync(ServiceBaseAsync):
             provider=provider,
             transfer_method=transfer_method,
         )
-        if params is not None and (
-            transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT
-        ):
-            input.transfer_crc32c = params.crc_hex
-            input.transfer_sha256 = params.sha256_hex
-            input.transfer_size = params.size
+        if params is not None and (transfer_method == TransferMethod.POST_URL):
+            input.crc32c = params.crc_hex
+            input.sha256 = params.sha256_hex
+            input.size = params.size
 
         data = input.dict(exclude_none=True)
         return await self.request.request_presigned_url("v1/scan", m.FileScanResult, data=data)
@@ -156,7 +156,7 @@ class FileUploaderAsync:
         if transfer_method == TransferMethod.PUT_URL:
             files = [("file", ("filename", file, "application/octet-stream"))]
             await self._request.put_presigned_url(url=url, files=files)
-        elif transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT:
+        elif transfer_method == TransferMethod.POST_URL:
             files = [("file", ("filename", file, "application/octet-stream"))]
             await self._request.post_presigned_url(url=url, data=file_details, files=files)
         else:

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/pangea/request.py

@@ -205,11 +205,7 @@ class PangeaRequest(PangeaRequestBase):
 
         transfer_method = data.get("transfer_method", None)
 
-        if (
-            files is not None
-            and type(data) is dict
-            and (transfer_method == TransferMethod.DIRECT.value or transfer_method == TransferMethod.POST_URL.value)
-        ):
+        if files is not None and type(data) is dict and (transfer_method == TransferMethod.POST_URL.value):
             requests_response = self._full_post_presigned_url(
                 endpoint, result_class=result_class, data=data, files=files
             )
@@ -218,7 +214,10 @@ class PangeaRequest(PangeaRequestBase):
                 url, headers=self._headers(), data=data, files=files, multipart_post=True
             )
 
-        pangea_response = PangeaResponse(requests_response, result_class=result_class, json=requests_response.json())
+        json_resp = requests_response.json()
+        self.logger.debug(json.dumps({"service": self.service, "action": "post", "url": url, "response": json_resp}))
+
+        pangea_response = PangeaResponse(requests_response, result_class=result_class, json=json_resp)
         if poll_result:
             pangea_response = self._handle_queued_result(pangea_response)
 
@@ -287,7 +286,7 @@ class PangeaRequest(PangeaRequestBase):
         except Exception as e:
             raise e
 
-        # Receive 202 with accepted_status
+        # Receive 202
         return self._poll_presigned_url(accepted_exception.response)
 
     def post_presigned_url(self, url: str, data: Dict, files: List[Tuple]):
@@ -382,8 +381,8 @@ class PangeaRequest(PangeaRequestBase):
             raise AttributeError("files attribute should have at least 1 file")
 
         response = self.request_presigned_url(endpoint=endpoint, result_class=result_class, data=data)
-        data_to_presigned = response.accepted_result.accepted_status.upload_details
-        presigned_url = response.accepted_result.accepted_status.upload_url
+        data_to_presigned = response.accepted_result.post_form_data
+        presigned_url = response.accepted_result.post_url
 
         self.post_presigned_url(url=presigned_url, data=data_to_presigned, files=files)
         return response.raw_response
@@ -416,7 +415,7 @@ class PangeaRequest(PangeaRequestBase):
         if response.http_status != 202:
             raise AttributeError("Response should be 202")
 
-        if response.accepted_result.accepted_status.upload_url:
+        if response.accepted_result is not None and response.accepted_result.has_upload_url:
             return response
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "start"}))
@@ -426,7 +425,7 @@ class PangeaRequest(PangeaRequestBase):
 
         while (
             loop_resp.accepted_result is not None
-            and not loop_resp.accepted_result.accepted_status.upload_url
+            and not loop_resp.accepted_result.has_upload_url
             and not self._reach_timeout(start)
         ):
             time.sleep(self._get_delay(retry_count, start))
@@ -453,7 +452,7 @@ class PangeaRequest(PangeaRequestBase):
 
         self.logger.debug(json.dumps({"service": self.service, "action": "poll_presigned_url", "step": "exit"}))
 
-        if loop_resp.accepted_result is not None and not loop_resp.accepted_result.accepted_status.upload_url:
+        if loop_resp.accepted_result is not None and not loop_resp.accepted_result.has_upload_url:
             return loop_resp
         else:
             raise loop_exc

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/pangea/response.py

@@ -13,11 +13,10 @@ T = TypeVar("T")
 
 
 class TransferMethod(str, enum.Enum):
-    DIRECT = "post-url"  # deprecated, use POST_URL instead
     MULTIPART = "multipart"
     POST_URL = "post-url"
     PUT_URL = "put-url"
-    # URL = "url"
+    SOURCE_URL = "source-url"
 
     def __str__(self):
         return str(self.value)
@@ -79,7 +78,16 @@ class AcceptedStatus(APIResponseModel):
 
 
 class AcceptedResult(PangeaResponseResult):
-    accepted_status: Optional[AcceptedStatus] = None
+    ttl_mins: int
+    retry_counter: int
+    location: str
+    post_url: Optional[str] = None
+    post_form_data: Dict[str, Any] = {}
+    put_url: Optional[str] = None
+
+    @property
+    def has_upload_url(self) -> bool:
+        return self.post_url is not None or self.put_url is not None
 
 
 class PangeaError(PangeaResponseResult):

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/pangea/services/file_scan.py

@@ -23,10 +23,11 @@ class FileScanRequest(APIRequestModel):
     verbose: Optional[bool] = None
     raw: Optional[bool] = None
     provider: Optional[str] = None
-    transfer_size: Optional[int] = None
-    transfer_crc32c: Optional[str] = None
-    transfer_sha256: Optional[str] = None
-    transfer_method: TransferMethod = TransferMethod.DIRECT
+    size: Optional[int] = None
+    crc32c: Optional[str] = None
+    sha256: Optional[str] = None
+    source_url: Optional[str] = None
+    transfer_method: TransferMethod = TransferMethod.POST_URL
 
 
 class FileScanData(PangeaResponseResult):
@@ -81,7 +82,8 @@ class FileScan(ServiceBase):
         raw: Optional[bool] = None,
         provider: Optional[str] = None,
         sync_call: bool = True,
-        transfer_method: TransferMethod = TransferMethod.DIRECT,
+        transfer_method: TransferMethod = TransferMethod.POST_URL,
+        source_url: Optional[str] = None,
     ) -> PangeaResponse[FileScanResult]:
         """
         Scan
@@ -120,7 +122,7 @@ class FileScan(ServiceBase):
         if file or file_path:
             if file_path:
                 file = open(file_path, "rb")
-            if transfer_method == TransferMethod.DIRECT or transfer_method == TransferMethod.POST_URL:
+            if transfer_method == TransferMethod.POST_URL:
                 params = get_file_upload_params(file)
                 crc = params.crc_hex
                 sha = params.sha256_hex
@@ -135,10 +137,11 @@ class FileScan(ServiceBase):
             verbose=verbose,
             raw=raw,
             provider=provider,
-            transfer_crc32c=crc,
-            transfer_sha256=sha,
-            transfer_size=size,
+            crc32c=crc,
+            sha256=sha,
+            size=size,
             transfer_method=transfer_method,
+            source_url=source_url,
         )
         data = input.dict(exclude_none=True)
         return self.request.post("v1/scan", FileScanResult, data=data, files=files, poll_result=sync_call)
@@ -157,12 +160,10 @@ class FileScan(ServiceBase):
             provider=provider,
             transfer_method=transfer_method,
         )
-        if params is not None and (
-            transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT
-        ):
-            input.transfer_crc32c = params.crc_hex
-            input.transfer_sha256 = params.sha256_hex
-            input.transfer_size = params.size
+        if params is not None and (transfer_method == TransferMethod.POST_URL):
+            input.crc32c = params.crc_hex
+            input.sha256 = params.sha256_hex
+            input.size = params.size
 
         data = input.dict(exclude_none=True)
         return self.request.request_presigned_url("v1/scan", FileScanResult, data=data)
@@ -188,7 +189,7 @@ class FileUploader:
         if transfer_method == TransferMethod.PUT_URL:
             files = [("file", ("filename", file, "application/octet-stream"))]
             self._request.put_presigned_url(url=url, files=files)
-        elif transfer_method == TransferMethod.POST_URL or transfer_method == TransferMethod.DIRECT:
+        elif transfer_method == TransferMethod.POST_URL:
             files = [("file", ("filename", file, "application/octet-stream"))]
             self._request.post_presigned_url(url=url, data=file_details, files=files)
         else:

{pangea_sdk-3.3.0 → pangea_sdk-3.4.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pangea-sdk"
-version = "3.3.0"
+version = "3.4.0"
 description = "Pangea API SDK"
 authors = ["Glenn Gallien <glenn.gallien@pangea.cloud>"]
 license = "MIT"