Update samples

Author: ottmar-zittlau

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/additional_properties_class.py

@@ -57,13 +57,15 @@ def to_dict(self):
                             "additional_properties"
                           },
                           exclude_none=True)
-        # override the default output from pydantic by calling `to_dict()` of each value in map_of_map_non_primitive_property (dict)
-        _field_dict = {}
+        # override the default output from pydantic by calling `to_dict()` of each value in map_of_map_non_primitive_property (dict of dict)
+        _field_dict_of_dict = {}
         if self.map_of_map_non_primitive_property:
-            for _key in self.map_of_map_non_primitive_property:
-                if self.map_of_map_non_primitive_property[_key]:
-                    _field_dict[_key] = self.map_of_map_non_primitive_property[_key].to_dict()
-            _dict['map_of_map_non_primitive_property'] = _field_dict
+            for _key, _value in self.map_of_map_non_primitive_property.items():
+                if _value is not None:
+                    _field_dict_of_dict[_key] = {
+                        _inner_key: _inner_value.to_dict() for _inner_key, _inner_value in _value.items() if _inner_value is not None
+                    }
+            _dict['map_of_map_non_primitive_property'] = _field_dict_of_dict
         # puts key-value pairs in additional_properties in the top level
         if self.additional_properties is not None:
             for _key, _value in self.additional_properties.items():
@@ -83,16 +85,10 @@ def from_dict(cls, obj: dict) -> AdditionalPropertiesClass:
         _obj = AdditionalPropertiesClass.parse_obj({
             "map_property": obj.get("map_property"),
             "map_of_map_property": obj.get("map_of_map_property"),
-            "map_of_map_non_primitive_property": dict(
-                (_k, dict(
-                    (_ik, Pet.from_dict(_iv))
-                        for _ik, _iv in _v.items()
-                    )
-                    if _v is not None
-                    else None
-                )
+            "map_of_map_non_primitive_property": {
+                _k: {_ik: Pet.from_dict(_iv) for _ik, _iv in _v.items()} if _v is not None else None
                 for _k, _v in obj.get("map_of_map_non_primitive_property").items()
-            )
+            }
             if obj.get("map_of_map_non_primitive_property") is not None
             else None
         })

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/animal.py

@@ -68,7 +68,7 @@ def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> Union(Cat, Dog):
+    def from_json(cls, json_str: str) -> Union[Cat, Dog]:
         """Create an instance of Animal from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
@@ -87,7 +87,7 @@ def to_dict(self):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> Union(Cat, Dog):
+    def from_dict(cls, obj: dict) -> Union[Cat, Dog]:
         """Create an instance of Animal from a dict"""
         # look up the object type based on discriminator mapping
         object_type = cls.get_discriminator_value(obj)

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/array_of_map_model.py

@@ -55,12 +55,14 @@ def to_dict(self):
                             "additional_properties"
                           },
                           exclude_none=True)
-        # override the default output from pydantic by calling `to_dict()` of each item in array_of_map_property (list)
+        # override the default output from pydantic by calling `to_dict()` of each item in array_of_map_property (list of map)
         _items = []
         if self.array_of_map_property:
             for _item in self.array_of_map_property:
                 if _item:
-                    _items.append(_item.to_dict())
+                    _items.append(
+                         {_inner_key: _inner_value.to_dict() for _inner_key, _inner_value in _item.items if _inner_value is not None}
+                    )
             _dict['array_of_map_property'] = _items
         # puts key-value pairs in additional_properties in the top level
         if self.additional_properties is not None:
@@ -79,7 +81,10 @@ def from_dict(cls, obj: dict) -> ArrayOfMapModel:
             return ArrayOfMapModel.parse_obj(obj)
 
         _obj = ArrayOfMapModel.parse_obj({
-            "array_of_map_property": [Dict[str, Tag].from_dict(_item) for _item in obj.get("array_of_map_property")] if obj.get("array_of_map_property") is not None else None
+            "array_of_map_property": [
+                    {_inner_key: Tag.from_dict(_inner_value) for _inner_key, _inner_value in _item.items()}
+                    for _item in obj.get("array_of_map_property")
+                ] if obj.get("array_of_map_property") is not None else None
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/base_discriminator.py

@@ -67,7 +67,7 @@ def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> Union(Info, PrimitiveString):
+    def from_json(cls, json_str: str) -> Union[Info, PrimitiveString]:
         """Create an instance of BaseDiscriminator from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
@@ -86,7 +86,7 @@ def to_dict(self):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> Union(Info, PrimitiveString):
+    def from_dict(cls, obj: dict) -> Union[Info, PrimitiveString]:
         """Create an instance of BaseDiscriminator from a dict"""
         # look up the object type based on discriminator mapping
         object_type = cls.get_discriminator_value(obj)

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/creature.py

@@ -67,7 +67,7 @@ def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> Union(HuntingDog):
+    def from_json(cls, json_str: str) -> Union[HuntingDog]:
         """Create an instance of Creature from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
@@ -89,7 +89,7 @@ def to_dict(self):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> Union(HuntingDog):
+    def from_dict(cls, obj: dict) -> Union[HuntingDog]:
         """Create an instance of Creature from a dict"""
         # look up the object type based on discriminator mapping
         object_type = cls.get_discriminator_value(obj)

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/discriminator_all_of_super.py

@@ -65,7 +65,7 @@ def to_json(self) -> str:
         return json.dumps(self.to_dict())
 
     @classmethod
-    def from_json(cls, json_str: str) -> Union(DiscriminatorAllOfSub):
+    def from_json(cls, json_str: str) -> Union[DiscriminatorAllOfSub]:
         """Create an instance of DiscriminatorAllOfSuper from a JSON string"""
         return cls.from_dict(json.loads(json_str))
 
@@ -84,7 +84,7 @@ def to_dict(self):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: dict) -> Union(DiscriminatorAllOfSub):
+    def from_dict(cls, obj: dict) -> Union[DiscriminatorAllOfSub]:
         """Create an instance of DiscriminatorAllOfSuper from a dict"""
         # look up the object type based on discriminator mapping
         object_type = cls.get_discriminator_value(obj)

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/input_all_of.py

@@ -79,10 +79,9 @@ def from_dict(cls, obj: dict) -> InputAllOf:
             return InputAllOf.parse_obj(obj)
 
         _obj = InputAllOf.parse_obj({
-            "some_data": dict(
-                (_k, Tag.from_dict(_v))
-                for _k, _v in obj.get("some_data").items()
-            )
+            "some_data": {
+                _k: Tag.from_dict(_v) for _k, _v in obj.get("some_data").items()
+            }
             if obj.get("some_data") is not None
             else None
         })

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

@@ -81,14 +81,10 @@ def from_dict(cls, obj: dict) -> MapOfArrayOfModel:
             return MapOfArrayOfModel.parse_obj(obj)
 
         _obj = MapOfArrayOfModel.parse_obj({
-            "shop_id_to_org_online_lip_map": dict(
-                (_k,
-                        [Tag.from_dict(_item) for _item in _v]
-                        if _v is not None
-                        else None
-                )
+            "shop_id_to_org_online_lip_map": {
+                _k: [Tag.from_dict(_item) for _item in _v] if _v is not None else None
                 for _k, _v in obj.get("shopIdToOrgOnlineLipMap").items()
-            )
+            }
         })
         # store additional fields in additional_properties
         for _key in obj.keys():

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/mixed_properties_and_additional_properties_class.py

@@ -83,10 +83,9 @@ def from_dict(cls, obj: dict) -> MixedPropertiesAndAdditionalPropertiesClass:
         _obj = MixedPropertiesAndAdditionalPropertiesClass.parse_obj({
             "uuid": obj.get("uuid"),
             "date_time": obj.get("dateTime"),
-            "map": dict(
-                (_k, Animal.from_dict(_v))
-                for _k, _v in obj.get("map").items()
-            )
+            "map": {
+                _k: Animal.from_dict(_v) for _k, _v in obj.get("map").items()
+            }
             if obj.get("map") is not None
             else None
         })

samples/openapi3/client/petstore/python-pydantic-v1/petstore_api/models/parent.py

@@ -79,10 +79,9 @@ def from_dict(cls, obj: dict) -> Parent:
             return Parent.parse_obj(obj)
 
         _obj = Parent.parse_obj({
-            "optional_dict": dict(
-                (_k, InnerDictWithProperty.from_dict(_v))
-                for _k, _v in obj.get("optionalDict").items()
-            )
+            "optional_dict": {
+                _k: InnerDictWithProperty.from_dict(_v) for _k, _v in obj.get("optionalDict").items()
+            }
             if obj.get("optionalDict") is not None
             else None
         })