Adds generic to schema class

Author: spacether

modules/openapi-json-schema-generator/src/main/resources/python/schemas.hbs

@@ -2,6 +2,7 @@
 
 {{> _helper_header }}
 
+from __future__ import annotations
 import collections
 import datetime
 import functools
@@ -2155,7 +2156,7 @@ class ListSchema(
     def from_openapi_data_(cls, arg: typing.List[typing.Any], configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any]], **kwargs: schema_configuration.SchemaConfiguration) -> ListSchema[tuple]:
         return super().__new__(cls, arg_, **kwargs)
 
 
@@ -2171,7 +2172,7 @@ class NoneSchema(
     def from_openapi_data_(cls, arg: None, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: None, **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: None, **kwargs: schema_configuration.SchemaConfiguration) -> NoneSchema[NoneClass]:
         return super().__new__(cls, arg_, **kwargs)
 
 
@@ -2191,7 +2192,7 @@ class NumberSchema(
     def from_openapi_data_(cls, arg: typing.Union[int, float], configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: schema_configuration.SchemaConfiguration) -> NumberSchema[decimal.Decimal]:
         return super().__new__(cls, arg_, **kwargs)
 
 
@@ -2205,7 +2206,7 @@ class IntBase:
             return self._as_int
 
 
-class IntSchema(IntBase, NumberSchema):
+class IntSchema(IntBase, NumberSchema[T]):
     class Schema_:
         types = {decimal.Decimal}
         format = 'int'
@@ -2214,28 +2215,34 @@ class IntSchema(IntBase, NumberSchema):
     def from_openapi_data_(cls, arg: int, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: schema_configuration.SchemaConfiguration) -> IntSchema[decimal.Decimal]:
         return super().__new__(cls, arg_, **kwargs)
 
 
 class Int32Schema(
-    IntSchema
+    IntSchema[T]
 ):
     class Schema_:
         types = {decimal.Decimal}
         format = 'int32'
 
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: schema_configuration.SchemaConfiguration) -> Int32Schema[decimal.Decimal]:
+        return super().__new__(cls, arg_, **kwargs)
+
 
 class Int64Schema(
-    IntSchema
+    IntSchema[T]
 ):
     class Schema_:
         types = {decimal.Decimal}
         format = 'int64'
 
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int], **kwargs: schema_configuration.SchemaConfiguration) -> Int64Schema[decimal.Decimal]:
+        return super().__new__(cls, arg_, **kwargs)
+
 
 class Float32Schema(
-    NumberSchema
+    NumberSchema[T]
 ):
     class Schema_:
         types = {decimal.Decimal}
@@ -2245,9 +2252,12 @@ class Float32Schema(
     def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: schema_configuration.SchemaConfiguration) -> Float32Schema[decimal.Decimal]:
+        return super().__new__(cls, arg_, **kwargs)
+
 
 class Float64Schema(
-    NumberSchema
+    NumberSchema[T]
 ):
     class Schema_:
         types = {decimal.Decimal}
@@ -2257,6 +2267,9 @@ class Float64Schema(
     def from_openapi_data_(cls, arg: float, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
+    def __new__(cls, arg_: typing.Union[decimal.Decimal, int, float], **kwargs: schema_configuration.SchemaConfiguration) -> Float64Schema[decimal.Decimal]:
+        return super().__new__(cls, arg_, **kwargs)
+
 
 class StrSchema(
     StrBase,
@@ -2273,46 +2286,46 @@ class StrSchema(
         types = {str}
 
     @classmethod
-    def from_openapi_data_(cls, arg: str, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> 'StrSchema':
+    def from_openapi_data_(cls, arg: str, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None) -> StrSchema[str]:
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: schema_configuration.SchemaConfiguration) -> StrSchema[str]:
         return super().__new__(cls, arg_, **kwargs)
 
 
-class UUIDSchema(UUIDBase, StrSchema):
+class UUIDSchema(UUIDBase, StrSchema[T]):
     class Schema_:
         types = {str}
         format = 'uuid'
 
-    def __new__(cls, arg_: typing.Union[str, uuid.UUID], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[str, uuid.UUID], **kwargs: schema_configuration.SchemaConfiguration) -> StrSchema[str]:
         return super().__new__(cls, arg_, **kwargs)
 
 
-class DateSchema(DateBase, StrSchema):
+class DateSchema(DateBase, StrSchema[T]):
     class Schema_:
         types = {str}
         format = 'date'
 
-    def __new__(cls, arg_: typing.Union[str, datetime.date], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[str, datetime.date], **kwargs: schema_configuration.SchemaConfiguration) -> DateSchema[str]:
         return super().__new__(cls, arg_, **kwargs)
 
 
-class DateTimeSchema(DateTimeBase, StrSchema):
+class DateTimeSchema(DateTimeBase, StrSchema[T]):
     class Schema_:
         types = {str}
         format = 'date-time'
 
-    def __new__(cls, arg_: typing.Union[str, datetime.datetime], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[str, datetime.datetime], **kwargs: schema_configuration.SchemaConfiguration) -> DateTimeSchema[str]:
         return super().__new__(cls, arg_, **kwargs)
 
 
-class DecimalSchema(DecimalBase, StrSchema):
+class DecimalSchema(DecimalBase, StrSchema[T]):
     class Schema_:
         types = {str}
         format = 'number'
 
-    def __new__(cls, arg_: str, **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: str, **kwargs: schema_configuration.SchemaConfiguration) -> DecimalSchema[str]:
         """
         Note: Decimals may not be passed in because cast_to_allowed_types is only invoked once for payloads
         which can be simple (str) or complex (dicts or lists with nested values)
@@ -2334,7 +2347,7 @@ class BytesSchema(
     class Schema_:
         types = {bytes}
 
-    def __new__(cls, arg_: bytes, **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: bytes, **kwargs: schema_configuration.SchemaConfiguration) -> BytesSchema[bytes]:
         return super(Schema, cls).__new__(cls, arg_)
 
 
@@ -2361,7 +2374,7 @@ class FileSchema(
     class Schema_:
         types = {FileIO}
 
-    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader], **kwargs: schema_configuration.SchemaConfiguration) -> -> FileSchema[FileIO]:
         return super(Schema, cls).__new__(cls, arg_)
 
 
@@ -2379,7 +2392,7 @@ class BinarySchema(
                 FileSchema,
             ]
 
-    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: schema_configuration.SchemaConfiguration):
+    def __new__(cls, arg_: typing.Union[io.FileIO, io.BufferedReader, bytes], **kwargs: schema_configuration.SchemaConfiguration) -> BinarySchema[typing.Union[FileIO, bytes]]:
         return super().__new__(cls, arg_)
 
 
@@ -2395,7 +2408,7 @@ class BoolSchema(
     def from_openapi_data_(cls, arg: bool, configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, arg_: bool, **kwargs: ValidationMetadata):
+    def __new__(cls, arg_: bool, **kwargs: ValidationMetadata) -> BoolSchema[bool]:
         return super().__new__(cls, arg_, **kwargs)
 
 
@@ -2413,8 +2426,28 @@ class AnyTypeSchema(
     class Schema_:
         pass
 
+    def __new__(
+        cls,
+        *args_: typing.Union[
+            {{> _helper_types_all_incl_schema }}
+        ],
+        configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None,
+        **kwargs: typing.Union[
+            {{> _helper_types_all_incl_schema }}
+            Unset
+        ]
+    ) -> AnyTypeSchema[typing.Union[
+        NoneClass,
+        frozendict.frozendict,
+        tuple,
+        str,
+        decimal.Decimal,
+        BoolClass
+    ]:
+        return super().__new__(cls, arg_, **kwargs)
+
 
-class UnsetAnyTypeSchema(AnyTypeSchema):
+class UnsetAnyTypeSchema(AnyTypeSchema[T]):
     # Used when additionalProperties/items was not explicitly defined and a defining schema is needed
     pass
 
@@ -2453,7 +2486,7 @@ class DictSchema(
     def from_openapi_data_(cls, arg: typing.Dict[str, typing.Any], configuration_: typing.Optional[schema_configuration.SchemaConfiguration] = None):
         return super().from_openapi_data_(arg, configuration_=configuration_)
 
-    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
+    def __new__(cls, *args_: typing.Union[dict, frozendict.frozendict], **kwargs: typing.Union[dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]) -> DictSchema[frozendict.frozendict]:
         return super().__new__(cls, *args_, **kwargs)