dagster-sling 0.27.12__py3-none-any.whl → 0.27.14__py3-none-any.whl

dagster_sling/components/sling_replication_collection/component.py

@@ -20,7 +20,12 @@ from dagster.components.core.context import ComponentLoadContext
 from dagster.components.resolved.context import ResolutionContext
 from dagster.components.resolved.core_models import OpSpec
 from dagster.components.scaffold.scaffold import scaffold_with
-from dagster.components.utils.translation import TranslationFn, TranslationFnResolver
+from dagster.components.utils.translation import (
+    ComponentTranslator,
+    TranslationFn,
+    TranslationFnResolver,
+    create_component_translator_cls,
+)
 from dagster_shared.utils.warnings import deprecation_warning
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import TypeAlias
@@ -35,15 +40,6 @@ from dagster_sling.resources import AssetExecutionContext, SlingConnectionResour
 SlingMetadataAddons: TypeAlias = Literal["column_metadata", "row_count"]
 
 
-class ProxyDagsterSlingTranslator(DagsterSlingTranslator):
-    def __init__(self, fn: TranslationFn[Mapping[str, Any]]):
-        self._fn = fn
-
-    def get_asset_spec(self, stream_definition: Mapping[str, Any]) -> AssetSpec:
-        base_asset_spec = super().get_asset_spec(stream_definition)
-        return self._fn(base_asset_spec, stream_definition)
-
-
 @dataclass
 class SlingReplicationSpecModel(Resolvable):
     path: str
@@ -56,33 +52,16 @@ class SlingReplicationSpecModel(Resolvable):
             ),
         ]
     ] = None
-    include_metadata: list[SlingMetadataAddons] = field(default_factory=list)
-
-    @cached_property
-    def translator(self):
-        if self.translation:
-            return ProxyDagsterSlingTranslator(self.translation)
-        return DagsterSlingTranslator()
-
-
-def resolve_resource(
-    context: ResolutionContext,
-    sling,
-) -> Optional[SlingResource]:
-    if sling:
-        deprecation_warning(
-            "The `sling` field is deprecated, use `connections` instead. This field will be removed in a future release.",
-            "1.11.1",
-        )
-    return SlingResource(**context.resolve_value(sling.model_dump())) if sling else None
-
-
-def replicate(
-    context: AssetExecutionContext,
-    connections: list[SlingConnectionResource],
-) -> Iterator[Union[AssetMaterialization, MaterializeResult]]:
-    sling = SlingResource(connections=connections)
-    yield from sling.replicate(context=context)
+    include_metadata: Annotated[
+        list[SlingMetadataAddons],
+        Resolver.default(
+            description="Optionally include additional metadata in materializations generated while executing your Sling models",
+            examples=[
+                ["row_count"],
+                ["row_count", "column_metadata"],
+            ],
+        ),
+    ] = field(default_factory=list)
 
 
 class SlingConnectionResourcePropertiesModel(Resolvable, BaseModel):
@@ -123,6 +102,18 @@ ResolvedSlingConnections: TypeAlias = Annotated[
 ]
 
 
+def resolve_resource(
+    context: ResolutionContext,
+    sling,
+) -> Optional[SlingResource]:
+    if sling:
+        deprecation_warning(
+            "The `sling` field is deprecated, use `connections` instead. This field will be removed in a future release.",
+            "1.11.1",
+        )
+    return SlingResource(**context.resolve_value(sling.model_dump())) if sling else None
+
+
 @public
 @scaffold_with(SlingReplicationComponentScaffolder)
 @dataclass
@@ -148,28 +139,24 @@ class SlingReplicationCollectionComponent(Component, Resolvable):
     def sling_resource(self) -> SlingResource:
         return self.resource or SlingResource(connections=self.connections)
 
+    @cached_property
+    def _base_translator(self) -> DagsterSlingTranslator:
+        return DagsterSlingTranslator()
+
+    def get_asset_spec(self, stream_definition: Mapping[str, Any]) -> AssetSpec:
+        return self._base_translator.get_asset_spec(stream_definition)
+
     def build_asset(
         self, context: ComponentLoadContext, replication_spec_model: SlingReplicationSpecModel
     ) -> AssetsDefinition:
         op_spec = replication_spec_model.op or OpSpec()
-
-        class ReplicationTranslatorWithCodeReferences(DagsterSlingTranslator):
-            def get_asset_spec(self, stream_definition: Mapping[str, Any]) -> AssetSpec:
-                asset_spec = replication_spec_model.translator.get_asset_spec(stream_definition)
-                return merge_code_references(
-                    asset_spec,
-                    [
-                        LocalFileCodeReference(
-                            file_path=str(context.path / replication_spec_model.path)
-                        )
-                    ],
-                )
+        translator = SlingComponentTranslator(self, replication_spec_model, context.path)
 
         @sling_assets(
             name=op_spec.name or Path(replication_spec_model.path).stem,
             op_tags=op_spec.tags,
             replication_config=context.path / replication_spec_model.path,
-            dagster_sling_translator=ReplicationTranslatorWithCodeReferences(),
+            dagster_sling_translator=translator,
             backfill_policy=op_spec.backfill_policy,
         )
         def _asset(context: AssetExecutionContext):
@@ -198,3 +185,29 @@ class SlingReplicationCollectionComponent(Component, Resolvable):
         return Definitions(
             assets=[self.build_asset(context, replication) for replication in self.replications],
         )
+
+
+class SlingComponentTranslator(
+    create_component_translator_cls(SlingReplicationCollectionComponent, DagsterSlingTranslator),
+    ComponentTranslator[SlingReplicationCollectionComponent],
+):
+    def __init__(
+        self,
+        component: SlingReplicationCollectionComponent,
+        replication_spec: SlingReplicationSpecModel,
+        base_path: Path,
+    ):
+        self._component = component
+        self._replication_spec = replication_spec
+        self._base_path = base_path
+
+    def get_asset_spec(self, stream_definition: Mapping[str, Any]) -> AssetSpec:
+        spec = super().get_asset_spec(stream_definition)
+        if self._replication_spec.translation is not None:
+            spec = self._replication_spec.translation(spec, stream_definition)
+
+        # always add code references to the replication spec
+        code_reference = LocalFileCodeReference(
+            file_path=str(self._base_path / self._replication_spec.path)
+        )
+        return merge_code_references(spec, [code_reference])

dagster_sling/resources.py

@@ -279,8 +279,12 @@ class SlingResource(ConfigurableResource):
             yield
 
     def _clean_line(self, line: str) -> str:
-        """Removes ANSI escape sequences from a line of output."""
-        return ANSI_ESCAPE.sub("", line).replace("INF", "")
+        """Removes ANSI escape sequences and Sling log prefixes from a line of output."""
+        line = ANSI_ESCAPE.sub("", line)
+        # Remove Sling log format prefix: "{timestamp} {LEVEL} " (e.g., "1:04PM INF ")
+        # Match pattern: optional timestamp followed by log level (INF, WRN, ERR, DBG) and space
+        line = re.sub(r"^\d{1,2}:\d{2}[AP]M\s+(INF|WRN|ERR|DBG)\s+", "", line)
+        return line
 
     def _clean_timestamp_log(self, line: str):
         """Remove timestamp from log gather from sling cli to reduce redundency in dagster log.

dagster_sling/version.py

@@ -1 +1 @@
-__version__ = "0.27.12"
+__version__ = "0.27.14"

{dagster_sling-0.27.12.dist-info → dagster_sling-0.27.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dagster-sling
-Version: 0.27.12
+Version: 0.27.14
 Summary: Package for performing ETL/ELT tasks with Sling in Dagster.
 Home-page: https://github.com/dagster-io/dagster/tree/master/python_modules/libraries/dagster-sling
 Author: Dagster Labs
@@ -15,7 +15,7 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Requires-Python: >=3.9,<3.14
 License-File: LICENSE
-Requires-Dist: dagster==1.11.12
+Requires-Dist: dagster==1.11.14
 Requires-Dist: sling>=1.1.5
 Requires-Dist: sling-mac-arm64; platform_system == "Darwin" and platform_machine == "arm64"
 Provides-Extra: test

{dagster_sling-0.27.12.dist-info → dagster_sling-0.27.14.dist-info}/RECORD

@@ -3,17 +3,17 @@ dagster_sling/asset_decorator.py,sha256=wWHHMkWq5ZsLQ9eEWxw6rpkLUm3v_Vg2lHv91cU7
 dagster_sling/asset_defs.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dagster_sling/dagster_sling_translator.py,sha256=4HRgqTp5PMxO-73jEvB1oMbguYGfhSlNYVogCtHMWGA,23995
 dagster_sling/py.typed,sha256=la67KBlbjXN-_-DfGNcdOcjYumVpKG_Tkw-8n5dnGB4,8
-dagster_sling/resources.py,sha256=JKfrNgvmWmrxKsecR5SK_oxe6z7EqpdfS-6FpDiwyzk,25975
+dagster_sling/resources.py,sha256=N6Sy_9ykqJYB4NIY_4QAuYyndF_A_8UdKGy-zIbkHM8,26262
 dagster_sling/sling_event_iterator.py,sha256=zLlcYAO-ZbTw-K0lbaIMDuzQPmhNSRrIMcNRvvWkkNY,8460
 dagster_sling/sling_replication.py,sha256=24Fwuokmc2l_8HBStoTMvZSj77Qpt8ZcKUSAJNq34_M,1113
-dagster_sling/version.py,sha256=LsrV9vLeQGPkCzZUAe_cL-EObzt7m1nJHGhyU7GcAI0,24
+dagster_sling/version.py,sha256=L7VpQaY2T34JkbqawqNFJ6nG-6vihOrlyqaDfc_Z1ww,24
 dagster_sling/components/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 dagster_sling/components/sling_replication_collection/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-dagster_sling/components/sling_replication_collection/component.py,sha256=EJDrEp7xPWEk8gEraB3Uk7OPvWHyBZeXNZ9xRmtK9N4,7748
+dagster_sling/components/sling_replication_collection/component.py,sha256=guSZkRg0KkPdbqJK8lD7RkAYwYOkiI4mqBQ4skmGa1M,8124
 dagster_sling/components/sling_replication_collection/scaffolder.py,sha256=b0L4DtJifCg4FGEQ9E3O9N93WyiGSBlJikSbJOLsq1c,608
-dagster_sling-0.27.12.dist-info/licenses/LICENSE,sha256=4lsMW-RCvfVD4_F57wrmpe3vX1xwUk_OAKKmV_XT7Z0,11348
-dagster_sling-0.27.12.dist-info/METADATA,sha256=67LmCqUvHWqDVANWfD_x7SceLS0k8j2Jywcr7DrPfTk,1184
-dagster_sling-0.27.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-dagster_sling-0.27.12.dist-info/entry_points.txt,sha256=X75y2oDwNMmfILdNMk3CNOsskBN-RQnDoFV9D3PgVvc,64
-dagster_sling-0.27.12.dist-info/top_level.txt,sha256=eoJKEGsD6fqIEmF6xaF8tj5Kq9a7riWyRHbZn6oHTk8,14
-dagster_sling-0.27.12.dist-info/RECORD,,
+dagster_sling-0.27.14.dist-info/licenses/LICENSE,sha256=4lsMW-RCvfVD4_F57wrmpe3vX1xwUk_OAKKmV_XT7Z0,11348
+dagster_sling-0.27.14.dist-info/METADATA,sha256=D6Pnhyjq5YQ3HkJuQNULxouQKKFOXPUDivZ9A2yMW8A,1184
+dagster_sling-0.27.14.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+dagster_sling-0.27.14.dist-info/entry_points.txt,sha256=X75y2oDwNMmfILdNMk3CNOsskBN-RQnDoFV9D3PgVvc,64
+dagster_sling-0.27.14.dist-info/top_level.txt,sha256=eoJKEGsD6fqIEmF6xaF8tj5Kq9a7riWyRHbZn6oHTk8,14
+dagster_sling-0.27.14.dist-info/RECORD,,