dataeval 1.1.1__tar.gz → 1.1.2__tar.gz

{dataeval-1.1.1 → dataeval-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: dataeval
-Version: 1.1.1
+Version: 1.1.2
 Summary: DataEval provides a simple interface to characterize image data and its impact on model performance across classification and object-detection tasks
 Project-URL: Homepage, https://dataeval.ai/
 Project-URL: Repository, https://github.com/aria-ml/dataeval/

{dataeval-1.1.1 → dataeval-1.1.2}/src/dataeval/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '1.1.1'
-__version_tuple__ = version_tuple = (1, 1, 1)
+__version__ = version = '1.1.2'
+__version_tuple__ = version_tuple = (1, 1, 2)
 
 __commit_id__ = commit_id = None

{dataeval-1.1.1 → dataeval-1.1.2}/src/dataeval/models/_backends.py

@@ -2,6 +2,7 @@
 
 __all__ = ["RuntimeBackend", "OnnxBackend", "LiteRtBackend", "make_backend"]
 
+from importlib import import_module
 from pathlib import Path
 from typing import Any, Protocol, runtime_checkable
 
@@ -93,25 +94,34 @@ class OnnxBackend:
         return {name: np.asarray(arr) for name, arr in zip(self.output_names, outputs, strict=True)}
 
 
+#: Interpreter providers tried in order. `ai_edge_litert` is what `dataeval[litert]`
+#: installs and is the supported successor to the standalone `tflite_runtime` wheel;
+#: the other two stay as fallbacks for environments that already carry them.
+_LITERT_MODULES = ("ai_edge_litert.interpreter", "tflite_runtime.interpreter", "tensorflow.lite")
+
+
 def _litert_interpreter(model_path: str | Path) -> Any:
-    try:
-        from tflite_runtime.interpreter import Interpreter
-    except ImportError:
+    for module_name in _LITERT_MODULES:
         try:
-            from tensorflow.lite import Interpreter  # type: ignore[no-redef]
-        except ImportError as e:
-            raise ImportError("LiteRtBackend requires tflite-runtime or tensorflow. Install dataeval[tflite].") from e
-    return Interpreter(model_path=str(model_path))
+            interpreter = import_module(module_name).Interpreter
+        except ImportError:
+            continue
+        return interpreter(model_path=str(model_path))
+    raise ImportError(
+        "LiteRtBackend requires a LiteRT interpreter, which is not installed. "
+        "Install it with: pip install 'dataeval[litert]' (or provide tflite-runtime or tensorflow)."
+    )
 
 
 class LiteRtBackend:
     """
     LiteRT (TensorFlow Lite) backend with NCHW input.
 
-    Loads a ``.tflite`` model via a LiteRT interpreter (``tflite-runtime`` if
-    available, else ``tensorflow.lite``). Accepts NCHW input and transposes to the
-    NHWC layout LiteRT expects internally, resizing the interpreter's input tensor
-    per batch. Implements :class:`RuntimeBackend`. Requires ``dataeval[tflite]``.
+    Loads a ``.tflite`` model via a LiteRT interpreter (``ai-edge-litert`` if
+    available, else ``tflite-runtime`` or ``tensorflow.lite``). Accepts NCHW input
+    and transposes to the NHWC layout LiteRT expects internally, resizing the
+    interpreter's input tensor per batch. Implements :class:`RuntimeBackend`.
+    Requires ``dataeval[litert]``.
 
     Parameters
     ----------
@@ -121,7 +131,7 @@ class LiteRtBackend:
     Raises
     ------
     ImportError
-        If neither ``tflite-runtime`` nor ``tensorflow`` is installed.
+        If no LiteRT interpreter is available.
     FileNotFoundError
         If ``model_path`` does not exist.
     """

{dataeval-1.1.1 → dataeval-1.1.2}/src/dataeval/models/_predictors.py

@@ -184,7 +184,7 @@ class LiteRtImageClassifier(_BaseImageClassifier):
     of CHW images to per-image class scores. Calling the instance preprocesses each
     image to the model's input contract (color layout, size, ``[0, 1]``
     normalization), runs inference, and returns one ``(nClasses,)`` float32 score
-    array per image. Requires ``dataeval[tflite]``.
+    array per image. Requires ``dataeval[litert]``.
 
     Parameters
     ----------
@@ -205,7 +205,7 @@ class LiteRtImageClassifier(_BaseImageClassifier):
     ValueError
         If the metadata declares a task other than ``IMAGE_CLASSIFICATION``.
     ImportError
-        If neither ``tflite-runtime`` nor ``tensorflow`` is installed.
+        If no LiteRT interpreter is available.
     FileNotFoundError
         If ``model_path`` does not exist.
 
@@ -413,7 +413,7 @@ class LiteRtObjectDetector(_BaseObjectDetector):
     to per-image detection targets. Calling the instance preprocesses each image to
     the model's input contract (color layout, size, ``[0, 1]`` normalization), runs
     inference, and returns one detection target per image. Requires
-    ``dataeval[tflite]``.
+    ``dataeval[litert]``.
 
     Parameters
     ----------
@@ -436,7 +436,7 @@ class LiteRtObjectDetector(_BaseObjectDetector):
     ValueError
         If the metadata declares a task other than ``IMAGE_OBJECT_DETECTION``.
     ImportError
-        If neither ``tflite-runtime`` nor ``tensorflow`` is installed.
+        If no LiteRT interpreter is available.
     FileNotFoundError
         If ``model_path`` does not exist.