Fixes issue 54, additionalProperties referenced in composed schema when it doesn't exist

modules/openapi-json-schema-generator/src/main/resources/python/model_templates/schema_composed_or_anytype.handlebars

@@ -68,4 +68,8 @@ class {{#if this.classname}}{{classname}}{{else}}{{#if nameInSnakeCase}}{{name}}
 
     {{> model_templates/property_type_hints }}
 
+{{#if additionalProperties}}
     {{> model_templates/new }}
+{{else}}
+    {{> model_templates/new addPropsUnset=true }}
+{{/if}}

modules/openapi-json-schema-generator/src/test/resources/3_0/python/petstore-with-fake-endpoints-models-for-testing-with-http-signature.yaml

@@ -2991,4 +2991,18 @@ components:
           required: [ test ]
           properties:
             name:
-              type: string
+              type: string
+    AbstractStepMessage:
+      required:
+        - description
+        - discriminator
+        - sequenceNumber
+      type: object
+      properties:
+        discriminator:
+          type: string
+      description: Abstract Step
+      discriminator:
+        propertyName: discriminator
+      anyOf:
+        - $ref: '#/components/schemas/AbstractStepMessage'

samples/openapi3/client/petstore/python/.openapi-generator/FILES

@@ -9,6 +9,7 @@ docs/apis/tags/FakeClassnameTags123Api.md
 docs/apis/tags/PetApi.md
 docs/apis/tags/StoreApi.md
 docs/apis/tags/UserApi.md
+docs/models/AbstractStepMessage.md
 docs/models/AdditionalPropertiesClass.md
 docs/models/AdditionalPropertiesValidator.md
 docs/models/AdditionalPropertiesWithArrayOfEnums.md
@@ -144,6 +145,8 @@ petstore_api/apis/tags/user_api.py
 petstore_api/configuration.py
 petstore_api/exceptions.py
 petstore_api/model/__init__.py
+petstore_api/model/abstract_step_message.py
+petstore_api/model/abstract_step_message.pyi
 petstore_api/model/additional_properties_class.py
 petstore_api/model/additional_properties_class.pyi
 petstore_api/model/additional_properties_validator.py

samples/openapi3/client/petstore/python/README.md

@@ -231,6 +231,7 @@ Class | Method | HTTP request | Description
 
 ## Documentation For Models
 
+ - [AbstractStepMessage](docs/models/AbstractStepMessage.md)
  - [AdditionalPropertiesClass](docs/models/AdditionalPropertiesClass.md)
  - [AdditionalPropertiesValidator](docs/models/AdditionalPropertiesValidator.md)
  - [AdditionalPropertiesWithArrayOfEnums](docs/models/AdditionalPropertiesWithArrayOfEnums.md)

samples/openapi3/client/petstore/python/docs/models/AbstractStepMessage.md

@@ -0,0 +1,25 @@
+# petstore_api.model.abstract_step_message.AbstractStepMessage
+
+Abstract Step
+
+## Model Type Info
+Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+dict, frozendict.frozendict,  | frozendict.frozendict,  | Abstract Step | 
+
+### Dictionary Keys
+Key | Input Type | Accessed Type | Description | Notes
+------------ | ------------- | ------------- | ------------- | -------------
+**sequenceNumber** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO |  | 
+**description** | dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader,  | frozendict.frozendict, str, decimal.Decimal, BoolClass, NoneClass, tuple, bytes, FileIO |  | 
+**discriminator** | str,  | str,  |  | 
+**any_string_name** | dict, frozendict.frozendict, str, date, datetime, int, float, bool, decimal.Decimal, None, list, tuple, bytes, io.FileIO, io.BufferedReader | frozendict.frozendict, str, BoolClass, decimal.Decimal, NoneClass, tuple, bytes, FileIO | any string name can be used but the value must be the correct type | [optional]
+
+### Composed Schemas (allOf/anyOf/oneOf/not)
+#### anyOf
+Class Name | Input Type | Accessed Type | Description | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+[AbstractStepMessage](AbstractStepMessage.md) | [**AbstractStepMessage**](AbstractStepMessage.md) | [**AbstractStepMessage**](AbstractStepMessage.md) |  | 
+
+[[Back to Model list]](../../README.md#documentation-for-models) [[Back to API list]](../../README.md#documentation-for-api-endpoints) [[Back to README]](../../README.md)
+

samples/openapi3/client/petstore/python/petstore_api/model/abstract_step_message.py

@@ -0,0 +1,119 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from petstore_api import schemas  # noqa: F401
+
+
+class AbstractStepMessage(
+    schemas.ComposedBase,
+    schemas.DictSchema
+):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Abstract Step
+    """
+
+
+    class MetaOapg:
+        required = {
+            "sequenceNumber",
+            "description",
+            "discriminator",
+        }
+
+        @staticmethod
+        def discriminator():
+            return {
+                'discriminator': {
+                    'AbstractStepMessage': AbstractStepMessage,
+                }
+            }
+
+        class properties:
+            discriminator = schemas.StrSchema
+            __annotations__ = {
+                "discriminator": discriminator,
+            }
+
+        @classmethod
+        @functools.lru_cache()
+        def any_of(cls):
+            # we need this here to make our import statements work
+            # we must store _composed_schemas in here so the code is only run
+            # when we invoke this method. If we kept this at the class
+            # level we would get an error because the class level
+            # code would be run when this module is imported, and these composed
+            # classes don't exist yet because their module has not finished
+            # loading
+            return [
+                AbstractStepMessage,
+            ]
+
+
+    sequenceNumber: schemas.AnyTypeSchema
+    description: schemas.AnyTypeSchema
+    discriminator: MetaOapg.properties.discriminator
+
+    @typing.overload
+    def __getitem__(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.properties.discriminator: ...
+
+    @typing.overload
+    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
+
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["discriminator", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+
+
+    @typing.overload
+    def get_item_oapg(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.properties.discriminator: ...
+
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["discriminator", ], str]):
+        return super().get_item_oapg(name)
+
+
+    def __new__(
+        cls,
+        *args: typing.Union[dict, frozendict.frozendict, ],
+        sequenceNumber: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        description: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        discriminator: typing.Union[MetaOapg.properties.discriminator, str, ],
+        _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
+    ) -> 'AbstractStepMessage':
+        return super().__new__(
+            cls,
+            *args,
+            sequenceNumber=sequenceNumber,
+            description=description,
+            discriminator=discriminator,
+            _configuration=_configuration,
+            **kwargs,
+        )
+
+from petstore_api.model.abstract_step_message import AbstractStepMessage

samples/openapi3/client/petstore/python/petstore_api/model/abstract_step_message.pyi

@@ -0,0 +1,119 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+from datetime import date, datetime  # noqa: F401
+import decimal  # noqa: F401
+import functools  # noqa: F401
+import io  # noqa: F401
+import re  # noqa: F401
+import typing  # noqa: F401
+import typing_extensions  # noqa: F401
+import uuid  # noqa: F401
+
+import frozendict  # noqa: F401
+
+from petstore_api import schemas  # noqa: F401
+
+
+class AbstractStepMessage(
+    schemas.ComposedBase,
+    schemas.DictSchema
+):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Abstract Step
+    """
+
+
+    class MetaOapg:
+        required = {
+            "sequenceNumber",
+            "description",
+            "discriminator",
+        }
+
+        @staticmethod
+        def discriminator():
+            return {
+                'discriminator': {
+                    'AbstractStepMessage': AbstractStepMessage,
+                }
+            }
+
+        class properties:
+            discriminator = schemas.StrSchema
+            __annotations__ = {
+                "discriminator": discriminator,
+            }
+
+        @classmethod
+        @functools.lru_cache()
+        def any_of(cls):
+            # we need this here to make our import statements work
+            # we must store _composed_schemas in here so the code is only run
+            # when we invoke this method. If we kept this at the class
+            # level we would get an error because the class level
+            # code would be run when this module is imported, and these composed
+            # classes don't exist yet because their module has not finished
+            # loading
+            return [
+                AbstractStepMessage,
+            ]
+
+
+    sequenceNumber: schemas.AnyTypeSchema
+    description: schemas.AnyTypeSchema
+    discriminator: MetaOapg.properties.discriminator
+
+    @typing.overload
+    def __getitem__(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.properties.discriminator: ...
+
+    @typing.overload
+    def __getitem__(self, name: str) -> schemas.UnsetAnyTypeSchema: ...
+
+    def __getitem__(self, name: typing.Union[typing_extensions.Literal["discriminator", ], str]):
+        # dict_instance[name] accessor
+        return super().__getitem__(name)
+
+
+    @typing.overload
+    def get_item_oapg(self, name: typing_extensions.Literal["discriminator"]) -> MetaOapg.properties.discriminator: ...
+
+    @typing.overload
+    def get_item_oapg(self, name: str) -> typing.Union[schemas.UnsetAnyTypeSchema, schemas.Unset]: ...
+
+    def get_item_oapg(self, name: typing.Union[typing_extensions.Literal["discriminator", ], str]):
+        return super().get_item_oapg(name)
+
+
+    def __new__(
+        cls,
+        *args: typing.Union[dict, frozendict.frozendict, ],
+        sequenceNumber: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        description: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, ],
+        discriminator: typing.Union[MetaOapg.properties.discriminator, str, ],
+        _configuration: typing.Optional[schemas.Configuration] = None,
+        **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
+    ) -> 'AbstractStepMessage':
+        return super().__new__(
+            cls,
+            *args,
+            sequenceNumber=sequenceNumber,
+            description=description,
+            discriminator=discriminator,
+            _configuration=_configuration,
+            **kwargs,
+        )
+
+from petstore_api.model.abstract_step_message import AbstractStepMessage

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

@@ -11,6 +11,7 @@
 # import sys
 # sys.setrecursionlimit(n)
 
+from petstore_api.model.abstract_step_message import AbstractStepMessage
 from petstore_api.model.additional_properties_class import AdditionalPropertiesClass
 from petstore_api.model.additional_properties_validator import AdditionalPropertiesValidator
 from petstore_api.model.additional_properties_with_array_of_enums import AdditionalPropertiesWithArrayOfEnums

samples/openapi3/client/petstore/python/test/test_models/test_abstract_step_message.py

@@ -0,0 +1,25 @@
+# coding: utf-8
+
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+import unittest
+
+import petstore_api
+from petstore_api.model.abstract_step_message import AbstractStepMessage
+from petstore_api import configuration
+
+
+class TestAbstractStepMessage(unittest.TestCase):
+    """AbstractStepMessage unit test stubs"""
+    _configuration = configuration.Configuration()
+
+
+if __name__ == '__main__':
+    unittest.main()