diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt/cli/app.py b/python_modules/libraries/dagster-dbt/dagster_dbt/cli/app.py index bd1feea00fe67..28606bf5ad0ba 100644 --- a/python_modules/libraries/dagster-dbt/dagster_dbt/cli/app.py +++ b/python_modules/libraries/dagster-dbt/dagster_dbt/cli/app.py @@ -108,7 +108,7 @@ def copy_scaffold( dagster_project_dir: Path, dbt_project_dir: Path, use_experimental_dbt_state: bool, - use_experimental_dbt_project: bool, + use_dbt_project: bool, ) -> None: dbt_project_yaml_path = dbt_project_dir.joinpath(DBT_PROJECT_YML_NAME) dbt_project_yaml: Dict[str, Any] = yaml.safe_load(dbt_project_yaml_path.read_bytes()) @@ -161,14 +161,14 @@ def copy_scaffold( dbt_core_version_upper_bound=DBT_CORE_VERSION_UPPER_BOUND, project_name=project_name, use_experimental_dbt_state=use_experimental_dbt_state, - use_experimental_dbt_project=use_experimental_dbt_project, + use_dbt_project=use_dbt_project, ).dump(destination_path) path.unlink() dagster_project_dir.joinpath("scaffold").rename(dagster_project_dir.joinpath(project_name)) - if use_experimental_dbt_project: + if use_dbt_project: dagster_project_dir.joinpath(project_name, "constants.py").unlink() else: dagster_project_dir.joinpath(project_name, "project.py").unlink() @@ -246,10 +246,11 @@ def project_scaffold_command( hidden=True, ), ] = False, - use_experimental_dbt_project: Annotated[ + use_dbt_project: Annotated[ bool, typer.Option( ..., + "--use-dbt-project", "--use-experimental-dbt-project", "--use-dbt-project-package-data-dir", help="Controls whether `DbtProject` is used.", @@ -273,18 +274,18 @@ def project_scaffold_command( ) dagster_project_dir = Path.cwd().joinpath(project_name) - use_experimental_dbt_project = use_experimental_dbt_project or use_experimental_dbt_state + use_dbt_project = use_dbt_project or use_experimental_dbt_state copy_scaffold( project_name=project_name, dagster_project_dir=dagster_project_dir, dbt_project_dir=dbt_project_dir, use_experimental_dbt_state=use_experimental_dbt_state, - use_experimental_dbt_project=use_experimental_dbt_project, + use_dbt_project=use_dbt_project, ) dagster_dev_command = "DAGSTER_DBT_PARSE_PROJECT_ON_LOAD=1 dagster dev" - if use_experimental_dbt_project: + if use_dbt_project: dagster_dev_command = "dagster dev" console.print( diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/assets.py.jinja b/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/assets.py.jinja index 4fe4dfb5946be..ee090ccc296aa 100644 --- a/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/assets.py.jinja +++ b/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/assets.py.jinja @@ -1,13 +1,13 @@ from dagster import AssetExecutionContext from dagster_dbt import DbtCliResource, dbt_assets -{% if use_experimental_dbt_project -%} +{% if use_dbt_project -%} from .project import {{ dbt_project_name }} {% else -%} from .constants import dbt_manifest_path {% endif %} -{% if use_experimental_dbt_project -%} +{% if use_dbt_project -%} @dbt_assets(manifest={{ dbt_project_name }}.manifest_path) {% else -%} @dbt_assets(manifest=dbt_manifest_path) diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/definitions.py.jinja b/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/definitions.py.jinja index 0907bf0523f4d..2c3d6924247ff 100644 --- a/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/definitions.py.jinja +++ b/python_modules/libraries/dagster-dbt/dagster_dbt/include/scaffold/definitions.py.jinja @@ -1,4 +1,4 @@ -{% if use_experimental_dbt_project -%} +{% if use_dbt_project -%} from dagster import Definitions from dagster_dbt import DbtCliResource {% else -%} @@ -8,7 +8,7 @@ from dagster import Definitions from dagster_dbt import DbtCliResource {% endif %} from .assets import {{ dbt_assets_name }} -{% if use_experimental_dbt_project -%} +{% if use_dbt_project -%} from .project import {{ dbt_project_name }} {% else -%} from .constants import dbt_project_dir @@ -19,7 +19,7 @@ defs = Definitions( assets=[{{ dbt_assets_name }}], schedules=schedules, resources={ - {% if use_experimental_dbt_project -%} + {% if use_dbt_project -%} "dbt": DbtCliResource(project_dir={{ dbt_project_name }}), {%- else -%} "dbt": DbtCliResource(project_dir=os.fspath(dbt_project_dir)), diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt/include/setup.py.jinja b/python_modules/libraries/dagster-dbt/dagster_dbt/include/setup.py.jinja index aec08a9bb8ca0..6c195cf2ac123 100644 --- a/python_modules/libraries/dagster-dbt/dagster_dbt/include/setup.py.jinja +++ b/python_modules/libraries/dagster-dbt/dagster_dbt/include/setup.py.jinja @@ -4,7 +4,7 @@ setup( name="{{ project_name }}", version="0.0.1", packages=find_packages(), - {%- if use_experimental_dbt_project %} + {%- if use_dbt_project %} package_data={ "{{ project_name }}": [ "dbt-project/**/*", diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_prepare_and_package.py b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_prepare_and_package.py index a38f7d89fa4b4..006a394640cab 100644 --- a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_prepare_and_package.py +++ b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_prepare_and_package.py @@ -31,7 +31,7 @@ def test_prepare_and_package(monkeypatch: pytest.MonkeyPatch, dbt_project_dir: P project_name, "--dbt-project-dir", os.fspath(dbt_project_dir), - "--use-experimental-dbt-project", + "--use-dbt-project", ], ) @@ -75,7 +75,7 @@ def test_prepare_and_package_with_dependencies( project_name, "--dbt-project-dir", os.fspath(dbt_project_dir), - "--use-experimental-dbt-project", + "--use-dbt-project", ], ) @@ -133,7 +133,7 @@ def test_prepare_and_package_with_packages( project_name, "--dbt-project-dir", os.fspath(dbt_project_dir), - "--use-experimental-dbt-project", + "--use-dbt-project", ], ) diff --git a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_scaffold.py b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_scaffold.py index bf01fc39d32dd..e2ef6fb8ec7e2 100644 --- a/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_scaffold.py +++ b/python_modules/libraries/dagster-dbt/dagster_dbt_tests/cli/test_scaffold.py @@ -26,7 +26,7 @@ def _assert_scaffold_invocation( dbt_project_dir: Path, dagster_project_dir: Path, use_dbt_project_package_data_dir: bool, - use_experimental_dbt_project: bool, + use_dbt_project: bool, ) -> None: result = runner.invoke( app, @@ -38,7 +38,7 @@ def _assert_scaffold_invocation( "--dbt-project-dir", os.fspath(dbt_project_dir), *(["--use-dbt-project-package-data-dir"] if use_dbt_project_package_data_dir else []), - *(["--use-experimental-dbt-project"] if use_experimental_dbt_project else []), + *(["--use-dbt-project"] if use_dbt_project else []), ], ) @@ -53,7 +53,7 @@ def _assert_scaffold_invocation( in dagster_project_dir.joinpath("setup.py").read_text() ) - if use_dbt_project_package_data_dir or use_experimental_dbt_project: + if use_dbt_project_package_data_dir or use_dbt_project: assert dagster_project_dir.joinpath(project_name, "project.py").exists() assert not dagster_project_dir.joinpath(project_name, "constants.py").exists() else: @@ -89,18 +89,18 @@ def _update_dbt_project_path( return dbt_project_dir -@pytest.mark.parametrize("use_experimental_dbt_project", [True, False]) +@pytest.mark.parametrize("use_dbt_project", [True, False]) @pytest.mark.parametrize("use_dbt_project_package_data_dir", [True, False]) def test_project_scaffold_command_with_precompiled_manifest( monkeypatch: pytest.MonkeyPatch, tmp_path: Path, dbt_project_dir: Path, use_dbt_project_package_data_dir: bool, - use_experimental_dbt_project: bool, + use_dbt_project: bool, ) -> None: monkeypatch.chdir(tmp_path) - project_name = f"test_dagster_scaffold_precompiled_manifest_{use_experimental_dbt_project}" + project_name = f"test_dagster_scaffold_precompiled_manifest_{use_dbt_project}" dagster_project_dir = tmp_path.joinpath(project_name) _assert_scaffold_invocation( @@ -108,7 +108,7 @@ def test_project_scaffold_command_with_precompiled_manifest( dbt_project_dir=dbt_project_dir, dagster_project_dir=dagster_project_dir, use_dbt_project_package_data_dir=use_dbt_project_package_data_dir, - use_experimental_dbt_project=use_experimental_dbt_project, + use_dbt_project=use_dbt_project, ) dbt_project_dir = _update_dbt_project_path( @@ -127,18 +127,18 @@ def test_project_scaffold_command_with_precompiled_manifest( _assert_scaffold_defs(project_name=project_name, dagster_project_dir=dagster_project_dir) -@pytest.mark.parametrize("use_experimental_dbt_project", [False]) +@pytest.mark.parametrize("use_dbt_project", [False]) @pytest.mark.parametrize("use_dbt_project_package_data_dir", [False]) def test_project_scaffold_command_without_dbt_project_with_runtime_manifest( monkeypatch: pytest.MonkeyPatch, tmp_path: Path, dbt_project_dir: Path, use_dbt_project_package_data_dir: bool, - use_experimental_dbt_project: bool, + use_dbt_project: bool, ) -> None: monkeypatch.chdir(tmp_path) - project_name = f"test_dagster_scaffold_runtime_manifest_{use_experimental_dbt_project}" + project_name = f"test_dagster_scaffold_runtime_manifest_{use_dbt_project}" dagster_project_dir = tmp_path.joinpath(project_name) _assert_scaffold_invocation( @@ -146,7 +146,7 @@ def test_project_scaffold_command_without_dbt_project_with_runtime_manifest( dbt_project_dir=dbt_project_dir, dagster_project_dir=dagster_project_dir, use_dbt_project_package_data_dir=use_dbt_project_package_data_dir, - use_experimental_dbt_project=use_experimental_dbt_project, + use_dbt_project=use_dbt_project, ) dbt_project_dir = _update_dbt_project_path( @@ -162,22 +162,22 @@ def test_project_scaffold_command_without_dbt_project_with_runtime_manifest( _assert_scaffold_defs(project_name=project_name, dagster_project_dir=dagster_project_dir) -@pytest.mark.parametrize("use_experimental_dbt_project", [True, False]) +@pytest.mark.parametrize("use_dbt_project", [True, False]) @pytest.mark.parametrize("use_dbt_project_package_data_dir", [True, False]) def test_project_scaffold_command_with_dbt_project_with_runtime_manifest( monkeypatch: pytest.MonkeyPatch, tmp_path: Path, dbt_project_dir: Path, use_dbt_project_package_data_dir: bool, - use_experimental_dbt_project: bool, + use_dbt_project: bool, ) -> None: # Skip the case where we don't use DbtProject - if not use_dbt_project_package_data_dir and not use_experimental_dbt_project: + if not use_dbt_project_package_data_dir and not use_dbt_project: pytest.skip() monkeypatch.chdir(tmp_path) - project_name = f"test_dagster_scaffold_runtime_manifest_{use_experimental_dbt_project}" + project_name = f"test_dagster_scaffold_runtime_manifest_{use_dbt_project}" dagster_project_dir = tmp_path.joinpath(project_name) _assert_scaffold_invocation( @@ -185,7 +185,7 @@ def test_project_scaffold_command_with_dbt_project_with_runtime_manifest( dbt_project_dir=dbt_project_dir, dagster_project_dir=dagster_project_dir, use_dbt_project_package_data_dir=use_dbt_project_package_data_dir, - use_experimental_dbt_project=use_experimental_dbt_project, + use_dbt_project=use_dbt_project, ) dbt_project_dir = _update_dbt_project_path( @@ -202,18 +202,18 @@ def test_project_scaffold_command_with_dbt_project_with_runtime_manifest( _assert_scaffold_defs(project_name=project_name, dagster_project_dir=dagster_project_dir) -@pytest.mark.parametrize("use_experimental_dbt_project", [True, False]) +@pytest.mark.parametrize("use_dbt_project", [True, False]) @pytest.mark.parametrize("use_dbt_project_package_data_dir", [True, False]) def test_project_scaffold_command_with_runtime_manifest_without_env_var( monkeypatch: pytest.MonkeyPatch, tmp_path: Path, dbt_project_dir: Path, use_dbt_project_package_data_dir: bool, - use_experimental_dbt_project: bool, + use_dbt_project: bool, ) -> None: monkeypatch.chdir(tmp_path) - project_name = f"test_scaffold_runtime_without_env_var_{use_experimental_dbt_project}" + project_name = f"test_scaffold_runtime_without_env_var_{use_dbt_project}" dagster_project_dir = tmp_path.joinpath(project_name) _assert_scaffold_invocation( @@ -221,7 +221,7 @@ def test_project_scaffold_command_with_runtime_manifest_without_env_var( dbt_project_dir=dbt_project_dir, dagster_project_dir=dagster_project_dir, use_dbt_project_package_data_dir=use_dbt_project_package_data_dir, - use_experimental_dbt_project=use_experimental_dbt_project, + use_dbt_project=use_dbt_project, ) dbt_project_dir = _update_dbt_project_path(