Skip to content

Fix _consume_object_or_array on unbalanced brackets in JSON strings #621

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 20, 2025
Merged

Fix _consume_object_or_array on unbalanced brackets in JSON strings #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion pydantic_settings/sources/providers/cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,8 +450,13 @@ def _consume_comma(self, item: str, merged_list: list[str], is_last_consumed_a_v
def _consume_object_or_array(self, item: str, merged_list: list[str]) -> str:
count = 1
close_delim = '}' if item.startswith('{') else ']'
in_str = False
for consumed in range(1, len(item)):
if item[consumed] in ('{', '['):
if item[consumed] == '"' and item[consumed - 1] != '\\':
in_str = not in_str
elif in_str:
continue
elif item[consumed] in ('{', '['):
count += 1
elif item[consumed] in ('}', ']'):
count -= 1
Expand Down
34 changes: 34 additions & 0 deletions tests/test_source_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2452,6 +2452,40 @@ class Root(BaseModel):
)


def test_cli_with_unbalanced_brackets_in_json_string():
class StrToStrDictOptions(BaseSettings):
nested: dict[str, str]

assert CliApp.run(StrToStrDictOptions, cli_args=['--nested={"test": "{"}']).model_dump() == {
'nested': {'test': '{'}
}
assert CliApp.run(StrToStrDictOptions, cli_args=['--nested={"test": "}"}']).model_dump() == {
'nested': {'test': '}'}
}
assert CliApp.run(StrToStrDictOptions, cli_args=['--nested={"test": "["}']).model_dump() == {
'nested': {'test': '['}
}
assert CliApp.run(StrToStrDictOptions, cli_args=['--nested={"test": "]"}']).model_dump() == {
'nested': {'test': ']'}
}

class StrToListDictOptions(BaseSettings):
nested: dict[str, list[str]]

assert CliApp.run(StrToListDictOptions, cli_args=['--nested={"test": ["{"]}']).model_dump() == {
'nested': {'test': ['{']}
}
assert CliApp.run(StrToListDictOptions, cli_args=['--nested={"test": ["}"]}']).model_dump() == {
'nested': {'test': ['}']}
}
assert CliApp.run(StrToListDictOptions, cli_args=['--nested={"test": ["["]}']).model_dump() == {
'nested': {'test': ['[']}
}
assert CliApp.run(StrToListDictOptions, cli_args=['--nested={"test": ["]"]}']).model_dump() == {
'nested': {'test': [']']}
}


def test_cli_json_optional_default():
class Nested(BaseModel):
foo: int = 1
Expand Down