Merge branch 'main' into gh-8-disciminator

Author: manchenkoff

src/openapi_parser/builders/schema.py

@@ -154,6 +154,7 @@ def __init__(self, strict_enum: bool = True) -> None:
     def create(self, data: dict[str, Any]) -> Schema:
         """Create a schema object from a raw dict."""
         data = merge_all_of_schemas(data)
+        not_data = data.pop("not", None)
 
         if "oneOf" in data:
             data["type"] = DataType.ONE_OF
@@ -181,7 +182,12 @@ def create(self, data: dict[str, Any]) -> Schema:
 
         logger.debug(f"Building schema [type={data_type}]")
 
-        return builder_func(data)
+        schema = builder_func(data)
+
+        if not_data is not None:
+            schema.not_schema = self.create(not_data)
+
+        return schema
 
     def _null(self, data: dict[str, Any]) -> Null:
         return Null(**extract_attrs(data, {}))

src/openapi_parser/specification.py

@@ -94,13 +94,9 @@ class Schema:
     read_only: bool | None = field(default=False)
     write_only: bool | None = field(default=False)
     deprecated: bool | None = field(default=False)
+    not_schema: Schema | None = None
     extensions: dict[str, Any] | None = field(default_factory=dict)
 
-    # all_of: Any  # TODO
-    # one_of: Any  # TODO
-    # any_of: Any  # TODO
-    # not: Any  # TODO
-
 
 @dataclass
 class Integer(Schema):

tests/builders/test_not.py

@@ -0,0 +1,75 @@
+from typing import Any
+
+import pytest
+
+from openapi_parser.builders.schema import SchemaFactory
+from openapi_parser.enumeration import DataType
+from openapi_parser.specification import (
+    AnyOf,
+    Array,
+    Boolean,
+    Integer,
+    Number,
+    Object,
+    Property,
+    Schema,
+    String,
+)
+
+data_provider = (
+    (
+        {
+            "type": "string",
+            "not": {"type": "integer"},
+        },
+        String(
+            type=DataType.STRING,
+            not_schema=Integer(type=DataType.INTEGER),
+        ),
+    ),
+    (
+        {
+            "type": "object",
+            "properties": {
+                "name": {"type": "string"},
+            },
+            "not": {"type": "integer"},
+        },
+        Object(
+            type=DataType.OBJECT,
+            properties=[
+                Property(name="name", schema=String(type=DataType.STRING)),
+            ],
+            not_schema=Integer(type=DataType.INTEGER),
+        ),
+    ),
+    (
+        {
+            "not": {"type": "integer"},
+        },
+        AnyOf(
+            type=DataType.ANY_OF,
+            schemas=[
+                Integer(type=DataType.INTEGER),
+                Number(type=DataType.NUMBER),
+                String(type=DataType.STRING),
+                Boolean(type=DataType.BOOLEAN),
+                Array(type=DataType.ARRAY),
+                Object(type=DataType.OBJECT),
+            ],
+            not_schema=Integer(type=DataType.INTEGER),
+        ),
+    ),
+    (
+        {
+            "type": "string",
+        },
+        String(type=DataType.STRING),
+    ),
+)
+
+
+@pytest.mark.parametrize(["data", "expected"], data_provider)
+def test_not_builder(data: dict[str, Any], expected: Schema) -> None:
+    factory = SchemaFactory()
+    assert expected == factory.create(data)

tests/data/swagger.yml

@@ -120,6 +120,8 @@ components:
       allowReserved: true
       schema:
         type: integer
+        not:
+          type: string
 
     Offset:
       name: offset

tests/openapi_fixture.py

@@ -354,7 +354,10 @@ def create_specification() -> Specification:
                             style=QueryParameterStyle.FORM,
                             allow_reserved=True,
                             example=10,
-                            schema=Integer(type=DataType.INTEGER),
+                            schema=Integer(
+                                type=DataType.INTEGER,
+                                not_schema=String(type=DataType.STRING),
+                            ),
                         ),
                         Parameter(
                             name="offset",