From 862050de75d9858d7ea3cdb04041df486bb07eb2 Mon Sep 17 00:00:00 2001 From: Wes Weber Date: Sat, 12 Feb 2022 13:45:38 -0500 Subject: [PATCH 1/2] Example fix to postponed annotations issue --- fastapi/dependencies/utils.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py index d4028d067..99d719f7d 100644 --- a/fastapi/dependencies/utils.py +++ b/fastapi/dependencies/utils.py @@ -242,9 +242,25 @@ def is_scalar_sequence_field(field: ModelField) -> bool: return False +def get_globalns(call: Callable[..., Any]) -> Dict[str, Any]: + source_func: Any + if hasattr(call, "__globals__"): + # If the callable has __globals__ set, use that + source_func = call + elif isinstance(call, type): + # If the callable is a class, its dependencies are declared on __init__ + source_func = getattr(call, "__init__") + else: + # For callable instances of classes, the dependencies are declared on __call__ + source_func = getattr(call, "__call__") + + return cast(Dict[str, Any], getattr(source_func, "__globals__", {})) + + def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature: signature = inspect.signature(call) - globalns = getattr(call, "__globals__", {}) + globalns = get_globalns(call) + typed_params = [ inspect.Parameter( name=param.name, From 58219c07216653514e4bfffe0a7141a962213194 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Fri, 16 Dec 2022 20:24:46 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20[pre-commit.ci]=20Auto=20for?= =?UTF-8?q?mat=20from=20pre-commit.com=20hooks?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastapi/dependencies/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py index 548d7df26..cbc3a6d9a 100644 --- a/fastapi/dependencies/utils.py +++ b/fastapi/dependencies/utils.py @@ -252,10 +252,10 @@ def get_globalns(call: Callable[..., Any]) -> Dict[str, Any]: source_func = call elif isinstance(call, type): # If the callable is a class, its dependencies are declared on __init__ - source_func = getattr(call, "__init__") + source_func = call.__init__ else: # For callable instances of classes, the dependencies are declared on __call__ - source_func = getattr(call, "__call__") + source_func = call.__call__ return cast(Dict[str, Any], getattr(source_func, "__globals__", {}))