Add new-syle YAML (Parsed) Metric

Author: theyostalservice

core/dbt/parser/schema_yaml_readers.py

@@ -49,6 +49,7 @@
     UnparsedMetricInput,
     UnparsedMetricInputMeasure,
     UnparsedMetricTypeParams,
+    UnparsedMetricV2,
     UnparsedNonAdditiveDimension,
     UnparsedQueryParams,
     UnparsedSavedQuery,
@@ -72,7 +73,7 @@
 
 
 def parse_where_filter(
-    where: Optional[Union[List[str], str]]
+    where: Optional[Union[List[str], str]],
 ) -> Optional[WhereFilterIntersection]:
     if where is None:
         return None
@@ -470,12 +471,20 @@ def _generate_metric_config(
 
     def parse(self) -> None:
         for data in self.get_key_dicts():
-            try:
-                UnparsedMetric.validate(data)
-                unparsed = UnparsedMetric.from_dict(data)
-
-            except (ValidationError, JSONValidationError) as exc:
-                raise YamlParseDictError(self.yaml.path, self.key, data, exc)
+            # The main differentiator of old-style yaml and new-style is "type_params",
+            # so if that is missing, we'll assume you're using the newer yaml.
+            if "type_params" in data:
+                try:
+                    UnparsedMetric.validate(data)
+                    unparsed = UnparsedMetric.from_dict(data)
+                except (ValidationError, JSONValidationError) as exc:
+                    raise YamlParseDictError(self.yaml.path, self.key, data, exc)
+            else:
+                try:
+                    UnparsedMetricV2.validate(data)
+                    unparsed = UnparsedMetricV2.from_dict(data)
+                except (ValidationError, JSONValidationError) as exc:
+                    raise YamlParseDictError(self.yaml.path, self.key, data, exc)
             self.parse_metric(unparsed)