Update impl

uriyyo · uriyyo · commit 1d6161cf4aa4 · 2022-10-24T14:55:45.000+03:00
diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py
@@ -253,22 +253,32 @@ def get_typed_signature(call: Callable[..., Any]) -> inspect.Signature:
             name=param.name,
             kind=param.kind,
             default=param.default,
-            annotation=get_typed_annotation(param, globalns),
+            annotation=get_typed_annotation(param.annotation, globalns),
         )
         for param in signature.parameters.values()
     ]
     typed_signature = inspect.Signature(typed_params)
     return typed_signature
 
 
-def get_typed_annotation(param: inspect.Parameter, globalns: Dict[str, Any]) -> Any:
-    annotation = param.annotation
+def get_typed_annotation(annotation: Any, globalns: Dict[str, Any]) -> Any:
     if isinstance(annotation, str):
         annotation = ForwardRef(annotation)
         annotation = evaluate_forwardref(annotation, globalns, globalns)
     return annotation
 
 
+def get_typed_return_annotation(call: Callable[..., Any]) -> Any:
+    signature = inspect.signature(call)
+    annotation = signature.return_annotation
+
+    if annotation is inspect.Signature.empty:
+        return None
+
+    globalns = getattr(call, "__globals__", {})
+    return get_typed_annotation(annotation, globalns)
+
+
 def get_dependant(
     *,
     path: str,
diff --git a/fastapi/routing.py b/fastapi/routing.py
@@ -25,6 +25,7 @@
     get_body_field,
     get_dependant,
     get_parameterless_sub_dependant,
+    get_typed_return_annotation,
     solve_dependencies,
 )
 from fastapi.encoders import DictIntStrAny, SetIntStr, jsonable_encoder
@@ -350,6 +351,8 @@ def __init__(
     ) -> None:
         self.path = path
         self.endpoint = endpoint
+        if response_model is None:
+            response_model = get_typed_return_annotation(endpoint)
         self.response_model = response_model
         self.summary = summary
         self.response_description = response_description
diff --git a/tests/test_response_model_as_return_annotation.py b/tests/test_response_model_as_return_annotation.py
@@ -16,17 +16,22 @@ class ModelTwo(BaseModel):
 
 @app.get("/valid1")
 def valid1() -> ModelOne:
-    pass
+    return ModelOne(name="Test")
 
 
 @app.get("/valid2", response_model=ModelTwo)
 def valid2():
-    pass
+    return ModelTwo(surname="Test")
 
 
 @app.get("/valid3", response_model=ModelTwo)
 def valid3() -> ModelOne:
-    pass
+    return ModelTwo(surname="Test")
+
+
+@app.get("/valid4")
+def valid4() -> "ModelOne":
+    return ModelOne(name="Test")
 
 
 openapi_schema = {
@@ -81,6 +86,22 @@ def valid3() -> ModelOne:
                 },
             }
         },
+        "/valid4": {
+            "get": {
+                "summary": "Valid4",
+                "operationId": "valid4_valid4_get",
+                "responses": {
+                    "200": {
+                        "description": "Successful Response",
+                        "content": {
+                            "application/json": {
+                                "schema": {"$ref": "#/components/schemas/ModelOne"}
+                            }
+                        },
+                    }
+                },
+            }
+        },
     },
     "components": {
         "schemas": {
@@ -116,3 +137,5 @@ def test_path_operations():
     assert response.status_code == 200, response.text
     response = client.get("/valid3")
     assert response.status_code == 200, response.text
+    response = client.get("/valid4")
+    assert response.status_code == 200, response.text
