InProgress: Add tags to SavedQueries

dbt-labs · Nov 13, 2024 · 2d39824 · 2d39824
1 parent 89caa33
commit 2d39824
Show file tree

Hide file tree

Showing 10 changed files with 66 additions and 7 deletions.
diff --git a/core/dbt/artifacts/resources/v1/saved_query.py b/core/dbt/artifacts/resources/v1/saved_query.py
@@ -2,16 +2,18 @@
 
 import time
 from dataclasses import dataclass, field
-from typing import Any, Dict, List, Literal, Optional
+from typing import Any, Dict, List, Literal, Optional, Union
 
 from dbt.artifacts.resources.base import GraphResource
 from dbt.artifacts.resources.types import NodeType
 from dbt.artifacts.resources.v1.components import DependsOn, RefArgs
+from dbt.artifacts.resources.v1.config import list_str, metas
 from dbt.artifacts.resources.v1.semantic_layer_components import (
     SourceFileMetadata,
     WhereFilterIntersection,
 )
 from dbt_common.contracts.config.base import BaseConfig, CompareBehavior, MergeBehavior
+from dbt_common.contracts.config.metadata import ShowBehavior
 from dbt_common.dataclass_schema import dbtClassMixin
 from dbt_semantic_interfaces.type_enums.export_destination_type import (
     ExportDestinationType,
@@ -95,6 +97,10 @@ class SavedQuery(SavedQueryMandatory):
     depends_on: DependsOn = field(default_factory=DependsOn)
     created_at: float = field(default_factory=lambda: time.time())
     refs: List[RefArgs] = field(default_factory=list)
+    tags: Union[List[str], str] = field(
+        default_factory=list_str,
+        metadata=metas(ShowBehavior.Hide, MergeBehavior.Append, CompareBehavior.Exclude),
+    )
 
     @property
     def metrics(self) -> List[str]:

diff --git a/core/dbt/contracts/graph/nodes.py b/core/dbt/contracts/graph/nodes.py
@@ -460,6 +460,8 @@ def from_args(cls, args: ModelNodeArgs) -> "ModelNode":
         if args.database:
             unrendered_config["database"] = args.database
 
+        raise Exception("TESTING")
+
         return cls(
             resource_type=NodeType.Model,
             name=args.name,
@@ -1603,6 +1605,9 @@ def same_exports(self, old: "SavedQuery") -> bool:
 
         return True
 
+    def same_tags(self, old: "SavedQuery") -> bool:
+        return self.tags == old.tags
+
     def same_contents(self, old: Optional["SavedQuery"]) -> bool:
         # existing when it didn't before is a change!
         # metadata/tags changes are not "changes"
@@ -1618,6 +1623,7 @@ def same_contents(self, old: Optional["SavedQuery"]) -> bool:
             and self.same_config(old)
             and self.same_group(old)
             and self.same_exports(old)
+            and self.same_tags(old)
             and True
         )
 

diff --git a/core/dbt/contracts/graph/unparsed.py b/core/dbt/contracts/graph/unparsed.py
@@ -27,8 +27,11 @@
     UnitTestOutputFixture,
     UnitTestOverrides,
 )
+from dbt.artifacts.resources.v1.config import list_str, metas
 from dbt.exceptions import ParsingError
 from dbt.node_types import NodeType
+from dbt_common.contracts.config.base import CompareBehavior, MergeBehavior
+from dbt_common.contracts.config.metadata import ShowBehavior
 from dbt_common.contracts.config.properties import AdditionalPropertiesMixin
 from dbt_common.contracts.util import Mergeable
 from dbt_common.dataclass_schema import (
@@ -740,6 +743,10 @@ class UnparsedSavedQuery(dbtClassMixin):
     label: Optional[str] = None
     exports: List[UnparsedExport] = field(default_factory=list)
     config: Dict[str, Any] = field(default_factory=dict)
+    tags: Union[List[str], str] = field(
+        default_factory=list_str,
+        metadata=metas(ShowBehavior.Hide, MergeBehavior.Append, CompareBehavior.Exclude),
+    )
 
 
 def normalize_date(d: Optional[datetime.date]) -> Optional[datetime.datetime]:

diff --git a/core/dbt/parser/schema_yaml_readers.py b/core/dbt/parser/schema_yaml_readers.py
@@ -816,6 +816,18 @@ def parse_saved_query(self, unparsed: UnparsedSavedQuery) -> None:
             rendered=False,
         )
 
+        config_tags = config.get("tags")
+        unparsed_tags = unparsed.tags
+        tags: Union[List[str], str]
+        if config_tags:
+            if isinstance(config_tags, str):
+                config_tags = [config_tags]
+            if isinstance(unparsed_tags, str):
+                unparsed_tags = [unparsed_tags]
+            tags = list(set([*unparsed_tags, *config_tags]))
+        else:
+            tags = unparsed_tags
+
         parsed = SavedQuery(
             description=unparsed.description,
             label=unparsed.label,
@@ -831,6 +843,7 @@ def parse_saved_query(self, unparsed: UnparsedSavedQuery) -> None:
             config=config,
             unrendered_config=unrendered_config,
             group=config.group,
+            tags=tags,
         )
 
         for export in parsed.exports:

diff --git a/core/setup.py b/core/setup.py
@@ -69,7 +69,7 @@
         # These are major-version-0 packages also maintained by dbt-labs.
         # Accept patches but avoid automatically updating past a set minor version range.
         "dbt-extractor>=0.5.0,<=0.6",
-        "dbt-semantic-interfaces>=0.7.4,<0.8",
+        # "dbt-semantic-interfaces>=0.7.4,<0.8",
         # Minor versions for these are expected to be backwards-compatible
         "dbt-common>=1.11.0,<2.0",
         "dbt-adapters>=1.8.0,<2.0",

diff --git a/editable-requirements.txt b/editable-requirements.txt
@@ -1 +1,2 @@
 -e ./core
+-e /Users/patricky/git/dbt-semantic-interfaces
diff --git a/schemas/dbt/catalog/v1.json b/schemas/dbt/catalog/v1.json
@@ -12,7 +12,7 @@
         },
         "dbt_version": {
           "type": "string",
-          "default": "1.9.0b2"
+          "default": "1.9.0b4"
         },
         "generated_at": {
           "type": "string"

diff --git a/schemas/dbt/manifest/v12.json b/schemas/dbt/manifest/v12.json
@@ -13,7 +13,7 @@
         },
         "dbt_version": {
           "type": "string",
-          "default": "1.9.0b2"
+          "default": "1.9.0b4"
         },
         "generated_at": {
           "type": "string"
@@ -19969,6 +19969,19 @@
                           "name"
                         ]
                       }
+                    },
+                    "tags": {
+                      "anyOf": [
+                        {
+                          "type": "array",
+                          "items": {
+                            "type": "string"
+                          }
+                        },
+                        {
+                          "type": "string"
+                        }
+                      ]
                     }
                   },
                   "additionalProperties": false,
@@ -21524,6 +21537,19 @@
                 "name"
               ]
             }
+          },
+          "tags": {
+            "anyOf": [
+              {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                }
+              },
+              {
+                "type": "string"
+              }
+            ]
           }
         },
         "additionalProperties": false,
@@ -22648,4 +22674,4 @@
     "unit_tests"
   ],
   "$id": "https://schemas.getdbt.com/dbt/manifest/v12.json"
-}
+}
diff --git a/schemas/dbt/run-results/v6.json b/schemas/dbt/run-results/v6.json
@@ -12,7 +12,7 @@
         },
         "dbt_version": {
           "type": "string",
-          "default": "1.9.0b2"
+          "default": "1.9.0b4"
         },
         "generated_at": {
           "type": "string"

diff --git a/schemas/dbt/sources/v3.json b/schemas/dbt/sources/v3.json
@@ -12,7 +12,7 @@
         },
         "dbt_version": {
           "type": "string",
-          "default": "1.9.0b2"
+          "default": "1.9.0b4"
         },
         "generated_at": {
           "type": "string"