Skip to content

Commit 4f2ccf5

Browse files
Use more concise code for dict generation
1 parent 2d2d06c commit 4f2ccf5

1 file changed

Lines changed: 10 additions & 21 deletions

File tree

modules/openapi-generator/src/main/resources/python-pydantic-v1/model_generic.mustache

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -321,41 +321,30 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
321321
{{^items.isEnumOrRef}}
322322
{{#items.isContainer}}
323323
{{#items.isMap}}
324-
"{{{name}}}": dict(
325-
(_k, dict(
326-
(_ik, {{{items.items.dataType}}}.from_dict(_iv))
327-
for _ik, _iv in _v.items()
328-
)
329-
if _v is not None
330-
else None
331-
)
324+
"{{{name}}}": {
325+
_k: {_ik: {{{items.items.dataType}}}.from_dict(_iv) for _ik, _iv in _v.items()} if _v is not None else None
332326
for _k, _v in obj.get("{{{baseName}}}").items()
333-
)
327+
}
334328
if obj.get("{{{baseName}}}") is not None
335329
else None{{^-last}},{{/-last}}
336330
{{/items.isMap}}
337331
{{#items.isArray}}
338-
"{{{name}}}": dict(
339-
(_k,
340-
[{{{items.items.dataType}}}.from_dict(_item) for _item in _v]
341-
if _v is not None
342-
else None
343-
)
332+
"{{{name}}}": {
333+
_k: [{{{items.items.dataType}}}.from_dict(_item) for _item in _v] if _v is not None else None
344334
for _k, _v in obj.get("{{{baseName}}}").items()
345-
){{^-last}},{{/-last}}
335+
}{{^-last}},{{/-last}}
346336
{{/items.isArray}}
347337
{{/items.isContainer}}
348338
{{^items.isContainer}}
349-
"{{{name}}}": dict(
350-
(_k, {{{items.dataType}}}.from_dict(_v))
351-
for _k, _v in obj.get("{{{baseName}}}").items()
352-
)
339+
"{{{name}}}": {
340+
_k: {{{items.dataType}}}.from_dict(_v) for _k, _v in obj.get("{{{baseName}}}").items()
341+
}
353342
if obj.get("{{{baseName}}}") is not None
354343
else None{{^-last}},{{/-last}}
355344
{{/items.isContainer}}
356345
{{/items.isEnumOrRef}}
357346
{{#items.isEnumOrRef}}
358-
"{{{name}}}": dict((_k, _v) for _k, _v in obj.get("{{{baseName}}}").items()){{^-last}},{{/-last}}
347+
"{{{name}}}": obj.get("{{{baseName}}}"){{^-last}},{{/-last}}
359348
{{/items.isEnumOrRef}}
360349
{{/items.isPrimitiveType}}
361350
{{#items.isPrimitiveType}}

0 commit comments

Comments
 (0)