Handle upload errors (#5)

Author: inverse

edge_addons_api/client.py

@@ -1,10 +1,21 @@
+import logging
+import time
 from dataclasses import dataclass
 from os import path
 
 import requests
 
+from edge_addons_api.exceptions import UploadException
 from edge_addons_api.responses import SubmitResponse
 
+logger = logging.getLogger(__name__)
+
+
+class ResponseStatus:
+    SUCCEEDED = "Succeeded"
+    IN_PROGRESS = "InProgress"
+    FAILED = "Failed"
+
 
 @dataclass
 class Options:
@@ -26,10 +37,11 @@ def submit(self, file_path: str, notes: str) -> SubmitResponse:
             raise FileNotFoundError(f"Unable to locate file at {file_path}")
 
         access_token = self._get_access_token()
-        upload = self._upload(file_path, access_token)
+        operation_id = self._upload(file_path, access_token)
+        self._check_upload(operation_id, access_token)
         publish = self._publish(notes, access_token)
 
-        return SubmitResponse(upload, publish)
+        return SubmitResponse({}, publish)
 
     def _publish(self, notes: str, access_token: str) -> dict:
         response = requests.post(
@@ -42,9 +54,11 @@ def _publish(self, notes: str, access_token: str) -> dict:
 
         response.raise_for_status()
 
+        logger.debug(f"Publish response: {response.content.decode()}")
+
         return response.json()
 
-    def _upload(self, file_path: str, access_token: str) -> dict:
+    def _upload(self, file_path: str, access_token: str) -> str:
 
         files = {"file": open(file_path, "rb")}
 
@@ -59,7 +73,42 @@ def _upload(self, file_path: str, access_token: str) -> dict:
 
         response.raise_for_status()
 
-        return response.json()
+        return response.headers["Location"]
+
+    def _check_upload(
+        self,
+        operation_id,
+        access_token: str,
+        retry_count: int = 5,
+        sleep_seconds: int = 3,
+    ) -> str:
+        upload_status = ""
+        attempts = 0
+
+        while upload_status != ResponseStatus.SUCCEEDED and attempts < retry_count:
+            response = requests.get(
+                self._status_endpoint(operation_id),
+                headers={
+                    "Authorization": f"Bearer {access_token}",
+                },
+            )
+
+            response.raise_for_status()
+            response_json = response.json()
+
+            logger.debug(f"Status response: {response_json}")
+            upload_status = response_json["status"]
+            if upload_status == ResponseStatus.FAILED:
+                raise UploadException(
+                    response_json["status"],
+                    response_json["message"],
+                    response_json["errorCode"],
+                    response_json["errors"],
+                )
+            elif upload_status == ResponseStatus.IN_PROGRESS:
+                time.sleep(sleep_seconds)
+
+        return upload_status
 
     def _get_access_token(self) -> str:
         response = requests.post(
@@ -86,3 +135,6 @@ def _publish_endpoint(self) -> str:
 
     def _upload_endpoint(self) -> str:
         return f"{self._publish_endpoint()}/draft/package"
+
+    def _status_endpoint(self, operation_id: str) -> str:
+        return f"{self._upload_endpoint()}/operations/{operation_id}"

edge_addons_api/exceptions.py

@@ -0,0 +1,9 @@
+from typing import List
+
+
+class UploadException(BaseException):
+    def __init__(self, status: str, message: str, error_code: str, errors: List):
+        self.status = status
+        self.message = message
+        self.error_code = error_code
+        self.errors = errors

script.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import sys
 
@@ -10,6 +11,9 @@
 file_path = sys.argv[1]
 notes = sys.argv[2]
 
+logging.basicConfig()
+logging.getLogger().setLevel(logging.DEBUG)
+
 options = Options(
     product_id=os.environ["EDGE_PRODUCT_ID"],
     client_id=os.environ["EDGE_CLIENT_ID"],