fixed bug: resolved issues in single file upload

Author: eadwinCode

ellar/common/params/args/request_model.py

@@ -106,9 +106,6 @@ def build_body_field(self) -> None:
             and len(body_resolvers) == 1
             and not (
                 body_resolvers[0].model_field.field_info.embed  # type: ignore[attr-defined]
-                and isinstance(
-                    body_resolvers[0].model_field.field_info, params.BodyFieldInfo
-                )
             )
         ):
             check_file_field(body_resolvers[0].model_field)

tests/test_routing/document_results.py

@@ -10,9 +10,12 @@
                     "content": {
                         "multipart/form-data": {
                             "schema": {
-                                "title": "Test",
-                                "type": "string",
-                                "format": "binary",
+                                "title": "Body",
+                                "allOf": [
+                                    {
+                                        "$ref": "#/components/schemas/body_form_upload_single_case_1__post"
+                                    }
+                                ],
                                 "include_in_schema": True,
                             }
                         }
@@ -174,14 +177,12 @@
                     "content": {
                         "multipart/form-data": {
                             "schema": {
-                                "title": "Test1",
-                                "type": "array",
-                                "items": {
-                                    "anyOf": [
-                                        {"type": "string", "format": "binary"},
-                                        {"type": "string"},
-                                    ]
-                                },
+                                "title": "Body",
+                                "allOf": [
+                                    {
+                                        "$ref": "#/components/schemas/body_form_upload_multiple_case_1_multiple_post"
+                                    }
+                                ],
                                 "include_in_schema": True,
                             }
                         }
@@ -276,6 +277,24 @@
                     },
                 },
             },
+            "body_form_upload_multiple_case_1_multiple_post": {
+                "title": "body_form_upload_multiple_case_1_multiple_post",
+                "required": ["test1"],
+                "type": "object",
+                "properties": {
+                    "test1": {
+                        "title": "Test1",
+                        "type": "array",
+                        "items": {
+                            "anyOf": [
+                                {"type": "string", "format": "binary"},
+                                {"type": "string"},
+                            ]
+                        },
+                        "include_in_schema": True,
+                    }
+                },
+            },
             "body_form_upload_multiple_case_2_mixed_optional_post": {
                 "title": "body_form_upload_multiple_case_2_mixed_optional_post",
                 "type": "object",
@@ -299,6 +318,19 @@
                     },
                 },
             },
+            "body_form_upload_single_case_1__post": {
+                "title": "body_form_upload_single_case_1__post",
+                "required": ["test"],
+                "type": "object",
+                "properties": {
+                    "test": {
+                        "title": "Test",
+                        "type": "string",
+                        "format": "binary",
+                        "include_in_schema": True,
+                    }
+                },
+            },
             "body_form_upload_single_case_2_mixed_post": {
                 "title": "body_form_upload_single_case_2_mixed_post",
                 "required": ["test_alias", "test2"],

tests/test_routing/test_form_schema.py

@@ -93,15 +93,44 @@ def test_schema():
     params = document["paths"]["/form-schema"]["post"]["requestBody"]
     assert params == {
         "content": {
-            "application/x-www-form-urlencoded": {
+            "application/form-data": {
                 "schema": {
-                    "allOf": [{"$ref": "#/components/schemas/Filter"}],
+                    "allOf": [
+                        {
+                            "$ref": "#/components/schemas/body_form_params_schema_form_schema_post"
+                        }
+                    ],
                     "include_in_schema": True,
-                    "title": "Will Not Work For Schema With Many Field",
+                    "title": "Body",
                 }
             }
+        }
+    }
+    schema = document["components"]["schemas"][
+        "body_form_params_schema_form_schema_post"
+    ]
+    assert schema == {
+        "title": "body_form_params_schema_form_schema_post",
+        "type": "object",
+        "properties": {
+            "to": {
+                "title": "To",
+                "type": "string",
+                "format": "date-time",
+                "include_in_schema": True,
+            },
+            "from": {
+                "title": "From",
+                "type": "string",
+                "format": "date-time",
+                "include_in_schema": True,
+            },
+            "range": {
+                "allOf": [{"$ref": "#/components/schemas/Range"}],
+                "default": 20,
+                "include_in_schema": True,
+            },
         },
-        "required": True,
     }