v20 - boolean schemas

Author: commonism

aiopenapi3/v20/schemas.py

@@ -1,6 +1,6 @@
 from typing import Union, Any, Optional
 
-from pydantic import Field, PrivateAttr
+from pydantic import Field, PrivateAttr, model_validator
 
 from .general import Reference
 from .xml import XML
@@ -40,13 +40,23 @@ class Schema(ObjectExtended, SchemaBase):
     items: Optional[Union[list[Union["Schema", Reference]], Union["Schema", Reference]]] = Field(default=None)
     allOf: list[Union["Schema", Reference]] = Field(default_factory=list)
     properties: dict[str, Union["Schema", Reference]] = Field(default_factory=dict)
-    additionalProperties: Optional[Union[bool, "Schema", Reference]] = Field(default=None)
+    additionalProperties: Optional[Union["Schema", Reference]] = Field(default=None)
 
     discriminator: Optional[str] = Field(default=None)  # 'Discriminator'
     readOnly: Optional[bool] = Field(default=None)
     xml: Optional[XML] = Field(default=None)  # 'XML'
     externalDocs: Optional[dict] = Field(default=None)  # 'ExternalDocs'
     example: Optional[Any] = Field(default=None)
 
+    @model_validator(mode="before")
+    @classmethod
+    def is_boolean_schema(cls, data: Any) -> Any:
+        if not isinstance(data, bool):
+            return data
+        if data:
+            return {}
+        else:
+            return {"not": {}}
+
     def __getstate__(self):
         return SchemaBase.__getstate__(self)

tests/conftest.py

@@ -440,6 +440,11 @@ def with_schema_additionalProperties_and_named_properties():
     yield _get_parsed_yaml("schema-additionalProperties-and-named-properties" ".yaml")
 
 
+@pytest.fixture
+def with_schema_boolean_v20():
+    yield _get_parsed_yaml("schema-boolean-v20.yaml")
+
+
 @pytest.fixture
 def with_schema_boolean(openapi_version):
     yield _get_parsed_yaml("schema-boolean.yaml", openapi_version)

tests/fixtures/schema-boolean-v20.yaml

@@ -0,0 +1,17 @@
+swagger: "2.0"
+info:
+  title: baseurl with port
+  description: baseurl with port
+  version: 1.0.0
+host: api.example.com:81
+basePath: /v1
+schemes:
+  - https
+
+consumes: []
+produces: []
+paths: {}
+definitions:
+  A:
+    type: object
+    additionalProperties: true

tests/schema_test.py

@@ -754,3 +754,7 @@ def test_schema_boolean(with_schema_boolean):
         ]:
             del v["components"]["schemas"][i]
     OpenAPI("/", v)
+
+
+def test_schema_boolean_v20(with_schema_boolean_v20):
+    OpenAPI("/", with_schema_boolean_v20)