runnable 0.28.3__py3-none-any.whl → 0.28.5__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
@@ -39,7 +40,17 @@ class TolerationOperator(str, Enum):
     EQUAL = "Equal"
 
 
-class Toleration(BaseModel):
+class BaseModelWIthConfig(BaseModel, use_enum_values=True):
+    model_config = ConfigDict(
+        extra="forbid",
+        alias_generator=to_camel,
+        populate_by_name=True,
+        from_attributes=True,
+        validate_default=True,
+    )
+
+
+class Toleration(BaseModelWIthConfig):
     key: str
     operator: TolerationOperator = TolerationOperator.EQUAL
     value: Optional[str]
@@ -47,24 +58,24 @@ class Toleration(BaseModel):
     toleration_seconds: Optional[int] = Field(default=None)
 
 
-class LabelSelectorRequirement(BaseModel):
+class LabelSelectorRequirement(BaseModelWIthConfig):
     key: str
     operator: Operator
     values: list[str]
 
 
-class LabelSelector(BaseModel):
+class LabelSelector(BaseModelWIthConfig):
     match_expressions: list[LabelSelectorRequirement]
     match_labels: dict[str, str]
 
 
-class ObjectMetaData(BaseModel):
+class ObjectMetaData(BaseModelWIthConfig):
     generate_name: Optional[str]
     annotations: Optional[dict[str, str]]
     namespace: Optional[str] = "default"
 
 
-class EnvVar(BaseModel):
+class EnvVar(BaseModelWIthConfig):
     name: str
     value: str
 
@@ -75,7 +86,7 @@ VendorGPU = Annotated[
 ]
 
 
-class Request(BaseModel):
+class Request(BaseModelWIthConfig):
     """
     The default requests
     """
@@ -85,7 +96,7 @@ class Request(BaseModel):
     gpu: VendorGPU = Field(default=None, serialization_alias="nvidia.com/gpu")
 
 
-class Limit(BaseModel):
+class Limit(BaseModelWIthConfig):
     """
     The default limits
     """
@@ -95,49 +106,43 @@ class Limit(BaseModel):
     gpu: VendorGPU = Field(default=None, serialization_alias="nvidia.com/gpu")
 
 
-class Resources(BaseModel):
+class Resources(BaseModelWIthConfig):
     limits: Limit = Limit()
-    requests: Request = Request()
+    requests: Optional[Request] = Field(default=None)
 
 
-class VolumeMount(BaseModel):
+class VolumeMount(BaseModelWIthConfig):
     name: str
     mount_path: str
 
 
-class Container(BaseModel):
+class Container(BaseModelWIthConfig):
     image: str
     env: list[EnvVar] = Field(default_factory=list)
-    image_pull_policy: ImagePullPolicy = ImagePullPolicy.NEVER
+    image_pull_policy: ImagePullPolicy = Field(default=ImagePullPolicy.NEVER)
     resources: Resources = Resources()
     volume_mounts: Optional[list[VolumeMount]] = Field(default_factory=lambda: [])
 
 
-class HostPath(BaseModel):
+class HostPath(BaseModelWIthConfig):
     path: str
 
 
-class HostPathVolume(BaseModel):
+class HostPathVolume(BaseModelWIthConfig):
     name: str
     host_path: HostPath
 
 
-class PVCClaim(BaseModel):
-    claim_name: str
-
-    model_config = ConfigDict(
-        alias_generator=to_camel,
-        populate_by_name=True,
-        from_attributes=True,
-    )
+class PVCClaim(BaseModelWIthConfig):
+    claimName: str
 
 
-class PVCVolume(BaseModel):
+class PVCVolume(BaseModelWIthConfig):
     name: str
     persistent_volume_claim: PVCClaim
 
 
-class K8sTemplateSpec(BaseModel):
+class K8sTemplateSpec(BaseModelWIthConfig):
     active_deadline_seconds: int = Field(default=60 * 60 * 2)  # 2 hours
     node_selector: Optional[dict[str, str]] = None
     tolerations: Optional[list[Toleration]] = None
@@ -149,12 +154,12 @@ class K8sTemplateSpec(BaseModel):
     container: Container
 
 
-class K8sTemplate(BaseModel):
+class K8sTemplate(BaseModelWIthConfig):
     spec: K8sTemplateSpec
     metadata: Optional[ObjectMetaData] = None
 
 
-class Spec(BaseModel):
+class Spec(BaseModelWIthConfig):
     active_deadline_seconds: Optional[int] = Field(default=60 * 60 * 2)  # 2 hours
     backoff_limit: int = 6
     selector: Optional[LabelSelector] = None
@@ -251,7 +256,7 @@ class GenericK8sJobExecutor(GenericJobExecutor):
         command = utils.get_job_execution_command()
 
         container_env = [
-            self._client.V1EnvVar(**env.model_dump(by_alias=True))
+            self._client.V1EnvVar(**env.model_dump())
             for env in self.job_spec.template.spec.container.env
         ]
 
@@ -260,8 +265,12 @@ class GenericK8sJobExecutor(GenericJobExecutor):
             env=container_env,
             name="default",
             volume_mounts=container_volume_mounts,
+            resources=self.job_spec.template.spec.container.resources.model_dump(
+                by_alias=True, exclude_none=True
+            ),
             **self.job_spec.template.spec.container.model_dump(
-                exclude_none=True, exclude={"volume_mounts", "command", "env"}
+                exclude_none=True,
+                exclude={"volume_mounts", "command", "env", "resources"},
             ),
         )
 
@@ -269,20 +278,19 @@ class GenericK8sJobExecutor(GenericJobExecutor):
             self._volumes += self.job_spec.template.spec.volumes
 
         spec_volumes = [
-            self._client.V1Volume(**vol.model_dump(by_alias=True))
-            for vol in self._volumes
+            self._client.V1Volume(**vol.model_dump()) for vol in self._volumes
         ]
 
         tolerations = None
         if self.job_spec.template.spec.tolerations:
             tolerations = [
-                self._client.V1Toleration(**toleration.model_dump(by_alias=True))
+                self._client.V1Toleration(**toleration.model_dump())
                 for toleration in self.job_spec.template.spec.tolerations
             ]
 
         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(
@@ -473,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-0.28.3.dist-info → runnable-0.28.5.dist-info}/METADATA

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

{runnable-0.28.3.dist-info → runnable-0.28.5.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=LQSD33Q4Zdox2dt4Rr_88ahX2hWu0ZTky3IRmW5Gd54,15777
+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
@@ -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.3.dist-info/METADATA,sha256=Nyn4qIxAdhRHPN--RXPJTwV-0CTgkdynbDsU1j8IXrA,10047
-runnable-0.28.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-runnable-0.28.3.dist-info/entry_points.txt,sha256=ioMbWojILtdibYVgh1jXJ00SpK-tX3gy7oVGDq61cSk,1839
-runnable-0.28.3.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-runnable-0.28.3.dist-info/RECORD,,
+runnable-0.28.5.dist-info/METADATA,sha256=coPYv1TmJ8bJaBaXNnnvax7cdKWS9hGBYSJWKtuEpZU,10047
+runnable-0.28.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+runnable-0.28.5.dist-info/entry_points.txt,sha256=ioMbWojILtdibYVgh1jXJ00SpK-tX3gy7oVGDq61cSk,1839
+runnable-0.28.5.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+runnable-0.28.5.dist-info/RECORD,,