Renames for the measures -> simple metrics migration - Part 2 (#1902)

This PR renames tests that reference `measures` to reference `simple
metrics` instead.

Author: plypaul

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

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

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

@@ -13,10 +13,10 @@
 
 from metricflow_semantics.collection_helpers.mf_type_aliases import AnyLengthTuple, Pair, T
 from metricflow_semantics.collection_helpers.syntactic_sugar import mf_first_item, mf_flatten
-from metricflow_semantics.experimental.dsi.measure_model_object_lookup import SimpleMetricModelObjectLookup
 from metricflow_semantics.experimental.dsi.model_object_lookup import (
     ModelObjectLookup,
 )
+from metricflow_semantics.experimental.dsi.simple_metric_model_object_lookup import SimpleMetricModelObjectLookup
 from metricflow_semantics.experimental.metricflow_exception import MetricflowInternalError
 from metricflow_semantics.experimental.ordered_set import FrozenOrderedSet, MutableOrderedSet, OrderedSet
 from metricflow_semantics.experimental.semantic_graph.model_id import SemanticModelId

metricflow-semantics/metricflow_semantics/experimental/dsi/measure_model_object_lookup.py renamed to metricflow-semantics/metricflow_semantics/experimental/dsi/simple_metric_model_object_lookup.py

@@ -15,10 +15,10 @@
 from metricflow_semantics.experimental.semantic_graph.builder.entity_key_subgraph import (
     EntityKeySubgraphGenerator,
 )
-from metricflow_semantics.experimental.semantic_graph.builder.measure_subgraph import (
+from metricflow_semantics.experimental.semantic_graph.builder.metric_subgraph import ComplexMetricSubgraphGenerator
+from metricflow_semantics.experimental.semantic_graph.builder.simple_metric_subgraph import (
     SimpleMetricSubgraphGenerator,
 )
-from metricflow_semantics.experimental.semantic_graph.builder.metric_subgraph import ComplexMetricSubgraphGenerator
 from metricflow_semantics.experimental.semantic_graph.builder.subgraph_generator import SemanticSubgraphGenerator
 from metricflow_semantics.experimental.semantic_graph.builder.time_dimension_subgraph import (
     TimeDimensionSubgraphGenerator,

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

@@ -4,7 +4,7 @@
 
 from typing_extensions import override
 
-from metricflow_semantics.experimental.dsi.measure_model_object_lookup import SimpleMetricModelObjectLookup
+from metricflow_semantics.experimental.dsi.simple_metric_model_object_lookup import SimpleMetricModelObjectLookup
 from metricflow_semantics.experimental.semantic_graph.attribute_resolution.attribute_recipe_step import (
     AttributeRecipeStep,
 )

metricflow-semantics/metricflow_semantics/experimental/semantic_graph/builder/measure_subgraph.py renamed to metricflow-semantics/metricflow_semantics/experimental/semantic_graph/builder/simple_metric_subgraph.py

@@ -16,9 +16,9 @@
 from metricflow_semantics.specs.entity_spec import EntitySpec
 from metricflow_semantics.specs.group_by_metric_spec import GroupByMetricSpec
 from metricflow_semantics.specs.instance_spec import InstanceSpec
-from metricflow_semantics.specs.measure_spec import SimpleMetricInputSpec
 from metricflow_semantics.specs.metadata_spec import MetadataSpec
 from metricflow_semantics.specs.metric_spec import MetricSpec
+from metricflow_semantics.specs.simple_metric_input_spec import SimpleMetricInputSpec
 from metricflow_semantics.specs.spec_set import InstanceSpecSet
 from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 from metricflow_semantics.visitor import VisitorOutputT

metricflow-semantics/metricflow_semantics/instances.py

@@ -28,9 +28,6 @@
     GroupByItemResolutionNode,
     GroupByItemResolutionNodeVisitor,
 )
-from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.measure_source_node import (
-    SimpleMetricGroupByItemSourceNode,
-)
 from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.metric_resolution_node import (
     ComplexMetricGroupByItemResolutionNode,
 )
@@ -40,17 +37,20 @@
 from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.query_resolution_node import (
     QueryGroupByItemResolutionNode,
 )
+from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.simple_metric_source_node import (
+    SimpleMetricGroupByItemSourceNode,
+)
 from metricflow_semantics.query.group_by_item.resolution_path import MetricFlowQueryResolutionPath
 from metricflow_semantics.query.issues.group_by_item_resolver.invalid_use_of_date_part import (
     MetricExcludesDatePartIssue,
 )
 from metricflow_semantics.query.issues.group_by_item_resolver.no_common_items import NoCommonItemsInParents
-from metricflow_semantics.query.issues.group_by_item_resolver.no_matching_items_for_measure import (
-    NoMatchingItemsForSimpleMetric,
-)
 from metricflow_semantics.query.issues.group_by_item_resolver.no_matching_items_for_no_metrics_query import (
     NoMatchingItemsForNoMetricsQuery,
 )
+from metricflow_semantics.query.issues.group_by_item_resolver.no_matching_items_for_simple_metric import (
+    NoMatchingItemsForSimpleMetric,
+)
 from metricflow_semantics.query.issues.group_by_item_resolver.no_parent_candidates import NoParentCandidates
 from metricflow_semantics.query.issues.issues_base import (
     MetricFlowQueryResolutionIssueSet,

metricflow-semantics/metricflow_semantics/query/group_by_item/candidate_push_down/push_down_visitor.py

@@ -36,9 +36,6 @@
     GroupByItemResolutionNode,
     GroupByItemResolutionNodeVisitor,
 )
-from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.measure_source_node import (
-    SimpleMetricGroupByItemSourceNode,
-)
 from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.metric_resolution_node import (
     ComplexMetricGroupByItemResolutionNode,
 )
@@ -48,6 +45,9 @@
 from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.query_resolution_node import (
     QueryGroupByItemResolutionNode,
 )
+from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.simple_metric_source_node import (
+    SimpleMetricGroupByItemSourceNode,
+)
 from metricflow_semantics.query.group_by_item.resolution_path import MetricFlowQueryResolutionPath
 from metricflow_semantics.query.issues.filter_spec_resolver.invalid_where import WhereFilterParsingIssue
 from metricflow_semantics.query.issues.issues_base import (

metricflow-semantics/metricflow_semantics/query/group_by_item/filter_spec_resolution/filter_spec_resolver.py

@@ -11,9 +11,6 @@
 from metricflow_semantics.model.semantics.metric_lookup import MetricLookup
 from metricflow_semantics.query.group_by_item.resolution_dag.dag import GroupByItemResolutionDag
 from metricflow_semantics.query.group_by_item.resolution_dag.input_metric_location import InputMetricDefinitionLocation
-from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.measure_source_node import (
-    SimpleMetricGroupByItemSourceNode,
-)
 from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.metric_resolution_node import (
     ComplexMetricGroupByItemResolutionNode,
 )
@@ -23,6 +20,9 @@
 from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.query_resolution_node import (
     QueryGroupByItemResolutionNode,
 )
+from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.simple_metric_source_node import (
+    SimpleMetricGroupByItemSourceNode,
+)
 
 logger = logging.getLogger(__name__)
 

metricflow-semantics/metricflow_semantics/query/group_by_item/resolution_dag/dag_builder.py

@@ -12,9 +12,6 @@
 from metricflow_semantics.visitor import Visitable, VisitorOutputT
 
 if TYPE_CHECKING:
-    from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.measure_source_node import (
-        SimpleMetricGroupByItemSourceNode,
-    )
     from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.metric_resolution_node import (
         ComplexMetricGroupByItemResolutionNode,
     )
@@ -24,6 +21,9 @@
     from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.query_resolution_node import (
         QueryGroupByItemResolutionNode,
     )
+    from metricflow_semantics.query.group_by_item.resolution_dag.resolution_nodes.simple_metric_source_node import (
+        SimpleMetricGroupByItemSourceNode,
+    )
 
 
 @dataclass(frozen=True)