Merge pull request #250 from DisruptiveLabs/use_get_type_hints

Use typing.get_type_hints instead of .__annotations__

spectree/plugins/falcon_plugin.py

@@ -1,7 +1,7 @@
 import inspect
 import re
 from functools import partial
-from typing import Any, Callable, Dict, List, Mapping, Optional
+from typing import Any, Callable, Dict, List, Mapping, Optional, get_type_hints
 
 from pydantic import ValidationError
 
@@ -213,8 +213,9 @@ def validate(
         try:
             self.request_validation(_req, query, json, form, headers, cookies)
             if self.config.annotations:
+                annotations = get_type_hints(func)
                 for name in ("query", "json", "form", "headers", "cookies"):
-                    if func.__annotations__.get(name):
+                    if annotations.get(name):
                         kwargs[name] = getattr(_req.context, name)
 
         except ValidationError as err:
@@ -308,8 +309,9 @@ async def validate(
         try:
             await self.request_validation(_req, query, json, form, headers, cookies)
             if self.config.annotations:
+                annotations = get_type_hints(func)
                 for name in ("query", "json", "form", "headers", "cookies"):
-                    if func.__annotations__.get(name):
+                    if annotations.get(name):
                         kwargs[name] = getattr(_req.context, name)
 
         except ValidationError as err:

spectree/plugins/flask_plugin.py

@@ -1,4 +1,4 @@
-from typing import Any, Callable, Mapping, Optional, Tuple
+from typing import Any, Callable, Mapping, Optional, Tuple, get_type_hints
 
 from pydantic import BaseModel, ValidationError
 
@@ -189,8 +189,9 @@ def validate(
         try:
             self.request_validation(request, query, json, form, headers, cookies)
             if self.config.annotations:
+                annotations = get_type_hints(func)
                 for name in ("query", "json", "form", "headers", "cookies"):
-                    if func.__annotations__.get(name):
+                    if annotations.get(name):
                         kwargs[name] = getattr(request.context, name)
         except ValidationError as err:
             req_validation_error = err

spectree/plugins/starlette_plugin.py

@@ -2,7 +2,7 @@
 from collections import namedtuple
 from functools import partial
 from json import JSONDecodeError
-from typing import Any, Callable, Optional
+from typing import Any, Callable, Optional, get_type_hints
 
 from pydantic import ValidationError
 
@@ -100,8 +100,9 @@ async def validate(
         try:
             await self.request_validation(request, query, json, form, headers, cookies)
             if self.config.annotations:
+                annotations = get_type_hints(func)
                 for name in ("query", "json", "form", "headers", "cookies"):
-                    if func.__annotations__.get(name):
+                    if annotations.get(name):
                         kwargs[name] = getattr(request.context, name)
         except ValidationError as err:
             req_validation_error = err

spectree/spec.py

@@ -1,7 +1,16 @@
 from collections import defaultdict
 from copy import deepcopy
 from functools import wraps
-from typing import Any, Callable, Dict, Mapping, Optional, Sequence, Type
+from typing import (
+    Any,
+    Callable,
+    Dict,
+    Mapping,
+    Optional,
+    Sequence,
+    Type,
+    get_type_hints,
+)
 
 from ._types import FunctionDecorator, ModelType
 from .config import Configuration, ModeEnum
@@ -193,11 +202,12 @@ async def async_validate(*args: Any, **kwargs: Any):
 
             if self.config.annotations:
                 nonlocal query, json, form, headers, cookies
-                query = func.__annotations__.get("query", query)
-                json = func.__annotations__.get("json", json)
-                form = func.__annotations__.get("form", form)
-                headers = func.__annotations__.get("headers", headers)
-                cookies = func.__annotations__.get("cookies", cookies)
+                annotations = get_type_hints(func)
+                query = annotations.get("query", query)
+                json = annotations.get("json", json)
+                form = annotations.get("form", form)
+                headers = annotations.get("headers", headers)
+                cookies = annotations.get("cookies", cookies)
 
             # register
             for name, model in zip(