runnable 0.28.0__tar.gz → 0.28.2__tar.gz

{runnable-0.28.0 → runnable-0.28.2}/PKG-INFO

@@ -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 → runnable-0.28.2}/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)

{runnable-0.28.0 → runnable-0.28.2}/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 → runnable-0.28.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "runnable"
-version = "0.28.0"
+version = "0.28.2"
 description = "Add your description here"
 readme = "README.md"
 authors = [