Move NodeRelation to dbt/artifacts

dbt-labs · Jan 29, 2024 · 44405cf · 44405cf
1 parent e7ee80d
commit 44405cf
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/core/dbt/artifacts/resources/__init__.py b/core/dbt/artifacts/resources/__init__.py
@@ -29,5 +29,6 @@
     Entity,
     Measure,
     MeasureAggregationParameters,
+    NodeRelation,
     NonAdditiveDimension,
 )
diff --git a/core/dbt/artifacts/resources/v1/semantic_model.py b/core/dbt/artifacts/resources/v1/semantic_model.py
@@ -21,6 +21,14 @@ class Defaults(dbtClassMixin):
     agg_time_dimension: Optional[str] = None
 
 
+@dataclass
+class NodeRelation(dbtClassMixin):
+    alias: str
+    schema_name: str  # TODO: Could this be called simply "schema" so we could reuse StateRelation?
+    database: Optional[str] = None
+    relation_name: Optional[str] = None
+
+
 # ====================================
 # Dimension objects
 # ====================================

diff --git a/core/dbt/contracts/graph/nodes.py b/core/dbt/contracts/graph/nodes.py
@@ -96,6 +96,7 @@
     Measure as MeasureResource,
     Documentation as DocumentationResource,
     Macro as MacroResource,
+    NodeRelation as NodeRelationResource,
     NodeVersion,
     Group as GroupResource,
     GraphResource,
@@ -1623,18 +1624,10 @@ class Group(GroupResource, BaseNode):
 # ====================================
 
 
-@dataclass
-class NodeRelation(dbtClassMixin):
-    alias: str
-    schema_name: str  # TODO: Could this be called simply "schema" so we could reuse StateRelation?
-    database: Optional[str] = None
-    relation_name: Optional[str] = None
-
-
 @dataclass
 class SemanticModel(GraphNode):
     model: str
-    node_relation: Optional[NodeRelation]
+    node_relation: Optional[NodeRelationResource]
     description: Optional[str] = None
     label: Optional[str] = None
     defaults: Optional[DefaultsResource] = None

diff --git a/core/dbt/parser/manifest.py b/core/dbt/parser/manifest.py
@@ -106,9 +106,8 @@
     ManifestNode,
     ResultNode,
     ModelNode,
-    NodeRelation,
 )
-from dbt.artifacts.resources import NodeVersion
+from dbt.artifacts.resources import NodeRelation, NodeVersion
 from dbt.artifacts.schemas.base import Writable
 from dbt.exceptions import (
     TargetNotFoundError,

diff --git a/tests/unit/test_graph_selector_methods.py b/tests/unit/test_graph_selector_methods.py
@@ -17,7 +17,6 @@
     MetricTypeParams,
     MetricInputMeasure,
     Group,
-    NodeRelation,
     SavedQuery,
     SeedNode,
     SemanticModel,
@@ -31,7 +30,7 @@
     UnitTestDefinition,
 )
 from dbt.contracts.graph.manifest import Manifest, ManifestMetadata
-from dbt.artifacts.resources import QueryParams
+from dbt.artifacts.resources import NodeRelation, QueryParams
 from dbt.contracts.graph.unparsed import (
     ExposureType,
     Owner,

diff --git a/tests/unit/test_semantic_layer_nodes_satisfy_protocols.py b/tests/unit/test_semantic_layer_nodes_satisfy_protocols.py
@@ -9,7 +9,6 @@
     MetricInputMeasure,
     MetricTimeWindow,
     MetricTypeParams,
-    NodeRelation,
     SavedQuery,
     SemanticModel,
 )
@@ -22,6 +21,7 @@
     FileSlice,
     Measure,
     MeasureAggregationParameters,
+    NodeRelation,
     NonAdditiveDimension,
     SourceFileMetadata,
     WhereFilter,