Skip to content

Use auto-detect validator proxy #418

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions openapi_core/spec/paths.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
from typing import Dict
from typing import Hashable
from typing import Mapping
from typing import Optional
from typing import Type
from typing import TypeVar

from jsonschema.protocols import Validator
from jsonschema_spec import Spec as JsonschemaSpec
from jsonschema_spec import default_handlers
from openapi_spec_validator import openapi_v30_spec_validator
from openapi_spec_validator.validation import openapi_spec_validator_proxy
from openapi_spec_validator.validation.protocols import SupportsValidation

TSpec = TypeVar("TSpec", bound="Spec")

Expand All @@ -24,7 +25,7 @@ def create(
url: str = "",
ref_resolver_handlers: Dict[str, Any] = default_handlers,
separator: str = SPEC_SEPARATOR,
validator: Validator = openapi_v30_spec_validator,
validator: Optional[SupportsValidation] = openapi_spec_validator_proxy,
) -> TSpec:
if validator is not None:
validator.validate(data, spec_url=url)
Expand Down
8 changes: 5 additions & 3 deletions openapi_core/spec/shortcuts.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
from typing import Dict
from typing import Hashable
from typing import Mapping
from typing import Optional

from jsonschema_spec import default_handlers
from openapi_spec_validator import openapi_v30_spec_validator
from openapi_spec_validator.validation import openapi_spec_validator_proxy
from openapi_spec_validator.validation.protocols import SupportsValidation

from openapi_core.spec.paths import Spec

Expand All @@ -16,9 +18,9 @@ def create_spec(
handlers: Dict[str, Any] = default_handlers,
validate_spec: bool = True,
) -> Spec:
validator = None
validator: Optional[SupportsValidation] = None
if validate_spec:
validator = openapi_v30_spec_validator
validator = openapi_spec_validator_proxy

return Spec.create(
spec_dict,
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/schema/test_empty.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import pytest
from jsonschema.exceptions import ValidationError
from openapi_spec_validator.validation.exceptions import ValidatorDetectError

from openapi_core.spec import Spec


class TestEmpty:
def test_raises_on_invalid(self):
with pytest.raises(ValidationError):
with pytest.raises(ValidatorDetectError):
Spec.create("")