confit 0.13.0.dev0__tar.gz → 0.13.0.dev1__tar.gz

{confit-0.13.0.dev0 → confit-0.13.0.dev1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confit
-Version: 0.13.0.dev0
+Version: 0.13.0.dev1
 Summary: Smart configuration framework
 Author-email: Perceval Wajsburt <perceval.wajsburt@aphp.fr>, Thomas Petit-Jean <thomas.petitjean@aphp.fr>, Adam Remaki <adam.remaki@aphp.fr>, Alice Calliger <alice.calliger@aphp.fr>
 License: Copyright 2023 Assistance Publique - Hôpitaux de Paris

{confit-0.13.0.dev0 → confit-0.13.0.dev1}/confit/_version.py

@@ -4,7 +4,7 @@ import subprocess
 from importlib import metadata
 from pathlib import Path
 
-_BASE_VERSION = "0.13.0.dev0"
+_BASE_VERSION = "0.13.0.dev1"
 
 
 def get_version(base_version: str = _BASE_VERSION) -> str:

{confit-0.13.0.dev0 → confit-0.13.0.dev1}/confit/registry.py

@@ -26,6 +26,7 @@ from confit.errors import (
     SignatureError,
     remove_lib_from_traceback,
 )
+from confit.typing import legacy_validator_schema
 from confit.utils.settings import is_debug
 
 # Reuse evaluated annotations, evaluating AsList[int] again can create a different class
@@ -48,7 +49,11 @@ def make_wrapper(raw_function, callee, config, invoker):
     extras_name = next(
         (name for name, p in parameters.items() if p.kind == p.VAR_KEYWORD), None
     )
-    callee_name = callee.__module__ + "." + callee.__qualname__
+    callee_name = (
+        f"{callee.__module__}.{callee.__qualname__}"
+        if callee.__module__
+        else callee.__qualname__
+    )
     # Keep Field defaults, ordinary defaults stay omitted through stacked decorators
     omitted_defaults = {
         name
@@ -252,8 +257,7 @@ def validate_arguments(
                     steps.append(old_get_pydantic_core_schema(*args, **kwargs))
                 elif old_get_validators is not None:
                     steps.extend(
-                        core_schema.no_info_plain_validator_function(fn)
-                        for fn in old_get_validators()
+                        legacy_validator_schema(fn) for fn in old_get_validators()
                     )
                 steps.append(
                     core_schema.no_info_plain_validator_function(post_validate)

{confit-0.13.0.dev0 → confit-0.13.0.dev1}/confit/typing.py

@@ -4,12 +4,28 @@ from typing import TypeVar
 
 from pydantic import BaseModel
 from pydantic.type_adapter import ConfigDict, TypeAdapter
-from pydantic_core import core_schema
+from pydantic_core import PydanticCustomError, core_schema
 from typing_extensions import is_typeddict
 
 T = TypeVar("T")
 
 
+def legacy_validator_schema(validator):
+    """
+    Keep TypeError as a validation failure for custom get_validators hooks
+    """
+
+    def validate(value):
+        try:
+            return validator(value)
+        except TypeError as error:
+            raise PydanticCustomError(
+                "type_error", "{error}", {"error": error}
+            ) from error
+
+    return core_schema.no_info_plain_validator_function(validate)
+
+
 class Validatable:
     @classmethod
     def __get_validators__(cls):
@@ -18,10 +34,7 @@ class Validatable:
     @classmethod
     def __get_pydantic_core_schema__(cls, source, handler):
         return core_schema.chain_schema(
-            [
-                core_schema.no_info_plain_validator_function(v)
-                for v in cls.__get_validators__()
-            ]
+            [legacy_validator_schema(v) for v in cls.__get_validators__()]
         )
 
 

{confit-0.13.0.dev0 → confit-0.13.0.dev1}/confit.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: confit
-Version: 0.13.0.dev0
+Version: 0.13.0.dev1
 Summary: Smart configuration framework
 Author-email: Perceval Wajsburt <perceval.wajsburt@aphp.fr>, Thomas Petit-Jean <thomas.petitjean@aphp.fr>, Adam Remaki <adam.remaki@aphp.fr>, Alice Calliger <alice.calliger@aphp.fr>
 License: Copyright 2023 Assistance Publique - Hôpitaux de Paris

{confit-0.13.0.dev0 → confit-0.13.0.dev1}/tests/test_validate.py

@@ -60,6 +60,13 @@ def test_validate_decorator():
     validated = validate_arguments()(GoodModel)
     assert validated("3").value == 3
 
+    scope = {"validate_arguments": validate_arguments}
+    exec("@validate_arguments\ndef fn(value: int): return value", scope)
+    assert scope["fn"]("3") == 3
+    with pytest.raises(ConfitValidationError) as exc:
+        scope["fn"]("invalid")
+    assert str(exc.value).startswith("1 validation error for fn()\n-> value\n")
+
 
 def test_custom_validators_v1():
     @validate_arguments()
@@ -151,6 +158,43 @@ def test_custom_validators_validatable():
     )
 
 
+@pytest.mark.parametrize("base", [Validatable, object])
+def test_custom_validator_type_error(base):
+    error = TypeError("Invalid value")
+
+    @validate_arguments
+    class Model(base):
+        def __init__(self, value: int):
+            self.value = value
+
+        @classmethod
+        def __get_validators__(cls):
+            yield cls.validate
+
+        @classmethod
+        def validate(cls, value):
+            raise error
+
+    @validate_arguments
+    def fn(values: list[Model]):
+        raise error
+
+    with pytest.raises(ConfitValidationError) as exc:
+        fn([1])
+    assert exc.value.errors() == [
+        {
+            "loc": ("values", 0),
+            "msg": "Invalid value",
+            "type": "type_error",
+            "input": 1,
+            "ctx": {"error": error},
+        }
+    ]
+    with pytest.raises(TypeError) as exc:
+        fn([])
+    assert exc.value is error
+
+
 def test_literals():
     @validate_arguments()
     def test(val: Literal["ok", "ko"]):