Jsonschema-path upgrade

Author: p1c2u

openapi_spec_validator/validation/keywords.py

@@ -96,11 +96,12 @@ def _collect_properties(self, schema: SchemaPath) -> set[str]:
     def __call__(
         self, schema: SchemaPath, require_properties: bool = True
     ) -> Iterator[ValidationError]:
-        if not hasattr(schema.content(), "__getitem__"):
+        schema_value = schema.read_value()
+        if not hasattr(schema_value, "__getitem__"):
             return
 
         assert self.schema_ids_registry is not None
-        schema_id = id(schema.content())
+        schema_id = id(schema_value)
         if schema_id in self.schema_ids_registry:
             return
         self.schema_ids_registry.append(schema_id)
@@ -151,8 +152,8 @@ def __call__(
                     require_properties=False,
                 )
 
-        required = schema.getkey("required", [])
-        properties = schema.get("properties", {}).keys()
+        required = "required" in schema and (schema / "required").read_value() or []
+        properties = "properties" in schema and (schema / "properties").keys() or []
         if "allOf" in schema:
             extra_properties = list(
                 set(required) - set(properties) - set(nested_properties)
@@ -166,10 +167,12 @@ def __call__(
             )
 
         if "default" in schema:
-            default = schema["default"]
-            nullable = schema.get("nullable", False)
-            if default is not None or nullable is not True:
-                yield from self.default_validator(schema, default)
+            default_value = (schema / "default").read_value()
+            nullable_value = False
+            if "nullable" in schema:
+                nullable_value = (schema / "nullable").read_value()
+            if default_value is not None or nullable_value is not True:
+                yield from self.default_validator(schema, default_value)
 
 
 class SchemasValidator(KeywordValidator):
@@ -203,9 +206,9 @@ def __call__(self, parameter: SchemaPath) -> Iterator[ValidationError]:
 
         if "default" in parameter:
             # only possible in swagger 2.0
-            default = parameter.getkey("default")
-            if default is not None:
-                yield from self.default_validator(parameter, default)
+            if "default" in parameter:
+                default_value = (parameter / "default").read_value()
+                yield from self.default_validator(parameter, default_value)
 
 
 class ParametersValidator(KeywordValidator):
@@ -317,15 +320,17 @@ def __call__(
     ) -> Iterator[ValidationError]:
         assert self.operation_ids_registry is not None
 
-        operation_id = operation.getkey("operationId")
-        if (
-            operation_id is not None
-            and operation_id in self.operation_ids_registry
-        ):
-            yield DuplicateOperationIDError(
-                f"Operation ID '{operation_id}' for '{name}' in '{url}' is not unique"
-            )
-        self.operation_ids_registry.append(operation_id)
+        if "operationId" in operation:
+            operation_id_value = (operation / "operationId").read_value()
+            if (
+                operation_id_value is not None
+                and operation_id_value in self.operation_ids_registry
+            ):
+                yield DuplicateOperationIDError(
+                    f"Operation ID '{operation_id_value}' for "
+                    f"'{name}' in '{url}' is not unique"
+                )
+            self.operation_ids_registry.append(operation_id_value)
 
         if "responses" in operation:
             responses = operation / "responses"
@@ -416,8 +421,9 @@ def schemas_validator(self) -> SchemasValidator:
         return cast(SchemasValidator, self.registry["schemas"])
 
     def __call__(self, components: SchemaPath) -> Iterator[ValidationError]:
-        schemas = components.get("schemas", {})
-        yield from self.schemas_validator(schemas)
+        if "schemas" in components:
+            schemas = components / "schemas"
+            yield from self.schemas_validator(schemas)
 
 
 class RootValidator(KeywordValidator):

openapi_spec_validator/validation/validators.py

@@ -53,7 +53,7 @@ def __init__(
 
         if isinstance(schema, SchemaPath):
             self.schema_path = schema
-            self.schema = schema.contents()
+            self.schema = schema.read_value()
         else:
             self.schema = schema
             self.schema_path = SchemaPath.from_dict(

poetry.lock

@@ -56,7 +56,7 @@ include = [
 jsonschema = "^4.24.0"
 openapi-schema-validator = "^0.6.0"
 python = "^3.9.0"
-jsonschema-path = "^0.3.1"
+jsonschema-path = {version = "^0.4.0a1", allow-prereleases = true}
 lazy-object-proxy = "^1.7.1"
 
 [tool.poetry.extras]