Renames for the measures -> simple metrics migration - Part 3 (#1903)

This PR renames more references to `measures`.

Author: plypaul

.changes/unreleased/Under the Hood-20251013-140859.yaml

@@ -0,0 +1,6 @@
+kind: Under the Hood
+body: Renames for the `measures -> simple metrics` migration - Part 3
+time: 2025-10-13T14:08:59.631665-07:00
+custom:
+  Author: plypaul
+  Issue: "1903"

metricflow-semantics/metricflow_semantics/experimental/dsi/join_lookup.py

@@ -133,8 +133,8 @@ def get_join_model_on_right_descriptors(
                     # We cannot join two semantic models with validity dimensions due to concerns with unexpected fanout
                     # due to the key structure of these semantic models. Applying multi-stage validity window filters can
                     # also lead to unexpected removal of interim join keys. Note this will need to be updated if we enable
-                    # measures in such semantic models, since those will need to be converted to a different type of semantic model
-                    # to support measure computation.
+                    # simple-metric inputs in such semantic models, since those will need to be converted to a different type of semantic model
+                    # to support such computation.
                     continue
 
                 if right_entity_type is EntityType.NATURAL and not right_model_has_validity_dimension:

metricflow-semantics/metricflow_semantics/experimental/semantic_graph/builder/simple_metric_subgraph.py

@@ -56,7 +56,7 @@ def _add_edges_for_simple_metric_model(
                 simple_metric_name = simple_metric_input.name
 
                 simple_metric_node = SimpleMetricNode.get_instance(simple_metric_name)
-                # Add an edge from the measure node to the metric-time node.
+                # Add an edge from the simple-metric input node to the metric-time node.
                 edge_list.append(
                     EntityRelationshipEdge.create(
                         tail_node=simple_metric_node,
@@ -67,7 +67,7 @@ def _add_edges_for_simple_metric_model(
                         ),
                     )
                 )
-                # Add an edge from the measure node to the model node.
+                # Add an edge from the simple-metric input node to the model node.
                 edge_list.append(
                     EntityRelationshipEdge.create(
                         tail_node=simple_metric_node,

metricflow-semantics/metricflow_semantics/experimental/semantic_graph/trie_resolver/group_by_metric_resolver.py

@@ -58,7 +58,7 @@
 
 
 class GroupByMetricTrieResolver(DunderNameTrieResolver):
-    """Resolves the group-by metrics that are available for the given measures / metrics.
+    """Resolves the group-by metrics that are available for the given simple-metric inputs / metrics.
 
     Group-by metrics are handled separately to break out the resolution of all available group-by items into smaller
     pieces.
@@ -203,7 +203,7 @@ def _resolve_trie(
                     LazyFormat(
                         "Valid group-by metrics for the given entity-key name not found. this may occur"
                         " when a given entity is not accessible from any metric (known case is related to conversion"
-                        " measures)",
+                        " simple-metric inputs)",
                         entity_key_name=entity_key_name,
                         known_key_names=list(self._entity_key_name_to_metric_names.keys()),
                     )
@@ -419,7 +419,7 @@ def generate(self) -> Mapping[str, MutableDunderNameTrie]:
         deny_labels = {
             # For metrics that require metric time to be in a query, it's not possible to query just the entity keys.
             DenyEntityKeyQueryResolutionLabel.get_instance(),
-            # For conversion metrics, the conversion measure is effectively hidden and is not used to generate the
+            # For conversion metrics, the conversion simple-metric input is effectively hidden and is not used to generate the
             # available group-by items for a metric.
             DenyVisibleAttributesLabel.get_instance(),
         }
@@ -441,7 +441,7 @@ def generate(self) -> Mapping[str, MutableDunderNameTrie]:
             if self._verbose_debug_logs:
                 logger.debug(
                     LazyFormat(
-                        "Found model nodes containing the measures for the given metric. Those model nodes"
+                        "Found model nodes containing the simple-metric inputs for the given metric. Those model nodes"
                         " will be used for generating the available group-by items.",
                         simple_metric_node=simple_metric_node,
                         visible_source_model_nodes=visible_source_model_nodes,
@@ -469,7 +469,7 @@ def generate(self) -> Mapping[str, MutableDunderNameTrie]:
             if self._verbose_debug_logs:
                 logger.debug(
                     LazyFormat(
-                        "Found model nodes containing the measures for the given metric. Those model nodes"
+                        "Found model nodes containing the simple-metric inputs for the given metric. Those model nodes"
                         " will be used for generating the available group-by items.",
                         simple_metric_node=simple_metric_node,
                         visible_source_model_nodes=visible_source_model_nodes,

metricflow-semantics/metricflow_semantics/experimental/semantic_graph/trie_resolver/simple_resolver.py

@@ -44,9 +44,9 @@
 
 
 class SimpleTrieResolver(DunderNameTrieResolver):
-    """Resolves the dunder-name trie that represents the "simple" group-by items available for measures / metrics.
+    """Resolves the dunder-name trie that represents the "simple" group-by items available for metrics.
 
-    The set of simple group-by items does not include group-by metrics Those are handled in a separate resolver.
+    The set of simple group-by items does not include group-by metrics. Those are handled in a separate resolver.
     """
 
     def __init__(
@@ -94,7 +94,7 @@ def _resolve_trie_for_source_nodes(
         the set of group-by items that are available for the source nodes is the intersection of the items that are
         available for each node.
         """
-        # Find the set measures / local-model nodes that the given source nodes depend on. Generating the result for
+        # Find the set simple-metric inputs / local-model nodes that the given source nodes depend on. Generating the result for
         # the set of given source nodes requires intersecting the result produced from each node.
         find_descendants_result = self._path_finder.find_descendants(
             graph=self._semantic_graph,

metricflow-semantics/metricflow_semantics/instances.py

@@ -398,7 +398,7 @@ def linkable_instances(self) -> Tuple[LinkableInstance, ...]:  # noqa: D102
         )
 
     def without_simple_metric_inputs(self) -> InstanceSet:
-        """Return a copy of this without the measure instances."""
+        """Return a copy of this without the simple-metric input instances."""
         return InstanceSet(
             simple_metric_input_instances=(),
             dimension_instances=self.dimension_instances,

metricflow-semantics/metricflow_semantics/model/dbt_manifest_parser.py

@@ -21,18 +21,18 @@ def parse_manifest_from_dbt_generated_manifest(manifest_json_string: str) -> Pyd
     """Parse a PydanticSemanticManifest given the generated semantic_manifest json from dbt."""
     raw_model = PydanticSemanticManifest.parse_raw(manifest_json_string)
     # The serialized object in the dbt project does not have all transformations applied to it at
-    # this time, which causes failures with input measure resolution.
+    # this time, which causes failures with input simple-metric input resolution.
     # TODO: remove this transform call once the upstream changes are integrated into our dependency tree
     # TODO: align rules between DSI, here, and MFS (if possible!)
     rule_set = PydanticSemanticManifestTransformRuleSet()
     rules = (
         # Primary
         (LowerCaseNamesRule(),),
-        # Secondary - broken out into groups because we run DedupeMetricInputMeasuresRule in the middle.
+        # Secondary
         (
             *rule_set.legacy_measure_update_rules,
             # These individual rules come from rule_set.convert_legacy_measures_to_metrics_rules, but
-            # dsi requØires AddInputMetricMeasuresRule, and metricflow requires that we do NOT run that rule
+            # dsi requires AddInputMetricMeasuresRule, and metricflow requires that we do NOT run that rule
             # as it is incompatible with a parser like dbt-core that pre-populates input measures.
             CreateProxyMeasureRule(),
             FlattenSimpleMetricsWithMeasureInputsRule(),

metricflow-semantics/metricflow_semantics/model/semantics/linkable_element_set_base.py

@@ -113,8 +113,8 @@ class AnnotatedSpec(SerializableDataclass):
 
     element_properties: Tuple[GroupByItemProperty, ...]
     # The semantic model(s) where the element (e.g. the categorical dimension) was defined.
-    # There can be multiple models if it's a metric / derived metric that references multiple measures, and the join
-    # path from the measure to the dimension is different.
+    # There can be multiple models if it's a metric / derived metric that references multiple simple-metric inputs, and the join
+    # path from the simple-metric input to the dimension is different.
     origin_semantic_model_names: Tuple[str, ...]
     derived_from_semantic_model_names: Tuple[str, ...]
 

metricflow-semantics/metricflow_semantics/model/semantics/linkable_spec_resolver.py

@@ -15,7 +15,7 @@
 
 
 class GroupByItemSetResolver(ABC):
-    """Resolves available group-by items for measures and metrics."""
+    """Resolves available group-by items for simple-metric inputs and metrics."""
 
     @abstractmethod
     def get_set_for_distinct_values_query(

metricflow-semantics/metricflow_semantics/model/semantics/semantic_model_join_evaluator.py

@@ -183,7 +183,7 @@ def get_valid_semantic_model_entity_join_type(
             # We cannot join two semantic models with validity dimensions due to concerns with unexpected fanout
             # due to the key structure of these semantic models. Applying multi-stage validity window filters can
             # also lead to unexpected removal of interim join keys. Note this will need to be updated if we enable
-            # measures in such semantic models, since those will need to be converted to a different type of semantic model
+            # simple-metric inputs in such semantic models, since those will need to be converted to a different type of semantic model
             # to support measure computation.
             return None