fastapi 0.156.2__tar.gz → 0.156.3__tar.gz

{fastapi-0.156.2 → fastapi-0.156.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi
-Version: 0.156.2
+Version: 0.156.3
 Summary: FastAPI framework, high performance, easy to learn, fast to code, ready for production
 Author-Email: Sebastián Ramírez <tiangolo@gmail.com>
 License-Expression: MIT

{fastapi-0.156.2 → fastapi-0.156.3}/fastapi/__init__.py

@@ -1,6 +1,6 @@
 """FastAPI framework, high performance, easy to learn, fast to code, ready for production"""
 
-__version__ = "0.156.2"
+__version__ = "0.156.3"
 
 from starlette import status as status
 

{fastapi-0.156.2 → fastapi-0.156.3}/fastapi/_compat/v2.py

@@ -259,20 +259,22 @@ def get_schema_from_model_field(
         tuple[ModelField, Literal["validation", "serialization"]], JsonSchemaValue
     ],
     separate_input_output_schemas: bool = True,
+    field_alias: str | None = None,
 ) -> dict[str, Any]:
     override_mode: Literal["validation"] | None = (
         None
         if (separate_input_output_schemas or _has_computed_fields(field))
         else "validation"
     )
-    field_alias = (
-        (field.validation_alias or field.alias)
-        if field.mode == "validation"
-        else (field.serialization_alias or field.alias)
-    )
+    if field_alias is None:
+        field_alias = (
+            (field.validation_alias or field.alias)
+            if field.mode == "validation"
+            else (field.serialization_alias or field.alias)
+        )
 
     # This expects that GenerateJsonSchema was already used to generate the definitions
-    json_schema = field_mapping[(field, override_mode or field.mode)]
+    json_schema = field_mapping[(field, override_mode or field.mode)].copy()
     if "$ref" not in json_schema:
         # TODO remove when deprecating Pydantic v1
         # Ref: https://github.com/pydantic/pydantic/blob/d61792cc42c80b13b23e3ffa74bc37ec7c77f7d1/pydantic/schema.py#L207

{fastapi-0.156.2 → fastapi-0.156.3}/fastapi/dependencies/utils.py

@@ -769,9 +769,8 @@ def _is_empty_file_input(value: Any) -> bool:
 
 
 def _get_multidict_value(
-    field: ModelField, values: Mapping[str, Any], alias: str | None = None
+    field: ModelField, values: Mapping[str, Any], alias: str
 ) -> Any:
-    alias = alias or get_validation_alias(field)
     if (
         (not _is_json_field(field))
         and field_annotation_is_sequence(field.field_info.annotation)
@@ -831,26 +830,28 @@ def request_params_to_args(
     processed_keys = set()
 
     for field in fields_to_extract:
-        alias = None
-        if isinstance(received_params, Headers):
-            # Handle fields extracted from a Pydantic Model for a header, each field
-            # doesn't have a FieldInfo of type Header with the default convert_underscores=True
-            convert_underscores = getattr(
-                field.field_info, "convert_underscores", default_convert_underscores
-            )
-            if convert_underscores:
-                alias = get_validation_alias(field)
-                if alias == field.name:
-                    alias = alias.replace("_", "-")
-                    header_aliases[field.name] = alias
-        value = _get_multidict_value(field, received_params, alias=alias)
+        convert_underscores = isinstance(received_params, Headers) and getattr(
+            field.field_info, "convert_underscores", default_convert_underscores
+        )
+        aliases = _get_param_aliases(field, convert_underscores=convert_underscores)
+        alias, request_alias = next(
+            (pair for pair in aliases if pair[1] in received_params), aliases[0]
+        )
+        # Only reshape the selected alias. Unused choices can be extra fields
+        # or aliases used by other fields with different types.
+        value = _get_multidict_value(field, received_params, alias=request_alias)
         if value is not Undefined:
-            params_to_process[get_validation_alias(field)] = value
-        processed_keys.add(alias or get_validation_alias(field))
-        # For headers with convert_underscores=True, mark both the converted
-        # header name and the original field alias as processed to avoid
-        # accepting the original alias as an extra header.
-        processed_keys.add(get_validation_alias(field))
+            params_to_process[alias] = value
+        if isinstance(received_params, Headers):
+            processed_keys.add(request_alias.lower())
+            for validation_alias, header_alias in aliases:
+                if validation_alias != header_alias:
+                    # Do not accept an unconverted field name as an extra header.
+                    processed_keys.add(validation_alias.lower())
+            if alias != request_alias:
+                header_aliases[field.name] = request_alias
+        else:
+            processed_keys.add(request_alias)
 
     for key in received_params.keys():
         if key not in processed_keys:
@@ -887,12 +888,16 @@ def request_params_to_args(
         return {first_field.name: v_}, errors_
 
     for field in fields:
-        value = _get_multidict_value(field, received_params)
+        aliases = _get_param_aliases(field)
+        _, alias = next(
+            (pair for pair in aliases if pair[1] in received_params), aliases[0]
+        )
+        value = _get_multidict_value(field, received_params, alias=alias)
         field_info = field.field_info
         assert isinstance(field_info, params.Param), (
             "Params must be subclasses of Param"
         )
-        loc = (field_info.in_.value, get_validation_alias(field))
+        loc = (field_info.in_.value, alias)
         v_, errors_ = _validate_value_with_model_field(
             field=field, value=value, values=values, loc=loc
         )
@@ -1185,3 +1190,35 @@ def _get_body_field(
 def get_validation_alias(field: ModelField) -> str:
     va = getattr(field, "validation_alias", None)
     return va or field.alias
+
+
+def _get_param_aliases(
+    field: ModelField, *, convert_underscores: bool = False
+) -> list[tuple[str, str]]:
+    """Return (validation alias, request key) pairs in preference order."""
+    alias = get_validation_alias(field)
+    request_alias = alias
+    if convert_underscores and alias == field.name:
+        request_alias = alias.replace("_", "-")
+    validation_alias = field.field_info.validation_alias
+    if (
+        isinstance(field.field_info, params.Path)
+        or not isinstance(validation_alias, AliasChoices)
+        or any(isinstance(alias, AliasPath) for alias in validation_alias.choices)
+    ):
+        return [(alias, request_alias)]
+    choices = cast(list[str], validation_alias.choices)
+    # Explicit choices are literal names, including underscores in headers.
+    aliases = [(choice, choice) for choice in choices]
+    config = field.config or {}
+    if config.get("validate_by_alias") is False or config.get(
+        "validate_by_name", config.get("populate_by_name", False)
+    ):
+        request_name = field.name
+        if convert_underscores:
+            request_name = request_name.replace("_", "-")
+        if config.get("validate_by_alias") is False:
+            return [(field.name, request_name)]
+        if field.name not in choices:
+            aliases.append((field.name, request_name))
+    return aliases

{fastapi-0.156.2 → fastapi-0.156.3}/fastapi/openapi/utils.py

@@ -26,8 +26,8 @@ from fastapi.dependencies.models import (
 )
 from fastapi.dependencies.utils import (
     _get_flat_fields_from_params,
+    _get_param_aliases,
     get_flat_params,
-    get_validation_alias,
 )
 from fastapi.encoders import jsonable_encoder
 from fastapi.exceptions import FastAPIDeprecationWarning
@@ -189,24 +189,19 @@ def _get_openapi_operation_parameters(
             # field_info = cast(Param, field_info)
             if not getattr(field_info, "include_in_schema", True):
                 continue
+            convert_underscores = param_type == ParamTypes.header and getattr(
+                field_info, "convert_underscores", default_convert_underscores
+            )
+            alias, name = _get_param_aliases(
+                param, convert_underscores=convert_underscores
+            )[0]
             param_schema = get_schema_from_model_field(
                 field=param,
                 model_name_map=model_name_map,
                 field_mapping=field_mapping,
                 separate_input_output_schemas=separate_input_output_schemas,
+                field_alias=alias,
             )
-            name = get_validation_alias(param)
-            convert_underscores = getattr(
-                param.field_info,
-                "convert_underscores",
-                default_convert_underscores,
-            )
-            if (
-                param_type == ParamTypes.header
-                and name == param.name
-                and convert_underscores
-            ):
-                name = param.name.replace("_", "-")
 
             parameter = {
                 "name": name,

{fastapi-0.156.2 → fastapi-0.156.3}/pyproject.toml

@@ -53,7 +53,7 @@ dependencies = [
     "annotated-doc>=0.0.2",
     "opentelemetry-api>=1.44.0",
 ]
-version = "0.156.2"
+version = "0.156.3"
 
 [project.urls]
 Homepage = "https://github.com/fastapi/fastapi"