Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit17eabdc

Browse files
committed
Requests chunk encoded request handling
1 parent4658b25 commit17eabdc

File tree

2 files changed

+58
-5
lines changed

2 files changed

+58
-5
lines changed

‎openapi_core/contrib/requests/requests.py

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
"""OpenAPI core contrib requests requests module"""
2+
fromtypingimportMapping
23
fromtypingimportOptional
34
fromtypingimportUnion
45
fromurllib.parseimportparse_qs
@@ -7,6 +8,7 @@
78
fromrequestsimportPreparedRequest
89
fromrequestsimportRequest
910
fromrequests.cookiesimportRequestsCookieJar
11+
fromrequests.utilsimportrewind_body
1012
fromwerkzeug.datastructuresimportHeaders
1113
fromwerkzeug.datastructuresimportImmutableMultiDict
1214

@@ -28,7 +30,9 @@ def __init__(self, request: Union[Request, PreparedRequest]):
2830
"'request' argument is not type of "
2931
f"{Request} or{PreparedRequest}"
3032
)
33+
self._request=None
3134
ifisinstance(request,Request):
35+
self._request=request
3236
request=request.prepare()
3337

3438
self.request=request
@@ -65,13 +69,28 @@ def method(self) -> str:
6569

6670
@property
6771
defbody(self)->Optional[str]:
68-
ifself.request.bodyisNone:
72+
importipdb;ipdb.set_trace()
73+
body=self.request.body
74+
ifbodyisNone:
6975
returnNone
70-
ifisinstance(self.request.body,bytes):
71-
returnself.request.body.decode("utf-8")
72-
assertisinstance(self.request.body,str)
76+
chunks=None
77+
is_stream=all(
78+
[
79+
hasattr(body,"__iter__"),
80+
notisinstance(body, (bytes,str,list,tuple,Mapping)),
81+
]
82+
)
83+
ifis_stream:
84+
chunks=list(body)
85+
body=b"".join(chunks)
86+
ifisinstance(body,bytes):
87+
body=body.decode("utf-8")
88+
assertisinstance(body,str)
89+
# recreate request stream from evaluated chunks
90+
ifchunksisnotNone:
91+
self.request.body= (xforxinchunks)
7392
# TODO: figure out if request._body_position is relevant
74-
returnself.request.body
93+
returnbody
7594

7695
@property
7796
defmimetype(self)->str:

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

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
fromtypesimportGeneratorType
2+
13
importpytest
24
importrequests
35
importresponses
@@ -9,6 +11,8 @@
911
fromopenapi_core.contrib.requestsimportRequestsOpenAPIRequest
1012
fromopenapi_core.contrib.requestsimportRequestsOpenAPIResponse
1113
fromopenapi_core.contrib.requestsimportRequestsOpenAPIWebhookRequest
14+
fromopenapi_core.datatypesimportParameters
15+
fromopenapi_core.datatypesimportRequestParameters
1216

1317

1418
classTestRequestsOpenAPIValidation:
@@ -72,6 +76,36 @@ def test_request_validator_path_pattern(self, request_unmarshaller):
7276
result=request_unmarshaller.unmarshal(openapi_request)
7377
assertnotresult.errors
7478

79+
deftest_request_validator_encoded_chunks(self,request_unmarshaller):
80+
request_chunks= [
81+
b'{',
82+
b'"param1": 1',
83+
b'}',
84+
]
85+
defgen():
86+
forchunkinrequest_chunks:
87+
yieldchunk
88+
89+
request=requests.Request(
90+
"POST",
91+
"http://localhost/browse/12/",
92+
params={"q":"string"},
93+
headers={"content-type":"application/json"},
94+
data=gen(),
95+
)
96+
openapi_request=RequestsOpenAPIRequest(request)
97+
result=request_unmarshaller.unmarshal(openapi_request)
98+
assertnotresult.errors
99+
assertresult.body== {"param1":1}
100+
assertresult.parameters==Parameters(
101+
query={"q":"string"},
102+
header={},
103+
cookie={},
104+
path={"id":12},
105+
)
106+
assertisinstance(request.data,GeneratorType)
107+
assertlist(request.data)==request_chunks
108+
75109
deftest_request_validator_prepared_request(self,request_unmarshaller):
76110
request=requests.Request(
77111
"POST",

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp