drift

Author: anuraaga

protovalidate/internal/_core.py

@@ -12,15 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-"""Backend-agnostic rule-engine primitives shared by both CEL backends.
-
-``Violation``, ``RuleContext``, ``CompilationError``, and the ``Rules`` ABC do
-not depend on the CEL implementation (celpy vs cel-expr-python) or the
-descriptor/value model (protobuf-py vs google.protobuf) — they only speak the
-public ``validate_pb`` path types. Both the celpy engine (``rules.py``) and the
-cel-expr-python engine (``celexpr/rules.py``) import them from here so violation
-output and path bookkeeping are identical across backends.
-"""
+"""Backend-agnostic rule-engine primitives shared by both CEL backends."""
 
 import abc
 import typing
@@ -33,12 +25,7 @@ class CompilationError(Exception):
 
 
 class Violation:
-    """A singular rule violation.
-
-    Field and rule paths accumulate as element lists during recursion
-    (messages are immutable and do not auto-vivify), then materialize into a
-    ``validate_pb.Violation`` lazily via :attr:`proto`.
-    """
+    """A singular rule violation."""
 
     field_value: typing.Any
     rule_value: typing.Any
@@ -69,7 +56,6 @@ def extend_rule_elements(self, elements: list[validate_pb.FieldPathElement]) ->
         self._rule_elements.extend(elements)
 
     def finalize_paths(self) -> None:
-        """Reverses the accumulated leaf-to-root paths into root-to-leaf order."""
         self._field_elements.reverse()
         self._rule_elements.reverse()
 

protovalidate/internal/backend.py

@@ -22,11 +22,17 @@
 ``CEL_EXPR_AVAILABLE`` to ``False`` before constructing a ``Validator``.
 """
 
-import importlib.util
-
-
 def _detect() -> bool:
-    return all(importlib.util.find_spec(name) is not None for name in ("cel_expr_python", "google.protobuf"))
+    # Actually import (rather than importlib.util.find_spec) so an installed but
+    # broken wheel — cel-expr-python ships only native wheels with spotty
+    # coverage, so a failed extension load is a real possibility — falls back to
+    # celpy instead of being reported available and then crashing at use.
+    try:
+        import cel_expr_python  # noqa: F401, PLC0415
+        import google.protobuf.message  # noqa: F401, PLC0415
+    except ImportError:
+        return False
+    return True
 
 
 CEL_EXPR_AVAILABLE: bool = _detect()

protovalidate/internal/celexpr/rules.py

@@ -21,9 +21,8 @@
 in google's global pool for discovery. Rules are *evaluated* by cel-expr-python,
 which only ingests google messages, so the message under validation and the rule
 messages bound as ``rules``/``rule`` are bridged to google (see
-``celexpr.bridge.GoogleBridge``). Output ``Violation``\\s are protobuf-py
-``validate_pb`` messages — the public type, shared with the celpy engine via
-``protovalidate.internal._core``.
+``_bridge.GoogleBridge``). Output ``Violation``\\s are protobuf-py ``validate_pb``
+messages — the public type.
 """
 
 import dataclasses