otsuvalidator 2.0.2__tar.gz → 2.0.3__tar.gz

{otsuvalidator-2.0.2 → otsuvalidator-2.0.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: otsuvalidator
-Version: 2.0.2
+Version: 2.0.3
 Summary: 単体でもディスクリプタとしても使用できるバリデータライブラリ
 Author-email: Otsuhachi <agequodagis.tufuiegoeris@gmail.com>
 License: MIT License

{otsuvalidator-2.0.2 → otsuvalidator-2.0.3}/otsuvalidator/__init__.py

@@ -59,4 +59,4 @@ __all__ = [
 
 logging.getLogger(__name__).addHandler(logging.NullHandler())
 
-__version__ = "2.0.2"
+__version__ = "2.0.3"

{otsuvalidator-2.0.2 → otsuvalidator-2.0.3}/otsuvalidator/bases.py

@@ -88,6 +88,7 @@ class VChain[OutT](Validator[OutT]):
     def __init__(self, *validators: Validator[Any], pass_type: Literal["all", "any"] = "any") -> None:
         super().__init__()
         self.validators: tuple[Validator[Any], ...] = validators
+        self.__target_loggers = [logging.getLogger(mn) for mn in {v.__module__ for v in validators}]
         self.pass_type: Literal["all", "any"] = pass_type
 
     def validate(self, value: Any) -> OutT:
@@ -97,18 +98,28 @@ class VChain[OutT](Validator[OutT]):
             for validator in validators:
                 current_value = validator.validate(current_value)
         else:
-            passed = False
-            exceptions = []
-            for validator in validators:
-                try:
-                    tmp = validator.validate(current_value)
-                    current_value = tmp
-                    passed = True
-                except Exception as ex:
-                    exceptions.append(ex)
-            if not passed:
-                logger.error(f"全てのバリデータでの検証に失敗しました: {value}")
-                raise ValueError(*exceptions)
+            # 複数のバリデータのいずれかが通過すればOKなので途中の検証エラーログを無効化する
+            original_levels: dict[logging.Logger, int] = {}
+            for tl in self.__target_loggers:
+                original_levels[tl] = tl.level
+                tl.setLevel(logging.CRITICAL + 1)
+
+            try:
+                passed = False
+                exceptions = []
+                for validator in validators:
+                    try:
+                        tmp = validator.validate(current_value)
+                        current_value = tmp
+                        passed = True
+                    except Exception as ex:
+                        exceptions.append(ex)
+                if not passed:
+                    logger.error(f"全てのバリデータでの検証に失敗しました: {value}")
+                    raise ValueError(*exceptions)
+            finally:
+                for tl, level in original_levels.items():
+                    tl.setLevel(level)
         return current_value
 
     def __or__[NextOutT](self, other: Validator[NextOutT]) -> "VChain[NextOutT]":

{otsuvalidator-2.0.2 → otsuvalidator-2.0.3}/tests/test_validators.py

@@ -1,10 +1,17 @@
 import io
+import logging
 import sys
 import unittest
 from typing import Any
 
 from otsuvalidator import VChain, VChoice, VDict, VInt, VList, VNone, VString
 
+logger = logging.getLogger(__name__)
+logging.basicConfig(
+    level=logging.DEBUG,
+    format="%(asctime)s [%(levelname)s] %(name)s: %(message)s",
+)
+
 
 class Student:
     name = VString(min_len=1, max_len=50, checker=str.istitle, pattern=r"^[a-zA-Z]+ [a-zA-Z]+$")  # 1~50文字, タイトルケース, 正規表現