Merge pull request #967 from python-openapi/dependabot/pip/falcon-4.0.2

Bump falcon from 3.1.3 to 4.0.2

Author: p1c2u

docs/integrations/falcon.md

@@ -3,6 +3,10 @@
 This section describes the integration with the [Falcon](https://falconframework.org) web framework.
 The integration supports Falcon version 3.0 and above.
 
+!!! warning
+
+    This integration does not support multipart form body requests.
+
 ## Middleware
 
 The Falcon API can be integrated using the `FalconOpenAPIMiddleware` middleware.

openapi_core/contrib/falcon/requests.py

@@ -66,9 +66,7 @@ def body(self) -> Optional[bytes]:
             self.request.content_type, self.request.options.default_media_type
         )
         try:
-            body = handler.serialize(
-                media, content_type=self.request.content_type
-            )
+            body = handler.serialize(media, content_type=self.content_type)
         # multipart form serialization is not supported
         except NotImplementedError:
             warnings.warn(

openapi_core/contrib/falcon/responses.py

@@ -1,6 +1,8 @@
 """OpenAPI core contrib falcon responses module"""
 
+from io import BytesIO
 from itertools import tee
+from typing import Iterable
 
 from falcon.response import Response
 from werkzeug.datastructures import Headers
@@ -17,16 +19,22 @@ def data(self) -> bytes:
         if self.response.text is None:
             if self.response.stream is None:
                 return b""
-            resp_iter1, resp_iter2 = tee(self.response.stream)
-            self.response.stream = resp_iter1
-            content = b"".join(resp_iter2)
-            return content
+            if isinstance(self.response.stream, Iterable):
+                resp_iter1, resp_iter2 = tee(self.response.stream)
+                self.response.stream = resp_iter1
+                content = b"".join(resp_iter2)
+                return content
+            # checks ReadableIO protocol
+            if hasattr(self.response.stream, "read"):
+                data = self.response.stream.read()
+                self.response.stream = BytesIO(data)
+                return data
         assert isinstance(self.response.text, str)
         return self.response.text.encode("utf-8")
 
     @property
     def status_code(self) -> int:
-        return int(self.response.status[:3])
+        return self.response.status_code
 
     @property
     def content_type(self) -> str:

openapi_core/contrib/falcon/util.py

@@ -1,11 +1,11 @@
 from typing import Any
-from typing import Dict
 from typing import Generator
+from typing import Mapping
 from typing import Tuple
 
 
 def unpack_params(
-    params: Dict[str, Any]
+    params: Mapping[str, Any]
 ) -> Generator[Tuple[str, Any], None, None]:
     for k, v in params.items():
         if isinstance(v, list):

poetry.lock

@@ -184,7 +184,7 @@ def test_post_media_type_invalid(self, client):
                     "title": (
                         "Content for the following mimetype not found: "
                         "text/html. "
-                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'text/plain']"
+                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain']"
                     ),
                 }
             ]

tests/integration/contrib/django/test_django_project.py

@@ -2,6 +2,7 @@
 from json import dumps
 
 import pytest
+from urllib3 import encode_multipart_formdata
 
 
 class BaseTestFalconProject:
@@ -204,7 +205,7 @@ def test_post_media_type_invalid(self, client):
                     "title": (
                         "Content for the following mimetype not found: "
                         f"{content_type}. "
-                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'text/plain']"
+                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain']"
                     ),
                 }
             ]
@@ -292,6 +293,43 @@ def test_post_valid(self, client, data_json):
         assert response.status_code == 201
         assert not response.content
 
+    @pytest.mark.xfail(
+        reason="falcon multipart form serialization unsupported",
+        strict=True,
+    )
+    def test_post_multipart_valid(self, client, data_gif):
+        cookies = {"user": 1}
+        auth = "authuser"
+        fields = {
+            "name": "Cat",
+            "address": (
+                "aaddress.json",
+                dumps(dict(city="Warsaw")),
+                "application/json",
+            ),
+            "photo": (
+                "photo.jpg",
+                data_gif,
+                "image/jpeg",
+            ),
+        }
+        body, content_type_header = encode_multipart_formdata(fields)
+        headers = {
+            "Authorization": f"Basic {auth}",
+            "Content-Type": content_type_header,
+        }
+
+        response = client.simulate_post(
+            "/v1/pets",
+            host="staging.gigantic-server.com",
+            headers=headers,
+            body=body,
+            cookies=cookies,
+            protocol="https",
+        )
+
+        assert response.status_code == 200
+
 
 class TestPetDetailResource:
     def test_get_server_invalid(self, client):

tests/integration/contrib/falcon/test_falcon_project.py

@@ -183,7 +183,7 @@ def test_post_media_type_invalid(self, client):
                     "title": (
                         "Content for the following mimetype not found: "
                         "text/html. "
-                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'text/plain']"
+                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain']"
                     ),
                 }
             ]

tests/integration/contrib/fastapi/test_fastapi_project.py

@@ -183,7 +183,7 @@ def test_post_media_type_invalid(self, client):
                     "title": (
                         "Content for the following mimetype not found: "
                         "text/html. "
-                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'text/plain']"
+                        "Valid mimetypes: ['application/json', 'application/x-www-form-urlencoded', 'multipart/form-data', 'text/plain']"
                     ),
                 }
             ]

tests/integration/contrib/starlette/test_starlette_project.py

@@ -150,6 +150,9 @@ paths:
           application/x-www-form-urlencoded:
             schema:
               $ref: '#/components/schemas/PetCreate'
+          multipart/form-data:
+            schema:
+              $ref: '#/components/schemas/PetWithPhotoCreate'
           text/plain: {}
       responses:
         '201':
@@ -375,6 +378,16 @@ components:
       oneOf:
         - $ref: "#/components/schemas/Cat"
         - $ref: "#/components/schemas/Bird"
+    PetWithPhotoCreate:
+      type: object
+      x-model: PetWithPhotoCreate
+      allOf:
+        - $ref: "#/components/schemas/PetCreatePartOne"
+        - $ref: "#/components/schemas/PetCreatePartTwo"
+        - $ref: "#/components/schemas/PetCreatePartPhoto"
+      oneOf:
+        - $ref: "#/components/schemas/Cat"
+        - $ref: "#/components/schemas/Bird"
     PetCreatePartOne:
       type: object
       x-model: PetCreatePartOne
@@ -395,6 +408,15 @@ components:
           $ref: "#/components/schemas/Position"
         healthy:
           type: boolean
+    PetCreatePartPhoto:
+      type: object
+      x-model: PetCreatePartPhoto
+      properties:
+        photo:
+          $ref: "#/components/schemas/PetPhoto"
+    PetPhoto:
+      type: string
+      format: binary
     Bird:
       type: object
       x-model: Bird

tests/integration/data/v3.0/petstore.yaml

@@ -201,6 +201,7 @@ def test_invalid_content_type(self, request_unmarshaller):
             availableMimetypes=[
                 "application/json",
                 "application/x-www-form-urlencoded",
+                "multipart/form-data",
                 "text/plain",
             ],
         )

tests/integration/unmarshalling/test_request_unmarshaller.py

@@ -106,6 +106,7 @@ def test_media_type_not_found(self, request_validator):
             availableMimetypes=[
                 "application/json",
                 "application/x-www-form-urlencoded",
+                "multipart/form-data",
                 "text/plain",
             ],
         )