Move data portion of SavedQuery class to dbt/artifacts

.changes/unreleased/Under the Hood-20240126-164038.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Move `SavedQuery` data definition to `dbt/artifacts`
+time: 2024-01-26T16:40:38.790993-08:00
+custom:
+  Author: QMalcolm
+  Issue: "9386"

core/dbt/artifacts/resources/__init__.py

@@ -11,6 +11,7 @@
     Export,
     ExportConfig,
     QueryParams,
+    SavedQuery,
     SavedQueryConfig,
     SavedQueryMandatory,
 )

core/dbt/artifacts/resources/v1/saved_query.py

@@ -1,8 +1,13 @@
 from __future__ import annotations
+import time
 
 from dataclasses import dataclass, field
 from dbt.artifacts.resources.base import GraphResource
-from dbt.artifacts.resources.v1.semantic_layer_components import WhereFilterIntersection
+from dbt.artifacts.resources.v1.components import DependsOn, RefArgs
+from dbt.artifacts.resources.v1.semantic_layer_components import (
+    SourceFileMetadata,
+    WhereFilterIntersection,
+)
 from dbt_common.contracts.config.base import BaseConfig, CompareBehavior, MergeBehavior
 from dbt_common.dataclass_schema import dbtClassMixin
 from dbt_semantic_interfaces.type_enums.export_destination_type import ExportDestinationType
@@ -62,3 +67,24 @@ class SavedQueryConfig(BaseConfig):
 class SavedQueryMandatory(GraphResource):
     query_params: QueryParams
     exports: List[Export]
+
+
+@dataclass
+class SavedQuery(SavedQueryMandatory):
+    description: Optional[str] = None
+    label: Optional[str] = None
+    metadata: Optional[SourceFileMetadata] = None
+    config: SavedQueryConfig = field(default_factory=SavedQueryConfig)
+    unrendered_config: Dict[str, Any] = field(default_factory=dict)
+    group: Optional[str] = None
+    depends_on: DependsOn = field(default_factory=DependsOn)
+    created_at: float = field(default_factory=lambda: time.time())
+    refs: List[RefArgs] = field(default_factory=list)
+
+    @property
+    def metrics(self) -> List[str]:
+        return self.query_params.metrics
+
+    @property
+    def depends_on_nodes(self):
+        return self.depends_on.nodes

core/dbt/contracts/graph/nodes.py

@@ -101,8 +101,7 @@
     Group as GroupResource,
     GraphResource,
     RefArgs as RefArgsResource,
-    SavedQueryConfig,
-    SavedQueryMandatory as SavedQueryMandatoryResource,
+    SavedQuery as SavedQueryResource,
     SourceFileMetadata as SourceFileMetadataResource,
     WhereFilterIntersection as WhereFilterIntersectionResource,
 )
@@ -1796,25 +1795,7 @@ def same_contents(self, old: Optional["SemanticModel"]) -> bool:
 
 
 @dataclass
-class SavedQuery(NodeInfoMixin, GraphNode, SavedQueryMandatoryResource):
-    description: Optional[str] = None
-    label: Optional[str] = None
-    metadata: Optional[SourceFileMetadataResource] = None
-    config: SavedQueryConfig = field(default_factory=SavedQueryConfig)
-    unrendered_config: Dict[str, Any] = field(default_factory=dict)
-    group: Optional[str] = None
-    depends_on: DependsOn = field(default_factory=DependsOn)
-    created_at: float = field(default_factory=lambda: time.time())
-    refs: List[RefArgsResource] = field(default_factory=list)
-
-    @property
-    def metrics(self) -> List[str]:
-        return self.query_params.metrics
-
-    @property
-    def depends_on_nodes(self):
-        return self.depends_on.nodes
-
+class SavedQuery(NodeInfoMixin, GraphNode, SavedQueryResource):
     def same_metrics(self, old: "SavedQuery") -> bool:
         return self.query_params.metrics == old.query_params.metrics