change name and usage, start tests

samuelcolvin · samuelcolvin · commit 0b509d3c3386 · 2020-06-27T13:47:00.000+01:00
diff --git a/pydantic/decorator.py b/pydantic/decorator.py
@@ -1,5 +1,5 @@
 from functools import wraps
-from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Tuple, TypeVar, cast, get_type_hints
+from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Tuple, Type, TypeVar, Union, cast, get_type_hints
 
 from . import validator
 from .errors import ConfigError
@@ -12,15 +12,16 @@
     from .typing import AnyCallable
 
     Callable = TypeVar('Callable', bound=AnyCallable)
+    ConfigType = Union[None, Type[Any], Dict[str, Any]]
 
 
-def validate_arguments(func: 'Callable' = None, **config_params: Any) -> 'Callable':
+def validate_arguments(func: 'Callable' = None, *, config: 'ConfigType' = None) -> 'Callable':
     """
     Decorator to validate the arguments passed to a function.
     """
 
     def validate(_func: 'Callable') -> 'Callable':
-        vd = ValidatedFunction(_func, **config_params)
+        vd = ValidatedFunction(_func, config)
 
         @wraps(_func)
         def wrapper_function(*args: Any, **kwargs: Any) -> Any:
@@ -43,7 +44,7 @@ def wrapper_function(*args: Any, **kwargs: Any) -> Any:
 
 
 class ValidatedFunction:
-    def __init__(self, function: 'Callable', **config_params: Any):
+    def __init__(self, function: 'Callable', config: 'ConfigType'):
         from inspect import signature, Parameter
 
         parameters: Mapping[str, Parameter] = signature(function).parameters
@@ -107,7 +108,7 @@ def __init__(self, function: 'Callable', **config_params: Any):
             # same with kwargs
             fields[self.v_kwargs_name] = Dict[Any, Any], None
 
-        self.create_model(fields, takes_args, takes_kwargs, **config_params)
+        self.create_model(fields, takes_args, takes_kwargs, config)
 
     def call(self, *args: Any, **kwargs: Any) -> Any:
         values = self.build_values(args, kwargs)
@@ -177,16 +178,17 @@ def execute(self, m: BaseModel) -> Any:
         else:
             return self.raw_function(**d)
 
-    def create_model(self, fields: Dict[str, Any], takes_args: bool, takes_kwargs: bool, **config_params: Any) -> None:
+    def create_model(self, fields: Dict[str, Any], takes_args: bool, takes_kwargs: bool, config: 'ConfigType') -> None:
         pos_args = len(self.arg_mapping)
 
-        if TYPE_CHECKING:
+        class CustomConfig:
+            pass
 
-            class CustomConfig:
-                pass
-
-        else:
-            CustomConfig = type('Config', (), config_params)
+        if not TYPE_CHECKING:
+            if isinstance(config, dict):
+                CustomConfig = type('Config', (), config)
+            elif config is not None:
+                CustomConfig = config
 
         class DecoratorBaseModel(BaseModel):
             @validator(self.v_args_name, check_fields=False, allow_reuse=True)
diff --git a/tests/test_decorator.py b/tests/test_decorator.py
@@ -70,6 +70,7 @@ def foo_bar(a: int, b: int):
     assert issubclass(foo_bar.model, BaseModel)
     assert foo_bar.model.__fields__.keys() == {'a', 'b', 'args', 'kwargs'}
     assert foo_bar.model.__name__ == 'FooBar'
+    assert foo_bar.model.schema()['title'] == 'FooBar'
     # signature is slightly different on 3.6
     if sys.version_info >= (3, 7):
         assert repr(inspect.signature(foo_bar)) == '<Signature (a: int, b: int)>'
@@ -262,3 +263,17 @@ def foo(cls, a: int, b: int):
         {'loc': ('a',), 'msg': 'field required', 'type': 'value_error.missing'},
         {'loc': ('b',), 'msg': 'field required', 'type': 'value_error.missing'},
     ]
+
+
+def test_config():
+    @validate_arguments(config=dict(title='testing', fields={'b': 'bang'}))
+    def foo(a: int, b: int):
+        return f'{a}, {b}'
+
+    assert foo(1, 2) == '1, 2'
+    assert foo(1, bang=2) == '1, 2'
+    assert foo.model.schema()['title'] == 'testing'
+    with pytest.raises(ValidationError) as exc_info:
+        foo(1, b=2)
+
+    assert exc_info.value.errors() == ...
