dagster-k8s 0.25.5__tar.gz → 0.25.7__tar.gz

{dagster-k8s-0.25.5/dagster_k8s.egg-info → dagster-k8s-0.25.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-k8s
-Version: 0.25.5
+Version: 0.25.7
 Summary: A Dagster integration for k8s
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-k8s
 Author: Dagster Labs

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7}/dagster_k8s/client.py

@@ -468,7 +468,7 @@ class DagsterKubernetesClient:
             try:
                 job = self.batch_api.read_namespaced_job_status(job_name, namespace=namespace)
             except kubernetes.client.rest.ApiException as e:
-                if e.reason == "Not Found":
+                if e.status == 404:
                     return None
                 else:
                     raise
@@ -518,14 +518,14 @@ class DagsterKubernetesClient:
                 for error in errors:
                     if not (
                         isinstance(error, kubernetes.client.rest.ApiException)
-                        and error.reason == "Not Found"
+                        and error.status == 404
                     ):
                         raise error
                 raise errors[0]
 
             return True
         except kubernetes.client.rest.ApiException as e:
-            if e.reason == "Not Found":
+            if e.status == 404:
                 return False
             raise e
 
@@ -673,7 +673,6 @@ class DagsterKubernetesClient:
             # State checks below, see:
             # https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.18/#containerstate-v1-core
             state = container_status.state
-
             if state.running is not None:
                 if wait_for_state == WaitForPodState.Ready:
                     # ready is boolean field of container status
@@ -684,6 +683,11 @@ class DagsterKubernetesClient:
                         continue
                     else:
                         ready_containers.add(container_status.name)
+                        if container_status.name in initcontainers:
+                            self.logger(
+                                f'Init container "{container_status.name}" is ready, waiting for non-init containers...'
+                            )
+                            continue
                         if initcontainers.issubset(exited_containers | ready_containers):
                             self.logger(f'Pod "{pod_name}" is ready, done waiting')
                             break

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7}/dagster_k8s/executor.py

@@ -237,9 +237,10 @@ class K8sStepHandler(StepHandler):
         user_defined_k8s_config = get_user_defined_k8s_config(
             step_handler_context.step_tags[step_key]
         )
-
+        step_context = step_handler_context.get_step_context(step_key)
+        op_name = step_context.step.op_name
         per_op_override = UserDefinedDagsterK8sConfig.from_dict(
-            self._per_step_k8s_config.get(step_key, {})
+            self._per_step_k8s_config.get(op_name, {})
         )
 
         return context.merge(K8sContainerContext(run_k8s_config=user_defined_k8s_config)).merge(
@@ -332,7 +333,7 @@ class K8sStepHandler(StepHandler):
         container_context = self._get_container_context(step_handler_context)
 
         status = self._api_client.get_job_status(
-            namespace=container_context.namespace,
+            namespace=container_context.namespace,  # pyright: ignore[reportArgumentType]
             job_name=job_name,
         )
         if not status:

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7}/dagster_k8s/launcher.py

@@ -400,7 +400,7 @@ class K8sRunLauncher(RunLauncher, ConfigurableClass):
             )
 
         else:
-            job_debug_info = self._api_client.get_job_debug_info(job_name, namespace=namespace)
+            job_debug_info = self._api_client.get_job_debug_info(job_name, namespace=namespace)  # pyright: ignore[reportArgumentType]
             full_msg = (
                 full_msg
                 + "\n\n"
@@ -419,7 +419,7 @@ class K8sRunLauncher(RunLauncher, ConfigurableClass):
         )
         try:
             status = self._api_client.get_job_status(
-                namespace=container_context.namespace,
+                namespace=container_context.namespace,  # pyright: ignore[reportArgumentType]
                 job_name=job_name,
             )
         except Exception:

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7}/dagster_k8s/models.py

@@ -69,7 +69,7 @@ def _k8s_parse_value(data: Any, classname: str, attr_name: str) -> Any:
     elif klass == object:
         return data
     elif klass == datetime.date:
-        return parse(data).date()
+        return parse(data).date()  # pyright: ignore[reportAttributeAccessIssue]
     elif klass == datetime.datetime:
         return parse(data)
     else:

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7}/dagster_k8s/ops/k8s_job_op.py

@@ -371,7 +371,10 @@ def execute_k8s_job(
             watch = kubernetes.watch.Watch()  # consider moving in to api_client
 
             api_client.wait_for_pod(
-                pod_to_watch, namespace, wait_timeout=timeout, start_time=start_time
+                pod_to_watch,
+                namespace,  # pyright: ignore[reportArgumentType]
+                wait_timeout=timeout,
+                start_time=start_time,  # pyright: ignore[reportArgumentType]
             )
 
             log_stream = watch.stream(
@@ -416,6 +419,20 @@ def execute_k8s_job(
             num_pods_to_wait_for=num_pods_to_wait_for,
         )
     except (DagsterExecutionInterruptedError, Exception) as e:
+        try:
+            pods = api_client.get_pod_names_in_job(job_name=job_name, namespace=namespace)
+            pod_debug_info = "\n\n".join(
+                [api_client.get_pod_debug_info(pod_name, namespace) for pod_name in pods]
+            )
+        except Exception:
+            context.log.exception(
+                f"Error trying to get pod debug information for failed k8s job {job_name}"
+            )
+        else:
+            context.log.error(
+                f"Debug information for failed k8s job {job_name}:\n\n{pod_debug_info}"
+            )
+
         if delete_failed_k8s_jobs:
             context.log.info(
                 f"Deleting Kubernetes job {job_name} in namespace {namespace} due to exception"

dagster-k8s-0.25.7/dagster_k8s/version.py

@@ -0,0 +1 @@
+__version__ = "0.25.7"

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7/dagster_k8s.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-k8s
-Version: 0.25.5
+Version: 0.25.7
 Summary: A Dagster integration for k8s
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-k8s
 Author: Dagster Labs

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7}/dagster_k8s.egg-info/requires.txt

@@ -1,3 +1,3 @@
-dagster==1.9.5
+dagster==1.9.7
 kubernetes<32
 google-auth!=2.23.1

{dagster-k8s-0.25.5 → dagster-k8s-0.25.7}/setup.py

@@ -43,7 +43,7 @@ setup(
     include_package_data=True,
     python_requires=">=3.9,<3.13",
     install_requires=[
-        "dagster==1.9.5",
+        "dagster==1.9.7",
         f"kubernetes<{KUBERNETES_VERSION_UPPER_BOUND}",
         # exclude a google-auth release that added an overly restrictive urllib3 pin that confuses dependency resolvers
         "google-auth!=2.23.1",

dagster-k8s-0.25.5/dagster_k8s/version.py

@@ -1 +0,0 @@
-__version__ = "0.25.5"