dagster-dbt 0.23.3__py3-none-any.whl → 0.28.4__py3-none-any.whl

dagster_dbt/cli/app.py

@@ -1,21 +1,24 @@
 import os
 import shutil
 from pathlib import Path
-from typing import Any, Dict, Iterator
+from typing import Annotated, Any, Optional
 
+import click
 import typer
 import yaml
 from dagster._cli.project import check_if_pypi_package_conflict_exists
 from dagster._core.code_pointer import load_python_file
-from dagster._core.definitions.load_assets_from_modules import find_objects_in_module_of_types
+from dagster._core.definitions.module_loaders.load_assets_from_modules import (
+    find_objects_in_module_of_types,
+)
 from jinja2 import Environment, FileSystemLoader
 from rich.console import Console
 from rich.syntax import Syntax
-from typing_extensions import Annotated
 
-from ..dbt_project import DbtProject
-from ..include import STARTER_PROJECT_PATH
-from ..version import __version__ as dagster_dbt_version
+from dagster_dbt.dbt_core_version import DBT_CORE_VERSION_UPPER_BOUND
+from dagster_dbt.dbt_project import DbtProject
+from dagster_dbt.include import STARTER_PROJECT_PATH
+from dagster_dbt.version import __version__ as dagster_dbt_version
 
 app = typer.Typer(
     no_args_is_help=True,
@@ -107,14 +110,13 @@ def copy_scaffold(
     dagster_project_dir: Path,
     dbt_project_dir: Path,
     use_experimental_dbt_state: bool,
-    use_experimental_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())
+    dbt_project_yaml: dict[str, Any] = yaml.safe_load(dbt_project_yaml_path.read_bytes())
     dbt_project_name: str = dbt_project_yaml["name"]
 
     dbt_profiles_path = find_dbt_profiles_path(dbt_project_dir=dbt_project_dir)
-    dbt_profiles_yaml: Dict[str, Any] = yaml.safe_load(dbt_profiles_path.read_bytes())
+    dbt_profiles_yaml: dict[str, Any] = yaml.safe_load(dbt_profiles_path.read_bytes())
 
     # Remove config from profiles.yml
     dbt_profiles_yaml.pop("config", None)
@@ -157,20 +159,15 @@ def copy_scaffold(
                 dbt_parse_command=dbt_parse_command,
                 dbt_assets_name=f"{dbt_project_name}_dbt_assets",
                 dbt_adapter_packages=dbt_adapter_packages,
+                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,
             ).dump(destination_path)
 
             path.unlink()
 
     dagster_project_dir.joinpath("scaffold").rename(dagster_project_dir.joinpath(project_name))
 
-    if use_experimental_dbt_project:
-        dagster_project_dir.joinpath(project_name, "constants.py").unlink()
-    else:
-        dagster_project_dir.joinpath(project_name, "project.py").unlink()
-
 
 def _check_and_error_on_package_conflicts(project_name: str) -> None:
     package_check_result = check_if_pypi_package_conflict_exists(project_name)
@@ -244,17 +241,6 @@ def project_scaffold_command(
             hidden=True,
         ),
     ] = False,
-    use_experimental_dbt_project: Annotated[
-        bool,
-        typer.Option(
-            ...,
-            "--use-experimental-dbt-project",
-            "--use-dbt-project-package-data-dir",
-            help="Controls whether `DbtProject` is used.",
-            is_flag=True,
-            hidden=True,
-        ),
-    ] = False,
 ) -> None:
     """This command will initialize a new Dagster project and create directories and files that
     load assets from an existing dbt project.
@@ -271,19 +257,15 @@ 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
 
     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,
     )
 
-    dagster_dev_command = "DAGSTER_DBT_PARSE_PROJECT_ON_LOAD=1 dagster dev"
-    if use_experimental_dbt_project:
-        dagster_dev_command = "dagster dev"
+    dagster_dev_command = "dagster dev"
 
     console.print(
         "Your Dagster project has been initialized. To view your dbt project in Dagster, run"
@@ -301,13 +283,13 @@ def project_scaffold_command(
     )
 
 
-def prepare_for_deployment(project: DbtProject) -> None:
+def prepare_and_package(project: DbtProject) -> None:
     """A method that can be called as part of the deployment process."""
-    if project.manifest_preparer:
+    if project.preparer:
         console.print(
-            f"Preparing project [bold green]{project.project_dir}[/bold green] for deployment with [bold green]{project.manifest_preparer.prepare.__qualname__}[/bold green]."
+            f"Preparing project [bold green]{project.project_dir}[/bold green] for deployment with [bold green]{project.preparer.prepare.__qualname__}[/bold green]."
         )
-        project.manifest_preparer.prepare(project)
+        project.preparer.prepare(project)
         console.print("Project preparation complete.")
 
     if project.packaged_project_dir:
@@ -356,24 +338,43 @@ def sync_project_to_packaged_dir(
     console.print("Sync complete.")
 
 
-@project_app.command(name="prepare-for-deployment")
-def project_prepare_for_deployment_command(
+@project_app.command(name="prepare-for-deployment", hidden=True)
+@project_app.command(name="prepare-and-package")
+def project_prepare_and_package_command(
     file: Annotated[
-        str,
+        Optional[Path],
         typer.Option(
             help="The file containing DbtProject definitions to prepare.",
         ),
-    ],
+    ] = None,
+    components: Annotated[
+        Optional[Path],
+        typer.Option(
+            help="The path to a dg project directory containing DbtProjectComponents.",
+        ),
+    ] = None,
 ) -> None:
-    """This command will invoke ``prepare_for_deployment`` on :py:class:`DbtProject` found in the target module or file."""
+    """This command will invoke ``prepare_and_package`` on :py:class:`DbtProject` found in the target module or file.
+    Note that this command runs `dbt deps` and `dbt parse`.
+    """
     console.print(
         f"Running with dagster-dbt version: [bold green]{dagster_dbt_version}[/bold green]."
     )
+    if file:
+        contents = load_python_file(file, working_directory=None)
+        dbt_projects = find_objects_in_module_of_types(contents, types=DbtProject)
+    elif components:
+        from dagster_dbt.components.dbt_project.component import get_projects_from_dbt_component
+
+        dbt_projects = get_projects_from_dbt_component(components)
+    else:
+        raise click.UsageError("Must specify --file or --components")
 
-    contents = load_python_file(file, working_directory=None)
-    dbt_projects: Iterator[DbtProject] = find_objects_in_module_of_types(contents, types=DbtProject)
     for project in dbt_projects:
-        prepare_for_deployment(project)
+        prepare_and_package(project)
 
 
 project_app_typer_click_object = typer.main.get_command(project_app)
+
+if __name__ == "__main__":
+    app()

dagster_dbt/cloud/__init__.py

@@ -1,8 +1,10 @@
-from .asset_defs import load_assets_from_dbt_cloud_job as load_assets_from_dbt_cloud_job
-from .ops import dbt_cloud_run_op as dbt_cloud_run_op
-from .resources import (
+from dagster_dbt.cloud.asset_defs import (
+    load_assets_from_dbt_cloud_job as load_assets_from_dbt_cloud_job,
+)
+from dagster_dbt.cloud.ops import dbt_cloud_run_op as dbt_cloud_run_op
+from dagster_dbt.cloud.resources import (
     DbtCloudClientResource as DbtCloudClientResource,
     DbtCloudResource as DbtCloudResource,
     dbt_cloud_resource as dbt_cloud_resource,
 )
-from .types import DbtCloudOutput as DbtCloudOutput
+from dagster_dbt.cloud.types import DbtCloudOutput as DbtCloudOutput