Implement primitive unions (#33)

Tinche · Jun 6, 2023 · 871e7be · 871e7be
1 parent d8161a0
commit 871e7be
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/docs/_static/custom.css b/docs/_static/custom.css
@@ -134,6 +134,6 @@ div.tab-set pre {
   padding: 1.25em;
 }
 
-body:not([data-theme="light"]) .highlight {
+body .highlight.only_dark {
   background: #18181a;
 }
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -23,6 +23,7 @@ The **third number** is for emergencies when we need to start branches for older
 - Add OpenAPI support for generic _attrs_ classes.
 - Add OpenAPI support for unions of a single _attrs_ class and `None` (optionals).
 - Properly set the OpenAPI `required` attribute for _attrs_ fields without defaults.
+- Add OpenAPI support for primitive types in unions.
 
 ### Fixed
 

diff --git a/src/uapi/openapi.py b/src/uapi/openapi.py
@@ -602,6 +602,8 @@ def _build_attrs_schema(
                     refs.append(Reference(ref))
                 elif arg is NoneType:
                     refs.append(InlineType(Schema.Type.NULL))
+                elif arg in PYTHON_PRIMITIVES_TO_OPENAPI:
+                    refs.append(InlineType(PYTHON_PRIMITIVES_TO_OPENAPI[arg].type))
             schema = OneOfSchema(refs)
         else:
             continue

diff --git a/tests/models.py b/tests/models.py
@@ -71,6 +71,8 @@ class SumTypesRequestInner:
         a: int
 
     inner: SumTypesRequestInner | None
+    opt_string: str | None
+    opt_def_string: str | None = None
 
 
 @define

diff --git a/tests/test_openapi_attrs.py b/tests/test_openapi_attrs.py
@@ -566,9 +566,15 @@ def test_sum_types_model(app_factory) -> None:
                     Reference("#/components/schemas/SumTypesRequestInner"),
                     InlineType(Schema.Type.NULL),
                 ]
-            )
+            ),
+            "opt_string": OneOfSchema(
+                [InlineType(Schema.Type.STRING), InlineType(Schema.Type.NULL)]
+            ),
+            "opt_def_string": OneOfSchema(
+                [InlineType(Schema.Type.STRING), InlineType(Schema.Type.NULL)]
+            ),
         },
-        required=["inner"],
+        required=["inner", "opt_string"],
     )
     assert spec.components.schemas["SumTypesRequestInner"] == Schema(
         Schema.Type.OBJECT,