Skip to content
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

Jump to bottom

[Python] fix model to dict #11234

Merged
merged 5 commits into from
Jan 25, 2022
Merged

[Python] fix model to dict #11234

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c760858
fix model to dict
JoeCqupt Jan 5, 2022
11692bb
add unit test
JoeCqupt Jan 6, 2022
2969641
Merge branch 'master' of github.com:OpenAPITools/openapi-generator in…
JoeCqupt Jan 6, 2022
3306c34
add unit test
JoeCqupt Jan 6, 2022
fc1548d
update sample files
JoeCqupt Jan 6, 2022
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
10 changes: 7 additions & 3 deletions modules/openapi-generator/src/main/resources/python/model_utils.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1340,6 +1340,7 @@ def model_to_dict(model_instance, serialize=True):
attribute_map
"""
result = {}
extract_item = lambda item: (item[0],model_to_dict(item[1], serialize=serialize)) if hasattr(item[1], '_data_store') else item

model_instances = [model_instance]
if model_instance._composed_schemas:
Expand Down Expand Up @@ -1369,14 +1370,17 @@ def model_to_dict(model_instance, serialize=True):
res.append(v)
elif isinstance(v, ModelSimple):
res.append(v.value)
elif isinstance(v, dict):
res.append(dict(map(
extract_item,
v.items()
)))
JoeCqupt marked this conversation as resolved.
Show resolved Hide resolved
else:
res.append(model_to_dict(v, serialize=serialize))
result[attr] = res
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0],
model_to_dict(item[1], serialize=serialize))
if hasattr(item[1], '_data_store') else item,
extract_item,
value.items()
))
elif isinstance(value, ModelSimple):
Expand Down
10 changes: 7 additions & 3 deletions samples/client/petstore/python/petstore_api/model_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,7 @@ def model_to_dict(model_instance, serialize=True):
attribute_map
"""
result = {}
extract_item = lambda item: (item[0],model_to_dict(item[1], serialize=serialize)) if hasattr(item[1], '_data_store') else item

model_instances = [model_instance]
if model_instance._composed_schemas:
Expand Down Expand Up @@ -1686,14 +1687,17 @@ def model_to_dict(model_instance, serialize=True):
res.append(v)
elif isinstance(v, ModelSimple):
res.append(v.value)
elif isinstance(v, dict):
res.append(dict(map(
extract_item,
v.items()
)))
else:
res.append(model_to_dict(v, serialize=serialize))
result[attr] = res
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0],
model_to_dict(item[1], serialize=serialize))
if hasattr(item[1], '_data_store') else item,
extract_item,
value.items()
))
elif isinstance(value, ModelSimple):
Expand Down
10 changes: 7 additions & 3 deletions ...ient/petstore/python_disallowAdditionalPropertiesIfNotPresent/petstore_api/model_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,7 @@ def model_to_dict(model_instance, serialize=True):
attribute_map
"""
result = {}
extract_item = lambda item: (item[0],model_to_dict(item[1], serialize=serialize)) if hasattr(item[1], '_data_store') else item

model_instances = [model_instance]
if model_instance._composed_schemas:
Expand Down Expand Up @@ -1686,14 +1687,17 @@ def model_to_dict(model_instance, serialize=True):
res.append(v)
elif isinstance(v, ModelSimple):
res.append(v.value)
elif isinstance(v, dict):
res.append(dict(map(
extract_item,
v.items()
)))
else:
res.append(model_to_dict(v, serialize=serialize))
result[attr] = res
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0],
model_to_dict(item[1], serialize=serialize))
if hasattr(item[1], '_data_store') else item,
extract_item,
value.items()
))
elif isinstance(value, ModelSimple):
Expand Down
10 changes: 7 additions & 3 deletions samples/openapi3/client/extensions/x-auth-id-alias/python/x_auth_id_alias/model_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,7 @@ def model_to_dict(model_instance, serialize=True):
attribute_map
"""
result = {}
extract_item = lambda item: (item[0],model_to_dict(item[1], serialize=serialize)) if hasattr(item[1], '_data_store') else item

model_instances = [model_instance]
if model_instance._composed_schemas:
Expand Down Expand Up @@ -1686,14 +1687,17 @@ def model_to_dict(model_instance, serialize=True):
res.append(v)
elif isinstance(v, ModelSimple):
res.append(v.value)
elif isinstance(v, dict):
res.append(dict(map(
extract_item,
v.items()
)))
else:
res.append(model_to_dict(v, serialize=serialize))
result[attr] = res
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0],
model_to_dict(item[1], serialize=serialize))
if hasattr(item[1], '_data_store') else item,
extract_item,
value.items()
))
elif isinstance(value, ModelSimple):
Expand Down
10 changes: 7 additions & 3 deletions samples/openapi3/client/features/dynamic-servers/python/dynamic_servers/model_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,7 @@ def model_to_dict(model_instance, serialize=True):
attribute_map
"""
result = {}
extract_item = lambda item: (item[0],model_to_dict(item[1], serialize=serialize)) if hasattr(item[1], '_data_store') else item

model_instances = [model_instance]
if model_instance._composed_schemas:
Expand Down Expand Up @@ -1686,14 +1687,17 @@ def model_to_dict(model_instance, serialize=True):
res.append(v)
elif isinstance(v, ModelSimple):
res.append(v.value)
elif isinstance(v, dict):
res.append(dict(map(
extract_item,
v.items()
)))
else:
res.append(model_to_dict(v, serialize=serialize))
result[attr] = res
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0],
model_to_dict(item[1], serialize=serialize))
if hasattr(item[1], '_data_store') else item,
extract_item,
value.items()
))
elif isinstance(value, ModelSimple):
Expand Down
10 changes: 7 additions & 3 deletions samples/openapi3/client/petstore/python/petstore_api/model_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1657,6 +1657,7 @@ def model_to_dict(model_instance, serialize=True):
attribute_map
"""
result = {}
extract_item = lambda item: (item[0],model_to_dict(item[1], serialize=serialize)) if hasattr(item[1], '_data_store') else item

model_instances = [model_instance]
if model_instance._composed_schemas:
Expand Down Expand Up @@ -1686,14 +1687,17 @@ def model_to_dict(model_instance, serialize=True):
res.append(v)
elif isinstance(v, ModelSimple):
res.append(v.value)
elif isinstance(v, dict):
res.append(dict(map(
extract_item,
v.items()
)))
else:
res.append(model_to_dict(v, serialize=serialize))
result[attr] = res
elif isinstance(value, dict):
result[attr] = dict(map(
lambda item: (item[0],
model_to_dict(item[1], serialize=serialize))
if hasattr(item[1], '_data_store') else item,
extract_item,
value.items()
))
elif isinstance(value, ModelSimple):
Expand Down