Merge pull request #515 from dbt-labs/qmalcolm--dbt-si-move-validations

Move model validator and rules to dbt_semantic_interfaces

metricflow/model/model_validator.py → dbt_semantic_interfaces/dbt_semantic_interfaces/model_validator.py

@@ -4,30 +4,30 @@
 from typing import List, Sequence
 
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
-from metricflow.model.validations.agg_time_dimension import AggregationTimeDimensionRule
-from metricflow.model.validations.semantic_models import (
+from dbt_semantic_interfaces.validations.agg_time_dimension import AggregationTimeDimensionRule
+from dbt_semantic_interfaces.validations.semantic_models import (
     SemanticModelTimeDimensionWarningsRule,
     SemanticModelValidityWindowRule,
 )
-from metricflow.model.validations.dimension_const import DimensionConsistencyRule
-from metricflow.model.validations.element_const import ElementConsistencyRule
-from metricflow.model.validations.entities import (
+from dbt_semantic_interfaces.validations.dimension_const import DimensionConsistencyRule
+from dbt_semantic_interfaces.validations.element_const import ElementConsistencyRule
+from dbt_semantic_interfaces.validations.entities import (
     NaturalEntityConfigurationRule,
     OnePrimaryEntityPerSemanticModelRule,
 )
-from metricflow.model.validations.measures import (
+from dbt_semantic_interfaces.validations.measures import (
     PercentileAggregationRule,
     CountAggregationExprRule,
     SemanticModelMeasuresUniqueRule,
     MeasureConstraintAliasesRule,
     MetricMeasuresRule,
     MeasuresNonAdditiveDimensionRule,
 )
-from metricflow.model.validations.metrics import CumulativeMetricRule, DerivedMetricRule
-from metricflow.model.validations.non_empty import NonEmptyRule
-from metricflow.model.validations.reserved_keywords import ReservedKeywordsRule
-from metricflow.model.validations.unique_valid_name import UniqueAndValidNameRule
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.metrics import CumulativeMetricRule, DerivedMetricRule
+from dbt_semantic_interfaces.validations.non_empty import NonEmptyRule
+from dbt_semantic_interfaces.validations.reserved_keywords import ReservedKeywordsRule
+from dbt_semantic_interfaces.validations.unique_valid_name import UniqueAndValidNameRule
+from dbt_semantic_interfaces.validations.validator_helpers import (
     ModelValidationResults,
     ModelValidationRule,
     ModelValidationException,

dbt_semantic_interfaces/dbt_semantic_interfaces/objects/where_filter/filter_renderer.py

@@ -5,7 +5,7 @@
 import jinja2
 
 from dbt_semantic_interfaces.references import DimensionReference, EntityReference
-from metricflow.time.time_granularity import TimeGranularity
+from dbt_semantic_interfaces.objects.time_granularity import TimeGranularity
 
 
 @dataclass(frozen=True)

dbt_semantic_interfaces/dbt_semantic_interfaces/parsing/dir_to_model.py

@@ -23,7 +23,7 @@
     YamlConfigLoader,
     PARSING_CONTEXT_KEY,
 )
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     FileContext,
     ModelValidationException,
     ModelValidationResults,

metricflow/model/validations/agg_time_dimension.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/agg_time_dimension.py

@@ -4,7 +4,7 @@
 from dbt_semantic_interfaces.objects.elements.dimension import DimensionType
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.references import SemanticModelElementReference, TimeDimensionReference
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelElementContext,
     SemanticModelElementType,
     FileContext,

metricflow/model/validations/common_entities.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/common_entities.py

@@ -4,7 +4,7 @@
 from dbt_semantic_interfaces.objects.elements.entity import Entity
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.references import SemanticModelElementReference, EntityReference
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelElementContext,
     SemanticModelElementType,
     FileContext,

metricflow/model/validations/dimension_const.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/dimension_const.py

@@ -2,7 +2,7 @@
 
 from dbt_semantic_interfaces.objects.semantic_model import SemanticModel
 from dbt_semantic_interfaces.objects.elements.dimension import Dimension, DimensionType
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelElementContext,
     SemanticModelElementType,
     FileContext,

metricflow/model/validations/element_const.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/element_const.py

@@ -3,7 +3,7 @@
 
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.references import SemanticModelReference
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelContext,
     SemanticModelElementType,
     FileContext,

metricflow/model/validations/entities.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/entities.py

@@ -6,15 +6,15 @@
 from dbt_semantic_interfaces.objects.elements.entity import EntityType
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.references import SemanticModelReference
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelContext,
     FileContext,
     ModelValidationRule,
     ValidationIssue,
     ValidationError,
     validate_safely,
 )
-from metricflow.model.validations.validator_helpers import ValidationFutureError
+from dbt_semantic_interfaces.validations.validator_helpers import ValidationFutureError
 
 logger = logging.getLogger(__name__)
 

metricflow/model/validations/measures.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/measures.py

@@ -8,8 +8,8 @@
 from dbt_semantic_interfaces.objects.metric import Metric
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.references import MetricModelReference, MeasureReference
-from metricflow.model.validations.unique_valid_name import UniqueAndValidNameRule
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.unique_valid_name import UniqueAndValidNameRule
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelElementContext,
     SemanticModelElementReference,
     SemanticModelElementType,

metricflow/model/validations/metrics.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/metrics.py

@@ -5,8 +5,8 @@
 from dbt_semantic_interfaces.objects.metric import Metric, MetricType, MetricTimeWindow
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.references import MetricModelReference
-from metricflow.model.validations.unique_valid_name import UniqueAndValidNameRule
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.unique_valid_name import UniqueAndValidNameRule
+from dbt_semantic_interfaces.validations.validator_helpers import (
     FileContext,
     MetricContext,
     ModelValidationRule,

metricflow/model/validations/non_empty.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/non_empty.py

@@ -1,7 +1,7 @@
 from typing import List
 
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     ModelValidationRule,
     ValidationError,
     ValidationIssue,

metricflow/model/validations/reserved_keywords.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/reserved_keywords.py

@@ -4,7 +4,7 @@
 
 from dbt_semantic_interfaces.objects.semantic_model import SemanticModel
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelContext,
     SemanticModelElementContext,
     SemanticModelElementType,

metricflow/model/validations/semantic_models.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/semantic_models.py

@@ -6,7 +6,7 @@
 from dbt_semantic_interfaces.objects.elements.entity import EntityType
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.references import SemanticModelReference
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelContext,
     FileContext,
     ModelValidationRule,

metricflow/model/validations/unique_valid_name.py → dbt_semantic_interfaces/dbt_semantic_interfaces/validations/unique_valid_name.py

@@ -13,7 +13,7 @@
 )
 from dbt_semantic_interfaces.references import ElementReference
 from dbt_semantic_interfaces.enum_extension import assert_values_exhausted
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelContext,
     SemanticModelElementContext,
     SemanticModelElementType,

metricflow/api/metricflow_client.py

@@ -14,10 +14,10 @@
 )
 from metricflow.engine.models import Dimension, Metric
 from metricflow.engine.utils import build_semantic_manifest_from_config, convert_to_datetime
-from metricflow.model.model_validator import ModelValidator
+from dbt_semantic_interfaces.model_validator import ModelValidator
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from metricflow.model.semantic_manifest_lookup import SemanticManifestLookup
-from metricflow.model.validations.validator_helpers import ModelValidationResults
+from dbt_semantic_interfaces.validations.validator_helpers import ModelValidationResults
 from metricflow.protocols.async_sql_client import AsyncSqlClient
 from metricflow.sql.optimizer.optimization_levels import SqlQueryOptimizationLevel
 from metricflow.sql_clients.common_client import not_empty

metricflow/cli/main.py

@@ -48,11 +48,11 @@
 from metricflow.inference.solver.weighted_tree import WeightedTypeTreeInferenceSolver
 from metricflow.inference.runner import InferenceProgressReporter, InferenceRunner
 from metricflow.model.data_warehouse_model_validator import DataWarehouseModelValidator
-from metricflow.model.model_validator import ModelValidator
+from dbt_semantic_interfaces.model_validator import ModelValidator
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from metricflow.protocols.sql_client import SqlEngine
 from metricflow.engine.utils import model_build_result_from_config
-from metricflow.model.validations.validator_helpers import ModelValidationResults
+from dbt_semantic_interfaces.validations.validator_helpers import ModelValidationResults
 from metricflow.sql_clients.common_client import SqlDialect
 from metricflow.telemetry.models import TelemetryLevel
 from metricflow.telemetry.reporter import TelemetryReporter, log_call

metricflow/dataset/dataset.py

@@ -5,7 +5,7 @@
 
 from dbt_semantic_interfaces.references import TimeDimensionReference
 from metricflow.instances import InstanceSet, TimeDimensionInstance
-from metricflow.model.validations.unique_valid_name import MetricFlowReservedKeywords
+from dbt_semantic_interfaces.validations.unique_valid_name import MetricFlowReservedKeywords
 from metricflow.specs import TimeDimensionSpec
 from dbt_semantic_interfaces.objects.time_granularity import TimeGranularity
 

metricflow/model/data_warehouse_model_validator.py

@@ -26,7 +26,7 @@
 from dbt_semantic_interfaces.objects.metric import Metric
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from metricflow.model.semantic_manifest_lookup import SemanticManifestLookup
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.validations.validator_helpers import (
     SemanticModelContext,
     SemanticModelElementContext,
     SemanticModelElementType,

metricflow/model/dbt_converter.py

@@ -37,7 +37,11 @@
 from dbt_semantic_interfaces.objects.metric import Metric
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.parsing.dir_to_model import ModelBuildResult
-from metricflow.model.validations.validator_helpers import ModelValidationResults, ValidationError, ValidationIssue
+from dbt_semantic_interfaces.validations.validator_helpers import (
+    ModelValidationResults,
+    ValidationError,
+    ValidationIssue,
+)
 
 logger = logging.getLogger(__name__)
 

metricflow/model/dbt_mapping_rules/dbt_mapping_rule.py

@@ -6,7 +6,7 @@
 
 from dbt_metadata_client.dbt_metadata_api_schema import MetricNode, ModelNode
 from dbt_semantic_interfaces.objects.metric import MetricType
-from metricflow.model.validations.validator_helpers import ModelValidationResults
+from dbt_semantic_interfaces.validations.validator_helpers import ModelValidationResults
 
 
 TransformedObjectsValueType: TypeAlias = Any  # type: ignore[misc]

metricflow/model/dbt_mapping_rules/dbt_metric_model_to_semantic_model_rules.py

@@ -8,7 +8,11 @@
     MappedObjects,
     assert_metric_model_name,
 )
-from metricflow.model.validations.validator_helpers import ModelValidationResults, ValidationIssue, ValidationError
+from dbt_semantic_interfaces.validations.validator_helpers import (
+    ModelValidationResults,
+    ValidationIssue,
+    ValidationError,
+)
 
 
 class DbtMapToSemanticModelName(DbtMappingRule):

metricflow/model/dbt_mapping_rules/dbt_metric_to_dimensions_rules.py

@@ -10,7 +10,11 @@
     MappedObjects,
     assert_metric_model_name,
 )
-from metricflow.model.validations.validator_helpers import ModelValidationResults, ValidationIssue, ValidationError
+from dbt_semantic_interfaces.validations.validator_helpers import (
+    ModelValidationResults,
+    ValidationIssue,
+    ValidationError,
+)
 
 DBT_COLUMN_TYPES_TO_DIMENSION_TYPES: Dict[str, DimensionType] = {
     "DATE": DimensionType.TIME,

metricflow/model/dbt_mapping_rules/dbt_metric_to_measure.py

@@ -10,7 +10,11 @@
     get_and_assert_calc_method_mapping,
 )
 from dbt_semantic_interfaces.objects.metric import MetricType
-from metricflow.model.validations.validator_helpers import ModelValidationResults, ValidationIssue, ValidationError
+from dbt_semantic_interfaces.validations.validator_helpers import (
+    ModelValidationResults,
+    ValidationIssue,
+    ValidationError,
+)
 
 CALC_METHOD_TO_MEASURE_TYPE: Dict[str, AggregationType] = {
     "count": AggregationType.COUNT,

metricflow/model/dbt_mapping_rules/dbt_metric_to_metrics_rules.py

@@ -9,7 +9,11 @@
     get_and_assert_calc_method_mapping,
 )
 from dbt_semantic_interfaces.objects.metric import MetricInputMeasure, MetricInput, MetricType, MetricTypeParams
-from metricflow.model.validations.validator_helpers import ModelValidationResults, ValidationIssue, ValidationError
+from dbt_semantic_interfaces.validations.validator_helpers import (
+    ModelValidationResults,
+    ValidationIssue,
+    ValidationError,
+)
 
 
 class DbtToMetricName(DbtMappingRule):

metricflow/model/transformations/dbt_to_metricflow.py

@@ -19,7 +19,11 @@
 from dbt_semantic_interfaces.objects.time_granularity import TimeGranularity
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.parsing.dir_to_model import ModelBuildResult
-from metricflow.model.validations.validator_helpers import ModelValidationResults, ValidationError, ValidationIssue
+from dbt_semantic_interfaces.validations.validator_helpers import (
+    ModelValidationResults,
+    ValidationError,
+    ValidationIssue,
+)
 
 
 @dataclass

metricflow/test/api/test_metricflow_client.py

@@ -1,7 +1,7 @@
 from metricflow.api.metricflow_client import MetricFlowClient
 from metricflow.dataflow.sql_table import SqlTable
 from metricflow.engine.models import Dimension, Metric
-from metricflow.model.validations.validator_helpers import ModelValidationResults
+from dbt_semantic_interfaces.validations.validator_helpers import ModelValidationResults
 from metricflow.random_id import random_id
 
 

metricflow/test/cli/test_cli.py

@@ -11,8 +11,8 @@
     validate_configs,
     version,
 )
-from metricflow.model.model_validator import ModelValidator
-from metricflow.model.validations.validator_helpers import (
+from dbt_semantic_interfaces.model_validator import ModelValidator
+from dbt_semantic_interfaces.validations.validator_helpers import (
     ModelValidationResults,
     ValidationError,
     ValidationFutureError,

metricflow/test/fixtures/model_fixtures.py

@@ -21,7 +21,7 @@
 from metricflow.dataflow.dataflow_plan import ReadSqlSourceNode, BaseOutput
 from metricflow.dataset.convert_semantic_model import SemanticModelToDataSetConverter
 from metricflow.dataset.semantic_model_adapter import SemanticModelDataSet
-from metricflow.model.model_validator import ModelValidator
+from dbt_semantic_interfaces.model_validator import ModelValidator
 from metricflow.model.semantic_manifest_lookup import SemanticManifestLookup
 from metricflow.plan_conversion.column_resolver import DefaultColumnAssociationResolver
 from metricflow.plan_conversion.time_spine import TimeSpineSource

metricflow/test/model/parsing/test_metric_parsing.py

@@ -5,7 +5,7 @@
 from dbt_semantic_interfaces.objects.time_granularity import TimeGranularity
 from dbt_semantic_interfaces.parsing.dir_to_model import parse_yaml_files_to_model
 from dbt_semantic_interfaces.parsing.objects import YamlConfigFile
-from metricflow.model.validations.validator_helpers import ModelValidationException
+from dbt_semantic_interfaces.validations.validator_helpers import ModelValidationException
 
 
 def test_legacy_measure_metric_parsing() -> None:

metricflow/test/model/validations/test_agg_time_dimension.py

@@ -1,10 +1,10 @@
 import pytest
 
-from metricflow.model.model_validator import ModelValidator
+from dbt_semantic_interfaces.model_validator import ModelValidator
 from dbt_semantic_interfaces.objects.elements.dimension import DimensionType
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
-from metricflow.model.validations.agg_time_dimension import AggregationTimeDimensionRule
-from metricflow.model.validations.validator_helpers import ModelValidationException
+from dbt_semantic_interfaces.validations.agg_time_dimension import AggregationTimeDimensionRule
+from dbt_semantic_interfaces.validations.validator_helpers import ModelValidationException
 from metricflow.test.model.validations.test_unique_valid_name import copied_model
 from metricflow.test.test_utils import find_semantic_model_with
 

metricflow/test/model/validations/test_common_entities.py

@@ -3,10 +3,10 @@
 import re
 from typing import Callable
 
-from metricflow.model.model_validator import ModelValidator
+from dbt_semantic_interfaces.model_validator import ModelValidator
 from dbt_semantic_interfaces.objects.semantic_model import SemanticModel
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
-from metricflow.model.validations.common_entities import CommonEntitysRule
+from dbt_semantic_interfaces.validations.common_entities import CommonEntitysRule
 from metricflow.specs import EntitySpec
 from metricflow.test.test_utils import find_semantic_model_with
 

metricflow/test/model/validations/test_configurable_rules.py

@@ -1,10 +1,10 @@
 import pytest
 import copy
 
-from metricflow.model.model_validator import ModelValidator
+from dbt_semantic_interfaces.model_validator import ModelValidator
 from dbt_semantic_interfaces.objects.semantic_manifest import SemanticManifest
 from dbt_semantic_interfaces.objects.metric import MetricTypeParams, MetricInput, MetricType
-from metricflow.model.validations.metrics import DerivedMetricRule
+from dbt_semantic_interfaces.validations.metrics import DerivedMetricRule
 from metricflow.test.model.validations.helpers import metric_with_guaranteed_meta