accli 0.5.1__tar.gz → 0.5.3__tar.gz

{accli-0.5.1 → accli-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.5.1
+Version: 0.5.3
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)
@@ -83,5 +83,3 @@ Please follow [this link.](https://packaging.python.org/en/latest/tutorials/pack
 2. Run 'python scripts/tag.py'
 3. `python -m build`
 4. `twine upload -r pypi -u __token__ -p <password-or-token> ./dist/*`
-
-

{accli-0.5.1 → accli-0.5.3}/README.md

@@ -48,5 +48,3 @@ Please follow [this link.](https://packaging.python.org/en/latest/tutorials/pack
 2. Run 'python scripts/tag.py'
 3. `python -m build`
 4. `twine upload -r pypi -u __token__ -p <password-or-token> ./dist/*`
-
-

{accli-0.5.1 → accli-0.5.3}/accli/AcceleratorJobProjectService.py

@@ -9,6 +9,8 @@ import urllib3
 from pathlib import Path
 from typing import List, Tuple
 
+from accli.common import todict
+
 class AccAPIError(Exception):
     pass
 
@@ -66,7 +68,7 @@ class AcceleratorJobProjectService:
             f"{self.cli_base_url}/file-stat/{bucket_object_id}",
             headers=self.common_request_headers
         )
-        return res.json()
+        return todict(res.data)
     
     def get_file_url_from_repo(self, filename):
         project_slug = filename.split('/')[0]
@@ -76,7 +78,7 @@ class AcceleratorJobProjectService:
             headers=self.common_request_headers
         )
         if res.data:
-            return res.json()
+            return todict(res.data)
     
     def get_dataset_type(self, *args, **kwargs):
         return self.get_bucket_object_validation_type(*args, **kwargs)
@@ -88,7 +90,7 @@ class AcceleratorJobProjectService:
             headers=self.common_request_headers
         )
         if res.data:
-            return res.json()
+            return todict(res.data)
 
     def get_bucket_object_validation_details(self, bucket_object_id):
         res = self.http_client_request(
@@ -97,7 +99,7 @@ class AcceleratorJobProjectService:
             headers=self.common_request_headers
         )
         if res.data:
-            return res.json()
+            return todict(res.data)
 
     
     def get_file_url(self, bucket_object_id):
@@ -108,7 +110,7 @@ class AcceleratorJobProjectService:
         )
 
         if res.data:
-            return res.json()
+            return todict(res.data)
 
 
     def get_file_stream(self, bucket_object_id):
@@ -123,7 +125,9 @@ class AcceleratorJobProjectService:
                 "GET",
                 f"{self.cli_base_url}/is-healthy/",
                 headers=self.common_request_headers
-            ).json()
+            )
+            if res.data:
+                res = todict(res.data)
         except Exception as err:
             raise UnhealthyControlServerError(str(err))
         
@@ -136,7 +140,9 @@ class AcceleratorJobProjectService:
                 "GET",
                 f"{self.cli_base_url}/presigned-log-upload-url/?filename={filename}",
                 headers=self.common_request_headers
-            ).json()
+            )
+            if res.data:
+                res = todict(res.data)
         except Exception as err:
             raise UnhealthyControlServerError(str(err))
 
@@ -189,7 +195,7 @@ class AcceleratorJobProjectService:
             headers=self.common_request_headers
         )
 
-        return res.json()
+        return todict(res.data)
 
     def get_multipart_put_update_signed_url(
         self,
@@ -208,7 +214,7 @@ class AcceleratorJobProjectService:
             headers=self.common_request_headers
         )
 
-        return res.json()
+        return todict(res.data)
 
     def get_put_create_multipart_upload_id(self, filename):
         res = self.http_client_request(
@@ -217,7 +223,7 @@ class AcceleratorJobProjectService:
             headers=self.common_request_headers
         )
 
-        data = res.json()
+        data = todict(res.data)
 
         return data['upload_id'], data['app_bucket_id'], data['uniqified_filename']
 
@@ -228,7 +234,7 @@ class AcceleratorJobProjectService:
             headers=self.common_request_headers
         )
 
-        return res.json()
+        return todict(res.data)
 
     def complete_job_multipart_upload(
         self,
@@ -255,7 +261,7 @@ class AcceleratorJobProjectService:
             headers=headers
         )
 
-        return res.json()
+        return todict(res.data)
 
     def complete_update_multipart_upload(
         self, bucket_object_id, upload_id, parts: List[Tuple[str, str]]
@@ -365,7 +371,7 @@ class AcceleratorJobProjectService:
             headers=headers
         )
 
-        return res.json()
+        return todict(res.data)
 
       
 

{accli-0.5.1 → accli-0.5.3}/accli/AcceleratorTerminalCliProjectService.py

@@ -7,7 +7,7 @@ import concurrent.futures
 from typing import List, Tuple
 from rich.progress import Progress
 
-
+from accli.common import todict
 
 class AccAPIError(Exception):
 
@@ -76,7 +76,7 @@ class AcceleratorTerminalCliProjectService:
             else:
                 raise err
 
-        return res.json()
+        return todict(res.data)
     
     def get_file_url_from_repo(self, filename):
         project_slug = filename.split('/')[0]
@@ -86,7 +86,7 @@ class AcceleratorTerminalCliProjectService:
             headers=self.common_request_headers
         )
         if res.data:
-            return res.json()
+            return todict(res.data)
     
     def get_github_app_token(self, project_slug):
         
@@ -96,7 +96,7 @@ class AcceleratorTerminalCliProjectService:
             headers=self.common_request_headers
         )
 
-        return res.json()
+        return todict(res.data)
     
     def get_jobstore_push_url(self, project_slug, filename):
         
@@ -109,7 +109,7 @@ class AcceleratorTerminalCliProjectService:
         if res.status == 409 or res.status == '409':
             return None
 
-        return res.json()
+        return todict(res.data)
     
     def dispatch(self, project_slug, job_description):
         
@@ -123,7 +123,7 @@ class AcceleratorTerminalCliProjectService:
         except AccAPIError as err:
                 raise err
 
-        return res.json()['job_id']
+        return todict(res.data)['job_id']
     
     def get_dataset_template_details(self, project_slug, template_slug):
         
@@ -138,7 +138,7 @@ class AcceleratorTerminalCliProjectService:
             else:
                 raise err
 
-        return res.json()
+        return todict(res.data)
 
     
     def get_multipart_put_create_signed_url(
@@ -161,7 +161,7 @@ class AcceleratorTerminalCliProjectService:
             headers=self.common_request_headers
         )
 
-        return res.json()
+        return todict(res.data)
 
     
 
@@ -175,7 +175,7 @@ class AcceleratorTerminalCliProjectService:
             headers=self.common_request_headers
         )
 
-        data = res.json()
+        data = todict(res.data)
 
         return data['upload_id'], data['app_bucket_id'], data['uniqified_filename']
 
@@ -204,7 +204,7 @@ class AcceleratorTerminalCliProjectService:
             headers=headers
         )
 
-        return res.json()
+        return todict(res.data)
 
     
     def abort_create_multipart_upload(self, project_slug, app_bucket_id, filename, upload_id):

{accli-0.5.1 → accli-0.5.3}/accli/_version.py

@@ -1,3 +1,3 @@
 # Please strictly put double quote to use this info for git tag 
 # Read developer guide for git tag command with regex
-VERSION = "v0.5.1" 
+VERSION = "v0.5.3" 

{accli-0.5.1 → accli-0.5.3}/accli/cli.py

@@ -192,10 +192,6 @@ def dispatch(
         verify_cert=False
     )
 
-    github_app_token = term_cli_project_service.get_github_app_token(project_slug)
-    set_github_app_token(github_app_token)
-
-
     spec = importlib.util.spec_from_file_location("workflow", workflow_file)
 
     module = importlib.util.module_from_spec(spec)

accli-0.5.3/accli/common.py

@@ -0,0 +1,6 @@
+import json
+
+def todict(bytestring: bytes):
+    return json.loads(
+        bytestring.decode("utf-8")
+    )

{accli-0.5.1 → accli-0.5.3}/accli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.5.1
+Version: 0.5.3
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)
@@ -83,5 +83,3 @@ Please follow [this link.](https://packaging.python.org/en/latest/tutorials/pack
 2. Run 'python scripts/tag.py'
 3. `python -m build`
 4. `twine upload -r pypi -u __token__ -p <password-or-token> ./dist/*`
-
-

{accli-0.5.1 → accli-0.5.3}/accli.egg-info/SOURCES.txt

@@ -9,6 +9,7 @@ accli/__init__.py
 accli/__main__.py
 accli/_version.py
 accli/cli.py
+accli/common.py
 accli/token.py
 accli.egg-info/PKG-INFO
 accli.egg-info/SOURCES.txt