Merge pull request #293 from python-openapi/feature/validator-accept-any-schema

Validator accept any schema

Author: p1c2u

openapi_spec_validator/schemas/types.py

@@ -0,0 +1,6 @@
+from typing import Union
+
+from jsonschema_path.paths import SchemaPath
+from jsonschema_path.typing import Schema
+
+AnySchema = Union[Schema, SchemaPath]

openapi_spec_validator/validation/validators.py

@@ -18,6 +18,7 @@
 from openapi_spec_validator.schemas import openapi_v2_schema_validator
 from openapi_spec_validator.schemas import openapi_v30_schema_validator
 from openapi_spec_validator.schemas import openapi_v31_schema_validator
+from openapi_spec_validator.schemas.types import AnySchema
 from openapi_spec_validator.validation import keywords
 from openapi_spec_validator.validation.decorators import unwraps_iter
 from openapi_spec_validator.validation.decorators import wraps_cached_iter
@@ -39,11 +40,10 @@ class SpecValidator:
 
     def __init__(
         self,
-        schema: Schema,
+        schema: AnySchema,
         base_uri: str = "",
         spec_url: Optional[str] = None,
     ) -> None:
-        self.schema = schema
         if spec_url is not None:
             warnings.warn(
                 "spec_url parameter is deprecated. " "Use base_uri instead.",
@@ -52,11 +52,16 @@ def __init__(
             base_uri = spec_url
         self.base_uri = base_uri
 
-        self.spec = SchemaPath.from_dict(
-            self.schema,
-            base_uri=self.base_uri,
-            handlers=self.resolver_handlers,
-        )
+        if isinstance(schema, SchemaPath):
+            self.schema_path = schema
+            self.schema = schema.contents()
+        else:
+            self.schema = schema
+            self.schema_path = SchemaPath.from_dict(
+                self.schema,
+                base_uri=self.base_uri,
+                handlers=self.resolver_handlers,
+            )
 
         self.keyword_validators_registry = KeywordValidatorRegistry(
             self.keyword_validators
@@ -84,12 +89,7 @@ def root_validator(self) -> keywords.RootValidator:
     def iter_errors(self) -> Iterator[ValidationError]:
         yield from self.schema_validator.iter_errors(self.schema)
 
-        spec = SchemaPath.from_dict(
-            self.schema,
-            base_uri=self.base_uri,
-            handlers=self.resolver_handlers,
-        )
-        yield from self.root_validator(spec)
+        yield from self.root_validator(self.schema_path)
 
 
 class OpenAPIV2SpecValidator(SpecValidator):

poetry.lock

@@ -56,7 +56,7 @@ jsonschema = "^4.18.0"
 openapi-schema-validator = "^0.6.0"
 python = "^3.8.0"
 importlib-resources = {version = ">=5.8,<7.0", python = "<3.9" }
-jsonschema-path = "^0.3.0"
+jsonschema-path = "^0.3.1"
 lazy-object-proxy = "^1.7.1"
 
 [tool.poetry.extras]

pyproject.toml

@@ -1,6 +1,7 @@
 import pytest
 from referencing.exceptions import Unresolvable
 
+from jsonschema_path import SchemaPath
 from openapi_spec_validator import OpenAPIV2SpecValidator
 from openapi_spec_validator import OpenAPIV30SpecValidator
 from openapi_spec_validator import OpenAPIV31SpecValidator
@@ -23,7 +24,11 @@ def test_valid(self, factory, spec_file):
         spec_path = self.local_test_suite_file_path(spec_file)
         spec = factory.spec_from_file(spec_path)
         spec_url = factory.spec_file_url(spec_path)
-        validator = OpenAPIV2SpecValidator(spec, base_uri=spec_url)
+        schema_path = SchemaPath.from_dict(
+            spec,
+            base_uri=spec_url,
+        )
+        validator = OpenAPIV2SpecValidator(schema_path)
 
         validator.validate()