dataeval 0.81.0__tar.gz → 0.82.0__tar.gz

{dataeval-0.81.0 → dataeval-0.82.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dataeval
-Version: 0.81.0
+Version: 0.82.0
 Summary: DataEval provides a simple interface to characterize image data and its impact on model performance across classification and object-detection tasks
 Home-page: https://dataeval.ai/
 License: MIT
@@ -74,7 +74,7 @@ DataEval is easy to install, supports a wide range of Python versions, and is
 compatible with many of the most popular packages in the scientific and T&E
 communities.
 
-DataEval also has native interopability between JATIC's suite of tools when
+DataEval also has native interoperability between JATIC's suite of tools when
 using MAITE-compliant datasets and models.
 <!-- end JATIC interop -->
 

{dataeval-0.81.0 → dataeval-0.82.0}/README.md

@@ -32,7 +32,7 @@ DataEval is easy to install, supports a wide range of Python versions, and is
 compatible with many of the most popular packages in the scientific and T&E
 communities.
 
-DataEval also has native interopability between JATIC's suite of tools when
+DataEval also has native interoperability between JATIC's suite of tools when
 using MAITE-compliant datasets and models.
 <!-- end JATIC interop -->
 

{dataeval-0.81.0 → dataeval-0.82.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dataeval"
-version = "0.81.0" # dynamic
+version = "0.82.0" # dynamic
 description = "DataEval provides a simple interface to characterize image data and its impact on model performance across classification and object-detection tasks"
 license = "MIT"
 readme = "README.md"

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/__init__.py

@@ -8,7 +8,7 @@ shifts that impact performance of deployed models.
 from __future__ import annotations
 
 __all__ = ["config", "detectors", "log", "metrics", "typing", "utils", "workflows"]
-__version__ = "0.81.0"
+__version__ = "0.82.0"
 
 import logging
 

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/drift/__init__.py

@@ -14,9 +14,9 @@ __all__ = [
 ]
 
 from dataeval.detectors.drift import updates
-from dataeval.detectors.drift._base import DriftOutput
 from dataeval.detectors.drift._cvm import DriftCVM
 from dataeval.detectors.drift._ks import DriftKS
-from dataeval.detectors.drift._mmd import DriftMMD, DriftMMDOutput
+from dataeval.detectors.drift._mmd import DriftMMD
 from dataeval.detectors.drift._torch import preprocess_drift
 from dataeval.detectors.drift._uncertainty import DriftUncertainty
+from dataeval.outputs._drift import DriftMMDOutput, DriftOutput

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/drift/_base.py

@@ -11,84 +11,28 @@ from __future__ import annotations
 __all__ = []
 
 import math
-from abc import ABC, abstractmethod
-from dataclasses import dataclass
+from abc import abstractmethod
 from functools import wraps
-from typing import Any, Callable, Literal, TypeVar
+from typing import Any, Callable, Literal, Protocol, TypeVar, runtime_checkable
 
 import numpy as np
 from numpy.typing import NDArray
 
-from dataeval._output import Output, set_metadata
+from dataeval.outputs import DriftOutput
+from dataeval.outputs._base import set_metadata
 from dataeval.typing import Array, ArrayLike
 from dataeval.utils._array import as_numpy, to_numpy
 
 R = TypeVar("R")
 
 
-class UpdateStrategy(ABC):
+@runtime_checkable
+class UpdateStrategy(Protocol):
     """
-    Updates reference dataset for drift detector
-
-    Parameters
-    ----------
-    n : int
-        Update with last n instances seen by the detector.
-    """
-
-    def __init__(self, n: int) -> None:
-        self.n = n
-
-    @abstractmethod
-    def __call__(self, x_ref: NDArray[Any], x: NDArray[Any], count: int) -> NDArray[Any]:
-        """Abstract implementation of update strategy"""
-
-
-@dataclass(frozen=True)
-class DriftBaseOutput(Output):
-    """
-    Base output class for Drift Detector classes
-    """
-
-    drifted: bool
-    threshold: float
-    p_val: float
-    distance: float
-
-
-@dataclass(frozen=True)
-class DriftOutput(DriftBaseOutput):
-    """
-    Output class for :class:`.DriftCVM`, :class:`.DriftKS`, and :class:`.DriftUncertainty` drift detectors.
-
-    Attributes
-    ----------
-    drifted : bool
-        :term:`Drift` prediction for the images
-    threshold : float
-        Threshold after multivariate correction if needed
-    p_val : float
-        Instance-level p-value
-    distance : float
-        Instance-level distance
-    feature_drift : NDArray
-        Feature-level array of images detected to have drifted
-    feature_threshold : float
-        Feature-level threshold to determine drift
-    p_vals : NDArray
-        Feature-level p-values
-    distances : NDArray
-        Feature-level distances
+    Protocol for reference dataset update strategy for drift detectors
     """
 
-    # drifted: bool
-    # threshold: float
-    # p_val: float
-    # distance: float
-    feature_drift: NDArray[np.bool_]
-    feature_threshold: float
-    p_vals: NDArray[np.float32]
-    distances: NDArray[np.float32]
+    def __call__(self, x_ref: NDArray[Any], x: NDArray[Any], count: int) -> NDArray[Any]: ...
 
 
 def update_x_ref(fn: Callable[..., R]) -> Callable[..., R]:

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/drift/_mmd.py

@@ -10,44 +10,18 @@ from __future__ import annotations
 
 __all__ = []
 
-from dataclasses import dataclass
 from typing import Callable
 
 import torch
 
-from dataeval._output import set_metadata
 from dataeval.config import get_device
-from dataeval.detectors.drift._base import BaseDrift, DriftBaseOutput, UpdateStrategy, preprocess_x, update_x_ref
+from dataeval.detectors.drift._base import BaseDrift, UpdateStrategy, preprocess_x, update_x_ref
 from dataeval.detectors.drift._torch import GaussianRBF, mmd2_from_kernel_matrix
+from dataeval.outputs import DriftMMDOutput
+from dataeval.outputs._base import set_metadata
 from dataeval.typing import ArrayLike
 
 
-@dataclass(frozen=True)
-class DriftMMDOutput(DriftBaseOutput):
-    """
-    Output class for :class:`.DriftMMD` :term:`drift<Drift>` detector.
-
-    Attributes
-    ----------
-    drifted : bool
-        Drift prediction for the images
-    threshold : float
-        :term:`P-Value` used for significance of the permutation test
-    p_val : float
-        P-value obtained from the permutation test
-    distance : float
-        MMD^2 between the reference and test set
-    distance_threshold : float
-        MMD^2 threshold above which drift is flagged
-    """
-
-    # drifted: bool
-    # threshold: float
-    # p_val: float
-    # distance: float
-    distance_threshold: float
-
-
 class DriftMMD(BaseDrift):
     """
     :term:`Maximum Mean Discrepancy (MMD) Drift Detection` algorithm \

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/drift/_uncertainty.py

@@ -19,9 +19,10 @@ from scipy.special import softmax
 from scipy.stats import entropy
 
 from dataeval.config import get_device
-from dataeval.detectors.drift._base import DriftOutput, UpdateStrategy
+from dataeval.detectors.drift._base import UpdateStrategy
 from dataeval.detectors.drift._ks import DriftKS
 from dataeval.detectors.drift._torch import preprocess_drift
+from dataeval.outputs import DriftOutput
 from dataeval.typing import ArrayLike
 
 

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/drift/updates.py

@@ -7,15 +7,32 @@ from __future__ import annotations
 
 __all__ = ["LastSeenUpdate", "ReservoirSamplingUpdate"]
 
+from abc import ABC, abstractmethod
 from typing import Any
 
 import numpy as np
 from numpy.typing import NDArray
 
-from dataeval.detectors.drift._base import UpdateStrategy
+
+class BaseUpdateStrategy(ABC):
+    """
+    Updates reference dataset for drift detector
+
+    Parameters
+    ----------
+    n : int
+        Update with last n instances seen by the detector.
+    """
+
+    def __init__(self, n: int) -> None:
+        self.n = n
+
+    @abstractmethod
+    def __call__(self, x_ref: NDArray[Any], x: NDArray[Any], count: int) -> NDArray[Any]:
+        """Abstract implementation of update strategy"""
 
 
-class LastSeenUpdate(UpdateStrategy):
+class LastSeenUpdate(BaseUpdateStrategy):
     """
     Updates reference dataset for :term:`drift<Drift>` detector using last seen method.
 
@@ -30,7 +47,7 @@ class LastSeenUpdate(UpdateStrategy):
         return x_updated[-self.n :]
 
 
-class ReservoirSamplingUpdate(UpdateStrategy):
+class ReservoirSamplingUpdate(BaseUpdateStrategy):
     """
     Updates reference dataset for :term:`drift<Drift>` detector using reservoir sampling method.
 

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/linters/__init__.py

@@ -9,5 +9,6 @@ __all__ = [
     "OutliersOutput",
 ]
 
-from dataeval.detectors.linters.duplicates import Duplicates, DuplicatesOutput
-from dataeval.detectors.linters.outliers import Outliers, OutliersOutput
+from dataeval.detectors.linters.duplicates import Duplicates
+from dataeval.detectors.linters.outliers import Outliers
+from dataeval.outputs._linters import DuplicatesOutput, OutliersOutput

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/linters/duplicates.py

@@ -2,40 +2,15 @@ from __future__ import annotations
 
 __all__ = []
 
-from dataclasses import dataclass
-from typing import Any, Generic, Iterable, Sequence, TypeVar, overload
+from typing import Any, Sequence, overload
 
-from torch.utils.data import Dataset
-
-from dataeval._output import Output, set_metadata
+from dataeval.metrics.stats import hashstats
 from dataeval.metrics.stats._base import combine_stats, get_dataset_step_from_idx
-from dataeval.metrics.stats._hashstats import HashStatsOutput, hashstats
-from dataeval.typing import ArrayLike
-
-DuplicateGroup = list[int]
-DatasetDuplicateGroupMap = dict[int, DuplicateGroup]
-TIndexCollection = TypeVar("TIndexCollection", DuplicateGroup, DatasetDuplicateGroupMap)
-
-
-@dataclass(frozen=True)
-class DuplicatesOutput(Generic[TIndexCollection], Output):
-    """
-    Output class for :class:`.Duplicates` lint detector.
-
-    Attributes
-    ----------
-    exact : list[list[int] | dict[int, list[int]]]
-        Indices of images that are exact matches
-    near: list[list[int] | dict[int, list[int]]]
-        Indices of images that are near matches
-
-    - For a single dataset, indices are returned as a list of index groups.
-    - For multiple datasets, indices are returned as dictionaries where the key is the
-      index of the dataset, and the value is the list index groups from that dataset.
-    """
-
-    exact: list[TIndexCollection]
-    near: list[TIndexCollection]
+from dataeval.outputs import DuplicatesOutput, HashStatsOutput
+from dataeval.outputs._base import set_metadata
+from dataeval.outputs._linters import DatasetDuplicateGroupMap, DuplicateGroup
+from dataeval.typing import Array, Dataset
+from dataeval.utils.data._images import Images
 
 
 class Duplicates:
@@ -134,22 +109,15 @@ class Duplicates:
 
         return DuplicatesOutput(**duplicates)
 
-    @overload
-    def evaluate(self, data: Iterable[ArrayLike]) -> DuplicatesOutput[DuplicateGroup]: ...
-    @overload
-    def evaluate(self, data: Dataset[tuple[ArrayLike, Any, dict[str, Any]]]) -> DuplicatesOutput[DuplicateGroup]: ...
-
     @set_metadata(state=["only_exact"])
-    def evaluate(
-        self, data: Iterable[ArrayLike] | Dataset[tuple[ArrayLike, Any, dict[str, Any]]]
-    ) -> DuplicatesOutput[DuplicateGroup]:
+    def evaluate(self, data: Dataset[Array] | Dataset[tuple[Array, Any, Any]]) -> DuplicatesOutput[DuplicateGroup]:
         """
         Returns duplicate image indices for both exact matches and near matches
 
         Parameters
         ----------
-        data : Iterable[ArrayLike], shape - (N, C, H, W) | StatsOutput | Sequence[StatsOutput]
-            A dataset of images in an ArrayLike format or the output(s) from a hashstats analysis
+        data : Iterable[Array], shape - (N, C, H, W) | Dataset[tuple[Array, Any, Any]]
+            A dataset of images in an Array format or the output(s) from a hashstats analysis
 
         Returns
         -------
@@ -166,7 +134,7 @@ class Duplicates:
         >>> all_dupes.evaluate(duplicate_images)
         DuplicatesOutput(exact=[[3, 20], [16, 37]], near=[[3, 20, 22], [12, 18], [13, 36], [14, 31], [17, 27], [19, 38, 47]])
         """  # noqa: E501
-        images = (d[0] for d in data) if isinstance(data, Dataset) else data
+        images = Images(data) if isinstance(data, Dataset) else data
         self.stats = hashstats(images)
         duplicates = self._get_duplicates(self.stats.dict())
         return DuplicatesOutput(**duplicates)

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/linters/outliers.py

@@ -2,142 +2,19 @@ from __future__ import annotations
 
 __all__ = []
 
-import contextlib
-from dataclasses import dataclass
-from typing import Any, Generic, Iterable, Literal, Sequence, TypeVar, Union, overload
+from typing import Any, Literal, Sequence, overload
 
 import numpy as np
 from numpy.typing import NDArray
-from torch.utils.data import Dataset
-
-from dataeval._output import Output, set_metadata
-from dataeval.metrics.stats._base import BOX_COUNT, SOURCE_INDEX, combine_stats, get_dataset_step_from_idx
-from dataeval.metrics.stats._datasetstats import DatasetStatsOutput, datasetstats
-from dataeval.metrics.stats._dimensionstats import DimensionStatsOutput
-from dataeval.metrics.stats._labelstats import LabelStatsOutput
-from dataeval.metrics.stats._pixelstats import PixelStatsOutput
-from dataeval.metrics.stats._visualstats import VisualStatsOutput
-from dataeval.typing import ArrayLike
-
-with contextlib.suppress(ImportError):
-    import pandas as pd
-
-
-IndexIssueMap = dict[int, dict[str, float]]
-OutlierStatsOutput = Union[DimensionStatsOutput, PixelStatsOutput, VisualStatsOutput]
-TIndexIssueMap = TypeVar("TIndexIssueMap", IndexIssueMap, list[IndexIssueMap])
-
-
-def _reorganize_by_class_and_metric(result, lstats):
-    """Flip result from grouping by image to grouping by class and metric"""
-    metrics = {}
-    class_wise = {label: {} for label in lstats.image_indices_per_label}
-
-    # Group metrics and calculate class-wise counts
-    for img, group in result.items():
-        for extreme in group:
-            metrics.setdefault(extreme, []).append(img)
-            for label, images in lstats.image_indices_per_label.items():
-                if img in images:
-                    class_wise[label][extreme] = class_wise[label].get(extreme, 0) + 1
-
-    return metrics, class_wise
-
-
-def _create_table(metrics, class_wise):
-    """Create table for displaying the results"""
-    max_class_length = max(len(str(label)) for label in class_wise) + 2
-    max_total = max(len(metrics[group]) for group in metrics) + 2
-
-    table_header = " | ".join(
-        [f"{'Class':>{max_class_length}}"]
-        + [f"{group:^{max(5, len(str(group))) + 2}}" for group in sorted(metrics.keys())]
-        + [f"{'Total':<{max_total}}"]
-    )
-    table_rows = []
-
-    for class_cat, results in class_wise.items():
-        table_value = [f"{class_cat:>{max_class_length}}"]
-        total = 0
-        for group in sorted(metrics.keys()):
-            count = results.get(group, 0)
-            table_value.append(f"{count:^{max(5, len(str(group))) + 2}}")
-            total += count
-        table_value.append(f"{total:^{max_total}}")
-        table_rows.append(" | ".join(table_value))
-
-    table = [table_header] + table_rows
-    return table
-
-
-def _create_pandas_dataframe(class_wise):
-    """Create data for pandas dataframe"""
-    data = []
-    for label, metrics_dict in class_wise.items():
-        row = {"Class": label}
-        total = sum(metrics_dict.values())
-        row.update(metrics_dict)  # Add metric counts
-        row["Total"] = total
-        data.append(row)
-    return data
-
-
-@dataclass(frozen=True)
-class OutliersOutput(Generic[TIndexIssueMap], Output):
-    """
-    Output class for :class:`.Outliers` lint detector.
-
-    Attributes
-    ----------
-    issues : dict[int, dict[str, float]] | list[dict[int, dict[str, float]]]
-        Indices of image Outliers with their associated issue type and calculated values.
-
-    - For a single dataset, a dictionary containing the indices of outliers and
-      a dictionary showing the issues and calculated values for the given index.
-    - For multiple stats outputs, a list of dictionaries containing the indices of
-      outliers and their associated issues and calculated values.
-    """
 
-    issues: TIndexIssueMap
-
-    def __len__(self) -> int:
-        if isinstance(self.issues, dict):
-            return len(self.issues)
-        else:
-            return sum(len(d) for d in self.issues)
-
-    def to_table(self, labelstats: LabelStatsOutput) -> str:
-        if isinstance(self.issues, dict):
-            metrics, classwise = _reorganize_by_class_and_metric(self.issues, labelstats)
-            listed_table = _create_table(metrics, classwise)
-            table = "\n".join(listed_table)
-        else:
-            outertable = []
-            for d in self.issues:
-                metrics, classwise = _reorganize_by_class_and_metric(d, labelstats)
-                listed_table = _create_table(metrics, classwise)
-                str_table = "\n".join(listed_table)
-                outertable.append(str_table)
-            table = "\n\n".join(outertable)
-        return table
-
-    def to_dataframe(self, labelstats: LabelStatsOutput) -> pd.DataFrame:
-        import pandas as pd
-
-        if isinstance(self.issues, dict):
-            _, classwise = _reorganize_by_class_and_metric(self.issues, labelstats)
-            data = _create_pandas_dataframe(classwise)
-            df = pd.DataFrame(data)
-        else:
-            df_list = []
-            for i, d in enumerate(self.issues):
-                _, classwise = _reorganize_by_class_and_metric(d, labelstats)
-                data = _create_pandas_dataframe(classwise)
-                single_df = pd.DataFrame(data)
-                single_df["Dataset"] = i
-                df_list.append(single_df)
-            df = pd.concat(df_list)
-        return df
+from dataeval.metrics.stats._base import combine_stats, get_dataset_step_from_idx
+from dataeval.metrics.stats._imagestats import imagestats
+from dataeval.outputs import DimensionStatsOutput, ImageStatsOutput, OutliersOutput, PixelStatsOutput, VisualStatsOutput
+from dataeval.outputs._base import set_metadata
+from dataeval.outputs._linters import IndexIssueMap, OutlierStatsOutput
+from dataeval.outputs._stats import BOX_COUNT, SOURCE_INDEX
+from dataeval.typing import Array, Dataset
+from dataeval.utils.data._images import Images
 
 
 def _get_outlier_mask(
@@ -227,7 +104,7 @@ class Outliers:
         outlier_method: Literal["zscore", "modzscore", "iqr"] = "modzscore",
         outlier_threshold: float | None = None,
     ):
-        self.stats: DatasetStatsOutput
+        self.stats: ImageStatsOutput
         self.use_dimension = use_dimension
         self.use_pixel = use_pixel
         self.use_visual = use_visual
@@ -248,23 +125,23 @@ class Outliers:
         return dict(sorted(flagged_images.items()))
 
     @overload
-    def from_stats(self, stats: OutlierStatsOutput | DatasetStatsOutput) -> OutliersOutput[IndexIssueMap]: ...
+    def from_stats(self, stats: OutlierStatsOutput | ImageStatsOutput) -> OutliersOutput[IndexIssueMap]: ...
 
     @overload
     def from_stats(self, stats: Sequence[OutlierStatsOutput]) -> OutliersOutput[list[IndexIssueMap]]: ...
 
     @set_metadata(state=["outlier_method", "outlier_threshold"])
     def from_stats(
-        self, stats: OutlierStatsOutput | DatasetStatsOutput | Sequence[OutlierStatsOutput]
+        self, stats: OutlierStatsOutput | ImageStatsOutput | Sequence[OutlierStatsOutput]
     ) -> OutliersOutput[IndexIssueMap] | OutliersOutput[list[IndexIssueMap]]:
         """
         Returns indices of Outliers with the issues identified for each.
 
         Parameters
         ----------
-        stats : OutlierStatsOutput | DatasetStatsOutput | Sequence[OutlierStatsOutput]
+        stats : OutlierStatsOutput | ImageStatsOutput | Sequence[OutlierStatsOutput]
             The output(s) from a dimensionstats, pixelstats, or visualstats metric
-            analysis or an aggregate DatasetStatsOutput
+            analysis or an aggregate ImageStatsOutput
 
         Returns
         -------
@@ -291,11 +168,7 @@ class Outliers:
         >>> results.issues[1]
         {}
         """  # noqa: E501
-        if isinstance(stats, DatasetStatsOutput):
-            outliers = self._get_outliers({k: v for o in stats._outputs() for k, v in o.dict().items()})
-            return OutliersOutput(outliers)
-
-        if isinstance(stats, (DimensionStatsOutput, PixelStatsOutput, VisualStatsOutput)):
+        if isinstance(stats, (ImageStatsOutput, DimensionStatsOutput, PixelStatsOutput, VisualStatsOutput)):
             return OutliersOutput(self._get_outliers(stats.dict()))
 
         if not isinstance(stats, Sequence):
@@ -306,7 +179,7 @@ class Outliers:
         stats_map: dict[type, list[int]] = {}
         for i, stats_output in enumerate(stats):
             if not isinstance(
-                stats_output, (DatasetStatsOutput, DimensionStatsOutput, PixelStatsOutput, VisualStatsOutput)
+                stats_output, (ImageStatsOutput, DimensionStatsOutput, PixelStatsOutput, VisualStatsOutput)
             ):
                 raise TypeError(
                     "Invalid stats output type; only use output from dimensionstats, pixelstats or visualstats."
@@ -323,22 +196,15 @@ class Outliers:
 
         return OutliersOutput(output_list)
 
-    @overload
-    def evaluate(self, data: Iterable[ArrayLike]) -> OutliersOutput[IndexIssueMap]: ...
-    @overload
-    def evaluate(self, data: Dataset[tuple[ArrayLike, Any, dict[str, Any]]]) -> OutliersOutput[IndexIssueMap]: ...
-
     @set_metadata(state=["use_dimension", "use_pixel", "use_visual", "outlier_method", "outlier_threshold"])
-    def evaluate(
-        self, data: Iterable[ArrayLike] | Dataset[tuple[ArrayLike, Any, dict[str, Any]]]
-    ) -> OutliersOutput[IndexIssueMap]:
+    def evaluate(self, data: Dataset[Array] | Dataset[tuple[Array, Any, Any]]) -> OutliersOutput[IndexIssueMap]:
         """
         Returns indices of Outliers with the issues identified for each
 
         Parameters
         ----------
-        data : Iterable[ArrayLike], shape - (C, H, W)
-            A dataset of images in an ArrayLike format
+        data : Iterable[Array], shape - (C, H, W)
+            A dataset of images in an Array format
 
         Returns
         -------
@@ -355,9 +221,9 @@ class Outliers:
         >>> list(results.issues)
         [10, 12]
         >>> results.issues[10]
-        {'skew': -3.906, 'kurtosis': 13.266, 'entropy': 0.2128, 'contrast': 1.25, 'zeros': 0.05493}
+        {'contrast': 1.25, 'zeros': 0.05493, 'skew': -3.906, 'kurtosis': 13.266, 'entropy': 0.2128}
         """
-        images = (d[0] for d in data) if isinstance(data, Dataset) else data
-        self.stats = datasetstats(images=images)
+        images = Images(data) if isinstance(data, Dataset) else data
+        self.stats = imagestats(images)
         outliers = self._get_outliers(self.stats.dict())
         return OutliersOutput(outliers)

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/ood/__init__.py

@@ -5,4 +5,4 @@ Out-of-distribution (OOD) detectors identify data that is different from the dat
 __all__ = ["OODOutput", "OODScoreOutput", "OOD_AE"]
 
 from dataeval.detectors.ood.ae import OOD_AE
-from dataeval.detectors.ood.output import OODOutput, OODScoreOutput
+from dataeval.outputs._ood import OODOutput, OODScoreOutput

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/ood/ae.py

@@ -19,7 +19,7 @@ import torch
 from numpy.typing import NDArray
 
 from dataeval.detectors.ood.base import OODBase
-from dataeval.detectors.ood.output import OODScoreOutput
+from dataeval.outputs import OODScoreOutput
 from dataeval.typing import ArrayLike
 from dataeval.utils.torch._internal import predict_batch
 

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/ood/mixin.py

@@ -1,7 +1,5 @@
 from __future__ import annotations
 
-from dataeval.detectors.ood.output import OODOutput, OODScoreOutput
-
 __all__ = []
 
 from abc import ABC, abstractmethod
@@ -10,7 +8,8 @@ from typing import Callable, Generic, Literal, TypeVar
 import numpy as np
 from numpy.typing import NDArray
 
-from dataeval._output import set_metadata
+from dataeval.outputs import OODOutput, OODScoreOutput
+from dataeval.outputs._base import set_metadata
 from dataeval.typing import ArrayLike
 from dataeval.utils._array import as_numpy, to_numpy
 

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/detectors/ood/vae.py

@@ -18,7 +18,7 @@ import numpy as np
 import torch
 
 from dataeval.detectors.ood.base import OODBase
-from dataeval.detectors.ood.output import OODScoreOutput
+from dataeval.outputs import OODScoreOutput
 from dataeval.typing import ArrayLike
 from dataeval.utils._array import as_numpy
 from dataeval.utils.torch._internal import predict_batch

{dataeval-0.81.0 → dataeval-0.82.0}/src/dataeval/metadata/__init__.py

@@ -1,5 +1,6 @@
 """Explanatory functions using metadata and additional features such as ood or drift"""
 
-__all__ = ["most_deviated_factors"]
+__all__ = ["most_deviated_factors", "metadata_distance"]
 
+from dataeval.metadata._distance import metadata_distance
 from dataeval.metadata._ood import most_deviated_factors