Merge pull request #1 from dotX12/dev

Fixes

Author: dotX12

examples/main.py

@@ -1,4 +1,4 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Depends
 from fastapi import File
 from fastapi import UploadFile
 
@@ -28,3 +28,15 @@ async def example_foo_body_handler(
         "date": data.date,
         "file_name": document.filename
     }
+
+
+@app.post("/form-data-body-two")
+async def example_foo_body_handler(
+    data: PostContractBodySchema = FormBody(),
+    document: UploadFile = File(...),
+):
+    return {
+        "title": data.title,
+        "date": data.date,
+        "file_name": document.filename
+    }

examples/models.py

@@ -22,6 +22,23 @@ def date_validator(cls, v: datetime):
         return v.date()
 
 
+class PostContractSmallJSONSchema(BaseModel):
+    title: str = Field(..., description="Description title")
+    date: Optional[datetime] = Field(
+        None, description="Example: 2021-12-14T09:56:31.056Z"
+    )
+
+
 @PydanticConverter.body
 class PostContractBodySchema(PostContractJSONSchema):
     pass
+
+
+@PydanticConverter.body
+class PostContractSmallBodySchema(PostContractSmallJSONSchema):
+    pass
+
+
+@PydanticConverter.body
+class PostContractSmallDoubleBodySchema(PostContractSmallJSONSchema):
+    pass

pyfa_converter/utils.py

@@ -19,7 +19,7 @@ def form(cls, field: ModelField) -> Body:
     @classmethod
     def __form(cls, model_field: ModelField, default: Any):
         return Form(
-            default=default,
+            default=default or None,
             alias=model_field.alias or None,
             title=model_field.field_info.title or None,
             description=model_field.field_info.description or None,
@@ -48,11 +48,12 @@ def body(cls, parent_cls: Type[BaseModel]):
                 )
             )
 
-        def as_form_func(**data):
-            return parent_cls(**data)
+        async def as_form_func(*args, **kwargs):
+            return parent_cls(*args, **kwargs)  # noqa
 
         sig = inspect.signature(as_form_func)
         sig = sig.replace(parameters=new_parameters)
         as_form_func.__signature__ = sig
         setattr(cls, 'body', as_form_func)
         return cls
+