accli 1.1.1__tar.gz → 1.1.3__tar.gz

{accli-1.1.1 → accli-1.1.3}/PKG-INFO

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

{accli-1.1.1 → accli-1.1.3}/accli/AcceleratorTaskDispatcher.py

@@ -135,21 +135,6 @@ class JobDispatchModel(BaseModel):
     children: List['JobDispatchModel'] = []
     callback: Optional['JobDispatchModel'] = None
 
-    def model_dump(self, *args, **kwargs):
-        result = super().model_dump(*args, **kwargs)
-        if result['is_holder_job'] and result['execute_cluster'] == 'WKUBE':
-            if len(result['children']) > 1:
-                if not result['children'][0]['job_kwargs'].get('docker_image'):
-                    builder_task = result['children'][0].copy()
-
-                    builder_task['build_only_task'] = True
-
-                    builder_task['callback'] = result.copy()
-                    builder_task['name'] = f"{builder_task['callback']['name']} -- Image Builder"
-                    builder_task['callback']['name'] = f"{builder_task['callback']['name']} -- Holder"
-                    return builder_task
-        return result
-
 
 class WKubeTaskMeta(BaseModel):
     required_cores: float

{accli-1.1.1 → accli-1.1.3}/accli/AcceleratorTerminalCliProjectService.py

@@ -281,7 +281,7 @@ class AcceleratorTerminalCliProjectService:
         headers = dict()
         headers["Content-Type"] = "application/octet-stream"
 
-        part_size, part_count = 200 * 1024 ** 2, -1
+        part_size, part_count = 50 * 1024 ** 2, -1
 
         upload_id = None
         app_bucket_id = None
@@ -294,13 +294,21 @@ class AcceleratorTerminalCliProjectService:
         uploaded_size = 0
         put_presigned_url = None
 
-        futures = []
-
         try:
 
             with concurrent.futures.ThreadPoolExecutor(max_workers=max_workers) as executor:
 
+                active_futures = set()
+
                 while not stop:
+                    if len(active_futures) >= max_workers:
+                        done, active_futures = concurrent.futures.wait(
+                            active_futures,
+                            return_when=concurrent.futures.FIRST_COMPLETED
+                        )
+                        for f in done:
+                            parts.append(f.result())
+
                     part_number += 1
                     part_data = self.read_part_data(
                         file_stream,
@@ -331,14 +339,16 @@ class AcceleratorTerminalCliProjectService:
                             # headers=headers
                         )
 
-                    future = executor.submit(self.put_part, project_slug, app_bucket_id, uniqified_filename, upload_id,
-                                             part_number, part_data, progress, task)
-
-                    futures.append(future)
-
-            futures_results = concurrent.futures.wait(futures, return_when=concurrent.futures.ALL_COMPLETED)
+                    future = executor.submit(
+                        self.put_part, project_slug, app_bucket_id, uniqified_filename,
+                        upload_id, part_number, part_data, progress, task
+                    )
+                    active_futures.add(future)
 
-            parts = [f.result() for f in futures_results.done]
+                if active_futures:
+                    done, _ = concurrent.futures.wait(active_futures, return_when=concurrent.futures.ALL_COMPLETED)
+                    for f in done:
+                        parts.append(f.result())
 
             parts.sort(key=lambda x: x[0])
 

{accli-1.1.1 → accli-1.1.3}/accli/_version.py

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

{accli-1.1.1 → accli-1.1.3}/accli.egg-info/PKG-INFO

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