fix tests

Author: jakeane

flask_pydantic_spec/types.py

@@ -1,5 +1,5 @@
 import re
-from typing import Optional, Type, Iterable, Mapping, Any, Dict, List
+from typing import Optional, Type, Iterable, Mapping, Any, Dict, List, NamedTuple
 
 from pydantic.v1 import BaseModel
 
@@ -47,11 +47,23 @@ def __init__(self, *args: Any, **kwargs: Any):
             else:
                 assert key in DEFAULT_CODE_DESC, "invalid HTTP status code"
                 if value:
-                    assert issubclass(value, BaseModel), "invalid `pydantic.BaseModel`"
-                    self.code_models[key] = value
+                    if self.is_list_type(value):
+                        assert issubclass(
+                            value.__args__[0], BaseModel
+                        ), "invalid `pydantic.BaseModel`"
+                        self.code_models[key] = value.__args__[0]
+                    else:
+                        assert issubclass(
+                            value, BaseModel
+                        ), "invalid `pydantic.BaseModel`"
+                        self.code_models[key] = value
                 else:
                     self.codes.append(key)
 
+    @staticmethod
+    def is_list_type(value: Any) -> bool:
+        return hasattr(value, "__origin__") and value.__origin__ is list
+
     def has_model(self) -> bool:
         """
         :returns: boolean -- does this response has models or not

flask_pydantic_spec/utils.py

@@ -50,10 +50,15 @@ def parse_request(func: Callable) -> Mapping[str, Any]:
         request_body = getattr(func, "body")
         if isinstance(request_body, RequestBase):
             result: Mapping[str, Any] = request_body.generate_spec()
-        elif issubclass(request_body, BaseModel):
-            result = Request(request_body).generate_spec()
         else:
-            result = {}
+            try:
+                if issubclass(request_body, BaseModel):
+                    result = Request(request_body).generate_spec()
+                else:
+                    result = {}
+            except TypeError:
+                # request_body is not a class (e.g., generic type)
+                result = {}
         return result
     return {}
 

requirements/development.txt

@@ -1,9 +1,8 @@
 -r production.txt
-openapi-spec-validator>=0.2.9, <0.3
-pytest==7.1.2
-flake8==7.3.0
-flask==2.2.5
-werkzeug==2.2.3
-requests==2.31.0
-black==24.4.2
-mypy==1.17.1
+openapi-spec-validator == 0.7.1
+pytest>=8.3.5, <9
+flake8 == 7.1.1
+flask>=2.0.2, <3
+requests>=2.24.0, <3
+black>=20.8b1
+mypy==1.10.0

tests/test_spec.py

@@ -4,8 +4,8 @@
 import pytest
 from flask import Flask
 from typing import List
-from openapi_spec_validator import validate_v3_spec
-from pydantic.v1 import BaseModel, Field, StrictFloat
+from openapi_spec_validator import OpenAPIV30SpecValidator
+from pydantic.v1 import BaseModel, StrictFloat, Field
 
 from flask_pydantic_spec import Response
 from flask_pydantic_spec.flask_backend import FlaskBackend
@@ -94,49 +94,57 @@ def test_spec_generate(name, app):
 def create_app():
     app = Flask(__name__)
 
-    @app.route("/foo")
-    @api.validate()
+    @app.get("/foo")
+    @api.validate(resp=Response(HTTP_200=ExampleModel))
     def foo():
         pass
 
-    @app.route("/bar")
-    @api_strict.validate()
+    @app.get("/bar")
+    @api_strict.validate(resp=Response(HTTP_200=ExampleModel))
     def bar():
         pass
 
-    @app.route("/lone", methods=["GET"])
+    @app.get("/lone")
+    @api.validate(
+        resp=Response(HTTP_200=ExampleNestedList, HTTP_400=ExampleNestedModel),
+        tags=["lone"],
+    )
     def lone_get():
         pass
 
-    @app.route("/lone", methods=["POST"])
+    @app.post("/lone")
     @api.validate(
         body=Request(ExampleModel),
-        resp=Response(HTTP_200=ExampleNestedList, HTTP_400=ExampleNestedModel),
+        resp=Response(HTTP_200=List[ExampleModel], HTTP_400=ExampleNestedModel),
         tags=["lone"],
         deprecated=True,
     )
     def lone_post():
         pass
 
-    @app.route("/query", methods=["GET"])
-    @api.validate(query=ExampleQuery)
+    @app.get("/query")
+    @api.validate(
+        query=ExampleQuery,
+        resp=Response(HTTP_200=List[ExampleModel]),
+        tags=["alpha"],
+    )
     def get_query():
         pass
 
-    @app.route("/file")
+    @app.get("/file")
     @api.validate(resp=FileResponse())
     def get_file():
         pass
 
-    @app.route("/file", methods=["POST"])
+    @app.post("/file")
     @api.validate(
         body=Request(content_type="application/octet-stream"),
-        resp=Response(HTTP_200=None),
+        resp=FileResponse(),
     )
     def post_file():
         pass
 
-    @app.route("/multipart-file", methods=["POST"])
+    @app.post("/multipart-file")
     @api.validate(
         body=MultipartFormRequest(ExampleModel), resp=Response(HTTP_200=ExampleModel)
     )
@@ -197,7 +205,8 @@ def test_valid_openapi_spec():
     app = create_app()
     api.register(app)
     spec = api.spec
-    validate_v3_spec(spec)
+    OpenAPIV30SpecValidator(spec).validate()
+    assert OpenAPIV30SpecValidator(spec).is_valid()
 
 
 def test_openapi_tags():