diff --git a/core/dbt/contracts/graph/manifest.py b/core/dbt/contracts/graph/manifest.py index 0db18aae935..a42efff676f 100644 --- a/core/dbt/contracts/graph/manifest.py +++ b/core/dbt/contracts/graph/manifest.py @@ -1406,7 +1406,7 @@ def is_invalid_protected_ref( def merge_from_artifact( self, adapter, - other: "WritableManifest", + other: "Manifest", selected: AbstractSet[UniqueID], favor_state: bool = False, ) -> None: diff --git a/core/dbt/graph/selector_methods.py b/core/dbt/graph/selector_methods.py index 10403ba04fc..c4bbcf27e6f 100644 --- a/core/dbt/graph/selector_methods.py +++ b/core/dbt/graph/selector_methods.py @@ -8,7 +8,7 @@ from .graph import UniqueId -from dbt.contracts.graph.manifest import Manifest, WritableManifest +from dbt.contracts.graph.manifest import Manifest from dbt.contracts.graph.nodes import ( SingularTestNode, Exposure, @@ -725,7 +725,7 @@ def search(self, included_nodes: Set[UniqueId], selector: str) -> Iterator[Uniqu f'Got an invalid selector "{selector}", expected one of ' f'"{list(state_checks)}"' ) - manifest: WritableManifest = self.previous_state.manifest + manifest: Manifest = self.previous_state.manifest for unique_id, node in self.all_nodes(included_nodes): previous_node: Optional[SelectorTarget] = None diff --git a/core/dbt/task/clone.py b/core/dbt/task/clone.py index 49f7d857a30..53c322211cb 100644 --- a/core/dbt/task/clone.py +++ b/core/dbt/task/clone.py @@ -4,7 +4,7 @@ from dbt.adapters.base import BaseRelation from dbt.clients.jinja import MacroGenerator from dbt.context.providers import generate_runtime_model_context -from dbt.contracts.graph.manifest import WritableManifest +from dbt.contracts.graph.manifest import Manifest from dbt.artifacts.schemas.run import RunStatus, RunResult from dbt_common.dataclass_schema import dbtClassMixin from dbt_common.exceptions import DbtInternalError, CompilationError @@ -94,7 +94,7 @@ class CloneTask(GraphRunnableTask): def raise_on_first_error(self): return False - def _get_deferred_manifest(self) -> Optional[WritableManifest]: + def _get_deferred_manifest(self) -> Optional[Manifest]: # Unlike other commands, 'clone' always requires a state manifest # Load previous state, regardless of whether --defer flag has been set return self._get_previous_state() diff --git a/core/dbt/task/runnable.py b/core/dbt/task/runnable.py index 8b361988517..d44f88cfc0b 100644 --- a/core/dbt/task/runnable.py +++ b/core/dbt/task/runnable.py @@ -15,7 +15,7 @@ import dbt.utils from dbt.adapters.base import BaseRelation from dbt.adapters.factory import get_adapter -from dbt.contracts.graph.manifest import WritableManifest +from dbt.contracts.graph.manifest import Manifest from dbt.contracts.graph.nodes import ResultNode from dbt.artifacts.schemas.results import NodeStatus, RunningStatus, RunStatus, BaseResult from dbt.artifacts.schemas.run import RunExecutionResult, RunResult @@ -643,7 +643,7 @@ def get_result(self, results, elapsed_time, generated_at): def task_end_messages(self, results): print_run_end_messages(results) - def _get_previous_state(self) -> Optional[WritableManifest]: + def _get_previous_state(self) -> Optional[Manifest]: state = self.previous_defer_state or self.previous_state if not state: raise DbtRuntimeError( @@ -654,5 +654,5 @@ def _get_previous_state(self) -> Optional[WritableManifest]: raise DbtRuntimeError(f'Could not find manifest in --state path: "{state}"') return state.manifest - def _get_deferred_manifest(self) -> Optional[WritableManifest]: + def _get_deferred_manifest(self) -> Optional[Manifest]: return self._get_previous_state() if self.args.defer else None