:bug: Fix optional bodies raising an error

when not provided in the request

diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py
index ba1e5efee553251b706153a81fe57e512d19501a..575836c6af5794049648a44dfc56a101d8946418 100644 (file)
--- a/fastapi/dependencies/utils.py
+++ b/fastapi/dependencies/utils.py
@@ -3,10 +3,6 @@ import inspect
 from copy import deepcopy
 from typing import Any, Callable, Dict, List, Mapping, Sequence, Tuple, Type
 
-from fastapi import params
-from fastapi.dependencies.models import Dependant, SecurityRequirement
-from fastapi.security.base import SecurityBase
-from fastapi.utils import get_path_param_names
 from pydantic import BaseConfig, Schema, create_model
 from pydantic.error_wrappers import ErrorWrapper
 from pydantic.errors import MissingError
@@ -16,6 +12,11 @@ from pydantic.utils import lenient_issubclass
 from starlette.concurrency import run_in_threadpool
 from starlette.requests import Request
 
+from fastapi import params
+from fastapi.dependencies.models import Dependant, SecurityRequirement
+from fastapi.security.base import SecurityBase
+from fastapi.utils import get_path_param_names
+
 param_supported_types = (str, int, float, bool)
 
 
@@ -283,6 +284,8 @@ async def request_body_to_args(
         embed = getattr(field.schema, "embed", None)
         if len(required_params) == 1 and not embed:
             received_body = {field.alias: received_body}
+        elif received_body is None:
+            received_body = {}
         for field in required_params:
             value = received_body.get(field.alias)
             if value is None:

diff --git a/fastapi/routing.py b/fastapi/routing.py
index 80b8056aa17c551e36916d33aec85efd856cbbbc..25ca651a4adaf3eacdb96926f8d58e5cb824fe55 100644 (file)
--- a/fastapi/routing.py
+++ b/fastapi/routing.py
@@ -3,10 +3,6 @@ import inspect
 import logging
 from typing import Any, Callable, List, Optional, Type
 
-from fastapi import params
-from fastapi.dependencies.models import Dependant
-from fastapi.dependencies.utils import get_body_field, get_dependant, solve_dependencies
-from fastapi.encoders import jsonable_encoder
 from pydantic import BaseConfig, BaseModel, Schema
 from pydantic.error_wrappers import ErrorWrapper, ValidationError
 from pydantic.fields import Field
@@ -20,6 +16,11 @@ from starlette.responses import JSONResponse, Response
 from starlette.routing import get_name, request_response
 from starlette.status import HTTP_422_UNPROCESSABLE_ENTITY
 
+from fastapi import params
+from fastapi.dependencies.models import Dependant
+from fastapi.dependencies.utils import get_body_field, get_dependant, solve_dependencies
+from fastapi.encoders import jsonable_encoder
+
 
 def serialize_response(*, field: Field = None, response: Response) -> Any:
     if field:
@@ -51,7 +52,8 @@ def get_app(
         try:
             body = None
             if body_field:
-                if is_body_form:
+                body_bytes = await request.body()
+                if body_bytes and is_body_form:
                     raw_body = await request.form()
                     body = {}
                     for field, value in raw_body.items():
@@ -59,7 +61,7 @@ def get_app(
                             body[field] = await value.read()
                         else:
                             body[field] = value
-                else:
+                elif body_bytes:
                     body = await request.json()
         except Exception as e:
             logging.error("Error getting request body", e)