Refactors schema class templates (#217)

* Breaks up composed schema template

* Removes dict partial

* Partial sample regen

* Switches dict schema info order back to original

* Refactos some lines into const and enum templates

* Template tweaks

* Extracts unique items template

* Creates max_length template

* Extracts template for minLength

* Simplifies schema_cls template

* Adds max and min items templates

* Makes and uses templates for max/minProperties

* Adds and uses max and min templates

* Removes validation template

* Deprecates hasValidation, adds default and format templates

* Adds and uses template for boolean schema class

* Adds templates for number and string

* Renames template to _schema_anytype_or_multitype

* Samples and docs regenerated

* Changes min max value detection to use not equal to null

* Fixes bug where extra const was written

* Samples regen

Author: spacether

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/anyof_with_base_schema.py

@@ -47,4 +47,3 @@ class AnyofWithBaseSchema(
         str,
     })
     any_of: AnyOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AnyOf)) # type: ignore
-

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/oneof_with_base_schema.py

@@ -47,4 +47,3 @@ class OneofWithBaseSchema(
         str,
     })
     one_of: OneOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(OneOf)) # type: ignore
-

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/oneof_with_required.py

@@ -178,16 +178,14 @@ class _1(
 
 @dataclasses.dataclass(frozen=True)
 class OneofWithRequired(
-    schemas.Schema[schemas.immutabledict, tuple]
+    schemas.Schema[schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES], tuple]
 ):
     """NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
     Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 
     Do not edit the class manually.
     """
-    types: typing.FrozenSet[typing.Type] = frozenset({
-        schemas.immutabledict,
-    })
+    types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict})
     one_of: OneOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(OneOf)) # type: ignore
 
     @classmethod

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/the_default_keyword_does_not_do_anything_if_the_property_is_missing.py

@@ -21,7 +21,6 @@ class Alpha(
         int,
     })
     inclusive_maximum: typing.Union[int, float] = 3
-    default: typing.Union[int, float] = 5
 Properties = typing.TypedDict(
     'Properties',
     {

samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/uniqueitems_false_validation.py

@@ -10,17 +10,4 @@
 from __future__ import annotations
 from unit_test_api.shared_imports.schema_imports import *  # pyright: ignore [reportWildcardImportFromLibrary]
 
-
-
-@dataclasses.dataclass(frozen=True)
-class UniqueitemsFalseValidation(
-    schemas.AnyTypeSchema[schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES], typing.Tuple[schemas.OUTPUT_BASE_TYPES, ...]],
-):
-    """NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
-    Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
-
-    Do not edit the class manually.
-    """
-    # any type
-    unique_items: bool = False
-
+UniqueitemsFalseValidation: typing_extensions.TypeAlias = schemas.AnyTypeSchema

samples/client/petstore/python/src/petstore_api/components/schema/abstract_step_message.py

@@ -101,9 +101,7 @@ class AbstractStepMessage(
 
     Abstract Step
     """
-    types: typing.FrozenSet[typing.Type] = frozenset({
-        schemas.immutabledict,
-    })
+    types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict})
     required: typing.FrozenSet[str] = frozenset({
         "description",
         "discriminator",
@@ -123,7 +121,7 @@ class AbstractStepMessage(
         typing.Type
     ] = dataclasses.field(
         default_factory=lambda: {
-            schemas.immutabledict: AbstractStepMessageDict,
+            schemas.immutabledict: AbstractStepMessageDict
         }
     )
 

samples/client/petstore/python/src/petstore_api/components/schema/additional_properties_validator.py

@@ -257,16 +257,14 @@ def validate(
 
 @dataclasses.dataclass(frozen=True)
 class AdditionalPropertiesValidator(
-    schemas.Schema[schemas.immutabledict, tuple]
+    schemas.Schema[schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES], tuple]
 ):
     """NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
     Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 
     Do not edit the class manually.
     """
-    types: typing.FrozenSet[typing.Type] = frozenset({
-        schemas.immutabledict,
-    })
+    types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict})
     all_of: AllOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AllOf)) # type: ignore
 
     @classmethod

samples/client/petstore/python/src/petstore_api/components/schema/composed_bool.py

@@ -29,4 +29,3 @@ class ComposedBool(
         schemas.Bool,
     })
     all_of: AllOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AllOf)) # type: ignore
-

samples/client/petstore/python/src/petstore_api/components/schema/composed_none.py

@@ -29,4 +29,3 @@ class ComposedNone(
         type(None),
     })
     all_of: AllOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AllOf)) # type: ignore
-

samples/client/petstore/python/src/petstore_api/components/schema/composed_number.py

@@ -30,4 +30,3 @@ class ComposedNumber(
         int,
     })
     all_of: AllOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AllOf)) # type: ignore
-

samples/client/petstore/python/src/petstore_api/components/schema/composed_object.py

@@ -18,16 +18,14 @@
 
 @dataclasses.dataclass(frozen=True)
 class ComposedObject(
-    schemas.Schema[schemas.immutabledict, tuple]
+    schemas.Schema[schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES], tuple]
 ):
     """NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
     Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 
     Do not edit the class manually.
     """
-    types: typing.FrozenSet[typing.Type] = frozenset({
-        schemas.immutabledict,
-    })
+    types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict})
     all_of: AllOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AllOf)) # type: ignore
 
     @classmethod

samples/client/petstore/python/src/petstore_api/components/schema/composed_string.py

@@ -29,4 +29,3 @@ class ComposedString(
         str,
     })
     all_of: AllOf = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance(AllOf)) # type: ignore
-

samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_with_default_value.py

@@ -40,7 +40,6 @@ class IntegerEnumWithDefaultValue(
         int,
     })
     format: str = 'int'
-    default: typing.Literal[0]  = 0
     enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field(
         default_factory=lambda: {
             0: "POSITIVE_0",

samples/client/petstore/python/src/petstore_api/components/schema/obj_with_required_props.py

@@ -73,9 +73,7 @@ class ObjWithRequiredProps(
 
     Do not edit the class manually.
     """
-    types: typing.FrozenSet[typing.Type] = frozenset({
-        schemas.immutabledict,
-    })
+    types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict})
     required: typing.FrozenSet[str] = frozenset({
         "a",
     })
@@ -86,7 +84,7 @@ class ObjWithRequiredProps(
         typing.Type
     ] = dataclasses.field(
         default_factory=lambda: {
-            schemas.immutabledict: ObjWithRequiredPropsDict,
+            schemas.immutabledict: ObjWithRequiredPropsDict
         }
     )
 

samples/client/petstore/python/src/petstore_api/components/schema/order.py

@@ -96,16 +96,7 @@ def validate(
             ],
             validated_arg
         )
-
-
-@dataclasses.dataclass(frozen=True)
-class Complete(
-    schemas.BoolSchema
-):
-    types: typing.FrozenSet[typing.Type] = frozenset({
-        schemas.Bool,
-    })
-    default: typing.Literal[False] = False
+Complete: typing_extensions.TypeAlias = schemas.BoolSchema
 Properties = typing.TypedDict(
     'Properties',
     {

samples/client/petstore/python/src/petstore_api/components/schema/parent_pet.py

@@ -14,16 +14,14 @@
 
 @dataclasses.dataclass(frozen=True)
 class ParentPet(
-    schemas.Schema[schemas.immutabledict, tuple]
+    schemas.Schema[schemas.immutabledict[str, schemas.OUTPUT_BASE_TYPES], tuple]
 ):
     """NOTE: This class is auto generated by OpenAPI JSON Schema Generator.
     Ref: https://github.com/openapi-json-schema-tools/openapi-json-schema-generator
 
     Do not edit the class manually.
     """
-    types: typing.FrozenSet[typing.Type] = frozenset({
-        schemas.immutabledict,
-    })
+    types: typing.FrozenSet[typing.Type] = frozenset({schemas.immutabledict})
     discriminator: typing.Mapping[str, typing.Mapping[str, typing.Type[schemas.Schema]]] = dataclasses.field(
         default_factory=lambda: {
             'pet_type': {

src/main/java/org/openapijsonschematools/codegen/common/ModelUtils.java

@@ -689,6 +689,10 @@ public static boolean isModelWithPropertiesOnly(Schema schema) {
         return false;
     }
 
+    /*
+    Remove this in the 4.0.0 release because it is unused
+     */
+    @Deprecated
     public static boolean hasValidation(Schema sc) {
         return (
                 sc.getMaxItems() != null ||

src/main/java/org/openapijsonschematools/codegen/generators/openapimodels/CodegenSchema.java

@@ -112,6 +112,10 @@ public class CodegenSchema {
     public String pathFromDocRoot = null;
     public boolean isInline = false;
 
+    /*
+    Remove this in the 4.0.0 release because it is unused
+     */
+    @Deprecated
     public boolean hasValidation() {
         return maxItems != null || minItems != null || minProperties != null || maxProperties != null || minLength != null || maxLength != null || multipleOf != null || patternInfo != null || minimum != null || maximum != null || exclusiveMinimum != null || exclusiveMaximum != null || uniqueItems != null;
     }

src/main/resources/python/components/schemas/schema_cls/_additional_properties.hbs

@@ -0,0 +1,3 @@
+{{#with additionalProperties}}
+additional_properties: typing.Type[{{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}] = dataclasses.field(default_factory=lambda: {{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}) # type: ignore
+{{/with}}

src/main/resources/python/components/schemas/schema_cls/_all_of.hbs

@@ -0,0 +1 @@
+all_of: {{allOf.jsonPathPiece.camelCase}} = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance({{allOf.jsonPathPiece.camelCase}})) # type: ignore

src/main/resources/python/components/schemas/schema_cls/_any_of.hbs

@@ -0,0 +1 @@
+any_of: {{anyOf.jsonPathPiece.camelCase}} = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance({{anyOf.jsonPathPiece.camelCase}})) # type: ignore

src/main/resources/python/components/schemas/schema_cls/_composed_schemas.hbs

@@ -23,3 +23,4 @@ const_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool,
 {{/each}}
     }
 )
+const = {{constInfo.jsonPathPiece.camelCase}}

src/main/resources/python/components/schemas/schema_cls/_const.hbs

@@ -1,11 +1,9 @@
-{{#if contains}}
-    {{#with contains}}
+{{#with contains}}
 contains: typing.Type[{{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}] = dataclasses.field(default_factory=lambda: {{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}) # type: ignore
-    {{/with}}
-    {{#if maxContains}}
+{{/with}}
+{{#neq maxContains null}}
 max_contains: typing.Literal[{{maxContains}}] = {{maxContains}}
-    {{/if}}
-    {{#if minContains}}
+{{/neq}}
+{{#neq minContains null}}
 min_contains: typing.Literal[{{minContains}}] = {{minContains}}
-    {{/if}}
-{{/if}}
+{{/neq}}

src/main/resources/python/components/schemas/schema_cls/_contains_partial.hbs renamed to src/main/resources/python/components/schemas/schema_cls/_contains.hbs

@@ -0,0 +1,21 @@
+{{#with defaultValue}}
+    {{#eq type "string"}}
+default: typing.Literal["{{{value}}}"] = "{{{value}}}"
+    {{/eq}}
+    {{#eq type "number"}}
+default: typing.Union[int, float] = {{{value}}}
+    {{/eq}}
+    {{#eq type "integer"}}
+default: typing.Literal[{{{value}}}]  = {{{value}}}
+    {{/eq}}
+    {{#eq type "boolean"}}
+        {{#if value}}
+default: typing.Literal[True] = True
+        {{else}}
+default: typing.Literal[False] = False
+        {{/if}}
+    {{/eq}}
+    {{#eq type "null"}}
+default: None = None
+    {{/eq}}
+{{/with}}

src/main/resources/python/components/schemas/schema_cls/_default.hbs

@@ -0,0 +1,11 @@
+{{#with discriminator}}
+discriminator: typing.Mapping[str, typing.Mapping[str, typing.Type[schemas.Schema]]] = dataclasses.field(
+    default_factory=lambda: {
+        '{{{propertyName.original}}}': {
+    {{#each mappedModels}}
+            '{{mappingName}}': {{{modelName}}},
+    {{/each}}
+        }
+    }
+)
+{{/with}}

src/main/resources/python/components/schemas/schema_cls/_dict_partial.hbs

@@ -23,3 +23,4 @@ enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, N
 {{/each}}
     }
 )
+enums = {{enumInfo.jsonPathPiece.camelCase}}

src/main/resources/python/components/schemas/schema_cls/_discriminator.hbs

@@ -0,0 +1 @@
+format: str = '{{format}}'

src/main/resources/python/components/schemas/schema_cls/_enum.hbs

@@ -0,0 +1 @@
+max_items: int = {{maxItems}}

src/main/resources/python/components/schemas/schema_cls/_format.hbs

@@ -0,0 +1 @@
+max_length: int = {{maxLength}}

src/main/resources/python/components/schemas/schema_cls/_max_items.hbs

@@ -0,0 +1 @@
+max_properties: int = {{maxProperties}}

src/main/resources/python/components/schemas/schema_cls/_max_length.hbs

@@ -0,0 +1 @@
+{{#if exclusiveMaximum}}exclusive_maximum{{/if}}inclusive_maximum{{#unless exclusiveMaximum}}{{/unless}}: typing.Union[int, float] = {{maximum}}

src/main/resources/python/components/schemas/schema_cls/_max_properties.hbs

@@ -0,0 +1 @@
+min_items: int = {{minItems}}

src/main/resources/python/components/schemas/schema_cls/_maximum.hbs

@@ -0,0 +1 @@
+min_length: int = {{minLength}}

src/main/resources/python/components/schemas/schema_cls/_min_items.hbs

@@ -0,0 +1 @@
+min_properties: int = {{minProperties}}

src/main/resources/python/components/schemas/schema_cls/_min_length.hbs

@@ -0,0 +1 @@
+{{#if exclusiveMinimum}}exclusive_minimum{{/if}}inclusive_minimum{{#unless exclusiveMinimum}}{{/unless}}: typing.Union[int, float] = {{minimum}}

src/main/resources/python/components/schemas/schema_cls/_min_properties.hbs

@@ -0,0 +1 @@
+multiple_of: typing.Union[int, float] = {{multipleOf}}

src/main/resources/python/components/schemas/schema_cls/_minimum.hbs

@@ -0,0 +1,3 @@
+{{#with not}}
+not_: typing.Type[{{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}] = dataclasses.field(default_factory=lambda: {{#if refInfo.refClass}}{{#if refInfo.refModule}}{{refInfo.refModule}}.{{/if}}{{refInfo.refClass}}{{else}}{{jsonPathPiece.camelCase}}{{/if}}) # type: ignore
+{{/with}}

src/main/resources/python/components/schemas/schema_cls/_multiple_of.hbs

@@ -0,0 +1 @@
+one_of: {{oneOf.jsonPathPiece.camelCase}} = dataclasses.field(default_factory=lambda: schemas.tuple_to_instance({{oneOf.jsonPathPiece.camelCase}})) # type: ignore

src/main/resources/python/components/schemas/schema_cls/_not.hbs

@@ -0,0 +1,27 @@
+pattern: schemas.PatternInfo = schemas.PatternInfo(
+    {{#with patternInfo}}
+    pattern=r'{{{pattern}}}'{{#if flags}},{{/if}}  # noqa: E501
+        {{#if flags}}
+            {{#eq flags.size 1}}
+    flags={{#each flags}}re.{{#eq this "i"}}I{{/eq}}{{#eq this "m"}}M{{/eq}}{{#eq this "s"}}S{{/eq}}{{#eq this "u"}}U{{/eq}}{{/each}},
+            {{else}}
+    flags=(
+                {{#each flags}}
+                    {{#eq this "i"}}
+        re.I{{#unless @last}} |{{/unless}}
+                    {{/eq}}
+                    {{#eq this "m"}}
+        re.M{{#unless @last}} |{{/unless}}
+                    {{/eq}}
+                    {{#eq this "s"}}
+        re.S{{#unless @last}} |{{/unless}}
+                    {{/eq}}
+                    {{#eq this "u"}}
+        re.U{{#unless @last}} |{{/unless}}
+                    {{/eq}}
+                {{/each}}
+        )
+            {{/eq}}
+        {{/if}}
+    {{/with}}
+)

src/main/resources/python/components/schemas/schema_cls/_one_of.hbs

@@ -0,0 +1 @@
+properties: {{properties.jsonPathPiece.camelCase}} = dataclasses.field(default_factory=lambda: schemas.typed_dict_to_instance({{properties.jsonPathPiece.camelCase}})) # type: ignore

src/main/resources/python/components/schemas/schema_cls/_pattern.hbs

@@ -0,0 +1,5 @@
+required: typing.FrozenSet[str] = frozenset({
+{{#each requiredProperties}}
+    "{{{@key.original}}}",
+{{/each}}
+})