Fix python model dict array generation (#23538)

Co-authored-by: William Cheng <wing328hk@gmail.com>

Author: ilayu-blip

.gitignore

@@ -311,4 +311,4 @@ samples/client/petstore/ocaml-recursion-test/_build/
 samples/client/jetbrains/adyen/checkout71/http/client/Apis/http-client.private.env.json
 
 # Generated by the run-in-docker.sh
-\?/
+\?/

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

@@ -317,14 +317,12 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             else None{{^-last}},{{/-last}}
             {{/items.isMap}}
             {{#items.isArray}}
-            "{{{baseName}}}": dict(
-                (_k,
-                        [{{{items.items.dataType}}}.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("{{{baseName}}}").items()
-            ){{^-last}},{{/-last}}
+            "{{{baseName}}}": {
+                _k: [{{{items.items.dataType}}}.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["{{{baseName}}}"].items()
+            }
+            if obj.get("{{{baseName}}}") is not None
+            else None{{^-last}},{{/-last}}
             {{/items.isArray}}
             {{/items.isContainer}}
             {{^items.isContainer}}

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

@@ -383,14 +383,12 @@ class {{classname}}({{#parent}}{{{.}}}{{/parent}}{{^parent}}BaseModel{{/parent}}
             else None{{^-last}},{{/-last}}
             {{/items.isMap}}
             {{#items.isArray}}
-            "{{{baseName}}}": dict(
-                (_k,
-                        [{{{items.items.dataType}}}.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("{{{baseName}}}", {}).items()
-            ){{^-last}},{{/-last}}
+            "{{{baseName}}}": {
+                _k: [{{{items.items.dataType}}}.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["{{{baseName}}}"].items()
+            }
+            if obj.get("{{{baseName}}}") is not None
+            else None{{^-last}},{{/-last}}
             {{/items.isArray}}
             {{/items.isContainer}}
             {{^items.isContainer}}

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/map_of_array_of_model.py

@@ -91,14 +91,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "shopIdToOrgOnlineLipMap": dict(
-                (_k,
-                        [Tag.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("shopIdToOrgOnlineLipMap", {}).items()
-            )
+            "shopIdToOrgOnlineLipMap": {
+                _k: [Tag.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["shopIdToOrgOnlineLipMap"].items()
+            }
+            if obj.get("shopIdToOrgOnlineLipMap") is not None
+            else None
         })
         return _obj
 

samples/openapi3/client/petstore/python-aiohttp/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py

@@ -91,14 +91,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "dictProperty": dict(
-                (_k,
-                        [CreatureInfo.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("dictProperty", {}).items()
-            )
+            "dictProperty": {
+                _k: [CreatureInfo.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["dictProperty"].items()
+            }
+            if obj.get("dictProperty") is not None
+            else None
         })
         return _obj
 

samples/openapi3/client/petstore/python-httpx/petstore_api/models/map_of_array_of_model.py

@@ -91,14 +91,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "shopIdToOrgOnlineLipMap": dict(
-                (_k,
-                        [Tag.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("shopIdToOrgOnlineLipMap", {}).items()
-            )
+            "shopIdToOrgOnlineLipMap": {
+                _k: [Tag.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["shopIdToOrgOnlineLipMap"].items()
+            }
+            if obj.get("shopIdToOrgOnlineLipMap") is not None
+            else None
         })
         return _obj
 

samples/openapi3/client/petstore/python-httpx/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py

@@ -91,14 +91,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "dictProperty": dict(
-                (_k,
-                        [CreatureInfo.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("dictProperty", {}).items()
-            )
+            "dictProperty": {
+                _k: [CreatureInfo.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["dictProperty"].items()
+            }
+            if obj.get("dictProperty") is not None
+            else None
         })
         return _obj
 

samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/map_of_array_of_model.py

@@ -99,14 +99,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "shopIdToOrgOnlineLipMap": dict(
-                (_k,
-                        [Tag.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("shopIdToOrgOnlineLipMap", {}).items()
-            )
+            "shopIdToOrgOnlineLipMap": {
+                _k: [Tag.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["shopIdToOrgOnlineLipMap"].items()
+            }
+            if obj.get("shopIdToOrgOnlineLipMap") is not None
+            else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python-lazyImports/petstore_api/models/unnamed_dict_with_additional_model_list_properties.py

@@ -99,14 +99,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "dictProperty": dict(
-                (_k,
-                        [CreatureInfo.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("dictProperty", {}).items()
-            )
+            "dictProperty": {
+                _k: [CreatureInfo.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["dictProperty"].items()
+            }
+            if obj.get("dictProperty") is not None
+            else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python/petstore_api/models/map_of_array_of_model.py

@@ -99,14 +99,12 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
             return cls.model_validate(obj)
 
         _obj = cls.model_validate({
-            "shopIdToOrgOnlineLipMap": dict(
-                (_k,
-                        [Tag.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
-                for _k, _v in obj.get("shopIdToOrgOnlineLipMap", {}).items()
-            )
+            "shopIdToOrgOnlineLipMap": {
+                _k: [Tag.from_dict(_item) for _item in _v] if _v is not None else None
+                for _k, _v in obj["shopIdToOrgOnlineLipMap"].items()
+            }
+            if obj.get("shopIdToOrgOnlineLipMap") is not None
+            else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():