more clear exception handling + relative import tweak

Author: kossak

paperspace/exceptions.py

@@ -10,6 +10,10 @@ class PresignedUrlUnreachableException(ApplicationException):
     pass
 
 
+class ProjectAccessDeniedException(ApplicationException):
+    pass
+
+
 class PresignedUrlAccessDeniedException(ApplicationException):
     pass
 

paperspace/main.py

@@ -1,7 +1,7 @@
 import os
 import sys
 
-from paperspace.cli.cli import cli
+from .cli.cli import cli
 from .jobs import run, print_json_pretty
 from .login import set_apikey
 from .version import version

paperspace/workspace.py

@@ -9,7 +9,7 @@
 from paperspace import logger as default_logger
 
 from paperspace.exceptions import S3UploadFailedException, PresignedUrlUnreachableException, \
-    PresignedUrlAccessDeniedException, PresignedUrlConnectionException
+    PresignedUrlAccessDeniedException, PresignedUrlConnectionException, ProjectAccessDeniedException
 
 
 class S3WorkspaceHandler:
@@ -130,10 +130,12 @@ def _upload(self, archive_path, s3_upload_data):
     def _get_upload_data(self, file_name, project_handle):
         response = self.experiments_api.get("/workspace/get_presigned_url",
                                             params={'workspaceName': file_name, 'projectHandle': project_handle})
-        if response.status_code == 404:
-            raise PresignedUrlUnreachableException
+        if response.status_code == 401:
+            raise ProjectAccessDeniedException(project_handle)
         if response.status_code == 403:
             raise PresignedUrlAccessDeniedException
+        if response.status_code == 404:
+            raise PresignedUrlUnreachableException
         if not response.ok:
             raise PresignedUrlConnectionException(response.reason)
         return response.json()