accli 0.7__tar.gz → 0.7.2__tar.gz

{accli-0.7 → accli-0.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.7
+Version: 0.7.2
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)

{accli-0.7 → accli-0.7.2}/accli/AcceleratorJobProjectService.py

@@ -6,6 +6,7 @@ import requests
 import json
 import base64
 import urllib3
+from urllib.parse import quote
 from pathlib import Path
 from typing import List, Tuple
 
@@ -245,9 +246,23 @@ class AcceleratorJobProjectService:
         return todict(res.data)
 
     def get_put_create_multipart_upload_id(self, filename):
+        encoded_filename = quote(filename)
         res = self.http_client_request(
             "GET", 
-            f"{self.cli_base_url}/create-multipart-upload-id/{filename}",
+            f"{self.cli_base_url}/multipart-upload-id/?filename={encoded_filename}",
+            headers=self.common_request_headers
+        )
+
+        data = todict(res.data)
+
+        return data['upload_id'], data['app_bucket_id'], data['uniqified_filename']
+
+
+    def get_validator_create_multipart_upload_id(self, filename):
+        encoded_filename = quote(filename)
+        res = self.http_client_request(
+            "GET", 
+            f"{self.cli_base_url}/validator-multipart-upload-id/?filename={encoded_filename}",
             headers=self.common_request_headers
         )
 
@@ -570,6 +585,84 @@ class AcceleratorJobProjectService:
 
             raise err
 
+
+    def add_filestream_as_validation_supporter(self, filename, file_stream, is_log_file=False):
+        headers = dict()
+        headers["Content-Type"] = "application/octet-stream"
+
+        part_size, part_count = 50 * 1024**2, -1
+
+        upload_id = None
+        app_bucket_id = None
+        uniqified_filename = None
+
+        one_byte = b""
+        stop = False
+        part_number = 0
+        parts = []
+        uploaded_size = 0
+        put_presigned_url = None
+
+        try:
+            while not stop:
+                part_number += 1
+                part_data = self.read_part_data(
+                    file_stream,
+                    part_size + 1,
+                    one_byte,
+                    progress=None,
+                )
+
+                # If part_data_size is less or equal to part_size,
+                # then we have reached last part.
+                if len(part_data) <= part_size:
+                    part_count = part_number
+                    stop = True
+                else:
+                    one_byte = part_data[-1:]
+                    part_data = part_data[:-1]
+
+                uploaded_size += len(part_data)
+
+                if not upload_id:
+                    (
+                        upload_id,
+                        app_bucket_id,
+                        uniqified_filename,
+                    ) = self.get_put_create_multipart_upload_id(
+                        filename, 
+                        # headers=headers
+                    )
+
+                put_presigned_url = self.get_validator_create_multipart_upload_id(
+                    app_bucket_id, uniqified_filename, upload_id, part_number
+                )
+
+                part_upload_response = requests.put(
+                    put_presigned_url,
+                    data=part_data,
+                    # headers=headers,
+                    verify=False,
+                )
+
+                etag = part_upload_response.headers.get("etag").replace('"', "")
+                parts.append((part_number, etag))
+
+            created_bucket_object_id = self.complete_job_multipart_upload(
+                app_bucket_id, uniqified_filename, upload_id, parts, is_log_file=is_log_file
+            )
+            return created_bucket_object_id
+
+        except Exception as err:
+            # Cancel if any error
+            if upload_id:
+                self.abort_create_multipart_upload(
+                    app_bucket_id,
+                    uniqified_filename,
+                    upload_id,
+                )
+            raise err
+
     def update_job_status(self, status):
         headers = {
             # "Content-Type": "application/json"

{accli-0.7 → accli-0.7.2}/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.7" 
+VERSION = "v0.7.2" 

{accli-0.7 → accli-0.7.2}/accli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: accli
-Version: 0.7
+Version: 0.7.2
 Summary: IIASA Accelerator Client
 Author-email: Wrufesh S <wrufesh@gmail.com>
 License: The MIT License (MIT)