Fixed multipart for aiohttp and binary response for falcon

Author: mr-fatalyst

fastopenapi/routers/aiohttp/extractors.py

@@ -5,6 +5,8 @@
 from fastopenapi.core.types import FileUpload
 from fastopenapi.routers.extractors import BaseAsyncRequestDataExtractor
 
+_MULTIPART_CACHE_ATTR = "_fastopenapi_multipart_cache"
+
 
 class AioHttpRequestDataExtractor(BaseAsyncRequestDataExtractor):
     @classmethod
@@ -43,57 +45,73 @@ async def _get_body(cls, request: Any) -> dict | list | None:
         except Exception:
             return {}
 
+    @classmethod
+    async def _parse_multipart(
+        cls, request: Any
+    ) -> tuple[dict, dict[str, FileUpload | list[FileUpload]]]:
+        """Parse multipart stream once and cache the result on the request."""
+        cached = getattr(request, _MULTIPART_CACHE_ATTR, None)
+        if isinstance(cached, tuple):
+            return cached
+
+        form_data = {}
+        files: dict[str, FileUpload | list[FileUpload]] = {}
+
+        reader = await request.multipart()
+        async for part in reader:
+            if part.filename:
+                file_data = await part.read()
+                file_upload = FileUpload(
+                    filename=part.filename,
+                    content_type=part.headers.get("Content-Type"),
+                    size=len(file_data),
+                    file=file_data,
+                )
+                if part.name in files:
+                    existing = files[part.name]
+                    if isinstance(existing, list):
+                        existing.append(file_upload)
+                    else:
+                        files[part.name] = [existing, file_upload]
+                else:
+                    files[part.name] = file_upload
+            else:
+                form_data[part.name] = await part.text()
+
+        result = (form_data, files)
+        setattr(request, _MULTIPART_CACHE_ATTR, result)
+        return result
+
     @classmethod
     async def _get_form_data(cls, request: Any) -> dict:
         """Extract form data"""
-        form_data = {}
         content_type = request.content_type or ""
 
         if content_type == "application/x-www-form-urlencoded":
             post_data = await request.post()
+            form_data = {}
             for key in post_data:
                 values = (
                     post_data.getall(key)
                     if hasattr(post_data, "getall")
                     else [post_data[key]]
                 )
                 form_data[key] = values[0] if len(values) == 1 else values
+            return form_data
 
-        elif content_type == "multipart/form-data":
-            reader = await request.multipart()
-            async for part in reader:
-                if part.filename:
-                    continue  # Files handled separately
-                form_data[part.name] = await part.text()
+        if content_type == "multipart/form-data":
+            form_data, _ = await cls._parse_multipart(request)
+            return form_data
 
-        return form_data
+        return {}
 
     @classmethod
     async def _get_files(cls, request: Any) -> dict[str, FileUpload | list[FileUpload]]:
         """Extract files from AioHTTP request"""
-        files = {}
         content_type = request.content_type or ""
 
         if content_type == "multipart/form-data":
-            reader = await request.multipart()
-            async for part in reader:
-                if not part.filename:
-                    continue
-
-                file_data = await part.read()
-                file_upload = FileUpload(
-                    filename=part.filename,
-                    content_type=part.headers.get("Content-Type"),
-                    size=len(file_data),
-                    file=file_data,
-                )
-
-                if part.name in files:
-                    if isinstance(files[part.name], list):
-                        files[part.name].append(file_upload)
-                    else:
-                        files[part.name] = [files[part.name], file_upload]
-                else:
-                    files[part.name] = file_upload
+            _, files = await cls._parse_multipart(request)
+            return files
 
-        return files
+        return {}

fastopenapi/routers/falcon/async_router.py

@@ -26,15 +26,9 @@ async def handle(request, response, **path_params):
 
             # Falcon needs special handling
             if isinstance(result_response, Response):
-                response.status = result_response.status_code
-                response.media = result_response.content
-                for key, value in result_response.headers.items():
-                    response.set_header(key, value)
+                self._apply_falcon_response(result_response, response)
             elif isinstance(result_response, FalconResponse):  # pragma: no cover
-                response.status = result_response.status_code
-                response.media = result_response.media
-                for key, value in result_response.headers.items():
-                    response.set_header(key, value)
+                self._copy_falcon_response(result_response, response)
 
         setattr(resource, method_name, handle)
         return resource