Skip to content

Commit 4cf9a39

Browse files
committed
shortcuts high level public api expose
1 parent 6b69bd5 commit 4cf9a39

File tree

7 files changed

+199
-157
lines changed

7 files changed

+199
-157
lines changed

README.rst

+7-17
Original file line numberDiff line numberDiff line change
@@ -77,15 +77,10 @@ Now you can use it to validate against requests
7777

7878
.. code-block:: python
7979
80-
from openapi_core import openapi_request_validator
80+
from openapi_core import validate_request
8181
82-
result = openapi_request_validator.validate(spec, request)
83-
84-
# raise errors if request invalid
85-
result.raise_for_errors()
86-
87-
# get list of errors
88-
errors = result.errors
82+
# raise error if request is invalid
83+
result = validate_request(request, spec=spec)
8984
9085
and unmarshal request data from validation result
9186

@@ -111,15 +106,10 @@ You can also validate against responses
111106

112107
.. code-block:: python
113108
114-
from openapi_core import openapi_response_validator
115-
116-
result = openapi_response_validator.validate(spec, request, response)
117-
118-
# raise errors if response invalid
119-
result.raise_for_errors()
109+
from openapi_core import validate_response
120110
121-
# get list of errors
122-
errors = result.errors
111+
# raise error if response is invalid
112+
result = validate_response(request, response, spec=spec)
123113
124114
and unmarshal response data from validation result
125115

@@ -142,7 +132,7 @@ In order to explicitly validate a:
142132
143133
from openapi_core import openapi_v31_response_validator
144134
145-
result = openapi_v31_response_validator.validate(spec, request, response)
135+
result = validate_response(request, response, spec=spec, validator=openapi_v31_response_validator)
146136
147137
You can also explicitly import ``openapi_v3_request_validator`` or ``openapi_v3_response_validator`` which is a shortcut to the latest v3 release.
148138

docs/integrations.rst

+22-22
Original file line numberDiff line numberDiff line change
@@ -56,21 +56,21 @@ You can use ``DjangoOpenAPIRequest`` as a Django request factory:
5656

5757
.. code-block:: python
5858
59-
from openapi_core import openapi_request_validator
59+
from openapi_core import validate_request
6060
from openapi_core.contrib.django import DjangoOpenAPIRequest
6161
6262
openapi_request = DjangoOpenAPIRequest(django_request)
63-
result = openapi_request_validator.validate(spec, openapi_request)
63+
result = validate_request(openapi_request, spec=spec)
6464
6565
You can use ``DjangoOpenAPIResponse`` as a Django response factory:
6666

6767
.. code-block:: python
6868
69-
from openapi_core import openapi_response_validator
69+
from openapi_core import validate_response
7070
from openapi_core.contrib.django import DjangoOpenAPIResponse
7171
7272
openapi_response = DjangoOpenAPIResponse(django_response)
73-
result = openapi_response_validator.validate(spec, openapi_request, openapi_response)
73+
result = validate_response(openapi_request, openapi_response, spec=spec)
7474
7575
7676
Falcon
@@ -115,21 +115,21 @@ You can use ``FalconOpenAPIRequest`` as a Falcon request factory:
115115

116116
.. code-block:: python
117117
118-
from openapi_core import openapi_request_validator
118+
from openapi_core import validate_request
119119
from openapi_core.contrib.falcon import FalconOpenAPIRequest
120120
121121
openapi_request = FalconOpenAPIRequest(falcon_request)
122-
result = openapi_request_validator.validate(spec, openapi_request)
122+
result = validate_request(openapi_request, spec=spec)
123123
124124
You can use ``FalconOpenAPIResponse`` as a Falcon response factory:
125125

126126
.. code-block:: python
127127
128-
from openapi_core import openapi_response_validator
128+
from openapi_core import validate_response
129129
from openapi_core.contrib.falcon import FalconOpenAPIResponse
130130
131131
openapi_response = FalconOpenAPIResponse(falcon_response)
132-
result = openapi_response_validator.validate(spec, openapi_request, openapi_response)
132+
result = validate_response(openapi_request, openapi_response, spec=spec)
133133
134134
135135
Flask
@@ -196,11 +196,11 @@ You can use ``FlaskOpenAPIRequest`` as a Flask request factory:
196196

197197
.. code-block:: python
198198
199-
from openapi_core import openapi_request_validator
199+
from openapi_core import validate_request
200200
from openapi_core.contrib.flask import FlaskOpenAPIRequest
201201
202202
openapi_request = FlaskOpenAPIRequest(flask_request)
203-
result = openapi_request_validator.validate(spec, openapi_request)
203+
result = validate_request(openapi_request, spec=spec)
204204
205205
For response factory see `Werkzeug`_ integration.
206206

@@ -223,21 +223,21 @@ You can use ``RequestsOpenAPIRequest`` as a Requests request factory:
223223

224224
.. code-block:: python
225225
226-
from openapi_core import openapi_request_validator
226+
from openapi_core import validate_request
227227
from openapi_core.contrib.requests import RequestsOpenAPIRequest
228228
229229
openapi_request = RequestsOpenAPIRequest(requests_request)
230-
result = openapi_request_validator.validate(spec, openapi_request)
230+
result = validate_request(openapi_request, spec=spec)
231231
232232
You can use ``RequestsOpenAPIResponse`` as a Requests response factory:
233233

234234
.. code-block:: python
235235
236-
from openapi_core import openapi_response_validator
236+
from openapi_core import validate_response
237237
from openapi_core.contrib.requests import RequestsOpenAPIResponse
238238
239239
openapi_response = RequestsOpenAPIResponse(requests_response)
240-
result = openapi_response_validator.validate(spec, openapi_request, openapi_response)
240+
result = validate_response(openapi_request, openapi_response, spec=spec)
241241
242242
243243
Starlette
@@ -252,21 +252,21 @@ You can use ``StarletteOpenAPIRequest`` as a Starlette request factory:
252252

253253
.. code-block:: python
254254
255-
from openapi_core import openapi_request_validator
255+
from openapi_core import validate_request
256256
from openapi_core.contrib.starlette import StarletteOpenAPIRequest
257257
258258
openapi_request = StarletteOpenAPIRequest(starlette_request)
259-
result = openapi_request_validator.validate(spec, openapi_request)
259+
result = validate_request(openapi_request, spec=spec)
260260
261261
You can use ``StarletteOpenAPIResponse`` as a Starlette response factory:
262262

263263
.. code-block:: python
264264
265-
from openapi_core import openapi_response_validator
265+
from openapi_core import validate_response
266266
from openapi_core.contrib.starlette import StarletteOpenAPIResponse
267267
268268
openapi_response = StarletteOpenAPIResponse(starlette_response)
269-
result = openapi_response_validator.validate(spec, openapi_request, openapi_response)
269+
result = validate_response(openapi_request, openapi_response, spec=spec)
270270
271271
272272
Tornado
@@ -287,18 +287,18 @@ You can use ``WerkzeugOpenAPIRequest`` as a Werkzeug request factory:
287287

288288
.. code-block:: python
289289
290-
from openapi_core import openapi_request_validator
290+
from openapi_core import validate_request
291291
from openapi_core.contrib.werkzeug import WerkzeugOpenAPIRequest
292292
293293
openapi_request = WerkzeugOpenAPIRequest(werkzeug_request)
294-
result = openapi_request_validator.validate(spec, openapi_request)
294+
result = validate_request(openapi_request, spec=spec)
295295
296296
You can use ``WerkzeugOpenAPIResponse`` as a Werkzeug response factory:
297297

298298
.. code-block:: python
299299
300-
from openapi_core import openapi_response_validator
300+
from openapi_core import validate_response
301301
from openapi_core.contrib.werkzeug import WerkzeugOpenAPIResponse
302302
303303
openapi_response = WerkzeugOpenAPIResponse(werkzeug_response)
304-
result = openapi_response_validator.validate(spec, openapi_request, openapi_response)
304+
result = validate_response(openapi_request, openapi_response, spec=spec)

docs/usage.rst

+6-16
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,10 @@ Now you can use it to validate against requests
2121

2222
.. code-block:: python
2323
24-
from openapi_core import openapi_request_validator
24+
from openapi_core import validate_request
2525
26-
result = openapi_request_validator.validate(spec, request)
27-
28-
# raise errors if request invalid
29-
result.raise_for_errors()
30-
31-
# get list of errors
32-
errors = result.errors
26+
# raise error if request is invalid
27+
result = validate_request(request, spec=spec)
3328
3429
and unmarshal request data from validation result
3530

@@ -55,15 +50,10 @@ You can also validate against responses
5550

5651
.. code-block:: python
5752
58-
from openapi_core import openapi_response_validator
59-
60-
result = openapi_response_validator.validate(spec, request, response)
61-
62-
# raise errors if response invalid
63-
result.raise_for_errors()
53+
from openapi_core import validate_response
6454
65-
# get list of errors
66-
errors = result.errors
55+
# raise error if response is invalid
56+
result = validate_response(request, response, spec=spec)
6757
6858
and unmarshal response data from validation result
6959

openapi_core/validation/shortcuts.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414

1515
def validate_request(
16-
spec: Spec,
1716
request: Request,
17+
spec: Spec,
1818
base_url: Optional[str] = None,
1919
validator: RequestValidator = openapi_request_validator,
2020
) -> RequestValidationResult:
@@ -24,9 +24,9 @@ def validate_request(
2424

2525

2626
def validate_response(
27-
spec: Spec,
2827
request: Request,
2928
response: Response,
29+
spec: Spec,
3030
base_url: Optional[str] = None,
3131
validator: ResponseValidator = openapi_response_validator,
3232
) -> ResponseValidationResult:

0 commit comments

Comments
 (0)