acryl-datahub-cloud 0.3.12rc3__py3-none-any.whl → 0.3.12rc5__py3-none-any.whl

acryl_datahub_cloud/sdk/{assertion.py → assertion/assertion_base.py}

@@ -14,7 +14,7 @@ from typing import Optional, Union
 
 from typing_extensions import Self
 
-from acryl_datahub_cloud.sdk.assertion_input import (
+from acryl_datahub_cloud.sdk.assertion_input.assertion_input import (
     ASSERTION_MONITOR_DEFAULT_TRAINING_LOOKBACK_WINDOW_DAYS,
     DEFAULT_DETECTION_MECHANISM,
     DEFAULT_SCHEDULE,
@@ -24,14 +24,23 @@ from acryl_datahub_cloud.sdk.assertion_input import (
     ExclusionWindowTypes,
     FixedRangeExclusionWindow,
     InferenceSensitivity,
+    TimeWindowSizeInputTypes,
     _DetectionMechanismTypes,
 )
+from acryl_datahub_cloud.sdk.assertion_input.smart_column_metric_assertion_input import (
+    MetricInputType,
+    OperatorInputType,
+    RangeInputType,
+    RangeTypeInputType,
+    ValueInputType,
+    ValueTypeInputType,
+)
 from acryl_datahub_cloud.sdk.entities.assertion import Assertion
 from acryl_datahub_cloud.sdk.entities.monitor import (
     Monitor,
     _get_nested_field_for_entity_with_default,
 )
-from acryl_datahub_cloud.sdk.errors import SDKNotYetSupportedError
+from acryl_datahub_cloud.sdk.errors import SDKNotYetSupportedError, SDKUsageError
 from datahub.emitter.mce_builder import parse_ts_millis
 from datahub.metadata import schema_classes as models
 from datahub.metadata.urns import AssertionUrn, CorpUserUrn, DatasetUrn, TagUrn
@@ -85,21 +94,12 @@ class _HasSmartFunctionality:
     Mixin class that provides smart functionality for assertions.
     """
 
-    _SUPPORTED_WITH_FILTER_ASSERTION_TYPES = (
-        models.FreshnessAssertionInfoClass,
-        models.VolumeAssertionInfoClass,
-    )
-
     def __init__(
         self,
         *,
         sensitivity: InferenceSensitivity = DEFAULT_SENSITIVITY,
         exclusion_windows: list[ExclusionWindowTypes],
         training_data_lookback_days: int = ASSERTION_MONITOR_DEFAULT_TRAINING_LOOKBACK_WINDOW_DAYS,
-        incident_behavior: list[AssertionIncidentBehavior],
-        detection_mechanism: Optional[
-            _DetectionMechanismTypes
-        ] = DEFAULT_DETECTION_MECHANISM,
     ) -> None:
         """
         Initialize the smart functionality mixin.
@@ -115,8 +115,6 @@ class _HasSmartFunctionality:
         self._sensitivity = sensitivity
         self._exclusion_windows = exclusion_windows
         self._training_data_lookback_days = training_data_lookback_days
-        self._incident_behavior = incident_behavior
-        self._detection_mechanism = detection_mechanism
 
     @property
     def sensitivity(self) -> InferenceSensitivity:
@@ -130,14 +128,6 @@ class _HasSmartFunctionality:
     def training_data_lookback_days(self) -> int:
         return self._training_data_lookback_days
 
-    @property
-    def incident_behavior(self) -> list[AssertionIncidentBehavior]:
-        return self._incident_behavior
-
-    @property
-    def detection_mechanism(self) -> Optional[_DetectionMechanismTypes]:
-        return self._detection_mechanism
-
     @staticmethod
     def _get_sensitivity(monitor: Monitor) -> InferenceSensitivity:
         # 1. Check if the monitor has a sensitivity field
@@ -186,213 +176,158 @@ class _HasSmartFunctionality:
         assert isinstance(retrieved, int)
         return retrieved
 
-    @staticmethod
-    def _get_detection_mechanism(
-        assertion: Assertion,
-        monitor: Monitor,
-        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
-    ) -> Optional[_DetectionMechanismTypes]:
-        """Get the detection mechanism from the monitor and assertion."""
-        if not _HasSmartFunctionality._has_valid_monitor_info(monitor):
-            return default
 
-        # 1. Check if the assertion has a parameters field
-        def _warn_and_return_default_detection_mechanism(
-            field_name: str,
-            default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
-        ) -> Optional[_DetectionMechanismTypes]:
-            logger.warning(
-                f"Monitor {monitor.urn} does not have an `{field_name}` field, defaulting detection mechanism to {default}"
-            )
-            return default
+class _HasColumnMetricFunctionality:
+    """
+    Mixin class that provides column metric functionality for assertions.
+    """
 
-        parameters = _HasSmartFunctionality._get_assertion_parameters(monitor, default)
-        if parameters is None:
-            return _warn_and_return_default_detection_mechanism("parameters", default)
+    def __init__(
+        self,
+        column_name: str,
+        metric_type: MetricInputType,
+        operator: OperatorInputType,
+        value: Optional[ValueInputType] = None,
+        value_type: Optional[ValueTypeInputType] = None,
+        range: Optional[RangeInputType] = None,
+        range_type: Optional[RangeTypeInputType] = None,
+    ):
+        self._column_name = column_name
+        self._metric_type = metric_type
+        self._operator = operator
+        self._value = value
+        self._value_type = value_type
+        self._range = range
+        self._range_type = range_type
 
-        # 2. Convert the raw detection mechanism to the SDK detection mechanism
-        if parameters.type in [
-            models.AssertionEvaluationParametersTypeClass.DATASET_FRESHNESS,
-            models.AssertionEvaluationParametersTypeClass.DATASET_VOLUME,
-        ]:
-            if assertion.info is None:
-                return _warn_and_return_default_detection_mechanism("info", default)
-            if isinstance(assertion.info, models.VolumeAssertionInfoClass):
-                return _HasSmartFunctionality._get_volume_detection_mechanism(
-                    assertion, parameters, default
-                )
-            elif isinstance(assertion.info, models.FreshnessAssertionInfoClass):
-                return _HasSmartFunctionality._get_freshness_detection_mechanism(
-                    assertion, parameters, default
-                )
-            # TODO: Consider moving the detection mechanism logic to the assertion classes themselves e.g. _get_assertion_specific_detection_mechanism as an abstract method
-            # TODO: Add support here for other detection mechanisms when other assertion types are supported
-            else:
-                raise SDKNotYetSupportedError(
-                    f"AssertionType {type(assertion.info).__name__}"
-                )
-        else:
-            raise SDKNotYetSupportedError(
-                f"AssertionEvaluationParametersType {parameters.type} not supported"
-            )
+    @property
+    def column_name(self) -> str:
+        return self._column_name
 
-    @staticmethod
-    def _has_valid_monitor_info(monitor: Monitor) -> bool:
-        """Check if monitor has valid info and assertion monitor."""
+    @property
+    def metric_type(self) -> MetricInputType:
+        return self._metric_type
 
-        def _warn_and_return_false(field_name: str) -> bool:
-            logger.warning(
-                f"Monitor {monitor.urn} does not have an `{field_name}` field, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
-            )
-            return False
+    @property
+    def operator(self) -> OperatorInputType:
+        return self._operator
 
-        if monitor.info is None:
-            return _warn_and_return_false("info")
-        if monitor.info.assertionMonitor is None:
-            return _warn_and_return_false("assertionMonitor")
-        if (
-            monitor.info.assertionMonitor.assertions is None
-            or len(monitor.info.assertionMonitor.assertions) == 0
-        ):
-            return _warn_and_return_false("assertionMonitor.assertions")
+    @property
+    def value(self) -> Optional[ValueInputType]:
+        return self._value
 
-        return True
+    @property
+    def value_type(self) -> Optional[ValueTypeInputType]:
+        return self._value_type
+
+    @property
+    def range(self) -> Optional[RangeInputType]:
+        return self._range
+
+    @property
+    def range_type(self) -> Optional[RangeTypeInputType]:
+        return self._range_type
 
     @staticmethod
-    def _get_assertion_parameters(
-        monitor: Monitor,
-        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
-    ) -> Optional[models.AssertionEvaluationParametersClass]:
-        """Get the assertion parameters from the monitor."""
-        # We know these are not None from _has_valid_monitor_info check
-        assert (
-            monitor is not None
-            and monitor.info is not None
-            and monitor.info.assertionMonitor is not None
-        )
-        assertion_monitor = monitor.info.assertionMonitor
-        assert (
-            assertion_monitor is not None and assertion_monitor.assertions is not None
+    def _get_column_name(assertion: Assertion) -> str:
+        column_name = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.field.path",
+            default=None,
         )
-        assertions = assertion_monitor.assertions
-
-        if assertions[0].parameters is None:
-            logger.warning(
-                f"Monitor {monitor.urn} does not have a assertionMonitor.assertions[0].parameters, defaulting detection mechanism to {default}"
+        if column_name is None:
+            raise SDKUsageError(
+                f"Column name is required for column metric assertions. Assertion {assertion.urn} does not have a column name"
             )
-            return None
-        return assertions[0].parameters
+        return column_name
 
     @staticmethod
-    def _get_freshness_detection_mechanism(
-        assertion: Assertion,
-        parameters: models.AssertionEvaluationParametersClass,
-        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
-    ) -> Optional[_DetectionMechanismTypes]:
-        """Get the detection mechanism for freshness assertions."""
-        if parameters.datasetFreshnessParameters is None:
-            logger.warning(
-                f"Monitor does not have datasetFreshnessParameters, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
+    def _get_metric_type(assertion: Assertion) -> MetricInputType:
+        metric_type = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.metric",
+            default=None,
+        )
+        if metric_type is None:
+            raise SDKUsageError(
+                f"Metric type is required for column metric assertions. Assertion {assertion.urn} does not have a metric type"
             )
-            return default
+        return metric_type
 
-        source_type = parameters.datasetFreshnessParameters.sourceType
-        if source_type == models.DatasetFreshnessSourceTypeClass.INFORMATION_SCHEMA:
-            return DetectionMechanism.INFORMATION_SCHEMA
-        elif source_type == models.DatasetFreshnessSourceTypeClass.AUDIT_LOG:
-            return DetectionMechanism.AUDIT_LOG
-        elif source_type == models.DatasetFreshnessSourceTypeClass.FIELD_VALUE:
-            return _HasSmartFunctionality._get_field_value_detection_mechanism(
-                assertion, parameters
+    @staticmethod
+    def _get_operator(assertion: Assertion) -> OperatorInputType:
+        operator = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.operator",
+            default=None,
+        )
+        if operator is None:
+            raise SDKUsageError(
+                f"Operator is required for column metric assertions. Assertion {assertion.urn} does not have an operator"
             )
-        elif source_type == models.DatasetFreshnessSourceTypeClass.DATAHUB_OPERATION:
-            return DetectionMechanism.DATAHUB_OPERATION
-        elif source_type == models.DatasetFreshnessSourceTypeClass.FILE_METADATA:
-            raise SDKNotYetSupportedError("FILE_METADATA DatasetFreshnessSourceType")
-        else:
-            raise SDKNotYetSupportedError(f"DatasetFreshnessSourceType {source_type}")
+        return operator
 
     @staticmethod
-    def _get_volume_detection_mechanism(
-        assertion: Assertion,
-        parameters: models.AssertionEvaluationParametersClass,
-        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
-    ) -> _DetectionMechanismTypes:
-        """Get the detection mechanism for volume assertions."""
-        if parameters.datasetVolumeParameters is None:
-            logger.warning(
-                f"Monitor does not have datasetVolumeParameters, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
-            )
-            if default is None:
-                return DEFAULT_DETECTION_MECHANISM
-            else:
-                return default
+    def _get_value(assertion: Assertion) -> Optional[ValueInputType]:
+        value = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.parameters.value.value",
+            default=None,
+        )
+        return value
 
-        source_type = parameters.datasetVolumeParameters.sourceType
-        if source_type == models.DatasetVolumeSourceTypeClass.INFORMATION_SCHEMA:
-            return DetectionMechanism.INFORMATION_SCHEMA
-        elif source_type == models.DatasetVolumeSourceTypeClass.QUERY:
-            additional_filter = _HasSmartFunctionality._get_additional_filter(assertion)
-            return DetectionMechanism.QUERY(additional_filter=additional_filter)
-        elif source_type == models.DatasetVolumeSourceTypeClass.DATAHUB_DATASET_PROFILE:
-            return DetectionMechanism.DATASET_PROFILE
-        else:
-            raise SDKNotYetSupportedError(f"DatasetVolumeSourceType {source_type}")
+    @staticmethod
+    def _get_value_type(assertion: Assertion) -> Optional[ValueTypeInputType]:
+        value_type = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.parameters.value.type",
+            default=None,
+        )
+        return value_type
 
     @staticmethod
-    def _get_field_value_detection_mechanism(
-        assertion: Assertion,
-        parameters: models.AssertionEvaluationParametersClass,
-    ) -> _DetectionMechanismTypes:
-        """Get the detection mechanism for field value based freshness."""
-        # We know datasetFreshnessParameters is not None from _get_freshness_detection_mechanism check
-        assert parameters.datasetFreshnessParameters is not None
-        field = parameters.datasetFreshnessParameters.field
+    def _get_range(assertion: Assertion) -> Optional[RangeInputType]:
+        min_value = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.parameters.minValue",
+            default=None,
+        )
+        max_value = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.parameters.maxValue",
+            default=None,
+        )
 
-        if field is None or field.kind is None:
-            logger.warning(
-                f"Monitor does not have valid field info, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
-            )
-            return DEFAULT_DETECTION_MECHANISM
+        # If both are None, return None
+        if min_value is None and max_value is None:
+            return None
 
-        column_name = field.path
-        additional_filter = _HasSmartFunctionality._get_additional_filter(assertion)
+        # Extract the value from the parameter objects if they exist
+        if min_value is not None and hasattr(min_value, "value"):
+            min_value = min_value.value
+        if max_value is not None and hasattr(max_value, "value"):
+            max_value = max_value.value
 
-        if field.kind == models.FreshnessFieldKindClass.LAST_MODIFIED:
-            return DetectionMechanism.LAST_MODIFIED_COLUMN(
-                column_name=column_name, additional_filter=additional_filter
-            )
-        elif field.kind == models.FreshnessFieldKindClass.HIGH_WATERMARK:
-            return DetectionMechanism.HIGH_WATERMARK_COLUMN(
-                column_name=column_name, additional_filter=additional_filter
-            )
-        else:
-            raise SDKNotYetSupportedError(f"FreshnessFieldKind {field.kind}")
+        return (min_value, max_value)
 
     @staticmethod
-    def _get_additional_filter(assertion: Assertion) -> Optional[str]:
-        """Get the additional filter SQL from the assertion."""
-        if assertion.info is None:
-            logger.warning(
-                f"Assertion {assertion.urn} does not have an info, defaulting additional filter to None"
-            )
-            return None
-        if (
-            not isinstance(
-                assertion.info,
-                _HasSmartFunctionality._SUPPORTED_WITH_FILTER_ASSERTION_TYPES,
-            )
-            or assertion.info.filter is None
-        ):
-            logger.warning(
-                f"Assertion {assertion.urn} does not have a filter, defaulting additional filter to None"
-            )
+    def _get_range_type(assertion: Assertion) -> Optional[RangeTypeInputType]:
+        min_value_range_type = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.parameters.minValue.type",
+            default=None,
+        )
+        max_value_range_type = _get_nested_field_for_entity_with_default(
+            assertion,
+            field_path="info.fieldMetricAssertion.parameters.maxValue.type",
+            default=None,
+        )
+
+        # If both are None, return None instead of a tuple of Nones
+        if min_value_range_type is None and max_value_range_type is None:
             return None
-        if assertion.info.filter.type != models.DatasetFilterTypeClass.SQL:
-            raise SDKNotYetSupportedError(
-                f"DatasetFilterType {assertion.info.filter.type}"
-            )
-        return assertion.info.filter.sql
+
+        return (min_value_range_type, max_value_range_type)
 
 
 class _AssertionPublic(ABC):
@@ -400,6 +335,12 @@ class _AssertionPublic(ABC):
     Abstract base class that represents a public facing assertion and contains the common properties of all assertions.
     """
 
+    _SUPPORTED_WITH_FILTER_ASSERTION_TYPES = (
+        models.FreshnessAssertionInfoClass,
+        models.VolumeAssertionInfoClass,
+        models.FieldAssertionInfoClass,
+    )
+
     def __init__(
         self,
         *,
@@ -408,6 +349,10 @@ class _AssertionPublic(ABC):
         display_name: str,
         mode: AssertionMode,
         tags: list[TagUrn],
+        incident_behavior: list[AssertionIncidentBehavior],
+        detection_mechanism: Optional[
+            _DetectionMechanismTypes
+        ] = DEFAULT_DETECTION_MECHANISM,
         created_by: Optional[CorpUserUrn] = None,
         created_at: Union[datetime, None] = None,
         updated_by: Optional[CorpUserUrn] = None,
@@ -431,6 +376,8 @@ class _AssertionPublic(ABC):
         self._dataset_urn = dataset_urn
         self._display_name = display_name
         self._mode = mode
+        self._incident_behavior = incident_behavior
+        self._detection_mechanism = detection_mechanism
         self._created_by = created_by
         self._created_at = created_at
         self._updated_by = updated_by
@@ -453,6 +400,14 @@ class _AssertionPublic(ABC):
     def mode(self) -> AssertionMode:
         return self._mode
 
+    @property
+    def incident_behavior(self) -> list[AssertionIncidentBehavior]:
+        return self._incident_behavior
+
+    @property
+    def detection_mechanism(self) -> Optional[_DetectionMechanismTypes]:
+        return self._detection_mechanism
+
     @property
     def created_by(self) -> Optional[CorpUserUrn]:
         return self._created_by
@@ -485,30 +440,99 @@ class _AssertionPublic(ABC):
         return incident_behaviors
 
     @staticmethod
-    def _get_created_by(assertion: Assertion) -> Optional[CorpUserUrn]:
-        if assertion.source is None:
-            logger.warning(f"Assertion {assertion.urn} does not have a source")
-            return None
-        if isinstance(assertion.source, models.AssertionSourceClass):
-            if assertion.source.created is None:
-                logger.warning(
-                    f"Assertion {assertion.urn} does not have a created by in the source"
-                )
-                return None
-            return CorpUserUrn.from_string(assertion.source.created.actor)
-        elif isinstance(assertion.source, models.AssertionSourceTypeClass):
+    @abstractmethod
+    def _get_detection_mechanism(
+        assertion: Assertion,
+        monitor: Monitor,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[_DetectionMechanismTypes]:
+        """Get the detection mechanism from the monitor and assertion.
+
+        This method should be implemented by each assertion class to handle
+        its specific detection mechanism logic.
+
+        Args:
+            assertion: The assertion entity
+            monitor: The monitor entity
+            default: Default detection mechanism to return if none is found
+
+        Returns:
+            The detection mechanism or default if none is found
+        """
+        pass
+
+    @staticmethod
+    def _has_valid_monitor_info(monitor: Monitor) -> bool:
+        """Check if monitor has valid info and assertion monitor."""
+
+        def _warn_and_return_false(field_name: str) -> bool:
             logger.warning(
-                f"Assertion {assertion.urn} has a source type with no created by"
+                f"Monitor {monitor.urn} does not have an `{field_name}` field, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
             )
-            return None
-        return None
+            return False
 
-    @staticmethod
-    def _get_created_at(assertion: Assertion) -> Union[datetime, None]:
-        if assertion.source is None:
-            logger.warning(f"Assertion {assertion.urn} does not have a source")
-            return None
-        if isinstance(assertion.source, models.AssertionSourceClass):
+        if monitor.info is None:
+            return _warn_and_return_false("info")
+        if monitor.info.assertionMonitor is None:
+            return _warn_and_return_false("assertionMonitor")
+        if (
+            monitor.info.assertionMonitor.assertions is None
+            or len(monitor.info.assertionMonitor.assertions) == 0
+        ):
+            return _warn_and_return_false("assertionMonitor.assertions")
+
+        return True
+
+    @staticmethod
+    def _get_assertion_parameters(
+        monitor: Monitor,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[models.AssertionEvaluationParametersClass]:
+        """Get the assertion parameters from the monitor."""
+        # We know these are not None from _has_valid_monitor_info check
+        assert (
+            monitor is not None
+            and monitor.info is not None
+            and monitor.info.assertionMonitor is not None
+        )
+        assertion_monitor = monitor.info.assertionMonitor
+        assert (
+            assertion_monitor is not None and assertion_monitor.assertions is not None
+        )
+        assertions = assertion_monitor.assertions
+
+        if assertions[0].parameters is None:
+            logger.warning(
+                f"Monitor {monitor.urn} does not have a assertionMonitor.assertions[0].parameters, defaulting detection mechanism to {default}"
+            )
+            return None
+        return assertions[0].parameters
+
+    @staticmethod
+    def _get_created_by(assertion: Assertion) -> Optional[CorpUserUrn]:
+        if assertion.source is None:
+            logger.warning(f"Assertion {assertion.urn} does not have a source")
+            return None
+        if isinstance(assertion.source, models.AssertionSourceClass):
+            if assertion.source.created is None:
+                logger.warning(
+                    f"Assertion {assertion.urn} does not have a created by in the source"
+                )
+                return None
+            return CorpUserUrn.from_string(assertion.source.created.actor)
+        elif isinstance(assertion.source, models.AssertionSourceTypeClass):
+            logger.warning(
+                f"Assertion {assertion.urn} has a source type with no created by"
+            )
+            return None
+        return None
+
+    @staticmethod
+    def _get_created_at(assertion: Assertion) -> Union[datetime, None]:
+        if assertion.source is None:
+            logger.warning(f"Assertion {assertion.urn} does not have a source")
+            return None
+        if isinstance(assertion.source, models.AssertionSourceClass):
             if assertion.source.created is None:
                 logger.warning(
                     f"Assertion {assertion.urn} does not have a created by in the source"
@@ -563,6 +587,124 @@ class _AssertionPublic(ABC):
         """
         pass
 
+    @staticmethod
+    def _get_additional_filter(assertion: Assertion) -> Optional[str]:
+        """Get the additional filter SQL from the assertion."""
+        if assertion.info is None:
+            logger.warning(
+                f"Assertion {assertion.urn} does not have an info, defaulting additional filter to None"
+            )
+            return None
+        if (
+            not isinstance(
+                assertion.info,
+                _AssertionPublic._SUPPORTED_WITH_FILTER_ASSERTION_TYPES,
+            )
+            or assertion.info.filter is None
+        ):
+            logger.warning(
+                f"Assertion {assertion.urn} does not have a filter, defaulting additional filter to None"
+            )
+            return None
+        if assertion.info.filter.type != models.DatasetFilterTypeClass.SQL:
+            raise SDKNotYetSupportedError(
+                f"DatasetFilterType {assertion.info.filter.type}"
+            )
+        return assertion.info.filter.sql
+
+    @staticmethod
+    def _get_field_value_detection_mechanism(
+        assertion: Assertion,
+        parameters: models.AssertionEvaluationParametersClass,
+    ) -> _DetectionMechanismTypes:
+        """Get the detection mechanism for field value based freshness."""
+        # We know datasetFreshnessParameters is not None from _get_freshness_detection_mechanism check
+        assert parameters.datasetFreshnessParameters is not None
+        field = parameters.datasetFreshnessParameters.field
+
+        if field is None or field.kind is None:
+            logger.warning(
+                f"Monitor does not have valid field info, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
+            )
+            return DEFAULT_DETECTION_MECHANISM
+
+        column_name = field.path
+        additional_filter = _AssertionPublic._get_additional_filter(assertion)
+
+        if field.kind == models.FreshnessFieldKindClass.LAST_MODIFIED:
+            return DetectionMechanism.LAST_MODIFIED_COLUMN(
+                column_name=column_name, additional_filter=additional_filter
+            )
+        elif field.kind == models.FreshnessFieldKindClass.HIGH_WATERMARK:
+            return DetectionMechanism.HIGH_WATERMARK_COLUMN(
+                column_name=column_name, additional_filter=additional_filter
+            )
+        else:
+            raise SDKNotYetSupportedError(f"FreshnessFieldKind {field.kind}")
+
+    @staticmethod
+    def _warn_and_return_default_detection_mechanism(
+        monitor: Monitor,
+        field_name: str,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[_DetectionMechanismTypes]:
+        """Helper method to log a warning and return default detection mechanism."""
+        logger.warning(
+            f"Monitor {monitor.urn} does not have an `{field_name}` field, defaulting detection mechanism to {default}"
+        )
+        return default
+
+    @staticmethod
+    def _check_valid_monitor_info(
+        monitor: Monitor,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[models.AssertionEvaluationParametersClass]:
+        """Check if monitor has valid info and get assertion parameters.
+
+        Returns:
+            The assertion parameters if monitor info is valid, None otherwise.
+        """
+        if not _AssertionPublic._has_valid_monitor_info(monitor):
+            return None
+
+        parameters = _AssertionPublic._get_assertion_parameters(monitor)
+        if parameters is None:
+            return None
+
+        return parameters
+
+    @staticmethod
+    def _get_validated_detection_context(
+        monitor: Monitor,
+        assertion: Assertion,
+        expected_parameters_type: str,
+        expected_info_class: type,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[models.AssertionEvaluationParametersClass]:
+        """
+        Validate and extract the detection context (parameters) for detection mechanism logic.
+        Returns the parameters if all checks pass, otherwise None.
+        """
+        parameters = _AssertionPublic._check_valid_monitor_info(monitor, default)
+        if parameters is None:
+            return None
+        if parameters.type != expected_parameters_type:
+            logger.warning(
+                f"Expected {expected_parameters_type} parameters type, got {parameters.type}, defaulting detection mechanism to {default}"
+            )
+            return None
+        if assertion.info is None:
+            _AssertionPublic._warn_and_return_default_detection_mechanism(
+                monitor, "info", default
+            )
+            return None
+        if not isinstance(assertion.info, expected_info_class):
+            logger.warning(
+                f"Expected {expected_info_class.__name__}, got {type(assertion.info).__name__}, defaulting detection mechanism to {default}"
+            )
+            return None
+        return parameters
+
 
 class SmartFreshnessAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPublic):
     """
@@ -619,8 +761,6 @@ class SmartFreshnessAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPu
             sensitivity=sensitivity,
             exclusion_windows=exclusion_windows,
             training_data_lookback_days=training_data_lookback_days,
-            incident_behavior=incident_behavior,
-            detection_mechanism=detection_mechanism,
         )
         # Then initialize the parent class
         _AssertionPublic.__init__(
@@ -629,6 +769,8 @@ class SmartFreshnessAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPu
             dataset_urn=dataset_urn,
             display_name=display_name,
             mode=mode,
+            incident_behavior=incident_behavior,
+            detection_mechanism=detection_mechanism,
             created_by=created_by,
             created_at=created_at,
             updated_by=updated_by,
@@ -661,6 +803,43 @@ class SmartFreshnessAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPu
             tags=cls._get_tags(assertion),
         )
 
+    @staticmethod
+    def _get_detection_mechanism(
+        assertion: Assertion,
+        monitor: Monitor,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[_DetectionMechanismTypes]:
+        """Get the detection mechanism for freshness assertions."""
+        parameters = _AssertionPublic._get_validated_detection_context(
+            monitor,
+            assertion,
+            models.AssertionEvaluationParametersTypeClass.DATASET_FRESHNESS,
+            models.FreshnessAssertionInfoClass,
+            default,
+        )
+        if parameters is None:
+            return default
+        if parameters.datasetFreshnessParameters is None:
+            logger.warning(
+                f"Monitor does not have datasetFreshnessParameters, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
+            )
+            return default
+        source_type = parameters.datasetFreshnessParameters.sourceType
+        if source_type == models.DatasetFreshnessSourceTypeClass.INFORMATION_SCHEMA:
+            return DetectionMechanism.INFORMATION_SCHEMA
+        elif source_type == models.DatasetFreshnessSourceTypeClass.AUDIT_LOG:
+            return DetectionMechanism.AUDIT_LOG
+        elif source_type == models.DatasetFreshnessSourceTypeClass.FIELD_VALUE:
+            return _AssertionPublic._get_field_value_detection_mechanism(
+                assertion, parameters
+            )
+        elif source_type == models.DatasetFreshnessSourceTypeClass.DATAHUB_OPERATION:
+            return DetectionMechanism.DATAHUB_OPERATION
+        elif source_type == models.DatasetFreshnessSourceTypeClass.FILE_METADATA:
+            raise SDKNotYetSupportedError("FILE_METADATA DatasetFreshnessSourceType")
+        else:
+            raise SDKNotYetSupportedError(f"DatasetFreshnessSourceType {source_type}")
+
 
 class SmartVolumeAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPublic):
     """
@@ -717,8 +896,6 @@ class SmartVolumeAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPubli
             sensitivity=sensitivity,
             exclusion_windows=exclusion_windows,
             training_data_lookback_days=training_data_lookback_days,
-            incident_behavior=incident_behavior,
-            detection_mechanism=detection_mechanism,
         )
         # Then initialize the parent class
         _AssertionPublic.__init__(
@@ -727,6 +904,8 @@ class SmartVolumeAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPubli
             dataset_urn=dataset_urn,
             display_name=display_name,
             mode=mode,
+            incident_behavior=incident_behavior,
+            detection_mechanism=detection_mechanism,
             created_by=created_by,
             created_at=created_at,
             updated_by=updated_by,
@@ -759,9 +938,213 @@ class SmartVolumeAssertion(_HasSchedule, _HasSmartFunctionality, _AssertionPubli
             tags=cls._get_tags(assertion),
         )
 
+    @staticmethod
+    def _get_detection_mechanism(
+        assertion: Assertion,
+        monitor: Monitor,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[_DetectionMechanismTypes]:
+        """Get the detection mechanism for volume assertions."""
+        parameters = _AssertionPublic._get_validated_detection_context(
+            monitor,
+            assertion,
+            models.AssertionEvaluationParametersTypeClass.DATASET_VOLUME,
+            models.VolumeAssertionInfoClass,
+            default,
+        )
+        if parameters is None:
+            return default
+        if parameters.datasetVolumeParameters is None:
+            logger.warning(
+                f"Monitor does not have datasetVolumeParameters, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
+            )
+            if default is None:
+                return DEFAULT_DETECTION_MECHANISM
+            else:
+                return default
+        source_type = parameters.datasetVolumeParameters.sourceType
+        if source_type == models.DatasetVolumeSourceTypeClass.INFORMATION_SCHEMA:
+            return DetectionMechanism.INFORMATION_SCHEMA
+        elif source_type == models.DatasetVolumeSourceTypeClass.QUERY:
+            additional_filter = _AssertionPublic._get_additional_filter(assertion)
+            return DetectionMechanism.QUERY(additional_filter=additional_filter)
+        elif source_type == models.DatasetVolumeSourceTypeClass.DATAHUB_DATASET_PROFILE:
+            return DetectionMechanism.DATASET_PROFILE
+        else:
+            raise SDKNotYetSupportedError(f"DatasetVolumeSourceType {source_type}")
+
 
-AssertionTypes = Union[
-    SmartFreshnessAssertion,
-    SmartVolumeAssertion,
-    # TODO: Add other assertion types here as we add them.
-]
+class FreshnessAssertion(_HasSchedule, _AssertionPublic):
+    """
+    A class that represents a freshness assertion.
+    """
+
+    def __init__(
+        self,
+        *,
+        urn: AssertionUrn,
+        dataset_urn: DatasetUrn,
+        display_name: str,
+        mode: AssertionMode,
+        schedule: models.CronScheduleClass,
+        freshness_schedule_check_type: Union[
+            str, models.FreshnessAssertionScheduleTypeClass
+        ],
+        lookback_window: Optional[TimeWindowSizeInputTypes],
+        tags: list[TagUrn],
+        incident_behavior: list[AssertionIncidentBehavior],
+        detection_mechanism: Optional[
+            _DetectionMechanismTypes
+        ] = DEFAULT_DETECTION_MECHANISM,
+        created_by: Optional[CorpUserUrn] = None,
+        created_at: Union[datetime, None] = None,
+        updated_by: Optional[CorpUserUrn] = None,
+        updated_at: Optional[datetime] = None,
+    ):
+        """
+        Initialize a freshness assertion.
+
+        Note: Values can be accessed, but not set on the assertion object.
+        To update an assertion, use the `upsert_*` method.
+        Args:
+            urn: The urn of the assertion.
+            dataset_urn: The urn of the dataset that the assertion is for.
+            display_name: The display name of the assertion.
+            mode: The mode of the assertion (active, inactive).
+            schedule: The schedule of the assertion.
+            freshness_schedule_check_type: The type of freshness schedule check to be used for the assertion.
+            lookback_window: The lookback window to be used for the assertion.
+            tags: The tags applied to the assertion.
+            incident_behavior: Whether to raise or resolve an incident when the assertion fails / passes.
+            detection_mechanism: The detection mechanism of the assertion.
+            created_by: The urn of the user that created the assertion.
+            created_at: The timestamp of when the assertion was created.
+            updated_by: The urn of the user that updated the assertion.
+            updated_at: The timestamp of when the assertion was updated.
+        """
+        _HasSchedule.__init__(self, schedule=schedule)
+        _AssertionPublic.__init__(
+            self,
+            urn=urn,
+            dataset_urn=dataset_urn,
+            display_name=display_name,
+            mode=mode,
+            incident_behavior=incident_behavior,
+            detection_mechanism=detection_mechanism,
+            created_by=created_by,
+            created_at=created_at,
+            updated_by=updated_by,
+            updated_at=updated_at,
+            tags=tags,
+        )
+        self._freshness_schedule_check_type = freshness_schedule_check_type
+        self._lookback_window = lookback_window
+
+    @property
+    def freshness_schedule_check_type(
+        self,
+    ) -> Union[str, models.FreshnessAssertionScheduleTypeClass]:
+        return self._freshness_schedule_check_type
+
+    @property
+    def lookback_window(self) -> Optional[TimeWindowSizeInputTypes]:
+        return self._lookback_window
+
+    @staticmethod
+    def _get_freshness_schedule_check_type(
+        assertion: Assertion,
+    ) -> Union[str, models.FreshnessAssertionScheduleTypeClass]:
+        if assertion.info is None:
+            raise SDKNotYetSupportedError(
+                f"Assertion {assertion.urn} does not have a freshness assertion info, which is not supported"
+            )
+        if isinstance(assertion.info, models.FreshnessAssertionInfoClass):
+            if assertion.info.schedule is None:
+                raise SDKNotYetSupportedError(
+                    f"Traditional freshness assertion {assertion.urn} does not have a schedule, which is not supported"
+                )
+            return assertion.info.schedule.type
+        else:
+            raise SDKNotYetSupportedError(
+                f"Assertion {assertion.urn} is not a freshness assertion"
+            )
+
+    @staticmethod
+    def _get_lookback_window(
+        assertion: Assertion,
+    ) -> Optional[models.FixedIntervalScheduleClass]:
+        if assertion.info is None:
+            raise SDKNotYetSupportedError(
+                f"Assertion {assertion.urn} does not have a freshness assertion info, which is not supported"
+            )
+        if isinstance(assertion.info, models.FreshnessAssertionInfoClass):
+            if assertion.info.schedule is None:
+                raise SDKNotYetSupportedError(
+                    f"Traditional freshness assertion {assertion.urn} does not have a schedule, which is not supported"
+                )
+            return assertion.info.schedule.fixedInterval
+        else:
+            raise SDKNotYetSupportedError(
+                f"Assertion {assertion.urn} is not a freshness assertion"
+            )
+
+    @classmethod
+    def _from_entities(cls, assertion: Assertion, monitor: Monitor) -> Self:
+        """
+        Create a freshness assertion from the assertion and monitor entities.
+        """
+        return cls(
+            urn=assertion.urn,
+            dataset_urn=assertion.dataset,
+            display_name=assertion.description or "",
+            mode=cls._get_mode(monitor),
+            schedule=cls._get_schedule(monitor),
+            freshness_schedule_check_type=cls._get_freshness_schedule_check_type(
+                assertion
+            ),
+            lookback_window=cls._get_lookback_window(assertion),
+            incident_behavior=cls._get_incident_behavior(assertion),
+            detection_mechanism=cls._get_detection_mechanism(assertion, monitor),
+            created_by=cls._get_created_by(assertion),
+            created_at=cls._get_created_at(assertion),
+            updated_by=cls._get_updated_by(assertion),
+            updated_at=cls._get_updated_at(assertion),
+            tags=cls._get_tags(assertion),
+        )
+
+    @staticmethod
+    def _get_detection_mechanism(
+        assertion: Assertion,
+        monitor: Monitor,
+        default: Optional[_DetectionMechanismTypes] = DEFAULT_DETECTION_MECHANISM,
+    ) -> Optional[_DetectionMechanismTypes]:
+        """Get the detection mechanism for freshness assertions."""
+        parameters = _AssertionPublic._get_validated_detection_context(
+            monitor,
+            assertion,
+            models.AssertionEvaluationParametersTypeClass.DATASET_FRESHNESS,
+            models.FreshnessAssertionInfoClass,
+            default,
+        )
+        if parameters is None:
+            return default
+        if parameters.datasetFreshnessParameters is None:
+            logger.warning(
+                f"Monitor does not have datasetFreshnessParameters, defaulting detection mechanism to {DEFAULT_DETECTION_MECHANISM}"
+            )
+            return default
+        source_type = parameters.datasetFreshnessParameters.sourceType
+        if source_type == models.DatasetFreshnessSourceTypeClass.INFORMATION_SCHEMA:
+            return DetectionMechanism.INFORMATION_SCHEMA
+        elif source_type == models.DatasetFreshnessSourceTypeClass.AUDIT_LOG:
+            return DetectionMechanism.AUDIT_LOG
+        elif source_type == models.DatasetFreshnessSourceTypeClass.FIELD_VALUE:
+            return _AssertionPublic._get_field_value_detection_mechanism(
+                assertion, parameters
+            )
+        elif source_type == models.DatasetFreshnessSourceTypeClass.DATAHUB_OPERATION:
+            return DetectionMechanism.DATAHUB_OPERATION
+        elif source_type == models.DatasetFreshnessSourceTypeClass.FILE_METADATA:
+            raise SDKNotYetSupportedError("FILE_METADATA DatasetFreshnessSourceType")
+        else:
+            raise SDKNotYetSupportedError(f"DatasetFreshnessSourceType {source_type}")