dagster-k8s 0.24.4__tar.gz → 0.24.6__tar.gz

{dagster-k8s-0.24.4/dagster_k8s.egg-info → dagster-k8s-0.24.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dagster-k8s
-Version: 0.24.4
+Version: 0.24.6
 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.24.4 → dagster-k8s-0.24.6}/dagster_k8s/__init__.py

@@ -1,20 +1,20 @@
 from dagster._core.libraries import DagsterLibraryRegistry
 
-from .executor import k8s_job_executor as k8s_job_executor
-from .job import (
+from dagster_k8s.executor import k8s_job_executor as k8s_job_executor
+from dagster_k8s.job import (
     DagsterK8sJobConfig as DagsterK8sJobConfig,
     K8sConfigMergeBehavior as K8sConfigMergeBehavior,
     construct_dagster_k8s_job as construct_dagster_k8s_job,
 )
-from .launcher import K8sRunLauncher as K8sRunLauncher
-from .ops import (
+from dagster_k8s.launcher import K8sRunLauncher as K8sRunLauncher
+from dagster_k8s.ops import (
     execute_k8s_job as execute_k8s_job,
     k8s_job_op as k8s_job_op,
 )
-from .pipes import (
+from dagster_k8s.pipes import (
     PipesK8sClient as PipesK8sClient,
     PipesK8sPodLogsMessageReader as PipesK8sPodLogsMessageReader,
 )
-from .version import __version__ as __version__
+from dagster_k8s.version import __version__ as __version__
 
 DagsterLibraryRegistry.register("dagster-k8s", __version__)

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/dagster_k8s/container_context.py

@@ -13,15 +13,15 @@ from dagster._core.utils import parse_env_var
 from dagster._utils import hash_collection
 
 if TYPE_CHECKING:
-    from . import K8sRunLauncher
+    from dagster_k8s import K8sRunLauncher
 
-from .job import (
+from dagster_k8s.job import (
     DagsterK8sJobConfig,
     K8sConfigMergeBehavior,
     UserDefinedDagsterK8sConfig,
     get_user_defined_k8s_config,
 )
-from .models import k8s_snake_case_dict, k8s_snake_case_keys
+from dagster_k8s.models import k8s_snake_case_dict, k8s_snake_case_keys
 
 
 def _dedupe_list(values):

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/dagster_k8s/executor.py

@@ -24,11 +24,9 @@ from dagster._core.executor.step_delegating import (
 )
 from dagster._utils.merger import merge_dicts
 
-from dagster_k8s.launcher import K8sRunLauncher
-
-from .client import DagsterKubernetesClient
-from .container_context import K8sContainerContext
-from .job import (
+from dagster_k8s.client import DagsterKubernetesClient
+from dagster_k8s.container_context import K8sContainerContext
+from dagster_k8s.job import (
     USER_DEFINED_K8S_CONFIG_SCHEMA,
     DagsterK8sJobConfig,
     UserDefinedDagsterK8sConfig,
@@ -36,6 +34,7 @@ from .job import (
     get_k8s_job_name,
     get_user_defined_k8s_config,
 )
+from dagster_k8s.launcher import K8sRunLauncher
 
 _K8S_EXECUTOR_CONFIG_SCHEMA = merge_dicts(
     DagsterK8sJobConfig.config_type_job(),

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/dagster_k8s/job.py

@@ -23,8 +23,8 @@ from dagster._serdes import whitelist_for_serdes
 from dagster._utils.merger import merge_dicts
 from dagster._utils.security import non_secure_md5_hash_str
 
-from .models import k8s_model_from_dict, k8s_snake_case_dict
-from .utils import get_common_labels, sanitize_k8s_label
+from dagster_k8s.models import k8s_model_from_dict, k8s_snake_case_dict
+from dagster_k8s.utils import get_common_labels, sanitize_k8s_label
 
 # To retry step worker, users should raise RetryRequested() so that the dagster system is aware of the
 # retry. As an example, see retry_job in dagster_test.test_project.test_jobs.repo

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/dagster_k8s/launcher.py

@@ -14,9 +14,9 @@ from dagster._grpc.types import ResumeRunArgs
 from dagster._serdes import ConfigurableClass, ConfigurableClassData
 from dagster._utils.error import serializable_error_info_from_exc_info
 
-from .client import DagsterKubernetesClient
-from .container_context import K8sContainerContext
-from .job import DagsterK8sJobConfig, construct_dagster_k8s_job, get_job_name_from_run_id
+from dagster_k8s.client import DagsterKubernetesClient
+from dagster_k8s.container_context import K8sContainerContext
+from dagster_k8s.job import DagsterK8sJobConfig, construct_dagster_k8s_job, get_job_name_from_run_id
 
 
 class K8sRunLauncher(RunLauncher, ConfigurableClass):
@@ -225,12 +225,6 @@ class K8sRunLauncher(RunLauncher, ConfigurableClass):
         job_config = container_context.get_k8s_job_config(
             job_image=repository_origin.container_image, run_launcher=self
         )
-        job_image = job_config.job_image
-        if job_image:  # expected to be set
-            self._instance.add_run_tags(
-                run.run_id,
-                {DOCKER_IMAGE_TAG: job_image},
-            )
 
         labels = {
             "dagster/job": job_origin.job_name,
@@ -257,6 +251,12 @@ class K8sRunLauncher(RunLauncher, ConfigurableClass):
             ],
         )
 
+        # Set docker/image tag here, as it can also be provided by `user_defined_k8s_config`.
+        self._instance.add_run_tags(
+            run.run_id,
+            {DOCKER_IMAGE_TAG: job.spec.template.spec.containers[0].image},
+        )
+
         namespace = check.not_none(container_context.namespace)
 
         self._instance.report_engine_event(

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/dagster_k8s/ops/__init__.py

@@ -1,4 +1,4 @@
-from .k8s_job_op import (
+from dagster_k8s.ops.k8s_job_op import (
     execute_k8s_job as execute_k8s_job,
     k8s_job_op as k8s_job_op,
 )

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/dagster_k8s/ops/k8s_job_op.py

@@ -19,16 +19,16 @@ from dagster._annotations import experimental
 from dagster._core.errors import DagsterExecutionInterruptedError
 from dagster._utils.merger import merge_dicts
 
-from ..client import DEFAULT_JOB_POD_COUNT, DagsterKubernetesClient, k8s_api_retry
-from ..container_context import K8sContainerContext
-from ..job import (
+from dagster_k8s.client import DEFAULT_JOB_POD_COUNT, DagsterKubernetesClient, k8s_api_retry
+from dagster_k8s.container_context import K8sContainerContext
+from dagster_k8s.job import (
     DagsterK8sJobConfig,
     K8sConfigMergeBehavior,
     UserDefinedDagsterK8sConfig,
     construct_dagster_k8s_job,
     get_k8s_job_name,
 )
-from ..launcher import K8sRunLauncher
+from dagster_k8s.launcher import K8sRunLauncher
 
 K8S_JOB_OP_CONFIG = merge_dicts(
     DagsterK8sJobConfig.config_type_container(),

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/dagster_k8s/pipes.py

@@ -1,5 +1,6 @@
 import os
 import random
+import re
 import string
 from contextlib import contextmanager
 from pathlib import Path
@@ -33,15 +34,17 @@ from dagster_pipes import (
     encode_env_var,
 )
 
-from dagster_k8s.client import DEFAULT_WAIT_BETWEEN_ATTEMPTS
+from dagster_k8s.client import (
+    DEFAULT_WAIT_BETWEEN_ATTEMPTS,
+    DagsterKubernetesClient,
+    WaitForPodState,
+)
+from dagster_k8s.models import k8s_model_from_dict, k8s_snake_case_dict
 from dagster_k8s.utils import get_common_labels
 
-from .client import DagsterKubernetesClient, WaitForPodState
-from .models import k8s_model_from_dict, k8s_snake_case_dict
-
 
 def get_pod_name(run_id: str, op_name: str):
-    clean_op_name = op_name.replace("_", "-")
+    clean_op_name = re.sub("[^a-z0-9-]", "", op_name.lower().replace("_", "-"))
     suffix = "".join(random.choice(string.digits) for i in range(10))
     return f"dagster-{run_id[:18]}-{clean_op_name[:20]}-{suffix}"
 

dagster-k8s-0.24.6/dagster_k8s/version.py

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

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6/dagster_k8s.egg-info}/PKG-INFO

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

@@ -1,3 +1,3 @@
-dagster==1.8.4
+dagster==1.8.6
 kubernetes
 google-auth!=2.23.1

{dagster-k8s-0.24.4 → dagster-k8s-0.24.6}/setup.py

@@ -36,7 +36,7 @@ setup(
     include_package_data=True,
     python_requires=">=3.8,<3.13",
     install_requires=[
-        "dagster==1.8.4",
+        "dagster==1.8.6",
         "kubernetes",
         # exclude a google-auth release that added an overly restrictive urllib3 pin that confuses dependency resolvers
         "google-auth!=2.23.1",

dagster-k8s-0.24.4/dagster_k8s/version.py

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