runnable 0.28.4__py3-none-any.whl → 0.28.6__py3-none-any.whl

extensions/job_executor/k8s.py

@@ -7,6 +7,7 @@ from kubernetes import client
 from kubernetes import config as k8s_config
 from pydantic import BaseModel, ConfigDict, Field, PlainSerializer, PrivateAttr
 from pydantic.alias_generators import to_camel
+from rich import print
 
 from extensions.job_executor import GenericJobExecutor
 from runnable import console, defaults, utils
@@ -133,13 +134,7 @@ class HostPathVolume(BaseModelWIthConfig):
 
 
 class PVCClaim(BaseModelWIthConfig):
-    claim_name: str
-
-    model_config = ConfigDict(
-        alias_generator=to_camel,
-        populate_by_name=True,
-        from_attributes=True,
-    )
+    claimName: str
 
 
 class PVCVolume(BaseModelWIthConfig):
@@ -295,7 +290,7 @@ class GenericK8sJobExecutor(GenericJobExecutor):
 
         pod_spec = self._client.V1PodSpec(
             containers=[base_container],
-            # volumes=[vol.model_dump(by_alias=True) for vol in self._volumes],
+            # volumes=[vol.model_dump(by_alias=True) for vol in spec_volumes],
             volumes=spec_volumes,
             tolerations=tolerations,
             **self.job_spec.template.spec.model_dump(
@@ -486,7 +481,7 @@ class K8sJobExecutor(GenericK8sJobExecutor):
         self._volumes.append(
             PVCVolume(
                 name=self.pvc_claim_name,
-                persistent_volume_claim=PVCClaim(claim_name=self.pvc_claim_name),
+                persistent_volume_claim=PVCClaim(claimName=self.pvc_claim_name),
             )
         )
         match self._context.run_log_store.service_name:

runnable/sdk.py

@@ -824,12 +824,22 @@ class Pipeline(BaseModel):
 
 class BaseJob(BaseModel):
     catalog: Optional[Catalog] = Field(default=None, alias="catalog")
-    overrides: Dict[str, Any] = Field(default_factory=dict, alias="overrides")
     returns: List[Union[str, TaskReturns]] = Field(
         default_factory=list, alias="returns"
     )
     secrets: List[str] = Field(default_factory=list)
 
+    @field_validator("catalog", mode="after")
+    @classmethod
+    def validate_catalog(cls, catalog: Optional[Catalog]) -> Optional[Catalog]:
+        if catalog is None:
+            return None
+
+        if catalog.get:
+            raise Exception("Catalog get is not supported for jobs")
+
+        return catalog
+
     def get_task(self) -> RunnableTask:
         raise NotImplementedError
 

{runnable-0.28.4.dist-info → runnable-0.28.6.dist-info}/METADATA

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

{runnable-0.28.4.dist-info → runnable-0.28.6.dist-info}/RECORD

@@ -8,7 +8,7 @@ extensions/catalog/pyproject.toml,sha256=lLNxY6v04c8I5QK_zKw_E6sJTArSJRA_V-79kta
 extensions/catalog/s3.py,sha256=Sw5t8_kVRprn3uGGJCiHn7M9zw1CLaCOFj6YErtfG0o,287
 extensions/job_executor/README.md,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 extensions/job_executor/__init__.py,sha256=E2R6GV5cZTlZdqA5SVJ6ajZFh4oruM0k8AKHkpOZ3W8,5772
-extensions/job_executor/k8s.py,sha256=yL6vMLO9CCf4jWopLvx0C0rK0xxWcOvvuJeumy-LgjA,16356
+extensions/job_executor/k8s.py,sha256=Mlmuqm1D70gfj471KKZrQF1PeDSCpOiW1bd4vD0pQ-w,16243
 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
@@ -52,12 +52,12 @@ runnable/names.py,sha256=vn92Kv9ANROYSZX6Z4z1v_WA3WiEdIYmG6KEStBFZug,8134
 runnable/nodes.py,sha256=YU9u7r1ESzui1uVtJ1dgwdv1ozyJnF2k-MCFieT8CLI,17519
 runnable/parameters.py,sha256=LyQb1d0SaFeI4PJ_yDYt9wArm9ThSPASWb36TwIdDUs,5213
 runnable/pickler.py,sha256=ydJ_eti_U1F4l-YacFp7BWm6g5vTn04UXye25S1HVok,2684
-runnable/sdk.py,sha256=T1nqDpLN9fULvvU9L-oY0EHqYdKUI9qk7oekLynm02Y,33568
+runnable/sdk.py,sha256=y3fbK4KAP6FiTF37ickVF9gqaZXrJIgSnHGOSG5ZWpI,33803
 runnable/secrets.py,sha256=PXcEJw-4WPzeWRLfsatcPPyr1zkqgHzdRWRcS9vvpvM,2354
 runnable/tasks.py,sha256=X6xijut7ffwpfYDcXoN6y0AcRVd7fWHs676DJ00Kma4,29134
 runnable/utils.py,sha256=hBr7oGwGL2VgfITlQCTz-a1iwvvf7Mfl-HY8UdENZac,19929
-runnable-0.28.4.dist-info/METADATA,sha256=fRMAv5diO4kDj1yQ515tE_-oyaxHr_kMpPOkbJPiiMI,10047
-runnable-0.28.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-runnable-0.28.4.dist-info/entry_points.txt,sha256=ioMbWojILtdibYVgh1jXJ00SpK-tX3gy7oVGDq61cSk,1839
-runnable-0.28.4.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-runnable-0.28.4.dist-info/RECORD,,
+runnable-0.28.6.dist-info/METADATA,sha256=phU1gjJ7dhv5biqBNFOCQv5-rdoLpVtViGFc_cGTIQQ,10047
+runnable-0.28.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+runnable-0.28.6.dist-info/entry_points.txt,sha256=ioMbWojILtdibYVgh1jXJ00SpK-tX3gy7oVGDq61cSk,1839
+runnable-0.28.6.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+runnable-0.28.6.dist-info/RECORD,,