Change hierarchy systemTags type (#686)

MetaphorData · Nov 16, 2023 · 50fb191 · 50fb191
1 parent 668f485
commit 50fb191
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 30 deletions.
diff --git a/metaphor/snowflake/extractor.py b/metaphor/snowflake/extractor.py
@@ -45,6 +45,7 @@
     SourceInfo,
     SQLSchema,
     SystemTag,
+    SystemTags,
     SystemTagSource,
 )
 from metaphor.snowflake import auth
@@ -409,8 +410,11 @@ def _add_system_tag(
         logical_id = HierarchyLogicalID(path=path)
 
         self._hierarchies.setdefault(
-            hierarchy_key, Hierarchy(logical_id=logical_id, system_tags=[])
-        ).system_tags.append(
+            hierarchy_key,
+            Hierarchy(
+                logical_id=logical_id, system_tags=SystemTags(tags=[])
+            ),  # SystemTags.tags should never be empty
+        ).system_tags.tags.append(
             SystemTag(
                 key=tag_key,
                 system_tag_source=SystemTagSource.SNOWFLAKE,

diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "metaphor-connectors"
-version = "0.13.48"
+version = "0.13.49"
 license = "Apache-2.0"
 description = "A collection of Python-based 'connectors' that extract metadata from various sources to ingest into the Metaphor app."
 authors = ["Metaphor <[email protected]>"]
@@ -30,7 +30,7 @@ google-cloud-logging = { version = "^3.5.0", optional = true }
 jsonschema = "^4.18.6"
 lkml = { version = "^1.3.1", optional = true }
 looker-sdk = { version = "^23.6.0", optional = true }
-metaphor-models = "0.30.3"
+metaphor-models = "0.30.5"
 msal = { version = "^1.20.0", optional = true }
 msgraph-beta-sdk = { version = "1.0.0", optional = true }
 pycarlo = { version = "^0.8.1", optional = true }

diff --git a/tests/snowflake/test_extractor.py b/tests/snowflake/test_extractor.py
@@ -14,6 +14,7 @@
     QueriedDataset,
     SchemaField,
     SystemTag,
+    SystemTags,
     SystemTagSource,
 )
 from metaphor.snowflake.config import SnowflakeQueryLogConfig, SnowflakeRunConfig
@@ -271,25 +272,35 @@ def test_fetch_hierarchy_system_tags(mock_connect: MagicMock):
         path=[DataPlatform.SNOWFLAKE.value, table_name]
     )
     assert db_hierarchy.system_tags is not None
-    assert db_hierarchy.system_tags == [
-        SystemTag(key="foo", system_tag_source=SystemTagSource.SNOWFLAKE, value="bar"),
-        SystemTag(
-            key="grault", system_tag_source=SystemTagSource.SNOWFLAKE, value="garply"
-        ),
-    ]
+    assert db_hierarchy.system_tags == SystemTags(
+        tags=[
+            SystemTag(
+                key="foo", system_tag_source=SystemTagSource.SNOWFLAKE, value="bar"
+            ),
+            SystemTag(
+                key="grault",
+                system_tag_source=SystemTagSource.SNOWFLAKE,
+                value="garply",
+            ),
+        ]
+    )
     schema_hierarchy = extractor._hierarchies[
         dataset_normalized_name(database, table_name)
     ]
     assert schema_hierarchy.logical_id == HierarchyLogicalID(
         path=[DataPlatform.SNOWFLAKE.value, database, table_name]
     )
     assert schema_hierarchy.system_tags is not None
-    assert schema_hierarchy.system_tags == [
-        SystemTag(key="baz", system_tag_source=SystemTagSource.SNOWFLAKE, value="qux"),
-        SystemTag(
-            key="quux", system_tag_source=SystemTagSource.SNOWFLAKE, value="corge"
-        ),
-    ]
+    assert schema_hierarchy.system_tags == SystemTags(
+        tags=[
+            SystemTag(
+                key="baz", system_tag_source=SystemTagSource.SNOWFLAKE, value="qux"
+            ),
+            SystemTag(
+                key="quux", system_tag_source=SystemTagSource.SNOWFLAKE, value="corge"
+            ),
+        ]
+    )
 
 
 @patch("metaphor.snowflake.auth.connect")