feat: support additional string format types, preventing failure on unknown types

Author: tractorcow

src/openapi_python_generator/language_converters/python/model_generator.py

@@ -118,14 +118,11 @@ def type_converter(  # noqa: C901
                 *[i.import_types for i in conversions if i.import_types is not None]
             )
         )
-    # We only want to auto convert to datetime if orjson is used throghout the code, otherwise we can not
-    # serialize it to JSON.
-    elif schema.type == "string" and (
-            schema.schema_format is None or not common.get_use_orjson()
-    ):
-        converted_type = pre_type + "str" + post_type
+    # With custom string format fields, in order to cast these to strict types (e.g. date, datetime, UUID)
+    # orjson is required for JSON serialiation.
     elif (
             schema.type == "string"
+            and schema.schema_format is not None
             and schema.schema_format.startswith("uuid")
             and common.get_use_orjson()
     ):
@@ -136,9 +133,17 @@ def type_converter(  # noqa: C901
         else:
             converted_type = pre_type + "UUID" + post_type
             import_types = ["from uuid import UUID"]
-    elif schema.type == "string" and schema.schema_format == "date-time":
+    elif schema.type == "string" and schema.schema_format == "date-time" and common.get_use_orjson():
         converted_type = pre_type + "datetime" + post_type
         import_types = ["from datetime import datetime"]
+    elif schema.type == "string" and schema.schema_format == "date" and common.get_use_orjson():
+        converted_type = pre_type + "date" + post_type
+        import_types = ["from datetime import date"]
+    elif schema.type == "string" and schema.schema_format == "decimal" and common.get_use_orjson():
+        converted_type = pre_type + "Decimal" + post_type
+        import_types = ["from decimal import Decimal"]
+    elif schema.type == "string":
+        converted_type = pre_type + "str" + post_type
     elif schema.type == "integer":
         converted_type = pre_type + "int" + post_type
     elif schema.type == "number":

tests/test_data/test_api.json

@@ -527,6 +527,16 @@
             "title": "Created At",
             "type": "string",
             "format": "date-time"
+          },
+          "birthdate": {
+            "title": "Birthdate",
+            "type": "string",
+            "format": "date"
+          },
+          "position": {
+            "title": "Position",
+            "type": "string",
+            "format": "decimal"
           }
         }
       },

tests/test_model_generator.py

@@ -43,6 +43,14 @@
             Schema(type=DataType.STRING, schema_format="date-time"),
             TypeConversion(original_type="string", converted_type="str"),
         ),
+        (
+            Schema(type=DataType.STRING, schema_format="date"),
+            TypeConversion(original_type="string", converted_type="str"),
+        ),
+        (
+            Schema(type=DataType.STRING, schema_format="decimal"),
+            TypeConversion(original_type="string", converted_type="str"),
+        ),
         (
             Schema(type=DataType.OBJECT),
             TypeConversion(original_type="object", converted_type="Dict[str, Any]"),
@@ -137,6 +145,29 @@ def test_type_converter_simple(test_openapi_types, expected_python_types):
                 import_types=["from datetime import datetime"],
             ),
         ),
+        (
+            Schema(type=DataType.STRING, schema_format="date"),
+            TypeConversion(
+                original_type="string",
+                converted_type="date",
+                import_types=["from datetime import date"],
+            ),
+        ),
+        (
+            Schema(type=DataType.STRING, schema_format="decimal"),
+            TypeConversion(
+                original_type="string",
+                converted_type="Decimal",
+                import_types=["from decimal import Decimal"],
+            ),
+        ),
+        (
+            Schema(type=DataType.STRING, schema_format="email"),
+            TypeConversion(
+                original_type="string",
+                converted_type="str",
+            ),
+        ),
         (
             Schema(type=DataType.OBJECT),
             TypeConversion(original_type="object", converted_type="Dict[str, Any]"),