Skip to content

Commit

Permalink
refactor: rename utils to match the rest
Browse files Browse the repository at this point in the history
  • Loading branch information
PrettyWood committed Jan 17, 2021
1 parent 11bd960 commit 51725e7
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 9 deletions.
6 changes: 3 additions & 3 deletions pydantic/__init__.py
@@ -1,6 +1,6 @@
# flake8: noqa
from . import dataclasses
from .annotated_types import namedtuple_to_model, typeddict_to_model
from .annotated_types import create_model_from_namedtuple, create_model_from_typeddict
from .class_validators import root_validator, validator
from .decorator import validate_arguments
from .env_settings import BaseSettings
Expand All @@ -18,8 +18,8 @@
# please use "from pydantic.errors import ..." instead
__all__ = [
# annotated types utils
'namedtuple_to_model',
'typeddict_to_model',
'create_model_from_namedtuple',
'create_model_from_typeddict',
# dataclasses
'dataclasses',
# class_validators
Expand Down
4 changes: 2 additions & 2 deletions pydantic/annotated_types.py
Expand Up @@ -12,7 +12,7 @@ class TypedDict(Dict[str, Any]):
__optional_keys__: FrozenSet[str]


def typeddict_to_model(
def create_model_from_typeddict(
typeddict_cls: Type['TypedDict'], *, config: Optional[Type['BaseConfig']] = None
) -> Type['BaseModel']:
"""
Expand Down Expand Up @@ -45,7 +45,7 @@ def typeddict_to_model(
return create_model(f'{typeddict_cls.__name__}Model', __config__=config, **field_definitions)


def namedtuple_to_model(namedtuple_cls: Type['NamedTuple']) -> Type['BaseModel']:
def create_model_from_namedtuple(namedtuple_cls: Type['NamedTuple']) -> Type['BaseModel']:
"""
Convert a named tuple to a `BaseModel`
A named tuple can be created with `typing.NamedTuple` and declared annotations
Expand Down
8 changes: 4 additions & 4 deletions pydantic/validators.py
Expand Up @@ -544,9 +544,9 @@ def pattern_validator(v: Any) -> Pattern[str]:


def make_named_tuple_validator(namedtuple_cls: Type[NamedTupleT]) -> Callable[[Tuple[Any, ...]], NamedTupleT]:
from .annotated_types import namedtuple_to_model
from .annotated_types import create_model_from_namedtuple

NamedTupleModel = namedtuple_to_model(namedtuple_cls)
NamedTupleModel = create_model_from_namedtuple(namedtuple_cls)

def named_tuple_validator(values: Tuple[Any, ...]) -> NamedTupleT:
dict_values: Dict[str, Any] = dict(zip(NamedTupleModel.__annotations__, values))
Expand All @@ -559,9 +559,9 @@ def named_tuple_validator(values: Tuple[Any, ...]) -> NamedTupleT:
def make_typeddict_validator(
typeddict_cls: Type['TypedDict'], config: Type['BaseConfig']
) -> Callable[[Any], Dict[str, Any]]:
from .annotated_types import typeddict_to_model
from .annotated_types import create_model_from_typeddict

TypedDictModel = typeddict_to_model(typeddict_cls, config=config)
TypedDictModel = create_model_from_typeddict(typeddict_cls, config=config)

def typeddict_validator(values: 'TypedDict') -> Dict[str, Any]:
return TypedDictModel(**values).dict(exclude_unset=True)
Expand Down

0 comments on commit 51725e7

Please sign in to comment.