Update imports.

metricflow-semantics/metricflow_semantics/instances.py

@@ -11,17 +11,15 @@
 
 from metricflow_semantics.aggregation_properties import AggregationState
 from metricflow_semantics.specs.column_assoc import ColumnAssociation
-from metricflow_semantics.specs.spec_classes import (
-    DimensionSpec,
-    EntitySpec,
-    GroupByMetricSpec,
-    InstanceSpec,
-    MeasureSpec,
-    MetadataSpec,
-    MetricSpec,
-    TimeDimensionSpec,
-)
+from metricflow_semantics.specs.dimension_spec import DimensionSpec
+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 MeasureSpec
+from metricflow_semantics.specs.metadata_spec import MetadataSpec
+from metricflow_semantics.specs.metric_spec import MetricSpec
 from metricflow_semantics.specs.spec_set import InstanceSpecSet
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 
 # Type for the specification used in the instance.
 SpecT = TypeVar("SpecT", bound=InstanceSpec)

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

@@ -20,15 +20,12 @@
     LinkableEntity,
     LinkableMetric,
 )
+from metricflow_semantics.specs.dimension_spec import DimensionSpec
+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, LinkableInstanceSpec
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
-from metricflow_semantics.specs.spec_classes import (
-    DimensionSpec,
-    EntitySpec,
-    GroupByMetricSpec,
-    InstanceSpec,
-    LinkableInstanceSpec,
-    TimeDimensionSpec,
-)
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 
 logger = logging.getLogger(__name__)
 

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

@@ -11,6 +11,7 @@
 from dbt_semantic_interfaces.protocols.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.protocols.semantic_model import SemanticModel
 from dbt_semantic_interfaces.references import (
+    EntityReference,
     MeasureReference,
     MetricReference,
     SemanticModelReference,
@@ -38,10 +39,7 @@
 )
 from metricflow_semantics.model.semantics.linkable_element_set import LinkableElementSet
 from metricflow_semantics.model.semantics.semantic_model_join_evaluator import SemanticModelJoinEvaluator
-from metricflow_semantics.specs.spec_classes import (
-    DEFAULT_TIME_GRANULARITY,
-    EntityReference,
-)
+from metricflow_semantics.specs.time_dimension_spec import DEFAULT_TIME_GRANULARITY
 
 if TYPE_CHECKING:
     from metricflow_semantics.model.semantics.semantic_model_lookup import SemanticModelLookup

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

@@ -19,7 +19,7 @@
 )
 from metricflow_semantics.model.semantics.semantic_model_join_evaluator import MAX_JOIN_HOPS
 from metricflow_semantics.model.semantics.semantic_model_lookup import SemanticModelLookup
-from metricflow_semantics.specs.spec_classes import TimeDimensionSpec
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 
 logger = logging.getLogger(__name__)
 

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

@@ -24,15 +24,12 @@
 from metricflow_semantics.mf_logging.pretty_print import mf_pformat
 from metricflow_semantics.model.semantics.element_group import ElementGrouper
 from metricflow_semantics.model.spec_converters import MeasureConverter
-from metricflow_semantics.specs.spec_classes import (
-    DEFAULT_TIME_GRANULARITY,
-    DimensionSpec,
-    EntitySpec,
-    LinkableInstanceSpec,
-    MeasureSpec,
-    NonAdditiveDimensionSpec,
-    TimeDimensionSpec,
-)
+from metricflow_semantics.specs.dimension_spec import DimensionSpec
+from metricflow_semantics.specs.entity_spec import EntitySpec
+from metricflow_semantics.specs.instance_spec import LinkableInstanceSpec
+from metricflow_semantics.specs.measure_spec import MeasureSpec
+from metricflow_semantics.specs.non_additive_dimension_spec import NonAdditiveDimensionSpec
+from metricflow_semantics.specs.time_dimension_spec import DEFAULT_TIME_GRANULARITY, TimeDimensionSpec
 
 logger = logging.getLogger(__name__)
 

metricflow-semantics/metricflow_semantics/model/spec_converters.py

@@ -12,10 +12,8 @@
 
 from dbt_semantic_interfaces.protocols.measure import Measure
 
-from metricflow_semantics.specs.spec_classes import (
-    MeasureSpec,
-    NonAdditiveDimensionSpec,
-)
+from metricflow_semantics.specs.measure_spec import MeasureSpec
+from metricflow_semantics.specs.non_additive_dimension_spec import NonAdditiveDimensionSpec
 
 
 class MeasureConverter:

metricflow-semantics/metricflow_semantics/naming/dunder_scheme.py

@@ -10,14 +10,12 @@
 from typing_extensions import override
 
 from metricflow_semantics.naming.naming_scheme import QueryItemNamingScheme
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 from metricflow_semantics.specs.patterns.entity_link_pattern import (
     EntityLinkPattern,
     EntityLinkPatternParameterSet,
     ParameterSetField,
 )
-from metricflow_semantics.specs.spec_classes import (
-    InstanceSpec,
-)
 from metricflow_semantics.specs.spec_set import InstanceSpecSet, InstanceSpecSetTransform, group_spec_by_type
 
 

metricflow-semantics/metricflow_semantics/naming/metric_scheme.py

@@ -6,10 +6,8 @@
 from typing_extensions import override
 
 from metricflow_semantics.naming.naming_scheme import QueryItemNamingScheme
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 from metricflow_semantics.specs.patterns.metric_pattern import MetricSpecPattern
-from metricflow_semantics.specs.spec_classes import (
-    InstanceSpec,
-)
 from metricflow_semantics.specs.spec_set import group_spec_by_type
 
 

metricflow-semantics/metricflow_semantics/naming/naming_scheme.py

@@ -6,7 +6,7 @@
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
 
 if TYPE_CHECKING:
-    from metricflow_semantics.specs.spec_classes import InstanceSpec
+    from metricflow_semantics.specs.instance_spec import InstanceSpec
 
 
 class QueryItemNamingScheme(ABC):

metricflow-semantics/metricflow_semantics/naming/object_builder_scheme.py

@@ -14,16 +14,14 @@
 
 from metricflow_semantics.naming.naming_scheme import QueryItemNamingScheme
 from metricflow_semantics.naming.object_builder_str import ObjectBuilderNameConverter
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 from metricflow_semantics.specs.patterns.entity_link_pattern import (
     EntityLinkPattern,
     EntityLinkPatternParameterSet,
     ParameterSetField,
 )
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
 from metricflow_semantics.specs.patterns.typed_patterns import DimensionPattern, TimeDimensionPattern
-from metricflow_semantics.specs.spec_classes import (
-    InstanceSpec,
-)
 
 logger = logging.getLogger(__name__)
 

metricflow-semantics/metricflow_semantics/naming/object_builder_str.py

@@ -14,7 +14,7 @@
 from dbt_semantic_interfaces.type_enums.date_part import DatePart
 from typing_extensions import override
 
-from metricflow_semantics.specs.spec_classes import InstanceSpec
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 from metricflow_semantics.specs.spec_set import InstanceSpecSet, InstanceSpecSetTransform, group_spec_by_type
 
 

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

@@ -12,8 +12,8 @@
 from metricflow_semantics.model.semantics.linkable_element_set import LinkableElementSet
 from metricflow_semantics.query.group_by_item.path_prefixable import PathPrefixable
 from metricflow_semantics.query.group_by_item.resolution_path import MetricFlowQueryResolutionPath
+from metricflow_semantics.specs.instance_spec import LinkableInstanceSpec
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
-from metricflow_semantics.specs.spec_classes import LinkableInstanceSpec
 
 logger = logging.getLogger(__name__)
 

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

@@ -26,7 +26,7 @@
 
 if TYPE_CHECKING:
     from metricflow_semantics.model.semantics.linkable_element_set import LinkableElementSet
-    from metricflow_semantics.specs.spec_classes import LinkableInstanceSpec
+    from metricflow_semantics.specs.instance_spec import LinkableInstanceSpec
 
 logger = logging.getLogger(__name__)
 

metricflow-semantics/metricflow_semantics/query/group_by_item/group_by_item_resolver.py

@@ -27,11 +27,11 @@
     MetricFlowQueryResolutionIssueSet,
 )
 from metricflow_semantics.query.suggestion_generator import QueryItemSuggestionGenerator
+from metricflow_semantics.specs.instance_spec import LinkableInstanceSpec
 from metricflow_semantics.specs.patterns.minimum_time_grain import MinimumTimeGrainPattern
 from metricflow_semantics.specs.patterns.no_group_by_metric import NoGroupByMetricPattern
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
 from metricflow_semantics.specs.patterns.typed_patterns import TimeDimensionPattern
-from metricflow_semantics.specs.spec_classes import LinkableInstanceSpec
 from metricflow_semantics.specs.spec_set import InstanceSpecSet, group_specs_by_type
 
 logger = logging.getLogger(__name__)

metricflow-semantics/metricflow_semantics/query/issues/group_by_item_resolver/invalid_use_of_date_part.py

@@ -12,7 +12,7 @@
     MetricFlowQueryResolutionIssue,
 )
 from metricflow_semantics.query.resolver_inputs.base_resolver_inputs import MetricFlowQueryResolverInput
-from metricflow_semantics.specs.spec_classes import LinkableInstanceSpec
+from metricflow_semantics.specs.instance_spec import LinkableInstanceSpec
 
 
 @dataclass(frozen=True)

metricflow-semantics/metricflow_semantics/query/query_parser.py

@@ -52,17 +52,15 @@
     ResolverInputForQuery,
     ResolverInputForQueryLevelWhereFilterIntersection,
 )
+from metricflow_semantics.specs.group_by_metric_spec import GroupByMetricSpec
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 from metricflow_semantics.specs.patterns.metric_time_pattern import MetricTimePattern
 from metricflow_semantics.specs.patterns.minimum_time_grain import MinimumTimeGrainPattern
 from metricflow_semantics.specs.patterns.none_date_part import NoneDatePartPattern
 from metricflow_semantics.specs.query_param_implementations import DimensionOrEntityParameter, MetricParameter
 from metricflow_semantics.specs.query_spec import MetricFlowQuerySpec
-from metricflow_semantics.specs.spec_classes import (
-    GroupByMetricSpec,
-    InstanceSpec,
-    TimeDimensionSpec,
-)
 from metricflow_semantics.specs.spec_set import group_specs_by_type
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 from metricflow_semantics.time.dateutil_adjuster import DateutilTimePeriodAdjuster
 
 logger = logging.getLogger(__name__)

metricflow-semantics/metricflow_semantics/query/query_resolver.py

@@ -54,14 +54,11 @@
 )
 from metricflow_semantics.query.suggestion_generator import QueryItemSuggestionGenerator
 from metricflow_semantics.query.validation_rules.query_validator import PostResolutionQueryValidator
+from metricflow_semantics.specs.instance_spec import InstanceSpec, LinkableInstanceSpec
+from metricflow_semantics.specs.metric_spec import MetricSpec
+from metricflow_semantics.specs.order_by_spec import OrderBySpec
 from metricflow_semantics.specs.patterns.match_list_pattern import MatchListSpecPattern
 from metricflow_semantics.specs.query_spec import MetricFlowQuerySpec
-from metricflow_semantics.specs.spec_classes import (
-    InstanceSpec,
-    LinkableInstanceSpec,
-    MetricSpec,
-    OrderBySpec,
-)
 from metricflow_semantics.specs.spec_set import group_specs_by_type
 from metricflow_semantics.workarounds.reference import sorted_semantic_model_references
 

metricflow-semantics/metricflow_semantics/query/suggestion_generator.py

@@ -5,11 +5,11 @@
 
 from metricflow_semantics.naming.naming_scheme import QueryItemNamingScheme
 from metricflow_semantics.query.similarity import top_fuzzy_matches
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 from metricflow_semantics.specs.patterns.minimum_time_grain import MinimumTimeGrainPattern
 from metricflow_semantics.specs.patterns.no_group_by_metric import NoGroupByMetricPattern
 from metricflow_semantics.specs.patterns.none_date_part import NoneDatePartPattern
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
-from metricflow_semantics.specs.spec_classes import InstanceSpec
 
 logger = logging.getLogger(__name__)
 

metricflow-semantics/metricflow_semantics/query/validation_rules/metric_time_requirements.py

@@ -20,7 +20,7 @@
 )
 from metricflow_semantics.query.resolver_inputs.query_resolver_inputs import ResolverInputForQuery
 from metricflow_semantics.query.validation_rules.base_validation_rule import PostResolutionQueryValidationRule
-from metricflow_semantics.specs.spec_classes import TimeDimensionSpec
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 
 
 class MetricTimeQueryValidationRule(PostResolutionQueryValidationRule):

metricflow-semantics/metricflow_semantics/specs/column_assoc.py

@@ -6,7 +6,7 @@
 
 from dbt_semantic_interfaces.dataclass_serialization import SerializableDataclass
 
-from metricflow_semantics.specs.spec_classes import InstanceSpec
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 
 
 class ColumnCorrelationKey(ABC):

metricflow-semantics/metricflow_semantics/specs/constant_property_spec.py

@@ -0,0 +1,15 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from dbt_semantic_interfaces.dataclass_serialization import SerializableDataclass
+
+from metricflow_semantics.specs.instance_spec import LinkableInstanceSpec
+
+
+@dataclass(frozen=True)
+class ConstantPropertySpec(SerializableDataclass):
+    """Includes the specs that are joined for conversion metric's constant properties."""
+
+    base_spec: LinkableInstanceSpec
+    conversion_spec: LinkableInstanceSpec

metricflow-semantics/metricflow_semantics/specs/dimension_spec_resolver.py

@@ -12,7 +12,8 @@
 from dbt_semantic_interfaces.type_enums import TimeGranularity
 from dbt_semantic_interfaces.type_enums.date_part import DatePart
 
-from metricflow_semantics.specs.spec_classes import DEFAULT_TIME_GRANULARITY, DimensionSpec, TimeDimensionSpec
+from metricflow_semantics.specs.dimension_spec import DimensionSpec
+from metricflow_semantics.specs.time_dimension_spec import DEFAULT_TIME_GRANULARITY, TimeDimensionSpec
 
 
 class DimensionSpecResolver:

metricflow-semantics/metricflow_semantics/specs/dunder_column_association_resolver.py

@@ -6,17 +6,14 @@
     ColumnAssociation,
     ColumnAssociationResolver,
 )
-from metricflow_semantics.specs.spec_classes import (
-    DimensionSpec,
-    EntitySpec,
-    GroupByMetricSpec,
-    InstanceSpec,
-    InstanceSpecVisitor,
-    MeasureSpec,
-    MetadataSpec,
-    MetricSpec,
-    TimeDimensionSpec,
-)
+from metricflow_semantics.specs.dimension_spec import DimensionSpec
+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, InstanceSpecVisitor
+from metricflow_semantics.specs.measure_spec import MeasureSpec
+from metricflow_semantics.specs.metadata_spec import MetadataSpec
+from metricflow_semantics.specs.metric_spec import MetricSpec
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 
 
 class DunderColumnAssociationResolver(ColumnAssociationResolver):

metricflow-semantics/metricflow_semantics/specs/linkable_spec_set.py

@@ -10,15 +10,12 @@
 from typing_extensions import override
 
 from metricflow_semantics.collection_helpers.merger import Mergeable
-from metricflow_semantics.specs.spec_classes import (
-    DimensionSpec,
-    EntitySpec,
-    GroupByMetricSpec,
-    InstanceSpec,
-    LinkableInstanceSpec,
-    TimeDimensionSpec,
-)
+from metricflow_semantics.specs.dimension_spec import DimensionSpec
+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, LinkableInstanceSpec
 from metricflow_semantics.specs.spec_set import InstanceSpecSet
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 
 if typing.TYPE_CHECKING:
     from metricflow_semantics.model.semantics.metric_lookup import MetricLookup

metricflow-semantics/metricflow_semantics/specs/partition_spec_set.py

@@ -5,7 +5,8 @@
 
 from dbt_semantic_interfaces.dataclass_serialization import SerializableDataclass
 
-from metricflow_semantics.specs.spec_classes import DimensionSpec, TimeDimensionSpec
+from metricflow_semantics.specs.dimension_spec import DimensionSpec
+from metricflow_semantics.specs.time_dimension_spec import TimeDimensionSpec
 
 
 @dataclass(frozen=True)

metricflow-semantics/metricflow_semantics/specs/patterns/entity_link_pattern.py

@@ -11,8 +11,8 @@
 from more_itertools import is_sorted
 from typing_extensions import override
 
+from metricflow_semantics.specs.instance_spec import InstanceSpec, LinkableInstanceSpec
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
-from metricflow_semantics.specs.spec_classes import InstanceSpec, LinkableInstanceSpec
 from metricflow_semantics.specs.spec_set import group_specs_by_type
 
 logger = logging.getLogger(__name__)

metricflow-semantics/metricflow_semantics/specs/patterns/match_list_pattern.py

@@ -4,8 +4,8 @@
 
 from typing_extensions import override
 
+from metricflow_semantics.specs.instance_spec import InstanceSpec
 from metricflow_semantics.specs.patterns.spec_pattern import SpecPattern
-from metricflow_semantics.specs.spec_classes import InstanceSpec
 
 
 class MatchListSpecPattern(SpecPattern):