dagster-aws 0.27.16__tar.gz → 0.28.1__tar.gz

{dagster_aws-0.27.16/dagster_aws.egg-info → dagster_aws-0.28.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dagster-aws
-Version: 0.27.16
+Version: 0.28.1
 Summary: Package for AWS-specific Dagster framework solid and resource components.
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-aws
 Author: Dagster Labs
@@ -16,7 +16,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9,<3.14
 License-File: LICENSE
 Requires-Dist: boto3
-Requires-Dist: dagster==1.11.16
+Requires-Dist: dagster==1.12.1
 Requires-Dist: packaging
 Requires-Dist: requests
 Provides-Extra: redshift

{dagster_aws-0.27.16 → dagster_aws-0.28.1}/dagster_aws/ecs/launcher.py

@@ -30,11 +30,12 @@ from dagster._core.launcher.base import (
     WorkerStatus,
 )
 from dagster._core.storage.dagster_run import DagsterRun
-from dagster._core.storage.tags import RUN_WORKER_ID_TAG
+from dagster._core.storage.tags import HIDDEN_TAG_PREFIX, RUN_WORKER_ID_TAG
 from dagster._grpc.types import ExecuteRunArgs
 from dagster._serdes import ConfigurableClass
 from dagster._serdes.config_class import ConfigurableClassData
 from dagster._utils.backoff import backoff
+from dagster._utils.tags import get_boolean_tag_value
 from typing_extensions import Self
 
 from dagster_aws.ecs.container_context import (
@@ -855,6 +856,28 @@ class EcsRunLauncher(RunLauncher[T_DagsterInstance], ConfigurableClass):
             task.get("stoppedReason", "")
         )
 
+    def _add_eni_id_tags(self, run: DagsterRun, task: dict[str, Any]):
+        attachments = task.get("attachments", [])
+        eni_ids = {}
+        eni_count = 0
+        for attachment in attachments:
+            if attachment.get("type") == "ElasticNetworkInterface":
+                details = {d["name"]: d["value"] for d in attachment.get("details", [])}
+
+                if "networkInterfaceId" in details:
+                    if eni_count == 0:
+                        eni_ids[f"{HIDDEN_TAG_PREFIX}eni_id"] = details["networkInterfaceId"]
+                    else:
+                        eni_ids[f"{HIDDEN_TAG_PREFIX}eni_id_{eni_count}"] = details[
+                            "networkInterfaceId"
+                        ]
+                    eni_count += 1
+        self._instance.add_run_tags(run.run_id, eni_ids)
+        if eni_count > 0:
+            logging.info(f"Added {eni_count} ENI ID tags for run {run.run_id}: {eni_ids}")
+        else:
+            logging.warning(f"No ENI IDs found for run {run.run_id}")
+
     def check_run_worker_health(self, run: DagsterRun):
         run_worker_id = run.tags.get(RUN_WORKER_ID_TAG)
 
@@ -870,6 +893,14 @@ class EcsRunLauncher(RunLauncher[T_DagsterInstance], ConfigurableClass):
 
         t = tasks[0]
 
+        if get_boolean_tag_value(os.getenv("DAGSTER_AWS_ENI_TAGGING_ENABLED")) and not run.tags.get(
+            f"{HIDDEN_TAG_PREFIX}eni_id"
+        ):
+            try:
+                self._add_eni_id_tags(run, t)
+            except Exception:
+                logging.exception(f"Error adding ENI ID tags for run {run.run_id}")
+
         if t.get("lastStatus") in RUNNING_STATUSES:
             return CheckRunHealthResult(WorkerStatus.RUNNING, run_worker_id=run_worker_id)
         elif t.get("lastStatus") in STOPPED_STATUSES:

{dagster_aws-0.27.16 → dagster_aws-0.28.1}/dagster_aws/pipes/context_injectors.py

@@ -4,15 +4,15 @@ import random
 import string
 from collections.abc import Iterator
 from contextlib import contextmanager
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
-import boto3
 import dagster._check as check
 from dagster._core.pipes.client import PipesContextInjector, PipesParams
 from dagster._core.pipes.utils import PipesEnvContextInjector
 
 if TYPE_CHECKING:
     from dagster_pipes import PipesContextData
+    from mypy_boto3_s3 import S3Client
 
 _CONTEXT_FILENAME = "context.json"
 
@@ -22,20 +22,21 @@ class PipesS3ContextInjector(PipesContextInjector):
 
     Args:
         bucket (str): The S3 bucket to write to.
-        client (boto3.client): A boto3 client to use to write to S3.
+        client (S3Client): A boto3 client to use to write to S3.
         key_prefix (Optional[str]): An optional prefix to use for the S3 key. Defaults to a random
             string.
 
     """
 
-    def __init__(self, *, bucket: str, client: boto3.client):  # pyright: ignore (reportGeneralTypeIssues)
+    def __init__(self, *, bucket: str, client: "S3Client", key_prefix: Optional[str] = None):
         super().__init__()
         self.bucket = check.str_param(bucket, "bucket")
         self.client = client
+        self.key_prefix = key_prefix
 
     @contextmanager
     def inject_context(self, context: "PipesContextData") -> Iterator[PipesParams]:  # pyright: ignore[reportIncompatibleMethodOverride]
-        key_prefix = "".join(random.choices(string.ascii_letters, k=30))
+        key_prefix = f"{self.key_prefix or ''}{''.join(random.choices(string.ascii_letters, k=30))}"
         key = os.path.join(key_prefix, _CONTEXT_FILENAME)
         self.client.put_object(
             Body=json.dumps(context).encode("utf-8"), Bucket=self.bucket, Key=key

dagster_aws-0.28.1/dagster_aws/version.py

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

{dagster_aws-0.27.16 → dagster_aws-0.28.1/dagster_aws.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dagster-aws
-Version: 0.27.16
+Version: 0.28.1
 Summary: Package for AWS-specific Dagster framework solid and resource components.
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-aws
 Author: Dagster Labs
@@ -16,7 +16,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9,<3.14
 License-File: LICENSE
 Requires-Dist: boto3
-Requires-Dist: dagster==1.11.16
+Requires-Dist: dagster==1.12.1
 Requires-Dist: packaging
 Requires-Dist: requests
 Provides-Extra: redshift

{dagster_aws-0.27.16 → dagster_aws-0.28.1}/dagster_aws.egg-info/requires.txt

@@ -1,5 +1,5 @@
 boto3
-dagster==1.11.16
+dagster==1.12.1
 packaging
 requests
 

{dagster_aws-0.27.16 → dagster_aws-0.28.1}/setup.py

@@ -36,7 +36,7 @@ setup(
     python_requires=">=3.9,<3.14",
     install_requires=[
         "boto3",
-        "dagster==1.11.16",
+        "dagster==1.12.1",
         "packaging",
         "requests",
     ],

dagster_aws-0.27.16/dagster_aws/version.py

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