Skip to content

Commit

Permalink
take experimental decorators off of asset APIs (#8260)
Browse files Browse the repository at this point in the history
  • Loading branch information
sryza committed Jun 9, 2022
1 parent 19a4d6e commit 079bdd9
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 43 deletions.
66 changes: 30 additions & 36 deletions python_modules/dagster/dagster/core/asset_defs/assets.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import warnings
from typing import AbstractSet, Dict, Iterable, Iterator, Mapping, Optional, Sequence, Set, cast

import dagster._check as check
Expand All @@ -15,7 +14,6 @@
from dagster.core.definitions.utils import DEFAULT_GROUP_NAME, validate_group_name
from dagster.core.execution.context.compute import OpExecutionContext
from dagster.utils import merge_dicts
from dagster.utils.backcompat import ExperimentalWarning, experimental

from ..definitions.resource_requirement import (
ResourceAddable,
Expand Down Expand Up @@ -120,7 +118,6 @@ def __call__(self, *args, **kwargs):
return solid_def(*args, **kwargs)

@staticmethod
@experimental
def from_graph(
graph_def: GraphDefinition,
asset_keys_by_input_name: Optional[Mapping[str, AssetKey]] = None,
Expand Down Expand Up @@ -312,39 +309,36 @@ def with_prefix_or_group(
f"Group name already exists on assets {', '.join(defined_group_names)}"
)

with warnings.catch_warnings():
warnings.simplefilter("ignore", category=ExperimentalWarning)

return self.__class__(
asset_keys_by_input_name={
input_name: input_asset_key_replacements.get(key, key)
for input_name, key in self._asset_keys_by_input_name.items()
},
asset_keys_by_output_name={
output_name: output_asset_key_replacements.get(key, key)
for output_name, key in self._asset_keys_by_output_name.items()
},
node_def=self.node_def,
partitions_def=self.partitions_def,
partition_mappings=self._partition_mappings,
asset_deps={
# replace both the keys and the values in this mapping
output_asset_key_replacements.get(key, key): {
input_asset_key_replacements.get(
upstream_key,
output_asset_key_replacements.get(upstream_key, upstream_key),
)
for upstream_key in value
}
for key, value in self.asset_deps.items()
},
can_subset=self.can_subset,
selected_asset_keys={
output_asset_key_replacements.get(key, key) for key in self._selected_asset_keys
},
resource_defs=self.resource_defs,
group_names={**self.group_names, **group_names},
)
return self.__class__(
asset_keys_by_input_name={
input_name: input_asset_key_replacements.get(key, key)
for input_name, key in self._asset_keys_by_input_name.items()
},
asset_keys_by_output_name={
output_name: output_asset_key_replacements.get(key, key)
for output_name, key in self._asset_keys_by_output_name.items()
},
node_def=self.node_def,
partitions_def=self.partitions_def,
partition_mappings=self._partition_mappings,
asset_deps={
# replace both the keys and the values in this mapping
output_asset_key_replacements.get(key, key): {
input_asset_key_replacements.get(
upstream_key,
output_asset_key_replacements.get(upstream_key, upstream_key),
)
for upstream_key in value
}
for key, value in self.asset_deps.items()
},
can_subset=self.can_subset,
selected_asset_keys={
output_asset_key_replacements.get(key, key) for key in self._selected_asset_keys
},
resource_defs=self.resource_defs,
group_names={**self.group_names, **group_names},
)

def subset_for(self, selected_asset_keys: AbstractSet[AssetKey]) -> "AssetsDefinition":
"""
Expand Down
8 changes: 1 addition & 7 deletions python_modules/dagster/dagster/core/asset_defs/decorators.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@
from dagster.core.storage.io_manager import IOManagerDefinition
from dagster.core.types.dagster_type import DagsterType
from dagster.seven import funcsigs
from dagster.utils.backcompat import (
ExperimentalWarning,
canonicalize_backcompat_args,
experimental_decorator,
)
from dagster.utils.backcompat import ExperimentalWarning, canonicalize_backcompat_args

from .asset_in import AssetIn
from .assets import AssetsDefinition
Expand Down Expand Up @@ -72,7 +68,6 @@ def asset(
...


@experimental_decorator
def asset(
name: Optional[Union[Callable[..., Any], Optional[str]]] = None,
namespace: Optional[Sequence[str]] = None,
Expand Down Expand Up @@ -306,7 +301,6 @@ def __call__(self, fn: Callable) -> AssetsDefinition:
)


@experimental_decorator
def multi_asset(
outs: Dict[str, Out],
name: Optional[str] = None,
Expand Down

0 comments on commit 079bdd9

Please sign in to comment.