Uses datetime import, adds types templates

Author: spacether

modules/openapi-json-schema-generator/src/main/java/org/openapitools/codegen/languages/AbstractPythonCodegen.java

@@ -61,7 +61,11 @@ public AbstractPythonCodegen() {
                         "assert", "else", "if", "pass", "yield", "break", "except", "import",
                         "print", "class", "exec", "in", "raise", "continue", "finally", "is",
                         "return", "def", "for", "lambda", "try", "self", "nonlocal", "None", "True",
-                        "False", "async", "await"));
+                        "False", "async", "await",
+                        // imports, imports_schema_types.handlebars, include these to prevent name collision
+                        "datetime", "decimal", "functools", "io", "re",
+                        "typing", "typing_extensions", "uuid", "frozendict", "schemas"
+                ));
 
         languageSpecificPrimitives.clear();
         languageSpecificPrimitives.add("int");

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

@@ -1,8 +1,9 @@
 # coding: utf-8
 {{>partial_header}}
 
+import datetime
 import dataclasses
-from decimal import Decimal
+import decimal
 import enum
 import email
 import json
@@ -33,8 +34,6 @@ from {{packageName}}.schemas import (
     Schema,
     FileIO,
     BinarySchema,
-    date,
-    datetime,
     none_type,
     Unset,
     unset,
@@ -58,7 +57,7 @@ class JSONEncoder(json.JSONEncoder):
             return float(obj)
         elif isinstance(obj, int):
             return int(obj)
-        elif isinstance(obj, Decimal):
+        elif isinstance(obj, decimal.Decimal):
             if obj.as_tuple().exponent >= 0:
                 return int(obj)
             return float(obj)
@@ -431,7 +430,7 @@ class PathParameter(ParameterBase, StyleSimpleSerializer):
     def serialize(
         cls,
         in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
+            Schema, decimal.Decimal, int, float, str, datetime.date, datetime.datetime, None, bool, list, tuple, dict, frozendict.frozendict]
     ) -> typing.Dict[str, str]:
         if cls.schema:
             cast_in_data = cls.schema(in_data)
@@ -536,7 +535,7 @@ class QueryParameter(ParameterBase, StyleFormSerializer):
     def serialize(
         cls,
         in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict],
+            Schema, decimal.Decimal, int, float, str, datetime.date, datetime.datetime, None, bool, list, tuple, dict, frozendict.frozendict],
         prefix_separator_iterator: typing.Optional[PrefixSeparatorIterator] = None
     ) -> typing.Dict[str, str]:
         if cls.schema:
@@ -592,7 +591,7 @@ class CookieParameter(ParameterBase, StyleFormSerializer):
     def serialize(
         cls,
         in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
+            Schema, decimal.Decimal, int, float, str, datetime.date, datetime.datetime, None, bool, list, tuple, dict, frozendict.frozendict]
     ) -> typing.Dict[str, str]:
         if cls.schema:
             cast_in_data = cls.schema(in_data)
@@ -646,7 +645,7 @@ class HeaderParameterWithoutName(ParameterBase, StyleSimpleSerializer):
     def serialize(
         cls,
         in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict],
+            Schema, decimal.Decimal, int, float, str, datetime.date, datetime.datetime, None, bool, list, tuple, dict, frozendict.frozendict],
         name: str
     ) -> HTTPHeaderDict:
         if cls.schema:
@@ -699,7 +698,7 @@ class HeaderParameter(HeaderParameterWithoutName):
     def serialize(
         cls,
         in_data: typing.Union[
-            Schema, Decimal, int, float, str, date, datetime, None, bool, list, tuple, dict, frozendict.frozendict]
+            Schema, decimal.Decimal, int, float, str, datetime.date, datetime.datetime, None, bool, list, tuple, dict, frozendict.frozendict]
     ) -> HTTPHeaderDict:
         return super().serialize(
             in_data,

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

@@ -1,4 +1,4 @@
-from datetime import date, datetime  # noqa: F401
+import datetime  # noqa: F401
 import decimal  # noqa: F401
 import functools  # noqa: F401
 import io  # noqa: F401

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

@@ -52,7 +52,7 @@ def __new__(
 {{/unless}}
 {{else}}
 {{#or isMap isAnyType}}
-    **kwargs: typing.Union[schemas.AnyTypeSchema, dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, None, list, tuple, bytes],
+    **kwargs: typing.Union[{{> types_all_incl_schema_oneline }}],
 {{/or}}
 {{/with}}
 ) -> '{{name.getCamelCaseName}}':

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

@@ -1 +1 @@
-{{#if isAnyType}}dict, frozendict.frozendict, str, date, datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, {{/if}}{{#if isArray}}list, tuple, {{/if}}{{#if isMap}}dict, frozendict.frozendict, {{/if}}{{#if isNull}}None, {{/if}}{{#if isString }}{{#neq format "binary"}}str, {{/neq}}{{#eq format "date"}}date, {{/eq}}{{#eq format "date-time"}}datetime, {{/eq}}{{#eq format "uuid"}}uuid.UUID, {{/eq}}{{#eq format "binary"}}bytes, io.FileIO, io.BufferedReader, {{/eq}}{{/if}}{{#if isInteger}}decimal.Decimal, int, {{/if}}{{#if isNumber}}decimal.Decimal, int, float, {{/if}}{{#if isBoolean}}bool, {{/if}}
+{{#if isAnyType}}dict, frozendict.frozendict, str, datetime.date, datetime.datetime, uuid.UUID, int, float, decimal.Decimal, bool, None, list, tuple, bytes, io.FileIO, io.BufferedReader, {{/if}}{{#if isArray}}list, tuple, {{/if}}{{#if isMap}}dict, frozendict.frozendict, {{/if}}{{#if isNull}}None, {{/if}}{{#if isString }}{{#neq format "binary"}}str, {{/neq}}{{#eq format "date"}}datetime.date, {{/eq}}{{#eq format "date-time"}}datetime.datetime, {{/eq}}{{#eq format "uuid"}}uuid.UUID, {{/eq}}{{#eq format "binary"}}bytes, io.FileIO, io.BufferedReader, {{/eq}}{{/if}}{{#if isInteger}}decimal.Decimal, int, {{/if}}{{#if isNumber}}decimal.Decimal, int, float, {{/if}}{{#if isBoolean}}bool, {{/if}}

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

@@ -1,5 +1,5 @@
 import dataclasses
-from datetime import date, datetime
+import datetime
 import decimal
 import io
 import typing

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

@@ -27,7 +27,7 @@ Key | Input Type | Accessed Type | Description | Notes
     {{/if}}
     {{/unless}}
     {{else}}
-**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]
+**any_string_name** | {{> types_all_incl_schema_oneline }} | {{> types_all_accessed }} | any string name can be used but the value must be the correct type | [optional]
     {{/with}}
 {{/or}}
 {{#each requiredProperties}}

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

@@ -3,7 +3,7 @@
 {{>partial_header}}
 
 from collections import defaultdict
-from datetime import date, datetime, timedelta  # noqa: F401
+import datetime
 import functools
 import decimal
 import io
@@ -687,12 +687,12 @@ class CustomIsoparser(isoparser):
 
         if len(components) > 3 and components[3] == 24:
             components[3] = 0
-            return datetime(*components) + timedelta(days=1)
+            return datetime.datetime(*components) + datetime.timedelta(days=1)
 
         if len(components) <= 3:
             raise ValueError('Value is not a datetime')
 
-        return datetime(*components)
+        return datetime.datetime(*components)
 
     @_takes_ascii
     def parse_isodate(self, datestr):
@@ -704,7 +704,7 @@ class CustomIsoparser(isoparser):
         if len(components) > 3:
             raise ValueError('String contains invalid time components')
 
-        return date(*components)
+        return datetime.date(*components)
 
 
 DEFAULT_ISOPARSER = CustomIsoparser()
@@ -1422,7 +1422,7 @@ class Schema:
             items = cls._get_items_oapg(arg, path_to_item, path_to_schemas)
             return super(Schema, cls).__new__(cls, items)
         """
-        str = openapi str, date, and datetime
+        str = openapi str, datetime.date, and datetime.datetime
         decimal.Decimal = openapi int and float
         FileIO = openapi binary type and the user inputs a file
         bytes = openapi binary type and the user inputs bytes
@@ -1483,35 +1483,11 @@ class Schema:
     def __new__(
         cls,
         *_args: typing.Union[
-            dict,
-            frozendict.frozendict,
-            list,
-            tuple,
-            decimal.Decimal,
-            float,
-            int,
-            str,
-            date,
-            datetime,
-            bool,
-            None,
-            'Schema'
+            {{> types_all_incl_schema }}
         ],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
-            dict,
-            frozendict.frozendict,
-            list,
-            tuple,
-            decimal.Decimal,
-            float,
-            int,
-            str,
-            date,
-            datetime,
-            bool,
-            None,
-            'Schema',
+            {{> types_all_incl_schema }}
             Unset
         ]
     ):
@@ -1557,10 +1533,10 @@ class Schema:
     def __init__(
         self,
         *_args: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema'],
+            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema'],
         _configuration: typing.Optional[Configuration] = None,
         **kwargs: typing.Union[
-            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, date, datetime, bool, None, 'Schema', Unset
+            dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, bool, None, 'Schema', Unset
         ]
     ):
         """
@@ -1907,11 +1883,11 @@ class StrBase:
         return self
 
     @property
-    def as_date_oapg(self) -> date:
+    def as_date_oapg(self) -> datetime.date:
         raise Exception('not implemented')
 
     @property
-    def as_datetime_oapg(self) -> datetime:
+    def as_datetime_oapg(self) -> datetime.datetime:
         raise Exception('not implemented')
 
     @property
@@ -1933,14 +1909,14 @@ class UUIDBase:
 class DateBase:
     @property
     @functools.lru_cache()
-    def as_date_oapg(self) -> date:
+    def as_date_oapg(self) -> datetime.date:
         return DEFAULT_ISOPARSER.parse_isodate(self)
 
 
 class DateTimeBase:
     @property
     @functools.lru_cache()
-    def as_datetime_oapg(self) -> datetime:
+    def as_datetime_oapg(self) -> datetime.datetime:
         return DEFAULT_ISOPARSER.parse_isodatetime(self)
 
 
@@ -2076,12 +2052,16 @@ class DictBase:
 
 
 def cast_to_allowed_types(
-    arg: typing.Union[str, date, datetime, uuid.UUID, decimal.Decimal, int, float, None, dict, frozendict.frozendict, list, tuple, bytes, Schema, io.FileIO, io.BufferedReader],
+    arg: typing.Union[
+        {{> types_all_incl_schema }}
+    ],
     from_server: bool,
     validated_path_to_schemas: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Set[typing.Union['Schema', str, decimal.Decimal, BoolClass, NoneClass, frozendict.frozendict, tuple]]],
     path_to_item: typing.Tuple[typing.Union[str, int], ...],
     path_to_type: typing.Dict[typing.Tuple[typing.Union[str, int], ...], typing.Type]
-) -> typing.Union[frozendict.frozendict, tuple, decimal.Decimal, str, bytes, BoolClass, NoneClass, FileIO]:
+) -> typing.Union[
+    {{> types_all_accessed }}
+]:
     """
     Casts the input payload arg into the allowed types
     The input validated_path_to_schemas is mutated by running this function
@@ -2170,7 +2150,7 @@ def cast_to_allowed_types(
     elif isinstance(arg, (none_type, NoneClass)):
         path_to_type[path_to_item] = NoneClass
         return NoneClass.NONE
-    elif isinstance(arg, (date, datetime)):
+    elif isinstance(arg, (datetime.date, datetime.datetime)):
         path_to_type[path_to_item] = str
         if not from_server:
             return arg.isoformat()
@@ -2325,7 +2305,7 @@ class StrSchema(
     def from_openapi_data_oapg(cls, arg: str, _configuration: typing.Optional[Configuration] = None) -> 'StrSchema':
         return super().from_openapi_data_oapg(arg, _configuration=_configuration)
 
-    def __new__(cls, _arg: typing.Union[str, date, datetime, uuid.UUID], **kwargs: Configuration):
+    def __new__(cls, _arg: typing.Union[str, datetime.date, datetime.datetime, uuid.UUID], **kwargs: Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2352,7 +2332,7 @@ class DateTimeSchema(DateTimeBase, StrSchema):
         types = {str}
         format = 'date-time'
 
-    def __new__(cls, _arg: typing.Union[str, datetime], **kwargs: Configuration):
+    def __new__(cls, _arg: typing.Union[str, datetime.datetime], **kwargs: Configuration):
         return super().__new__(cls, _arg, **kwargs)
 
 
@@ -2502,7 +2482,7 @@ class DictSchema(
     def from_openapi_data_oapg(cls, arg: typing.Dict[str, typing.Any], _configuration: typing.Optional[Configuration] = None):
         return super().from_openapi_data_oapg(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, date, 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, date.datetime, datetime.datetime, bool, None, bytes, Schema, Unset, ValidationMetadata]):
         return super().__new__(cls, *_args, **kwargs)
 
 

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

@@ -0,0 +1,8 @@
+frozendict.frozendict,
+tuple,
+decimal.Decimal,
+str,
+bytes,
+BoolClass,
+NoneClass,
+FileIO

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

@@ -0,0 +1 @@
+frozendict.frozendict, tuple, decimal.Decimal, str, bytes, BoolClass, NoneClass, FileIO

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

@@ -0,0 +1,16 @@
+dict,
+frozendict.frozendict,
+list,
+tuple,
+decimal.Decimal,
+float,
+int,
+str,
+datetime.date,
+datetime.datetime,
+uuid.UUID,
+bool,
+None,
+io.FileIO,
+io.BufferedReader,
+'Schema',

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

@@ -0,0 +1 @@
+dict, frozendict.frozendict, list, tuple, decimal.Decimal, float, int, str, datetime.date, datetime.datetime, uuid.UUID, bool, None, io.FileIO, io.BufferedReader, schemas.Schema