move Contract definition to model_config

dbt-labs · Mar 27, 2023 · 449aa48 · 449aa48
1 parent 4bf2766
commit 449aa48
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/core/dbt/contracts/graph/model_config.py b/core/dbt/contracts/graph/model_config.py
@@ -7,7 +7,7 @@
     ValidationError,
     register_pattern,
 )
-from dbt.contracts.graph.unparsed import AdditionalPropertiesAllowed, Contract, Docs
+from dbt.contracts.graph.unparsed import AdditionalPropertiesAllowed, Docs
 from dbt.contracts.graph.utils import validate_color
 from dbt.exceptions import DbtInternalError, CompilationError
 from dbt.contracts.util import Replaceable, list_str
@@ -189,6 +189,11 @@ class Severity(str):
 register_pattern(Severity, insensitive_patterns("warn", "error"))
 
 
+@dataclass
+class Contract(dbtClassMixin, Replaceable):
+    enforced: bool = False
+
+
 @dataclass
 class Hook(dbtClassMixin, Replaceable):
     sql: str

diff --git a/core/dbt/contracts/graph/nodes.py b/core/dbt/contracts/graph/nodes.py
@@ -20,7 +20,6 @@
 from dbt.clients.system import write_file
 from dbt.contracts.files import FileHash
 from dbt.contracts.graph.unparsed import (
-    Contract,
     Docs,
     ExposureType,
     ExternalTable,
@@ -52,6 +51,7 @@
 from dbt.node_types import ModelLanguage, NodeType, AccessType
 
 from .model_config import (
+    Contract,
     NodeConfig,
     SeedConfig,
     TestConfig,

diff --git a/core/dbt/contracts/graph/unparsed.py b/core/dbt/contracts/graph/unparsed.py
@@ -87,11 +87,6 @@ class Docs(dbtClassMixin, Replaceable):
     node_color: Optional[str] = None
 
 
-@dataclass
-class Contract(dbtClassMixin, Replaceable):
-    enforced: bool = False
-
-
 @dataclass
 class HasColumnProps(AdditionalPropertiesMixin, ExtensibleDbtClassMixin, Replaceable):
     name: str

diff --git a/core/dbt/parser/base.py b/core/dbt/parser/base.py
@@ -16,8 +16,8 @@
 from dbt.config import Project, RuntimeConfig
 from dbt.context.context_config import ContextConfig
 from dbt.contracts.graph.manifest import Manifest
-from dbt.contracts.graph.nodes import ManifestNode, BaseNode
-from dbt.contracts.graph.unparsed import Contract, Docs, UnparsedNode
+from dbt.contracts.graph.nodes import Contract, BaseNode, ManifestNode
+from dbt.contracts.graph.unparsed import Docs, UnparsedNode
 from dbt.exceptions import DbtInternalError, ConfigUpdateError, DictParseError
 from dbt import hooks
 from dbt.node_types import NodeType, ModelLanguage

diff --git a/test/unit/test_contracts_graph_compiled.py b/test/unit/test_contracts_graph_compiled.py
@@ -2,14 +2,16 @@
 import pytest
 
 from dbt.contracts.files import FileHash
-from dbt.contracts.graph.nodes import ModelNode, InjectedCTE, GenericTestNode
+from dbt.contracts.graph.model_config import Contract
 from dbt.contracts.graph.nodes import (
-    Contract,
+    ColumnInfo,
     DependsOn,
+    GenericTestNode,
+    InjectedCTE,
+    ModelNode,
     NodeConfig,
     TestConfig,
     TestMetadata,
-    ColumnInfo,
 )
 from dbt.node_types import NodeType