runnable 0.28.0__py3-none-any.whl → 0.28.2__py3-none-any.whl

extensions/job_executor/__init__.py

@@ -144,14 +144,10 @@ class GenericJobExecutor(BaseJobExecutor):
             logger.info("No catalog settings found")
             return None
 
-        compute_data_folder = self._context.catalog_handler.compute_data_folder
-
         data_catalogs = []
         for name_pattern in catalog_settings:
             data_catalog = self._context.catalog_handler.put(
                 name=name_pattern,
-                run_id=self._context.run_id,
-                compute_data_folder=compute_data_folder,
             )
 
             logger.debug(f"Added data catalog: {data_catalog} to job log")
@@ -168,7 +164,5 @@ class GenericJobExecutor(BaseJobExecutor):
         )
         task_console.save_text(log_file_name)
         # Put the log file in the catalog
-        self._context.catalog_handler.put(
-            name=log_file_name, run_id=self._context.run_id
-        )
+        self._context.catalog_handler.put(name=log_file_name)
         os.remove(log_file_name)

extensions/job_executor/k8s.py

@@ -34,6 +34,19 @@ class ImagePullPolicy(str, Enum):
     NEVER = "Never"
 
 
+class TolerationOperator(str, Enum):
+    EXISTS = "Exists"
+    EQUAL = "Equal"
+
+
+class Toleration(BaseModel):
+    key: str
+    operator: TolerationOperator = TolerationOperator.EQUAL
+    value: Optional[str]
+    effect: str
+    toleration_seconds: Optional[int] = Field(default=None)
+
+
 class LabelSelectorRequirement(BaseModel):
     key: str
     operator: Operator
@@ -124,7 +137,7 @@ class PVCVolume(BaseModel):
 class K8sTemplateSpec(BaseModel):
     active_deadline_seconds: int = Field(default=60 * 60 * 2)  # 2 hours
     node_selector: Optional[dict[str, str]] = None
-    tolerations: Optional[list[dict[str, str]]] = None
+    tolerations: Optional[list[Toleration]] = None
     volumes: Optional[list[HostPathVolume | PVCVolume]] = Field(
         default_factory=lambda: []
     )
@@ -260,7 +273,7 @@ class GenericK8sJobExecutor(GenericJobExecutor):
         tolerations = None
         if self.job_spec.template.spec.tolerations:
             tolerations = [
-                self._client.V1Toleration(**toleration)
+                self._client.V1Toleration(**toleration.model_dump(by_alias=True))
                 for toleration in self.job_spec.template.spec.tolerations
             ]
 

{runnable-0.28.0.dist-info → runnable-0.28.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: runnable
-Version: 0.28.0
+Version: 0.28.2
 Summary: Add your description here
 Author-email: "Vammi, Vijay" <vijay.vammi@astrazeneca.com>
 License-File: LICENSE

{runnable-0.28.0.dist-info → runnable-0.28.2.dist-info}/RECORD

@@ -7,8 +7,8 @@ extensions/catalog/minio.py,sha256=R3GvfCxN1GTcs4bQIAWh79_GHDTVd14gnpKlzwFeKUI,2
 extensions/catalog/pyproject.toml,sha256=lLNxY6v04c8I5QK_zKw_E6sJTArSJRA_V-79ktaA3Hk,279
 extensions/catalog/s3.py,sha256=Sw5t8_kVRprn3uGGJCiHn7M9zw1CLaCOFj6YErtfG0o,287
 extensions/job_executor/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-extensions/job_executor/__init__.py,sha256=3zS2m6dg-L6SkKfL0kr4AxVUVmVJcepV6eipyMvQR6s,6006
-extensions/job_executor/k8s.py,sha256=V5k6Rnf_sAFqptVbCrWs_x5sl3x3fSHwO96IZoiJxKU,15342
+extensions/job_executor/__init__.py,sha256=E2R6GV5cZTlZdqA5SVJ6ajZFh4oruM0k8AKHkpOZ3W8,5772
+extensions/job_executor/k8s.py,sha256=nIEiIUOYYwAYKcl0DboWnsL55lM-GUUXoirikb3BVps,15650
 extensions/job_executor/k8s_job_spec.yaml,sha256=7aFpxHdO_p6Hkc3YxusUOuAQTD1Myu0yTPX9DrhxbOg,1158
 extensions/job_executor/local.py,sha256=FvxTk0vyxdrbLOAyNkLyjvmmowypabWOSITQBK_ffVE,1907
 extensions/job_executor/local_container.py,sha256=hyFnpicCp3_87mZsW64P6KSVbz7XMLjwJUWVjeCJ0_I,6627
@@ -56,8 +56,8 @@ runnable/sdk.py,sha256=T1nqDpLN9fULvvU9L-oY0EHqYdKUI9qk7oekLynm02Y,33568
 runnable/secrets.py,sha256=PXcEJw-4WPzeWRLfsatcPPyr1zkqgHzdRWRcS9vvpvM,2354
 runnable/tasks.py,sha256=X6xijut7ffwpfYDcXoN6y0AcRVd7fWHs676DJ00Kma4,29134
 runnable/utils.py,sha256=hBr7oGwGL2VgfITlQCTz-a1iwvvf7Mfl-HY8UdENZac,19929
-runnable-0.28.0.dist-info/METADATA,sha256=Nxwf20GCaSSHfvxOqUmUiM1zuE3CgSd1Vq2wH3s9Ybg,10047
-runnable-0.28.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-runnable-0.28.0.dist-info/entry_points.txt,sha256=ioMbWojILtdibYVgh1jXJ00SpK-tX3gy7oVGDq61cSk,1839
-runnable-0.28.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-runnable-0.28.0.dist-info/RECORD,,
+runnable-0.28.2.dist-info/METADATA,sha256=_cIg_HPnrDO-LUIUuH2riE8g2oPGzbvEUrRkdWYsTEI,10047
+runnable-0.28.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+runnable-0.28.2.dist-info/entry_points.txt,sha256=ioMbWojILtdibYVgh1jXJ00SpK-tX3gy7oVGDq61cSk,1839
+runnable-0.28.2.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+runnable-0.28.2.dist-info/RECORD,,