Skip to content

Handle null values correctly. #1

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

Open
hayklevel wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Handle null values correctly. #1

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
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/date_property.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ isoparse({{ source }}).date()
{% else %}
{{ destination }} = UNSET
{% endif %}
if not isinstance({{ source }}, Unset):
if {{ source }} is None:
{{ destination }} = None
elif not isinstance({{ source }}, Unset):
{{ destination }} = {{ transformed }}
{%- endif %}
{% endmacro %}
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/datetime_property.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ isoparse({{ source }})
{% else %}
{{ destination }} = UNSET
{% endif %}
if not isinstance({{ source }}, Unset):
if {{ source }} is None:
{{ destination }} = None
elif not isinstance({{ source }}, Unset):
{{ destination }} = {{ transformed }}
{%- endif %}
{% endmacro %}
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/enum_property.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,9 @@
{{ destination }} = {{ transformed }}
{%- else %}
{{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
if not isinstance({{ source }}, Unset):
if {{ source }} is None:
{{ destination }} = None
elif not isinstance({{ source }}, Unset):
{{ destination }} = {{ transformed }}
{% endif %}
{% endmacro %}
Expand Down
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/file_property.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ File(
{{ destination }} = {{ source }}.to_tuple()
{% else %}
{{ destination }}{% if declare_type %}: {{ property.get_type_string(json=True) }}{% endif %} = UNSET
if not isinstance({{ source }}, Unset):
if {{ source }} is None:
{{ destination }} = None
elif not isinstance({{ source }}, Unset):
{{ destination }} = {{ source }}.to_tuple()
{% endif %}
{% endmacro %}
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/list_property.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,9 @@ for {{ inner_source }} in {{ source }}:
{{ _transform(property, source, destination, multipart, transform_method) }}
{% else %}
{{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
if not isinstance({{ source }}, Unset):
if {{ source }} is None:
{{ destination }} = list()
elif not isinstance({{ source }}, Unset):
{{ _transform(property, source, destination, multipart, transform_method) | indent(4)}}
{% endif %}

Expand Down
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/model_property.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,9 @@
{{ destination }} = {{ transformed }}
{%- else %}
{{ destination }}{% if declare_type %}: {{ type_string }}{% endif %} = UNSET
if not isinstance({{ source }}, Unset):
if {{ source }} is None:
{{ destination }} = None
elif not isinstance({{ source }}, Unset):
{{ destination }} = {{ transformed }}
{%- endif %}
{% endmacro %}
Expand Down
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/property_macros.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
_{{ property.python_name }} = {{ source }}
{{ property.python_name }}: {{ property.get_type_string() }}
{% if not property.required %}
if isinstance(_{{ property.python_name }}, Unset):
if _{{ property.python_name }} is None:
{{ property.python_name }} = None
elif isinstance(_{{ property.python_name }}, Unset):
{{ property.python_name }} = UNSET
{% endif %}
else:
Expand Down
4 changes: 3 additions & 1 deletion openapi_python_client/templates/property_templates/union_property.py.jinja
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@ def _parse_{{ property.python_name }}(data: object) -> {{ property.get_type_stri
{% if declare_type %}{{ destination }}: {{ property.get_type_string(json=not multipart, multipart=multipart) }}{% endif %}

{% if not property.required %}
if isinstance({{ source }}, Unset):
if {{ source }} is None:
{{ destination }} = None
elif isinstance({{ source }}, Unset):
{{ destination }} = UNSET
{% set ns.has_if = true %}
{% endif %}
Expand Down