Spaces:
Running
Running
File size: 1,888 Bytes
bd26047 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | diff --git a/fastapi/dependencies/utils.py b/fastapi/dependencies/utils.py
index 8d303016..2c5754a7 100644
--- a/fastapi/dependencies/utils.py
+++ b/fastapi/dependencies/utils.py
@@ -1217,15 +1217,18 @@ def _get_param_aliases(
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)
+ if isinstance(field.field_info, params.Path) or isinstance(
+ validation_alias, AliasPath
):
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]
+ aliases = [(alias, request_alias)]
+ if isinstance(validation_alias, AliasChoices):
+ if any(isinstance(choice, AliasPath) for choice in validation_alias.choices):
+ return aliases
+ # Explicit choices are literal names, including underscores in headers.
+ aliases = [
+ (choice, choice) for choice in cast(list[str], validation_alias.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)
@@ -1235,6 +1238,6 @@ def _get_param_aliases(
request_name = request_name.replace("_", "-")
if config.get("validate_by_alias") is False:
return [(field.name, request_name)]
- if field.name not in choices:
+ if field.name not in [alias for alias, _ in aliases]:
aliases.append((field.name, request_name))
return aliases
|