Support both new and old style Union/Optional

ninja/signature/details.py

@@ -24,6 +24,13 @@
     "FuncParam", ["name", "alias", "source", "annotation", "is_collection"]
 )
 
+try:
+    from types import UnionType
+
+    UNION_TYPES = (Union, UnionType)
+except ImportError:
+    UNION_TYPES = (Union,)
+
 
 class ViewSignature:
     FLATTEN_PATH_SEP = (
@@ -247,7 +254,7 @@ def _get_param_type(self, name: str, arg: inspect.Parameter) -> FuncParam:
 
 def is_pydantic_model(cls: Any) -> bool:
     try:
-        if get_collection_origin(cls) == Union:
+        if get_collection_origin(cls) in UNION_TYPES:
             return any(issubclass(arg, pydantic.BaseModel) for arg in get_args(cls))
         return issubclass(cls, pydantic.BaseModel)
     except TypeError:

tests/test_openapi_schema.py

@@ -1,3 +1,4 @@
+import sys
 from typing import List, Union
 from unittest.mock import Mock
 
@@ -107,6 +108,14 @@ def method_union_payload_and_simple(request, data: Union[int, TypeB]):
     return data.dict()
 
 
+if sys.version_info >= (3, 10):
+    # This requires Python 3.10 or higher (PEP 604), so we're using eval to
+    # conditionally make it available
+    @api.post("/test-new-union-type", response=Response)
+    def method_new_union_payload(request, data: "TypeA | TypeB"):
+        return dict(i=data.i, f=data.f)
+
+
 @api.post(
     "/test-title-description/",
     tags=["a-tag"],
@@ -659,6 +668,29 @@ def test_union_payload_simple(schema):
     }
 
 
+@pytest.mark.skipif(
+    sys.version_info < (3, 10),
+    reason="requires Python 3.10 or higher (PEP 604)",
+)
+def test_new_union_payload_type(schema):
+    method = schema["paths"]["/api/test-new-union-type"]["post"]
+
+    assert method["requestBody"] == {
+        "content": {
+            "application/json": {
+                "schema": {
+                    "anyOf": [
+                        {"$ref": "#/components/schemas/TypeA"},
+                        {"$ref": "#/components/schemas/TypeB"},
+                    ],
+                    "title": "Data",
+                }
+            }
+        },
+        "required": True,
+    }
+
+
 def test_get_openapi_urls():
     api = NinjaAPI(openapi_url=None)
     paths = get_openapi_urls(api)