schema - nullable additionalProperties

nullable additionalProperties have to be RootModels

Author: commonism

src/aiopenapi3/model.py

@@ -618,9 +618,10 @@ def createAnnotation(
 
     @staticmethod
     def types(schema: "SchemaType") -> typing.Generator[str, None, None]:
+        nullable = getattr(schema, "nullable", False)
         if isinstance(schema.type, str):
             yield schema.type
-            if getattr(schema, "nullable", False):
+            if nullable:
                 yield "null"
         else:
             typesfilter: set[str] = set()
@@ -631,6 +632,9 @@ def types(schema: "SchemaType") -> typing.Generator[str, None, None]:
                 values = set(SCHEMA_TYPES)
                 typesfilter = set()
 
+                if nullable:
+                    typesfilter.add("null")
+
                 if (const := getattr(schema, "const", None)) is not None:
                     typesfilter.add(cast(str, TYPES_SCHEMA_MAP.get(type(const))))
 

tests/fixtures/schema-additionalProperties-nullable-allof.yaml

@@ -10,7 +10,8 @@ components:
       properties:
         unitTestId:
           type: integer
-
+      required:
+        - unitTestId
     RelationsModel:
       type: object
       properties:
@@ -20,6 +21,9 @@ components:
           type: array
           items:
             $ref: "#/components/schemas/LinkOccasion"
+      required:
+        - unitPartNumber
+        - linkOccasions
 
 paths:
   /relations:
@@ -31,8 +35,12 @@ paths:
           content:
             application/json:
               schema:
+                title: base
                 type: object
                 additionalProperties:
+                  title: addi
+#                  type: object
+#                  additionalProperties: false
                   nullable: true
                   allOf:
                     - $ref: "#/components/schemas/RelationsModel"

tests/schema_test.py

@@ -340,21 +340,21 @@ def test_schema_additionalProperties_nullable_allof(with_schema_additionalProper
     """
     api = OpenAPI("/", with_schema_additionalProperties_nullable_allof)
 
-    schema = api.paths["/relations"].get.responses["200"].content["application/json"].schema_
+    schema = api._["getRelations"].return_value()
     value_type = schema.additionalProperties.get_type()
 
     assert value_type.__pydantic_complete__ is True
 
     # non-null value
     obj = value_type.model_validate({"unitPartNumber": "ABC", "linkOccasions": [{"unitTestId": 1}]})
-    assert obj.unitPartNumber == "ABC"
-    assert obj.linkOccasions[0].unitTestId == 1
+    assert obj.root.unitPartNumber == "ABC"
+    assert obj.root.linkOccasions[0].unitTestId == 1
 
     # map model accepts null values for the map entries
     map_type = schema.get_type()
     result = map_type.model_validate({"key1": {"unitPartNumber": "ABC", "linkOccasions": []}, "key2": None})
     assert result.root["key2"] is None
-    assert result.root["key1"].unitPartNumber == "ABC"
+    assert result.root["key1"].root.unitPartNumber == "ABC"
 
 
 def test_schema_with_patternProperties(with_schema_patternProperties):