accli 1.1.0__tar.gz → 1.1.2__tar.gz

{accli-1.1.0 → accli-1.1.2}/PKG-INFO

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

{accli-1.1.0 → accli-1.1.2}/accli/AcceleratorJobProjectService.py

@@ -79,7 +79,7 @@ class AcceleratorJobProjectService:
     def get_file_stat(self, bucket_object_id):
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/file-stat/{bucket_object_id}",
+            f"{self.cli_base_url}/file-stat/{bucket_object_id}/",
             headers=self.common_request_headers
         )
         return todict(res.data)
@@ -93,7 +93,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/{project_slug}/enumerate-all-files/{b64_encoded_prefix}",
+            f"{self.cli_base_url}/{project_slug}/enumerate-all-files/{b64_encoded_prefix}/",
             headers=self.common_request_headers
         )
         if res.data:
@@ -116,7 +116,7 @@ class AcceleratorJobProjectService:
     def get_bucket_object_validation_type(self, bucket_object_id):
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/dataset-type/{bucket_object_id}",
+            f"{self.cli_base_url}/dataset-type/{bucket_object_id}/",
             headers=self.common_request_headers
         )
         if res.data:
@@ -146,7 +146,7 @@ class AcceleratorJobProjectService:
     def get_bucket_object_validation_details(self, bucket_object_id):
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/validation-detail/{bucket_object_id}",
+            f"{self.cli_base_url}/validation-detail/{bucket_object_id}/",
             headers=self.common_request_headers
         )
         if res.data:
@@ -156,7 +156,7 @@ class AcceleratorJobProjectService:
     def get_file_url(self, bucket_object_id):
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/file-url/{bucket_object_id}",
+            f"{self.cli_base_url}/file-url/{bucket_object_id}/",
             headers=self.common_request_headers
         )
 
@@ -231,7 +231,7 @@ class AcceleratorJobProjectService:
     ):
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/put-create-signed-url",
+            f"{self.cli_base_url}/put-create-signed-url/",
             fields=dict(
                 app_bucket_id=app_bucket_id,
                 object_name=object_name,
@@ -251,7 +251,7 @@ class AcceleratorJobProjectService:
     ):
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/put-update-signed-url",
+            f"{self.cli_base_url}/put-update-signed-url/",
             fields=dict(
                 filename=filename,
                 upload_id=upload_id,
@@ -310,7 +310,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/complete-create-multipart-upload",
+            f"{self.cli_base_url}/complete-create-multipart-upload/",
             json=dict(
                 app_bucket_id=app_bucket_id,
                 filename=filename,
@@ -336,7 +336,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/complete-validator-multipart-upload",
+            f"{self.cli_base_url}/complete-validator-multipart-upload/",
             json=dict(
                 app_bucket_id=app_bucket_id,
                 filename=filename,
@@ -358,7 +358,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/complete-update-multipart-upload",
+            f"{self.cli_base_url}/complete-update-multipart-upload/",
             json=dict(
                 filename=filename,
                 upload_id=upload_id,
@@ -377,7 +377,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/abort-create-multipart-upload",
+            f"{self.cli_base_url}/abort-create-multipart-upload/",
             json=dict(
                 app_bucket_id=app_bucket_id,
                 filename=filename,
@@ -396,7 +396,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/abort-update-multipart-upload",
+            f"{self.cli_base_url}/abort-update-multipart-upload/",
             json=dict(
                 filename=filename,
                 upload_id=upload_id
@@ -415,7 +415,7 @@ class AcceleratorJobProjectService:
 
     #     res = self.http_client_request(
     #         "PUT", 
-    #         f"{self.cli_base_url}/register-iamc-validation",
+    #         f"{self.cli_base_url}/register-iamc-validation/",
     #         json=dict(
     #             validated_bucket_object_id=validated_bucket_object_id,
     #             indexdb_bucket_object_id=indexdb_bucket_object_id
@@ -436,7 +436,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/register-validation",
+            f"{self.cli_base_url}/register-validation/",
             json=dict(
                 validated_bucket_object_id=validated_bucket_object_id,
                 dataset_template_id=dataset_template_id,
@@ -456,7 +456,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/dataset-template-detail/{dataset_template_id}",
+            f"{self.cli_base_url}/dataset-template-detail/{dataset_template_id}/",
             headers=headers
         )
 
@@ -715,7 +715,7 @@ class AcceleratorJobProjectService:
 
         res = self.http_client_request(
             "POST",
-            f"{self.cli_base_url}/webhook-event",
+            f"{self.cli_base_url}/webhook-event/",
             json=dict(
                 type='STATUS_UPDATE',
                 data=dict(

{accli-1.1.0 → accli-1.1.2}/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.0 → accli-1.1.2}/accli/AcceleratorTerminalCliProjectService.py

@@ -172,7 +172,7 @@ class AcceleratorTerminalCliProjectService:
     ):
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/{project_slug}/put-multipart-signed-url",
+            f"{self.cli_base_url}/{project_slug}/put-multipart-signed-url/",
             fields=dict(
                 app_bucket_id=app_bucket_id,
                 object_name=object_name,
@@ -190,7 +190,7 @@ class AcceleratorTerminalCliProjectService:
 
         res = self.http_client_request(
             "GET",
-            f"{self.cli_base_url}/{project_slug}/create-multipart-upload-id/{b64_filename}",
+            f"{self.cli_base_url}/{project_slug}/create-multipart-upload-id/{b64_filename}/",
             headers=self.common_request_headers
         )
 
@@ -212,7 +212,7 @@ class AcceleratorTerminalCliProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/{project_slug}/complete-create-multipart-upload",
+            f"{self.cli_base_url}/{project_slug}/complete-create-multipart-upload/",
             json=dict(
                 app_bucket_id=app_bucket_id,
                 filename=filename,
@@ -232,7 +232,7 @@ class AcceleratorTerminalCliProjectService:
 
         res = self.http_client_request(
             "PUT",
-            f"{self.cli_base_url}/{project_slug}/abort-create-multipart-upload",
+            f"{self.cli_base_url}/{project_slug}/abort-create-multipart-upload/",
             json=dict(
                 app_bucket_id=app_bucket_id,
                 filename=filename,

{accli-1.1.0 → accli-1.1.2}/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.0"
+VERSION = "v1.1.2"

{accli-1.1.0 → accli-1.1.2}/accli.egg-info/PKG-INFO

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