Skip to content

Commit 6d8f1d9

Browse files
p1c2up1c2u
authored
Merge pull request #455 from p1c2u/feature/validators-public-api-expose
validators public api expose
2 parents ae08758 + aa233da commit 6d8f1d9

12 files changed

+40
-28
lines changed

‎README.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Now you can use it to validate against requests
7777

7878
.. code-block:: python
7979
80-
from openapi_core.validation.request import openapi_request_validator
80+
from openapi_core import openapi_request_validator
8181
8282
result = openapi_request_validator.validate(spec, request)
8383
@@ -111,7 +111,7 @@ You can also validate against responses
111111

112112
.. code-block:: python
113113
114-
from openapi_core.validation.response import openapi_response_validator
114+
from openapi_core import openapi_response_validator
115115
116116
result = openapi_response_validator.validate(spec, request, response)
117117
@@ -140,7 +140,7 @@ In order to explicitly validate a:
140140

141141
.. code:: python
142142
143-
from openapi_core.validation.response import openapi_v31_response_validator
143+
from openapi_core import openapi_v31_response_validator
144144
145145
result = openapi_v31_response_validator.validate(spec, request, response)
146146

‎docs/integrations.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ You can use ``DjangoOpenAPIRequest`` as a Django request factory:
5656

5757
.. code-block:: python
5858
59-
from openapi_core.validation.request import openapi_request_validator
59+
from openapi_core import openapi_request_validator
6060
from openapi_core.contrib.django import DjangoOpenAPIRequest
6161
6262
openapi_request = DjangoOpenAPIRequest(django_request)
@@ -66,7 +66,7 @@ You can use ``DjangoOpenAPIResponse`` as a Django response factory:
6666

6767
.. code-block:: python
6868
69-
from openapi_core.validation.response import openapi_response_validator
69+
from openapi_core import openapi_response_validator
7070
from openapi_core.contrib.django import DjangoOpenAPIResponse
7171
7272
openapi_response = DjangoOpenAPIResponse(django_response)
@@ -115,7 +115,7 @@ You can use ``FalconOpenAPIRequest`` as a Falcon request factory:
115115

116116
.. code-block:: python
117117
118-
from openapi_core.validation.request import openapi_request_validator
118+
from openapi_core import openapi_request_validator
119119
from openapi_core.contrib.falcon import FalconOpenAPIRequest
120120
121121
openapi_request = FalconOpenAPIRequest(falcon_request)
@@ -125,7 +125,7 @@ You can use ``FalconOpenAPIResponse`` as a Falcon response factory:
125125

126126
.. code-block:: python
127127
128-
from openapi_core.validation.response import openapi_response_validator
128+
from openapi_core import openapi_response_validator
129129
from openapi_core.contrib.falcon import FalconOpenAPIResponse
130130
131131
openapi_response = FalconOpenAPIResponse(falcon_response)
@@ -196,7 +196,7 @@ You can use ``FlaskOpenAPIRequest`` as a Flask request factory:
196196

197197
.. code-block:: python
198198
199-
from openapi_core.validation.request import openapi_request_validator
199+
from openapi_core import openapi_request_validator
200200
from openapi_core.contrib.flask import FlaskOpenAPIRequest
201201
202202
openapi_request = FlaskOpenAPIRequest(flask_request)
@@ -223,7 +223,7 @@ You can use ``RequestsOpenAPIRequest`` as a Requests request factory:
223223

224224
.. code-block:: python
225225
226-
from openapi_core.validation.request import openapi_request_validator
226+
from openapi_core import openapi_request_validator
227227
from openapi_core.contrib.requests import RequestsOpenAPIRequest
228228
229229
openapi_request = RequestsOpenAPIRequest(requests_request)
@@ -233,7 +233,7 @@ You can use ``RequestsOpenAPIResponse`` as a Requests response factory:
233233

234234
.. code-block:: python
235235
236-
from openapi_core.validation.response import openapi_response_validator
236+
from openapi_core import openapi_response_validator
237237
from openapi_core.contrib.requests import RequestsOpenAPIResponse
238238
239239
openapi_response = RequestsOpenAPIResponse(requests_response)
@@ -252,7 +252,7 @@ You can use ``StarletteOpenAPIRequest`` as a Starlette request factory:
252252

253253
.. code-block:: python
254254
255-
from openapi_core.validation.request import openapi_request_validator
255+
from openapi_core import openapi_request_validator
256256
from openapi_core.contrib.starlette import StarletteOpenAPIRequest
257257
258258
openapi_request = StarletteOpenAPIRequest(starlette_request)
@@ -262,7 +262,7 @@ You can use ``StarletteOpenAPIResponse`` as a Starlette response factory:
262262

263263
.. code-block:: python
264264
265-
from openapi_core.validation.response import openapi_response_validator
265+
from openapi_core import openapi_response_validator
266266
from openapi_core.contrib.starlette import StarletteOpenAPIResponse
267267
268268
openapi_response = StarletteOpenAPIResponse(starlette_response)
@@ -287,7 +287,7 @@ You can use ``WerkzeugOpenAPIRequest`` as a Werkzeug request factory:
287287

288288
.. code-block:: python
289289
290-
from openapi_core.validation.request import openapi_request_validator
290+
from openapi_core import openapi_request_validator
291291
from openapi_core.contrib.werkzeug import WerkzeugOpenAPIRequest
292292
293293
openapi_request = WerkzeugOpenAPIRequest(werkzeug_request)
@@ -297,7 +297,7 @@ You can use ``WerkzeugOpenAPIResponse`` as a Werkzeug response factory:
297297

298298
.. code-block:: python
299299
300-
from openapi_core.validation.response import openapi_response_validator
300+
from openapi_core import openapi_response_validator
301301
from openapi_core.contrib.werkzeug import WerkzeugOpenAPIResponse
302302
303303
openapi_response = WerkzeugOpenAPIResponse(werkzeug_response)

‎docs/usage.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Now you can use it to validate against requests
2121

2222
.. code-block:: python
2323
24-
from openapi_core.validation.request import openapi_request_validator
24+
from openapi_core import openapi_request_validator
2525
2626
result = openapi_request_validator.validate(spec, request)
2727
@@ -55,7 +55,7 @@ You can also validate against responses
5555

5656
.. code-block:: python
5757
58-
from openapi_core.validation.response import openapi_response_validator
58+
from openapi_core import openapi_response_validator
5959
6060
result = openapi_response_validator.validate(spec, request, response)
6161

‎openapi_core/__init__.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,15 @@
66
)
77
from openapi_core.validation.request import openapi_request_security_validator
88
from openapi_core.validation.request import openapi_request_validator
9+
from openapi_core.validation.request import openapi_v3_request_validator
10+
from openapi_core.validation.request import openapi_v30_request_validator
11+
from openapi_core.validation.request import openapi_v31_request_validator
912
from openapi_core.validation.response import openapi_response_data_validator
1013
from openapi_core.validation.response import openapi_response_headers_validator
1114
from openapi_core.validation.response import openapi_response_validator
15+
from openapi_core.validation.response import openapi_v3_response_validator
16+
from openapi_core.validation.response import openapi_v30_response_validator
17+
from openapi_core.validation.response import openapi_v31_response_validator
1218
from openapi_core.validation.shortcuts import validate_request
1319
from openapi_core.validation.shortcuts import validate_response
1420

@@ -22,10 +28,16 @@
2228
"Spec",
2329
"validate_request",
2430
"validate_response",
31+
"openapi_v3_request_validator",
32+
"openapi_v30_request_validator",
33+
"openapi_v31_request_validator",
2534
"openapi_request_body_validator",
2635
"openapi_request_parameters_validator",
2736
"openapi_request_security_validator",
2837
"openapi_request_validator",
38+
"openapi_v3_response_validator",
39+
"openapi_v30_response_validator",
40+
"openapi_v31_response_validator",
2941
"openapi_response_data_validator",
3042
"openapi_response_headers_validator",
3143
"openapi_response_validator",

‎tests/integration/contrib/flask/test_flask_validator.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
from flask.testing import FlaskClient
66
from flask.wrappers import Response
77

8+
from openapi_core import openapi_request_validator
89
from openapi_core.contrib.flask import FlaskOpenAPIRequest
9-
from openapi_core.validation.request import openapi_request_validator
1010

1111

1212
class TestWerkzeugOpenAPIValidation:

‎tests/integration/contrib/requests/test_requests_validation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
import requests
33
import responses
44

5+
from openapi_core import openapi_request_validator
6+
from openapi_core import openapi_response_validator
57
from openapi_core.contrib.requests import RequestsOpenAPIRequest
68
from openapi_core.contrib.requests import RequestsOpenAPIResponse
7-
from openapi_core.validation.request import openapi_request_validator
8-
from openapi_core.validation.response import openapi_response_validator
99

1010

1111
class TestRequestsOpenAPIValidation:

‎tests/integration/contrib/starlette/test_starlette_validation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
from starlette.routing import Route
99
from starlette.testclient import TestClient
1010

11+
from openapi_core import openapi_request_validator
12+
from openapi_core import openapi_response_validator
1113
from openapi_core.contrib.starlette import StarletteOpenAPIRequest
1214
from openapi_core.contrib.starlette import StarletteOpenAPIResponse
13-
from openapi_core.validation.request import openapi_request_validator
14-
from openapi_core.validation.response import openapi_response_validator
1515

1616

1717
class TestStarletteOpenAPIValidation:

‎tests/integration/contrib/werkzeug/test_werkzeug_validation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
from werkzeug.wrappers import Request
77
from werkzeug.wrappers import Response
88

9+
from openapi_core import openapi_request_validator
10+
from openapi_core import openapi_response_validator
911
from openapi_core.contrib.werkzeug import WerkzeugOpenAPIRequest
1012
from openapi_core.contrib.werkzeug import WerkzeugOpenAPIResponse
11-
from openapi_core.validation.request import openapi_request_validator
12-
from openapi_core.validation.response import openapi_response_validator
1313

1414

1515
class TestWerkzeugOpenAPIValidation:

‎tests/integration/validation/test_minimal.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import pytest
22

3+
from openapi_core import openapi_request_validator
34
from openapi_core.templating.paths.exceptions import OperationNotFound
45
from openapi_core.templating.paths.exceptions import PathNotFound
56
from openapi_core.testing import MockRequest
6-
from openapi_core.validation.request import openapi_request_validator
77
from openapi_core.validation.request.datatypes import Parameters
88

99

‎tests/integration/validation/test_petstore.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import pytest
99
from isodate.tzinfo import UTC
1010

11+
from openapi_core import openapi_v30_response_validator
1112
from openapi_core.casting.schemas.exceptions import CastError
1213
from openapi_core.deserializing.exceptions import DeserializeError
1314
from openapi_core.deserializing.parameters.exceptions import (
@@ -35,7 +36,6 @@
3536
from openapi_core.validation.response import (
3637
openapi_v30_response_headers_validator,
3738
)
38-
from openapi_core.validation.response import openapi_v30_response_validator
3939
from openapi_core.validation.shortcuts import validate_request
4040
from openapi_core.validation.shortcuts import validate_response
4141

‎tests/integration/validation/test_read_only_write_only.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33

44
import pytest
55

6+
from openapi_core import openapi_v30_request_validator
7+
from openapi_core import openapi_v30_response_validator
68
from openapi_core.testing import MockRequest
79
from openapi_core.testing import MockResponse
810
from openapi_core.unmarshalling.schemas.exceptions import InvalidSchemaValue
9-
from openapi_core.validation.request import openapi_v30_request_validator
10-
from openapi_core.validation.response import openapi_v30_response_validator
1111

1212

1313
@pytest.fixture(scope="class")

‎tests/integration/validation/test_security_override.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import pytest
44

5+
from openapi_core import openapi_request_validator
56
from openapi_core.testing import MockRequest
67
from openapi_core.validation.exceptions import InvalidSecurity
7-
from openapi_core.validation.request import openapi_request_validator
88

99

1010
@pytest.fixture(scope="class")

0 commit comments

Comments
 (0)