[python-nextgen] fix #16151 Disallow additional properties if not present - missing Any and Dict import (#16208)

* [python-nextgen] fix #16151 Disallow additional properties if not present - missing Any and Dict import

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python-nextgen] update samples

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python-nextgen] remove unwanted imports

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python-nextgen] update samples

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python-nextgen] remove unwanted imports

Signed-off-by: ふぁ <yuki@yuki0311.com>

* [python-nextgen] update samples

Signed-off-by: ふぁ <yuki@yuki0311.com>

---------

Signed-off-by: ふぁ <yuki@yuki0311.com>

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/PythonClientCodegen.java

@@ -1239,6 +1239,14 @@ public class PythonClientCodegen extends AbstractPythonCodegen implements Codege
                 codegenProperties = model.vars;
             }
 
+            // if model_generic.mustache is used
+            if (model.oneOf.isEmpty() && !model.isEnum) {
+                if (!this.disallowAdditionalPropertiesIfNotPresent) {
+                    typingImports.add("Dict");
+                    typingImports.add("Any");
+                }
+            }
+
             //loop through properties/schemas to set up typing, pydantic
             for (CodegenProperty cp : codegenProperties) {
                 String typing = getPydanticType(cp, typingImports, pydanticImports, datetimeImports, modelImports, exampleImports, model.classname);
@@ -1314,13 +1322,11 @@ public class PythonClientCodegen extends AbstractPythonCodegen implements Codege
                 }
             }
 
-            if (!model.isEnum) {
-                pydanticImports.add("BaseModel");
-            }
-
             // add parent model to import
             if (!StringUtils.isEmpty(model.parent)) {
                 modelImports.add(model.parent);
+            } else if (!model.isEnum) {
+                pydanticImports.add("BaseModel");
             }
 
             // set enum type in extensions and update `name` in enumVars

samples/client/echo_api/python/openapi_client/models/data_query.py

@@ -20,7 +20,7 @@ import json
 
 from datetime import datetime
 from typing import Optional
-from pydantic import BaseModel, Field, StrictStr
+from pydantic import Field, StrictStr
 from openapi_client.models.query import Query
 
 class DataQuery(Query):

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

@@ -19,7 +19,7 @@ import json
 
 
 from typing import Optional
-from pydantic import BaseModel, StrictBool
+from pydantic import StrictBool
 from petstore_api.models.animal import Animal
 
 class Cat(Animal):

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

@@ -19,7 +19,7 @@ import json
 
 
 from typing import Optional
-from pydantic import BaseModel, StrictStr
+from pydantic import StrictStr
 from petstore_api.models.animal import Animal
 
 class Dog(Animal):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Dict, Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class AdditionalPropertiesClass(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 from petstore_api.models.single_ref_type import SingleRefType
 

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

@@ -19,7 +19,7 @@ import json
 import petstore_api.models
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 
 class Animal(BaseModel):

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

@@ -18,7 +18,7 @@ import json
 import pprint
 import re  # noqa: F401
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, Field, StrictStr, ValidationError, conint, conlist, constr, validator
 from typing import Union, Any, List, TYPE_CHECKING
 from pydantic import StrictStr, Field

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

@@ -18,7 +18,7 @@ import json
 import pprint
 import re  # noqa: F401
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr, ValidationError, validator
 from petstore_api.models.basque_pig import BasquePig
 from petstore_api.models.danish_pig import DanishPig

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictInt, StrictStr
 
 class ApiResponse(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, conlist
 from petstore_api.models.tag import Tag
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, Field, StrictFloat, conlist
 
 class ArrayOfArrayOfNumberOnly(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, Field, StrictFloat, conlist
 
 class ArrayOfNumberOnly(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, StrictInt, StrictStr, conlist
 from petstore_api.models.read_only_first import ReadOnlyFirst
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-
+from typing import Any, Dict
 from pydantic import BaseModel, Field, StrictStr
 
 class BasquePig(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 
 class Capitalization(BaseModel):

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

@@ -18,8 +18,8 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
-from pydantic import BaseModel, StrictBool
+from typing import Any, Dict, Optional
+from pydantic import StrictBool
 from petstore_api.models.animal import Animal
 
 class Cat(Animal):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt, StrictStr
 
 class Category(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictInt
 
 class CircularReferenceModel(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 
 class ClassModel(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class Client(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-
+from typing import Any, Dict
 from pydantic import BaseModel, Field, StrictInt, StrictStr
 
 class DanishPig(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class DeprecatedObject(BaseModel):

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

@@ -18,8 +18,8 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
-from pydantic import BaseModel, StrictStr
+from typing import Any, Dict, Optional
+from pydantic import StrictStr
 from petstore_api.models.animal import Animal
 
 class Dog(Animal):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class DummyModel(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, StrictStr, conlist, validator
 
 class EnumArrays(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictFloat, StrictInt, StrictStr, validator
 from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.outer_enum_default_value import OuterEnumDefaultValue

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 
 class File(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, conlist
 from petstore_api.models.file import File
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class FirstRef(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class Foo(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel
 from petstore_api.models.foo import Foo
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 from datetime import date, datetime
-from typing import Optional, Union
+from typing import Any, Dict, Optional, Union
 from pydantic import BaseModel, Field, StrictBytes, StrictInt, StrictStr, condecimal, confloat, conint, constr, validator
 
 class FormatTest(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class HasOnlyReadOnly(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 
 class HealthCheckResult(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 
 class List(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Dict, List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, Field, conlist
 from petstore_api.models.tag import Tag
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Dict, Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictBool, StrictStr, validator
 
 class MapTest(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 from datetime import datetime
-from typing import Dict, Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 from petstore_api.models.animal import Animal
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt, StrictStr
 
 class Model200Response(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt
 
 class ModelReturn(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt, StrictStr
 
 class Name(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt, constr, validator
 
 class NullableProperty(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictFloat
 
 class NumberOnly(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, Field, StrictFloat, StrictStr, conlist
 from petstore_api.models.deprecated_object import DeprecatedObject
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 from datetime import datetime
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictBool, StrictInt, StrictStr, validator
 
 class Order(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictBool, StrictFloat, StrictStr
 
 class OuterComposite(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field
 from petstore_api.models.outer_enum import OuterEnum
 from petstore_api.models.outer_enum_integer import OuterEnumInteger

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Dict, Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Dict, Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field
 from petstore_api.models.inner_dict_with_property import InnerDictWithProperty
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import List, Optional
+from typing import Any, Dict, List, Optional
 from pydantic import BaseModel, Field, StrictInt, StrictStr, conlist, validator
 from petstore_api.models.category import Category
 from petstore_api.models.tag import Tag

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictStr
 
 class PropertyNameCollision(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class ReadOnlyFirst(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictStr
 
 class SecondRef(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictInt
 
 class SelfReferenceModel(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt
 
 class SpecialModelName(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt, StrictStr, validator
 from petstore_api.models.category import Category
 

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictInt, StrictStr
 
 class Tag(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, Field, StrictInt, StrictStr
 
 class User(BaseModel):

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

@@ -18,7 +18,7 @@ import re  # noqa: F401
 import json
 
 
-from typing import Optional
+from typing import Any, Dict, Optional
 from pydantic import BaseModel, StrictInt
 from petstore_api.models.one_of_enum_string import OneOfEnumString
 from petstore_api.models.pig import Pig