diff --git a/README.rst b/README.rst index c1f3b881..913d158d 100644 --- a/README.rst +++ b/README.rst @@ -77,7 +77,7 @@ Now you can use it to validate against requests .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator result = openapi_request_validator.validate(spec, request) @@ -111,7 +111,7 @@ You can also validate against responses .. code-block:: python - from openapi_core.validation.response import openapi_response_validator + from openapi_core import openapi_response_validator result = openapi_response_validator.validate(spec, request, response) @@ -140,7 +140,7 @@ In order to explicitly validate a: .. code:: python - from openapi_core.validation.response import openapi_v31_response_validator + from openapi_core import openapi_v31_response_validator result = openapi_v31_response_validator.validate(spec, request, response) diff --git a/docs/integrations.rst b/docs/integrations.rst index 29124e36..a3227bed 100644 --- a/docs/integrations.rst +++ b/docs/integrations.rst @@ -56,7 +56,7 @@ You can use ``DjangoOpenAPIRequest`` as a Django request factory: .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator from openapi_core.contrib.django import DjangoOpenAPIRequest openapi_request = DjangoOpenAPIRequest(django_request) @@ -66,7 +66,7 @@ You can use ``DjangoOpenAPIResponse`` as a Django response factory: .. code-block:: python - from openapi_core.validation.response import openapi_response_validator + from openapi_core import openapi_response_validator from openapi_core.contrib.django import DjangoOpenAPIResponse openapi_response = DjangoOpenAPIResponse(django_response) @@ -115,7 +115,7 @@ You can use ``FalconOpenAPIRequest`` as a Falcon request factory: .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator from openapi_core.contrib.falcon import FalconOpenAPIRequest openapi_request = FalconOpenAPIRequest(falcon_request) @@ -125,7 +125,7 @@ You can use ``FalconOpenAPIResponse`` as a Falcon response factory: .. code-block:: python - from openapi_core.validation.response import openapi_response_validator + from openapi_core import openapi_response_validator from openapi_core.contrib.falcon import FalconOpenAPIResponse openapi_response = FalconOpenAPIResponse(falcon_response) @@ -196,7 +196,7 @@ You can use ``FlaskOpenAPIRequest`` as a Flask request factory: .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator from openapi_core.contrib.flask import FlaskOpenAPIRequest openapi_request = FlaskOpenAPIRequest(flask_request) @@ -223,7 +223,7 @@ You can use ``RequestsOpenAPIRequest`` as a Requests request factory: .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator from openapi_core.contrib.requests import RequestsOpenAPIRequest openapi_request = RequestsOpenAPIRequest(requests_request) @@ -233,7 +233,7 @@ You can use ``RequestsOpenAPIResponse`` as a Requests response factory: .. code-block:: python - from openapi_core.validation.response import openapi_response_validator + from openapi_core import openapi_response_validator from openapi_core.contrib.requests import RequestsOpenAPIResponse openapi_response = RequestsOpenAPIResponse(requests_response) @@ -252,7 +252,7 @@ You can use ``StarletteOpenAPIRequest`` as a Starlette request factory: .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator from openapi_core.contrib.starlette import StarletteOpenAPIRequest openapi_request = StarletteOpenAPIRequest(starlette_request) @@ -262,7 +262,7 @@ You can use ``StarletteOpenAPIResponse`` as a Starlette response factory: .. code-block:: python - from openapi_core.validation.response import openapi_response_validator + from openapi_core import openapi_response_validator from openapi_core.contrib.starlette import StarletteOpenAPIResponse openapi_response = StarletteOpenAPIResponse(starlette_response) @@ -287,7 +287,7 @@ You can use ``WerkzeugOpenAPIRequest`` as a Werkzeug request factory: .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator from openapi_core.contrib.werkzeug import WerkzeugOpenAPIRequest openapi_request = WerkzeugOpenAPIRequest(werkzeug_request) @@ -297,7 +297,7 @@ You can use ``WerkzeugOpenAPIResponse`` as a Werkzeug response factory: .. code-block:: python - from openapi_core.validation.response import openapi_response_validator + from openapi_core import openapi_response_validator from openapi_core.contrib.werkzeug import WerkzeugOpenAPIResponse openapi_response = WerkzeugOpenAPIResponse(werkzeug_response) diff --git a/docs/usage.rst b/docs/usage.rst index 94ddbda3..94ccaf20 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -21,7 +21,7 @@ Now you can use it to validate against requests .. code-block:: python - from openapi_core.validation.request import openapi_request_validator + from openapi_core import openapi_request_validator result = openapi_request_validator.validate(spec, request) @@ -55,7 +55,7 @@ You can also validate against responses .. code-block:: python - from openapi_core.validation.response import openapi_response_validator + from openapi_core import openapi_response_validator result = openapi_response_validator.validate(spec, request, response) diff --git a/openapi_core/__init__.py b/openapi_core/__init__.py index ba01466f..8f77e27d 100644 --- a/openapi_core/__init__.py +++ b/openapi_core/__init__.py @@ -6,9 +6,15 @@ ) from openapi_core.validation.request import openapi_request_security_validator from openapi_core.validation.request import openapi_request_validator +from openapi_core.validation.request import openapi_v3_request_validator +from openapi_core.validation.request import openapi_v30_request_validator +from openapi_core.validation.request import openapi_v31_request_validator from openapi_core.validation.response import openapi_response_data_validator from openapi_core.validation.response import openapi_response_headers_validator from openapi_core.validation.response import openapi_response_validator +from openapi_core.validation.response import openapi_v3_response_validator +from openapi_core.validation.response import openapi_v30_response_validator +from openapi_core.validation.response import openapi_v31_response_validator from openapi_core.validation.shortcuts import validate_request from openapi_core.validation.shortcuts import validate_response @@ -22,10 +28,16 @@ "Spec", "validate_request", "validate_response", + "openapi_v3_request_validator", + "openapi_v30_request_validator", + "openapi_v31_request_validator", "openapi_request_body_validator", "openapi_request_parameters_validator", "openapi_request_security_validator", "openapi_request_validator", + "openapi_v3_response_validator", + "openapi_v30_response_validator", + "openapi_v31_response_validator", "openapi_response_data_validator", "openapi_response_headers_validator", "openapi_response_validator", diff --git a/tests/integration/contrib/flask/test_flask_validator.py b/tests/integration/contrib/flask/test_flask_validator.py index 606bf330..6e929c23 100644 --- a/tests/integration/contrib/flask/test_flask_validator.py +++ b/tests/integration/contrib/flask/test_flask_validator.py @@ -5,8 +5,8 @@ from flask.testing import FlaskClient from flask.wrappers import Response +from openapi_core import openapi_request_validator from openapi_core.contrib.flask import FlaskOpenAPIRequest -from openapi_core.validation.request import openapi_request_validator class TestWerkzeugOpenAPIValidation: diff --git a/tests/integration/contrib/requests/test_requests_validation.py b/tests/integration/contrib/requests/test_requests_validation.py index 1da9a3f2..9a59d6be 100644 --- a/tests/integration/contrib/requests/test_requests_validation.py +++ b/tests/integration/contrib/requests/test_requests_validation.py @@ -2,10 +2,10 @@ import requests import responses +from openapi_core import openapi_request_validator +from openapi_core import openapi_response_validator from openapi_core.contrib.requests import RequestsOpenAPIRequest from openapi_core.contrib.requests import RequestsOpenAPIResponse -from openapi_core.validation.request import openapi_request_validator -from openapi_core.validation.response import openapi_response_validator class TestRequestsOpenAPIValidation: diff --git a/tests/integration/contrib/starlette/test_starlette_validation.py b/tests/integration/contrib/starlette/test_starlette_validation.py index 87d444af..895b6ef4 100644 --- a/tests/integration/contrib/starlette/test_starlette_validation.py +++ b/tests/integration/contrib/starlette/test_starlette_validation.py @@ -8,10 +8,10 @@ from starlette.routing import Route from starlette.testclient import TestClient +from openapi_core import openapi_request_validator +from openapi_core import openapi_response_validator from openapi_core.contrib.starlette import StarletteOpenAPIRequest from openapi_core.contrib.starlette import StarletteOpenAPIResponse -from openapi_core.validation.request import openapi_request_validator -from openapi_core.validation.response import openapi_response_validator class TestStarletteOpenAPIValidation: diff --git a/tests/integration/contrib/werkzeug/test_werkzeug_validation.py b/tests/integration/contrib/werkzeug/test_werkzeug_validation.py index 19f35e00..278b7e70 100644 --- a/tests/integration/contrib/werkzeug/test_werkzeug_validation.py +++ b/tests/integration/contrib/werkzeug/test_werkzeug_validation.py @@ -6,10 +6,10 @@ from werkzeug.wrappers import Request from werkzeug.wrappers import Response +from openapi_core import openapi_request_validator +from openapi_core import openapi_response_validator from openapi_core.contrib.werkzeug import WerkzeugOpenAPIRequest from openapi_core.contrib.werkzeug import WerkzeugOpenAPIResponse -from openapi_core.validation.request import openapi_request_validator -from openapi_core.validation.response import openapi_response_validator class TestWerkzeugOpenAPIValidation: diff --git a/tests/integration/validation/test_minimal.py b/tests/integration/validation/test_minimal.py index bc52c41b..198a8430 100644 --- a/tests/integration/validation/test_minimal.py +++ b/tests/integration/validation/test_minimal.py @@ -1,9 +1,9 @@ import pytest +from openapi_core import openapi_request_validator from openapi_core.templating.paths.exceptions import OperationNotFound from openapi_core.templating.paths.exceptions import PathNotFound from openapi_core.testing import MockRequest -from openapi_core.validation.request import openapi_request_validator from openapi_core.validation.request.datatypes import Parameters diff --git a/tests/integration/validation/test_petstore.py b/tests/integration/validation/test_petstore.py index 6925bbf9..456abd76 100644 --- a/tests/integration/validation/test_petstore.py +++ b/tests/integration/validation/test_petstore.py @@ -8,6 +8,7 @@ import pytest from isodate.tzinfo import UTC +from openapi_core import openapi_v30_response_validator from openapi_core.casting.schemas.exceptions import CastError from openapi_core.deserializing.exceptions import DeserializeError from openapi_core.deserializing.parameters.exceptions import ( @@ -35,7 +36,6 @@ from openapi_core.validation.response import ( openapi_v30_response_headers_validator, ) -from openapi_core.validation.response import openapi_v30_response_validator from openapi_core.validation.shortcuts import validate_request from openapi_core.validation.shortcuts import validate_response diff --git a/tests/integration/validation/test_read_only_write_only.py b/tests/integration/validation/test_read_only_write_only.py index 6e1dad15..7ccc0eb0 100644 --- a/tests/integration/validation/test_read_only_write_only.py +++ b/tests/integration/validation/test_read_only_write_only.py @@ -3,11 +3,11 @@ import pytest +from openapi_core import openapi_v30_request_validator +from openapi_core import openapi_v30_response_validator from openapi_core.testing import MockRequest from openapi_core.testing import MockResponse from openapi_core.unmarshalling.schemas.exceptions import InvalidSchemaValue -from openapi_core.validation.request import openapi_v30_request_validator -from openapi_core.validation.response import openapi_v30_response_validator @pytest.fixture(scope="class") diff --git a/tests/integration/validation/test_security_override.py b/tests/integration/validation/test_security_override.py index bcc49e3d..499760ad 100644 --- a/tests/integration/validation/test_security_override.py +++ b/tests/integration/validation/test_security_override.py @@ -2,9 +2,9 @@ import pytest +from openapi_core import openapi_request_validator from openapi_core.testing import MockRequest from openapi_core.validation.exceptions import InvalidSecurity -from openapi_core.validation.request import openapi_request_validator @pytest.fixture(scope="class")