Skip to content

Commit

Permalink
refactor(dbt): rename resources_v2 to resource (dagster-io#23151)
Browse files Browse the repository at this point in the history
## Summary & Motivation
As the title.

## How I Tested These Changes
bk
  • Loading branch information
rexledesma authored Jul 23, 2024
1 parent 6617d9a commit 4c54e28
Show file tree
Hide file tree
Showing 13 changed files with 17 additions and 22 deletions.
2 changes: 1 addition & 1 deletion docs/sphinx/sections/api/apidocs/libraries/dagster-dbt.rst
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ CLI Resource

.. autoclass:: DbtCliInvocation

.. autoclass:: dagster_dbt.core.resources_v2.DbtEventIterator
.. autoclass:: dagster_dbt.core.resource.DbtEventIterator

.. autoclass:: DbtCliEventMessage

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
dbt_cloud_run_op as dbt_cloud_run_op,
load_assets_from_dbt_cloud_job as load_assets_from_dbt_cloud_job,
)
from .core import (
from .core.resource import (
DbtCliEventMessage as DbtCliEventMessage,
DbtCliInvocation as DbtCliInvocation,
DbtCliResource as DbtCliResource,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +0,0 @@
from .resources_v2 import (
DbtCliEventMessage as DbtCliEventMessage,
DbtCliInvocation as DbtCliInvocation,
DbtCliResource as DbtCliResource,
)
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ def prepare(self, project: "DbtProject") -> None:
)

def _prepare_packages(self, project: "DbtProject") -> None:
from .core.resources_v2 import DbtCliResource
from .core.resource import DbtCliResource

(
DbtCliResource(project_dir=project)
Expand All @@ -119,7 +119,7 @@ def _prepare_packages(self, project: "DbtProject") -> None:
)

def _prepare_manifest(self, project: "DbtProject") -> None:
from .core.resources_v2 import DbtCliResource
from .core.resource import DbtCliResource

(
DbtCliResource(project_dir=project)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import yaml
from dagster import AssetsDefinition, materialize
from dagster_dbt.cli.app import app
from dagster_dbt.core.resources_v2 import DbtCliResource
from dagster_dbt.core.resource import DbtCliResource
from dagster_dbt.dbt_project import DbtProject
from typer.testing import CliRunner

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import pytest
from dagster_dbt import DbtCliResource
from dagster_dbt.core.resources_v2 import DbtCliInvocation
from dagster_dbt.core.resource import DbtCliInvocation

from .dbt_projects import (
test_asset_checks_path,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
)
from dagster._core.definitions.metadata import TableMetadataSet
from dagster_dbt.asset_decorator import dbt_assets
from dagster_dbt.core.resources_v2 import DbtCliResource
from dagster_dbt.core.resource import DbtCliResource
from pytest_mock import MockFixture
from sqlglot import Dialect

Expand Down Expand Up @@ -101,7 +101,7 @@ def test_exception_fetch_column_schema_with_adapter(
monkeypatch.setenv("DBT_LOG_COLUMN_METADATA", "false")

mock_adapter = mocker.patch(
"dagster_dbt.core.resources_v2.DbtCliInvocation.adapter",
"dagster_dbt.core.resource.DbtCliInvocation.adapter",
return_value=mocker.MagicMock(),
new_callable=mocker.PropertyMock,
)
Expand Down Expand Up @@ -141,7 +141,7 @@ def test_exception_column_schema(
"DBT_LOG_COLUMN_METADATA", str(not use_experimental_fetch_column_schema).lower()
)
mocker.patch(
"dagster_dbt.core.resources_v2.default_metadata_from_dbt_resource_props",
"dagster_dbt.core.resource.default_metadata_from_dbt_resource_props",
side_effect=Exception("An error occurred"),
)

Expand Down Expand Up @@ -202,7 +202,7 @@ def test_exception_column_lineage(
"DBT_LOG_COLUMN_METADATA", str(not use_experimental_fetch_column_schema).lower()
)
mocker.patch(
"dagster_dbt.core.resources_v2._build_column_lineage_metadata",
"dagster_dbt.core.resource._build_column_lineage_metadata",
side_effect=Exception("An error occurred"),
)

Expand Down Expand Up @@ -538,10 +538,10 @@ def test_column_lineage(
) -> None:
# Patch get_relation_from_adapter so that we can track how often
# relations are queried from the adapter vs cached
from dagster_dbt.core.resources_v2 import _get_relation_from_adapter
from dagster_dbt.core.resource import _get_relation_from_adapter

get_relation_from_adapter = mocker.patch(
"dagster_dbt.core.resources_v2._get_relation_from_adapter",
"dagster_dbt.core.resource._get_relation_from_adapter",
side_effect=_get_relation_from_adapter,
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
materialize,
)
from dagster_dbt.asset_decorator import dbt_assets
from dagster_dbt.core.resources_v2 import DbtCliResource
from dagster_dbt.core.resource import DbtCliResource
from dagster_dbt.dagster_dbt_translator import DagsterDbtTranslator, DagsterDbtTranslatorSettings

from ..dbt_projects import test_asset_checks_path, test_dbt_alias_path
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from dagster_dbt.asset_decorator import dbt_assets
from dagster_dbt.asset_specs import build_dbt_asset_specs
from dagster_dbt.asset_utils import DUPLICATE_ASSET_KEY_ERROR_MESSAGE
from dagster_dbt.core.resources_v2 import DbtCliResource
from dagster_dbt.core.resource import DbtCliResource
from dagster_dbt.dagster_dbt_translator import DagsterDbtTranslator, DagsterDbtTranslatorSettings
from dbt.version import __version__ as dbt_version
from packaging import version
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from dagster import AssetExecutionContext
from dagster._core.definitions.metadata.metadata_set import TableMetadataSet
from dagster_dbt.asset_decorator import dbt_assets
from dagster_dbt.core.resources_v2 import DbtCliResource
from dagster_dbt.core.resource import DbtCliResource

pytestmark: pytest.MarkDecorator = pytest.mark.derived_metadata

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from dagster._core.definitions.metadata.metadata_value import MetadataValue, TableMetadataValue
from dagster._core.definitions.metadata.table import TableRecord
from dagster_dbt.asset_decorator import dbt_assets
from dagster_dbt.core.resources_v2 import (
from dagster_dbt.core.resource import (
DbtCliInvocation,
DbtCliResource,
DbtDagsterEventType,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from dagster._core.execution.context.compute import AssetExecutionContext, OpExecutionContext
from dagster_dbt import dbt_assets
from dagster_dbt.asset_utils import build_dbt_asset_selection
from dagster_dbt.core.resources_v2 import PARTIAL_PARSE_FILE_NAME, DbtCliResource
from dagster_dbt.core.resource import PARTIAL_PARSE_FILE_NAME, DbtCliResource
from dagster_dbt.dagster_dbt_translator import DagsterDbtTranslator, DagsterDbtTranslatorSettings
from dagster_dbt.dbt_project import DbtProject
from dagster_dbt.errors import DagsterDbtCliRuntimeError
Expand Down

0 comments on commit 4c54e28

Please sign in to comment.