Skip to content

Fix new coding style with multiple type choices and optional values #25

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
barroco merged 1 commit into from
Oct 1, 2025
Merged

Fix new coding style with multiple type choices and optional values #25

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
6 changes: 4 additions & 2 deletions src/implicitdict/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,9 @@ def _parse_value(value, value_type: type):
return result

elif (
(generic_type is Union or generic_type is UnionType) and len(arg_types) == 2 and arg_types[1] is type(None)
(generic_type is Union or generic_type is UnionType)
and len(arg_types) >= 2
and any([arg_type is type(None) for arg_type in arg_types])
):
# Type is an Optional declaration
if value is None:
Expand Down Expand Up @@ -297,7 +299,7 @@ def _get_fields(subtype: type) -> tuple[set[str], set[str]]:
optional_fields.add(key)
elif generic_type is Union or generic_type is UnionType:
generic_args = get_args(field_type)
if len(generic_args) == 2 and generic_args[1] is type(None):
if len(generic_args) >= 2 and any([arg_type is type(None) for arg_type in generic_args]):
optional_fields.add(key)
for key in attributes:
if key not in annotations:
Expand Down
4 changes: 3 additions & 1 deletion src/implicitdict/jsonschema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,9 @@ def _schema_for(
return schema, False

elif (
(generic_type is Union or generic_type is UnionType) and len(arg_types) == 2 and arg_types[1] is type(None)
(generic_type is Union or generic_type is UnionType)
and len(arg_types) >= 2
and any([arg_type is type(None) for arg_type in arg_types])
):
# Type is an Optional declaration
subschema, _ = _schema_for(arg_types[0], schema_vars_resolver, schema_repository, context)
Expand Down
4 changes: 4 additions & 0 deletions tests/test_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ class OptionalData(ImplicitDict):
optional_field2_with_none_default: Optional[str] = None # noqa UP045
optional_field3_with_default: Optional[str] = "concrete default" # noqa UP045
new_style_optional: str | None
new_style_optional_2: str | bool | None
new_style_optional_3: str | None | bool
new_style_optional_4: None | str | bool
new_style_optional_5: str | list[str] | None | list[bool] | bool

@staticmethod
def example_values():
Expand Down