fix bug we cannot use optional params

This commit is contained in:
Vincent Maillol
2020-11-03 12:51:27 +01:00
parent 13c19105d8
commit d866ce5358
7 changed files with 44 additions and 27 deletions

View File

@@ -5,6 +5,8 @@ from typing import Callable, Tuple
from aiohttp.web_request import BaseRequest
from pydantic import BaseModel
from .utils import is_pydantic_base_model
class AbstractInjector(metaclass=abc.ABCMeta):
"""
@@ -98,7 +100,7 @@ def _parse_func_signature(func: Callable) -> Tuple[dict, dict, dict, dict]:
if param_spec.kind is param_spec.POSITIONAL_ONLY:
path_args[param_name] = param_spec.annotation
elif param_spec.kind is param_spec.POSITIONAL_OR_KEYWORD:
if issubclass(param_spec.annotation, BaseModel):
if is_pydantic_base_model(param_spec.annotation):
body_args[param_name] = param_spec.annotation
else:
qs_args[param_name] = param_spec.annotation

View File

@@ -3,27 +3,17 @@ from typing import List, Type
from aiohttp.web import Response, json_response
from aiohttp.web_app import Application
from pydantic import BaseModel
from aiohttp_pydantic.oas.struct import OpenApiSpec3, OperationObject, PathItem
from ..injectors import _parse_func_signature
from ..utils import is_pydantic_base_model
from ..view import PydanticView, is_pydantic_view
from .typing import is_status_code_type
JSON_SCHEMA_TYPES = {float: "number", str: "string", int: "integer"}
def _is_pydantic_base_model(obj):
"""
Return true is obj is a pydantic.BaseModel subclass.
"""
try:
return issubclass(obj, BaseModel)
except TypeError:
return False
class _OASResponseBuilder:
"""
Parse the type annotated as returned by a function and
@@ -35,7 +25,7 @@ class _OASResponseBuilder:
@staticmethod
def _handle_pydantic_base_model(obj):
if _is_pydantic_base_model(obj):
if is_pydantic_base_model(obj):
return obj.schema()
return {}

11
aiohttp_pydantic/utils.py Normal file
View File

@@ -0,0 +1,11 @@
from pydantic import BaseModel
def is_pydantic_base_model(obj):
"""
Return true is obj is a pydantic.BaseModel subclass.
"""
try:
return issubclass(obj, BaseModel)
except TypeError:
return False

View File

@@ -9,14 +9,8 @@ from aiohttp.web_exceptions import HTTPMethodNotAllowed
from aiohttp.web_response import StreamResponse
from pydantic import ValidationError
from .injectors import (
AbstractInjector,
BodyGetter,
HeadersGetter,
MatchInfoGetter,
QueryGetter,
_parse_func_signature,
)
from .injectors import (AbstractInjector, BodyGetter, HeadersGetter,
MatchInfoGetter, QueryGetter, _parse_func_signature)
class PydanticView(AbstractView):