dagster-k8s 0.25.8__tar.gz → 0.25.10__tar.gz

{dagster-k8s-0.25.8/dagster_k8s.egg-info → dagster-k8s-0.25.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-k8s
-Version: 0.25.8
+Version: 0.25.10
 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.8 → dagster-k8s-0.25.10}/dagster_k8s/client.py

@@ -2,7 +2,7 @@ import logging
 import sys
 import time
 from enum import Enum
-from typing import Any, Callable, List, Optional, Set, TypeVar
+from typing import Any, Callable, Optional, TypeVar
 
 import kubernetes.client
 import kubernetes.client.rest
@@ -52,7 +52,7 @@ class DagsterK8sAPIRetryLimitExceeded(Exception):
         max_retries = check.int_param(kwargs.pop("max_retries"), "max_retries")
 
         check.invariant(original_exc_info[0] is not None)
-        super(DagsterK8sAPIRetryLimitExceeded, self).__init__(
+        super().__init__(
             f"Retry limit of {max_retries} exceeded: " + args[0],
             *args[1:],
             **kwargs,
@@ -72,7 +72,7 @@ class DagsterK8sUnrecoverableAPIError(Exception):
         original_exc_info = check.tuple_param(kwargs.pop("original_exc_info"), "original_exc_info")
 
         check.invariant(original_exc_info[0] is not None)
-        super(DagsterK8sUnrecoverableAPIError, self).__init__(args[0], *args[1:], **kwargs)
+        super().__init__(args[0], *args[1:], **kwargs)
 
         self.k8s_api_exception = check.opt_inst_param(
             k8s_api_exception, "k8s_api_exception", Exception
@@ -573,7 +573,7 @@ class DagsterKubernetesClient:
         wait_timeout: float = DEFAULT_WAIT_TIMEOUT,
         wait_time_between_attempts: float = DEFAULT_WAIT_BETWEEN_ATTEMPTS,
         start_time: Any = None,
-        ignore_containers: Optional[Set] = None,
+        ignore_containers: Optional[set] = None,
     ) -> None:
         """Wait for a pod to launch and be running, or wait for termination (useful for job pods).
 
@@ -847,7 +847,7 @@ class DagsterKubernetesClient:
         self,
         pod_name: str,
         namespace: str,
-    ) -> List[Any]:
+    ) -> list[Any]:
         # https://github.com/kubernetes-client/python/blob/master/kubernetes/docs/EventsV1Event.md
         field_selector = f"involvedObject.name={pod_name}"
         return self.core_api.list_namespaced_event(namespace, field_selector=field_selector).items
@@ -916,7 +916,7 @@ class DagsterKubernetesClient:
     ) -> str:
         if pod is None:
             pods = self.core_api.list_namespaced_pod(
-                namespace=namespace, field_selector="metadata.name=%s" % pod_name
+                namespace=namespace, field_selector=f"metadata.name={pod_name}"
             ).items
             pod = pods[0] if pods else None
 

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/dagster_k8s/container_context.py

@@ -1,6 +1,7 @@
 import copy
 import logging
-from typing import TYPE_CHECKING, Any, Dict, Mapping, NamedTuple, Optional, Sequence, Set, cast
+from collections.abc import Mapping, Sequence
+from typing import TYPE_CHECKING, Any, NamedTuple, Optional, cast
 
 import dagster._check as check
 import kubernetes
@@ -121,7 +122,7 @@ class K8sContainerContext(
             server_k8s_config or UserDefinedDagsterK8sConfig.from_dict({}),
         )
 
-        return super(K8sContainerContext, cls).__new__(
+        return super().__new__(
             cls,
             run_k8s_config=run_k8s_config,
             server_k8s_config=server_k8s_config,
@@ -236,7 +237,7 @@ class K8sContainerContext(
         return UserDefinedDagsterK8sConfig.from_dict(merged_dict)
 
     @staticmethod
-    def _deep_merge_k8s_config(onto_dict: Dict[str, Any], from_dict: Mapping[str, Any]):
+    def _deep_merge_k8s_config(onto_dict: dict[str, Any], from_dict: Mapping[str, Any]):
         for from_key, from_value in from_dict.items():
             if from_key not in onto_dict:
                 onto_dict[from_key] = from_value
@@ -369,8 +370,8 @@ class K8sContainerContext(
     def _filter_user_defined_k8s_config_env_vars(
         self,
         user_defined_k8s_config: UserDefinedDagsterK8sConfig,
-        only_allow_user_defined_env_vars: Set[str],
-        discarded_env_var_names: Set[str],
+        only_allow_user_defined_env_vars: set[str],
+        discarded_env_var_names: set[str],
     ) -> UserDefinedDagsterK8sConfig:
         """Filters out any env vars from the supplied UserDefinedDagsterK8sConfig
         that are not in the supplied set of env var names and adds the names of
@@ -399,7 +400,7 @@ class K8sContainerContext(
 
     def _filter_user_defined_env_vars(
         self,
-        only_allow_user_defined_env_vars: Set[str],
+        only_allow_user_defined_env_vars: set[str],
     ) -> "K8sContainerContext":
         discarded_env_var_names = set()
 
@@ -427,7 +428,7 @@ class K8sContainerContext(
 
     def _get_used_k8s_config_fields(
         self, user_defined_k8s_config: UserDefinedDagsterK8sConfig
-    ) -> Mapping[str, Mapping[str, Set[str]]]:
+    ) -> Mapping[str, Mapping[str, set[str]]]:
         used_fields = {}
         for key, fields in user_defined_k8s_config.to_dict().items():
             if key == "merge_behavior":
@@ -527,7 +528,7 @@ class K8sContainerContext(
                 run_k8s_container_context,
             )
 
-        processed_context_value = cast(Dict, processed_container_context.value)
+        processed_context_value = cast(dict, processed_container_context.value)
 
         return shared_container_context.merge(
             K8sContainerContext(

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/dagster_k8s/executor.py

@@ -1,4 +1,5 @@
-from typing import Iterator, List, Optional, cast
+from collections.abc import Iterator
+from typing import Optional, cast
 
 import kubernetes.config
 from dagster import (
@@ -217,7 +218,7 @@ class K8sStepHandler(StepHandler):
 
     def _get_step_key(self, step_handler_context: StepHandlerContext) -> str:
         step_keys_to_execute = cast(
-            List[str], step_handler_context.execute_step_args.step_keys_to_execute
+            list[str], step_handler_context.execute_step_args.step_keys_to_execute
         )
         assert len(step_keys_to_execute) == 1, "Launching multiple steps is not currently supported"
         return step_keys_to_execute[0]
@@ -258,9 +259,9 @@ class K8sStepHandler(StepHandler):
         if step_handler_context.execute_step_args.known_state:
             retry_state = step_handler_context.execute_step_args.known_state.get_retry_state()
             if retry_state.get_attempt_count(step_key):
-                return "dagster-step-%s-%d" % (name_key, retry_state.get_attempt_count(step_key))
+                return "dagster-step-%s-%d" % (name_key, retry_state.get_attempt_count(step_key))  # noqa: UP031
 
-        return "dagster-step-%s" % (name_key)
+        return f"dagster-step-{name_key}"
 
     def launch_step(self, step_handler_context: StepHandlerContext) -> Iterator[DagsterEvent]:
         step_key = self._get_step_key(step_handler_context)

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/dagster_k8s/job.py

@@ -2,8 +2,9 @@ import copy
 import json
 import random
 import string
+from collections.abc import Mapping, Sequence
 from enum import Enum
-from typing import Any, List, Mapping, NamedTuple, Optional, Sequence
+from typing import Any, NamedTuple, Optional
 
 import dagster._check as check
 import kubernetes
@@ -159,7 +160,7 @@ class UserDefinedDagsterK8sConfig(
         if service_metadata:
             service_metadata = k8s_snake_case_dict(kubernetes.client.V1ObjectMeta, service_metadata)
 
-        return super(UserDefinedDagsterK8sConfig, cls).__new__(
+        return super().__new__(
             cls,
             container_config=container_config,
             pod_template_spec_metadata=pod_template_spec_metadata,
@@ -790,13 +791,13 @@ def construct_dagster_k8s_job(
 
     check.invariant(
         len(job_name) <= MAX_K8S_NAME_LEN,
-        "job_name is %d in length; Kubernetes Jobs cannot be longer than %d characters."
+        "job_name is %d in length; Kubernetes Jobs cannot be longer than %d characters."  # noqa: UP031
         % (len(job_name), MAX_K8S_NAME_LEN),
     )
 
     check.invariant(
         len(pod_name) <= MAX_K8S_NAME_LEN,
-        "job_name is %d in length; Kubernetes Pods cannot be longer than %d characters."
+        "job_name is %d in length; Kubernetes Pods cannot be longer than %d characters."  # noqa: UP031
         % (len(pod_name), MAX_K8S_NAME_LEN),
     )
 
@@ -808,7 +809,7 @@ def construct_dagster_k8s_job(
     additional_labels = {k: sanitize_k8s_label(v) for k, v in (labels or {}).items()}
     dagster_labels = merge_dicts(k8s_common_labels, additional_labels)
 
-    env: List[Mapping[str, Any]] = []
+    env: list[Mapping[str, Any]] = []
     if env_vars:
         env.extend(env_vars)
 

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/dagster_k8s/launcher.py

@@ -1,6 +1,7 @@
 import logging
 import sys
-from typing import Any, Mapping, Optional, Sequence
+from collections.abc import Mapping, Sequence
+from typing import Any, Optional
 
 import kubernetes
 from dagster import _check as check

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/dagster_k8s/models.py

@@ -1,6 +1,7 @@
 import datetime
 import re
-from typing import Any, Mapping, Type, TypeVar
+from collections.abc import Mapping
+from typing import Any, TypeVar
 
 import dagster._check as check
 import kubernetes
@@ -21,7 +22,7 @@ T_KubernetesModel = TypeVar("T_KubernetesModel")
 shared_k8s_model_configuration = Configuration()
 
 
-def _get_k8s_class(classname: str) -> Type[Any]:
+def _get_k8s_class(classname: str) -> type[Any]:
     if classname in ApiClient.NATIVE_TYPES_MAPPING:
         return ApiClient.NATIVE_TYPES_MAPPING[classname]
     else:
@@ -133,7 +134,7 @@ def k8s_snake_case_keys(model_class, model_dict: Mapping[str, Any]) -> Mapping[s
     return snake_case_dict
 
 
-def k8s_snake_case_dict(model_class: Type[Any], model_dict: Mapping[str, Any]) -> Mapping[str, Any]:
+def k8s_snake_case_dict(model_class: type[Any], model_dict: Mapping[str, Any]) -> Mapping[str, Any]:
     snake_case_dict = k8s_snake_case_keys(model_class, model_dict)
 
     final_dict = {}
@@ -148,7 +149,7 @@ def k8s_snake_case_dict(model_class: Type[Any], model_dict: Mapping[str, Any]) -
 # that the keys and values match the expected format. Requires k8s attribute names to be in
 # snake_case.
 def k8s_model_from_dict(
-    model_class: Type[T_KubernetesModel], model_dict: Mapping[str, Any]
+    model_class: type[T_KubernetesModel], model_dict: Mapping[str, Any]
 ) -> T_KubernetesModel:
     check.mapping_param(model_dict, "model_dict")
 

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/dagster_k8s/ops/k8s_job_op.py

@@ -1,6 +1,6 @@
 import os
 import time
-from typing import Any, Dict, List, Optional
+from typing import Any, Optional
 
 import kubernetes.config
 import kubernetes.watch
@@ -139,28 +139,28 @@ K8S_JOB_OP_CONFIG = merge_dicts(
 def execute_k8s_job(
     context: OpExecutionContext,
     image: str,
-    command: Optional[List[str]] = None,
-    args: Optional[List[str]] = None,
+    command: Optional[list[str]] = None,
+    args: Optional[list[str]] = None,
     namespace: Optional[str] = None,
     image_pull_policy: Optional[str] = None,
-    image_pull_secrets: Optional[List[Dict[str, str]]] = None,
+    image_pull_secrets: Optional[list[dict[str, str]]] = None,
     service_account_name: Optional[str] = None,
-    env_config_maps: Optional[List[str]] = None,
-    env_secrets: Optional[List[str]] = None,
-    env_vars: Optional[List[str]] = None,
-    volume_mounts: Optional[List[Dict[str, Any]]] = None,
-    volumes: Optional[List[Dict[str, Any]]] = None,
-    labels: Optional[Dict[str, str]] = None,
-    resources: Optional[Dict[str, Any]] = None,
+    env_config_maps: Optional[list[str]] = None,
+    env_secrets: Optional[list[str]] = None,
+    env_vars: Optional[list[str]] = None,
+    volume_mounts: Optional[list[dict[str, Any]]] = None,
+    volumes: Optional[list[dict[str, Any]]] = None,
+    labels: Optional[dict[str, str]] = None,
+    resources: Optional[dict[str, Any]] = None,
     scheduler_name: Optional[str] = None,
     load_incluster_config: bool = True,
     kubeconfig_file: Optional[str] = None,
     timeout: Optional[int] = None,
-    container_config: Optional[Dict[str, Any]] = None,
-    pod_template_spec_metadata: Optional[Dict[str, Any]] = None,
-    pod_spec_config: Optional[Dict[str, Any]] = None,
-    job_metadata: Optional[Dict[str, Any]] = None,
-    job_spec_config: Optional[Dict[str, Any]] = None,
+    container_config: Optional[dict[str, Any]] = None,
+    pod_template_spec_metadata: Optional[dict[str, Any]] = None,
+    pod_spec_config: Optional[dict[str, Any]] = None,
+    job_metadata: Optional[dict[str, Any]] = None,
+    job_spec_config: Optional[dict[str, Any]] = None,
     k8s_job_name: Optional[str] = None,
     merge_behavior: K8sConfigMergeBehavior = K8sConfigMergeBehavior.DEEP,
     delete_failed_k8s_jobs: Optional[bool] = True,
@@ -403,6 +403,12 @@ def execute_k8s_job(
                     print(log_entry)  # noqa: T201
                 except StopIteration:
                     break
+                except Exception:
+                    context.log.warning(
+                        "Error reading pod logs. Giving up and waiting for the pod to finish",
+                        exc_info=True,
+                    )
+                    break
         else:
             context.log.info("Pod logs are disabled, because restart_policy is not Never")
 

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/dagster_k8s/pipes.py

@@ -5,11 +5,11 @@ import re
 import string
 import threading
 import time
-from collections.abc import Callable, Generator
+from collections.abc import Callable, Generator, Iterator, Mapping, Sequence
 from contextlib import contextmanager
 from datetime import datetime
 from pathlib import Path
-from typing import Any, Iterator, Mapping, Optional, Sequence, Set, Union
+from typing import Any, Optional, Union
 
 import kubernetes
 from dagster import (
@@ -370,7 +370,7 @@ class PipesK8sClient(PipesClient, TreatAsResourceParam):
         env: Optional[Mapping[str, str]] = None,
         base_pod_meta: Optional[Mapping[str, Any]] = None,
         base_pod_spec: Optional[Mapping[str, Any]] = None,
-        ignore_containers: Optional[Set] = None,
+        ignore_containers: Optional[set] = None,
         enable_multi_container_logs: bool = False,
     ) -> PipesClientCompletedInvocation:
         """Publish a kubernetes pod and wait for it to complete, enriched with the pipes protocol.

dagster-k8s-0.25.10/dagster_k8s/version.py

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

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10/dagster_k8s.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-k8s
-Version: 0.25.8
+Version: 0.25.10
 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.8 → dagster-k8s-0.25.10}/dagster_k8s.egg-info/requires.txt

@@ -1,3 +1,3 @@
-dagster==1.9.8
+dagster==1.9.10
 kubernetes<32
 google-auth!=2.23.1

{dagster-k8s-0.25.8 → dagster-k8s-0.25.10}/setup.py

@@ -1,12 +1,11 @@
 from pathlib import Path
-from typing import Dict, Tuple
 
 from setuptools import find_packages, setup
 
 
-def get_version() -> Tuple[str, str]:
-    version: Dict[str, str] = {}
-    kubernetes_version: Dict[str, str] = {}
+def get_version() -> tuple[str, str]:
+    version: dict[str, str] = {}
+    kubernetes_version: dict[str, str] = {}
 
     with open(Path(__file__).parent / "dagster_k8s/version.py", encoding="utf8") as fp:
         exec(fp.read(), version)
@@ -43,7 +42,7 @@ setup(
     include_package_data=True,
     python_requires=">=3.9,<3.13",
     install_requires=[
-        "dagster==1.9.8",
+        "dagster==1.9.10",
         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.8/dagster_k8s/version.py

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