Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1ac2f04
Add docstrings to `contracts/graph/metrics.py` functions to document …
QMalcolm Sep 5, 2023
b84b575
Add typing to `reverse_dag_parsing` and update function to work on 1.…
QMalcolm Sep 6, 2023
a92e5aa
Add typing to `parent_metrics` and `parent_metrics_names`
QMalcolm Sep 6, 2023
c8389f9
Add typing to `base_metric_dependency` and `derived_metric_dependency…
QMalcolm Sep 6, 2023
8f0c5c6
Simplify implementations of `basic_metric_dependency` and `derived_me…
QMalcolm Sep 6, 2023
4e062cb
Add typing to `ResolvedMetricReference` initialization
QMalcolm Sep 6, 2023
4dfe539
Add typing to `derived_metric_dependency_graph`
QMalcolm Sep 6, 2023
4a11c9f
Simplify conditional controls in `ResolvedMetricReference` functions
QMalcolm Sep 6, 2023
41c8ad0
Don't recurse on over `depends_on` for non-derived metrics in `revers…
QMalcolm Sep 6, 2023
b476f28
Simplify `parent_metrics_names` by having it call `parent_metrics`
QMalcolm Sep 6, 2023
84c5091
Unskip `TestMetricHelperFunctions.test_derived_metric` and update fix…
QMalcolm Sep 6, 2023
b073cff
Add changie doc for metric helper function updates
QMalcolm Sep 6, 2023
711ca98
Get manifest in `test_derived_metric` from the parse dbt_run invocation
QMalcolm Sep 6, 2023
70091df
Remove `Relation` a intiatlization attribute for `ResolvedMetricRefer…
QMalcolm Sep 6, 2023
da99e59
Add return typing to class `__` functions of `ResolvedMetricReference`
QMalcolm Sep 6, 2023
f80b4e1
Move from `manifest.metrics.get` to `manifest.expect` in metric helpers
QMalcolm Sep 7, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add typing to reverse_dag_parsing and update function to work on 1.…
…6+ metrics
  • Loading branch information
QMalcolm committed Sep 6, 2023
commit b84b5750b95134d34e7f872a2c9d51b02ff5561b
20 changes: 13 additions & 7 deletions core/dbt/contracts/graph/metrics.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
from dbt.node_types import NodeType
from dbt.contracts.graph.manifest import Manifest, Metric
from dbt_semantic_interfaces.type_enums import MetricType

from typing import Dict, Iterator


DERIVED_METRICS = [MetricType.DERIVED, MetricType.RATIO]
BASE_METRICS = [MetricType.SIMPLE, MetricType.CUMULATIVE]


class MetricReference(object):
Expand Down Expand Up @@ -50,22 +58,20 @@ def parent_metrics_names(cls, metric_node, manifest):
yield from cls.parent_metrics_names(node, manifest)

@classmethod
def reverse_dag_parsing(cls, metric_node, manifest, metric_depth_count):
def reverse_dag_parsing(
cls, metric_node: Metric, manifest: Manifest, metric_depth_count: int
) -> Iterator[Dict[str, int]]:
"""For the given metric, yeilds dictionaries having {<metric_name>: <depth_from_initial_metric} of upstream derived metrics.

This function is intended as a helper function for other metric helper functions.
"""
if metric_node.calculation_method == "derived":
if metric_node.type in DERIVED_METRICS:
yield {metric_node.name: metric_depth_count}
metric_depth_count = metric_depth_count + 1

for parent_unique_id in metric_node.depends_on.nodes:
node = manifest.metrics.get(parent_unique_id)
if (
node
and node.resource_type == NodeType.Metric
and node.calculation_method == "derived"
):
if node and node.resource_type == NodeType.Metric and node.type in DERIVED_METRICS:
yield from cls.reverse_dag_parsing(node, manifest, metric_depth_count)

def full_metric_dependency(self):
Expand Down