Draft refactoring. Optimization resolver and aiohttp router and extractor.

Author: mr-fatalyst

fastopenapi/resolution/resolver.py

@@ -48,15 +48,12 @@ class ParameterResolver:
     _signature_cache: dict[Callable, MappingProxyType] = {}
 
     @classmethod
-    def _get_signature(cls, endpoint) -> typing.ItemsView:
+    def _get_signature(cls, endpoint) -> MappingProxyType[str, inspect.Parameter]:
         """Get cached signature parameters for endpoint"""
-        cached_params = cls._signature_cache.get(endpoint)
-        if cached_params:
-            return cached_params.items()
-        else:
+        if endpoint not in cls._signature_cache:
             sig = inspect.signature(endpoint)
             cls._signature_cache[endpoint] = sig.parameters
-        return cls._signature_cache[endpoint].items()
+        return cls._signature_cache[endpoint]
 
     @classmethod
     def resolve(cls, endpoint: Callable, request_data: RequestData) -> dict[str, Any]:
@@ -95,18 +92,34 @@ def _resolve_dependencies(
 
     @classmethod
     def _process_parameters(
-        cls, params: typing.ItemsView, request_data: RequestData
+        cls,
+        params: MappingProxyType[str, inspect.Parameter],
+        request_data: RequestData,
     ) -> tuple[dict[str, Any], dict[str, tuple], dict[str, Any]]:
         """Process all endpoint parameters"""
         regular_kwargs = {}
         model_fields = {}
         model_values = {}
 
-        for name, param in params:
+        for name, param in params.items():
             # Skip dependency parameters - already resolved
             if isinstance(param.default, (Depends, Security)):
                 continue
 
+            # Handle Pydantic models separately (direct validation without wrapper)
+            if cls._is_pydantic_model(param.annotation):
+                source = cls._determine_source(name, param, request_data.path_params)
+                data = (
+                    request_data.body
+                    if source == ParameterSource.BODY
+                    else request_data.query_params
+                )
+                resolved_model = cls._resolve_pydantic_model(
+                    param.annotation, data, name
+                )
+                regular_kwargs[name] = resolved_model
+                continue  # Don't add to model_fields
+
             processed_param = cls._process_single_parameter(name, param, request_data)
 
             if processed_param.needs_validation:

fastopenapi/routers/aiohttp/async_router.py

@@ -2,6 +2,7 @@
 from collections.abc import Callable
 
 from aiohttp import web
+from pydantic_core import to_json
 
 from fastopenapi.core.types import Response
 from fastopenapi.openapi.ui import render_redoc_ui, render_swagger_ui
@@ -62,8 +63,14 @@ def build_framework_response(self, response: Response) -> web.Response:
             )
 
         # JSON content (dict, list, None)
-        return web.json_response(
-            response.content, status=response.status_code, headers=response.headers
+        body_bytes = to_json(response.content)
+        return web.Response(
+            body=body_bytes,
+            status=response.status_code,
+            headers={
+                **response.headers,
+                "Content-Type": content_type or "application/json",
+            },
         )
 
     def is_framework_response(self, response: Response | web.Response) -> bool:

fastopenapi/routers/aiohttp/extractors.py

@@ -1,5 +1,7 @@
 from typing import Any
 
+from pydantic_core import from_json
+
 from fastopenapi.core.types import FileUpload
 from fastopenapi.routers.extractors import BaseAsyncRequestDataExtractor
 
@@ -31,13 +33,15 @@ def _get_cookies(cls, request: Any) -> dict:
 
     @classmethod
     async def _get_body(cls, request: Any) -> dict | list | None:
+        """Extract JSON body"""
         try:
             body_bytes = await request.read()
             if body_bytes:
-                return await request.json()
+                return from_json(body_bytes)
+            else:
+                return {}
         except Exception:
-            pass
-        return {}
+            return {}
 
     @classmethod
     async def _get_form_data(cls, request: Any) -> dict:

tests/resolution/test_parameter_resolver.py

@@ -135,7 +135,7 @@ def dependency() -> str:
         }
 
         regular, model_fields, model_values = ParameterResolver._process_parameters(
-            params_dict.items(), request_data
+            params_dict, request_data
         )
 
         assert "dep" not in regular
@@ -153,7 +153,7 @@ def test_process_parameters_with_security(self, request_data: RequestData) -> No
         }
 
         regular, model_fields, model_values = ParameterResolver._process_parameters(
-            params_dict.items(), request_data
+            params_dict, request_data
         )
 
         assert "token" not in regular

tests/routers/aiohttp/test_aiohttp_extractor.py

@@ -114,7 +114,6 @@ async def test_get_body_json(self):
 
         assert result == {"key": "value"}
         request.read.assert_called_once()
-        request.json.assert_called_once()
 
     @pytest.mark.asyncio
     async def test_get_body_empty(self):