fix

schema_validator/core.py

@@ -113,15 +113,16 @@ def init_app(self, app) -> None:
                 IS_FLASK = True
             else:
                 IS_FLASK = False
-        except ModuleNotFoundError:
+        except BaseException:
             IS_FLASK = False
 
         if self.openapi_path is not None and app.config.get("SWAGGER_ROUTE"):
             if IS_FLASK:
                 from .flask import openapi, swagger_ui
                 app_name = "FLASK"
             else:
-                from .quart import openapi, swagger_ui
+                from .quart import openapi, swagger_ui, convert_model_result
+                app.make_response = convert_model_result(app.make_response)
                 app_name = "QUART"
 
             logger.info(f"start validator by {app_name}")

schema_validator/flask/api.py

@@ -16,6 +16,6 @@ def swagger_ui(validator, tag: Optional[str] = None) -> str:
         SWAGGER_TEMPLATE,
         title=validator.title,
         openapi_path=path,
-        swagger_js_url=current_app.config["FLASK_SCHEMA_SWAGGER_JS_URL"],
-        swagger_css_url=current_app.config["FLASK_SCHEMA_SWAGGER_CSS_URL"],
+        swagger_js_url=current_app.config["SCHEMA_SWAGGER_JS_URL"],
+        swagger_css_url=current_app.config["SCHEMA_SWAGGER_CSS_URL"],
     )

schema_validator/quart/api.py

@@ -1,10 +1,38 @@
-from typing import Optional
+import inspect
+
+from typing import Optional, Callable
+from functools import wraps
+from dataclasses import is_dataclass, asdict
+from pydantic import BaseModel
 
 from quart import current_app, render_template_string
 
 from schema_validator.constants import SWAGGER_TEMPLATE
 
 
+def convert_model_result(func: Callable) -> Callable:
+    @wraps(func)
+    async def decorator(result):
+        status_or_headers = None
+        headers = None
+        if isinstance(result, tuple):
+            value, status_or_headers, headers = result + (None,) * (3 - len(result))
+        else:
+            value = result
+
+        if is_dataclass(value):
+            dict_or_value = asdict(value)
+        elif isinstance(value, BaseModel):
+            dict_or_value = value.dict()
+        elif inspect.iscoroutine(value):
+            dict_or_value = await value
+        else:
+            dict_or_value = value
+        return await func((dict_or_value, status_or_headers, headers))
+
+    return decorator
+
+
 async def openapi(validator, tag: Optional[str] = None) -> dict:
     from ..core import _build_openapi_schema
     return _build_openapi_schema(current_app, validator, tag)
@@ -16,6 +44,6 @@ async def swagger_ui(validator, tag: Optional[str] = None) -> str:
         SWAGGER_TEMPLATE,
         title=validator.title,
         openapi_path=path,
-        swagger_js_url=current_app.config["FLASK_SCHEMA_SWAGGER_JS_URL"],
-        swagger_css_url=current_app.config["FLASK_SCHEMA_SWAGGER_CSS_URL"],
+        swagger_js_url=current_app.config["SCHEMA_SWAGGER_JS_URL"],
+        swagger_css_url=current_app.config["SCHEMA_SWAGGER_CSS_URL"],
     )