Merge pull request #4 from dotX12/dev-1.0

Big update 1.0.0.0!

Author: dotX12

examples/main.py

@@ -1,13 +1,12 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, Header
 from fastapi import File
 from fastapi import UploadFile
 
-from examples.models import PostContractBodySchema
+from examples.models import PostContractBodySchema, ExampleSchemaForHeader
 from examples.models import PostContractJSONSchema
 from examples.models import PostContractSmallDoubleBodySchema
 from examples.models import PostContractSmallDoubleQuerySchema
-from pyfa_converter import FormBody
-from pyfa_converter.depends import QueryBody
+from pyfa_converter.depends import QueryDepends, FormDepends, PyFaDepends
 
 app = FastAPI()
 
@@ -22,25 +21,28 @@ async def example_json_body_handler(
     }
 
 
+#
+
+
 @app.post("/form-data-body")
 async def example_foo_body_handler(
-    data: PostContractBodySchema = FormBody(PostContractBodySchema),
+    data: PostContractBodySchema = FormDepends(PostContractBodySchema),
     document: UploadFile = File(...),
 ):
     return {"title": data.title, "date": data.date, "file_name": document.filename}
 
 
 @app.post("/form-data-body-two")
 async def example_foo_body_handler(
-    data: PostContractBodySchema = FormBody(PostContractBodySchema),
+    data: PostContractBodySchema = FormDepends(PostContractBodySchema),
     document: UploadFile = File(...),
 ):
     return {"title": data.title, "date": data.date, "file_name": document.filename}
 
 
 @app.post("/test")
 async def foo(
-    data: PostContractSmallDoubleBodySchema = FormBody(
+    data: PostContractSmallDoubleBodySchema = FormDepends(
         PostContractSmallDoubleBodySchema
     ),
 ):
@@ -49,8 +51,18 @@ async def foo(
 
 @app.post("/test_query_list")
 async def test_list_form(
-    data: PostContractSmallDoubleQuerySchema = QueryBody(
+    data: PostContractSmallDoubleQuerySchema = QueryDepends(
         PostContractSmallDoubleQuerySchema
     ),
 ):
     return {"data": data}
+
+
+@app.post("/test_header_list")
+async def test_list_form(
+    data: ExampleSchemaForHeader = PyFaDepends(
+        model=ExampleSchemaForHeader, _type=Header
+    ),
+):
+    print(data.strange_header)
+    return {"data": data}

examples/models.py

@@ -7,8 +7,6 @@
 from pydantic import Field
 from pydantic import validator
 
-from pyfa_converter import PydanticConverter
-
 
 class PostContractJSONSchema(BaseModel):
     title: str = Field(..., description="Description title")
@@ -30,25 +28,28 @@ class PostContractSmallJSONSchema(BaseModel):
     )
 
 
-@PydanticConverter.body
 class PostContractBodySchema(PostContractJSONSchema):
     pass
 
 
-@PydanticConverter.body
 class PostContractSmallBodySchema(PostContractSmallJSONSchema):
     pass
 
 
-@PydanticConverter.body
 class PostContractSmallDoubleBodySchema(BaseModel):
     id: Optional[int] = Field(None, description="gwa")
     title: Optional[str] = Field(None)
     data: Optional[List[int]]
 
 
-@PydanticConverter.query
 class PostContractSmallDoubleQuerySchema(BaseModel):
     id: Optional[int] = Field(None, description="gwa")
     title: Optional[str] = Field(None)
     data: Optional[List[int]] = Field(default=[1, 2, 3])
+
+
+class ExampleSchemaForHeader(BaseModel):
+    strange_header: Optional[str] = Field(None, convert_underscores=True)
+    query: str = Field(...)
+    form: str = Field(...)
+    body: str = Field(...)

poetry.lock

@@ -1,8 +1,8 @@
-from .utils import PydanticConverter
-from .depends import FormBody, QueryBody
+from .main import PydanticConverter
+from .depends import FormDepends, QueryDepends
 
 __all__ = (
     "PydanticConverter",
-    "FormBody",
-    "QueryBody",
+    "FormDepends",
+    "QueryDepends",
 )

pyfa_converter/__init__.py

@@ -1,15 +1,49 @@
+from typing import Callable
 from typing import Type
-from fastapi import Depends
+from fastapi import Form, Query, Body, Depends
 from pydantic import BaseModel
+from pydantic.fields import FieldInfo
 
 from pyfa_converter import PydanticConverter
 
 
-class FormBody:
+class PyFaDepends:
+    def __new__(
+        cls,
+        model: Type[BaseModel | PydanticConverter],
+        _type: Callable[..., FieldInfo],
+    ):
+        return cls.generate(model=model, _type=_type)
+
+    @classmethod
+    def generate(
+        cls,
+        model: Type[BaseModel | PydanticConverter],
+        _type: Callable[..., FieldInfo],
+    ):
+        obj = PydanticConverter.reformat_model_signature(
+            model_cls=model, _type=_type
+        )
+        attr = getattr(obj, str(_type.__name__).lower())
+        return Depends(attr)
+
+
+class BodyDepends(PyFaDepends):
+    _TYPE = Body
+
     def __new__(cls, model_type: Type[BaseModel | PydanticConverter]):
-        return Depends(model_type.body)
+        return super().generate(model=model_type, _type=cls._TYPE)
+
+
+class FormDepends(PyFaDepends):
+    _TYPE = Form
+
+    def __new__(cls, model_type: Type[BaseModel | PydanticConverter]):
+        return super().generate(model=model_type, _type=cls._TYPE)
+
 
+class QueryDepends(PyFaDepends):
+    _TYPE = Query
 
-class QueryBody:
     def __new__(cls, model_type: Type[BaseModel | PydanticConverter]):
-        return Depends(model_type.query)
+        return super().generate(model=model_type, _type=cls._TYPE)