@@ -128,8 +128,8 @@ async def _forward_request_to_storage(
128
128
@login_required
129
129
@permission_required ("storage.files.*" )
130
130
async def list_storage_locations (request : web .Request ) -> web .Response :
131
- payload , status = await _forward_request_to_storage (request , "GET" , body = None )
132
- return create_data_response (payload , status = status )
131
+ payload , resp_status = await _forward_request_to_storage (request , "GET" , body = None )
132
+ return create_data_response (payload , status = resp_status )
133
133
134
134
135
135
@routes .get (_path_prefix + "/{location_id}/datasets" , name = "list_datasets_metadata" )
@@ -141,8 +141,8 @@ class _PathParams(BaseModel):
141
141
142
142
parse_request_path_parameters_as (_PathParams , request )
143
143
144
- payload , status = await _forward_request_to_storage (request , "GET" , body = None )
145
- return create_data_response (payload , status = status )
144
+ payload , resp_status = await _forward_request_to_storage (request , "GET" , body = None )
145
+ return create_data_response (payload , status = resp_status )
146
146
147
147
148
148
@routes .get (
@@ -163,8 +163,8 @@ class _QueryParams(BaseModel):
163
163
164
164
parse_request_query_parameters_as (_QueryParams , request )
165
165
166
- payload , status = await _forward_request_to_storage (request , "GET" , body = None )
167
- return create_data_response (payload , status = status )
166
+ payload , resp_status = await _forward_request_to_storage (request , "GET" , body = None )
167
+ return create_data_response (payload , status = resp_status )
168
168
169
169
170
170
_LIST_ALL_DATASETS_TIMEOUT_S : Final [int ] = 60
@@ -189,13 +189,13 @@ class _QueryParams(BaseModel):
189
189
190
190
parse_request_query_parameters_as (_QueryParams , request )
191
191
192
- payload , status = await _forward_request_to_storage (
192
+ payload , resp_status = await _forward_request_to_storage (
193
193
request ,
194
194
"GET" ,
195
195
body = None ,
196
196
timeout = ClientTimeout (total = _LIST_ALL_DATASETS_TIMEOUT_S ),
197
197
)
198
- return create_data_response (payload , status = status )
198
+ return create_data_response (payload , status = resp_status )
199
199
200
200
201
201
@routes .get (
@@ -211,8 +211,8 @@ class _PathParams(BaseModel):
211
211
212
212
parse_request_path_parameters_as (_PathParams , request )
213
213
214
- payload , status = await _forward_request_to_storage (request , "GET" )
215
- return create_data_response (payload , status = status )
214
+ payload , resp_status = await _forward_request_to_storage (request , "GET" )
215
+ return create_data_response (payload , status = resp_status )
216
216
217
217
218
218
@routes .get (
@@ -233,8 +233,8 @@ class _QueryParams(BaseModel):
233
233
234
234
parse_request_query_parameters_as (_QueryParams , request )
235
235
236
- payload , status = await _forward_request_to_storage (request , "GET" , body = None )
237
- return create_data_response (payload , status = status )
236
+ payload , resp_status = await _forward_request_to_storage (request , "GET" , body = None )
237
+ return create_data_response (payload , status = resp_status )
238
238
239
239
240
240
@routes .put (
@@ -257,7 +257,7 @@ class _QueryParams(BaseModel):
257
257
258
258
parse_request_query_parameters_as (_QueryParams , request )
259
259
260
- payload , status = await _forward_request_to_storage (request , "PUT" , body = None )
260
+ payload , resp_status = await _forward_request_to_storage (request , "PUT" , body = None )
261
261
data , _ = unwrap_envelope (payload )
262
262
file_upload_schema = FileUploadSchema .model_validate (data )
263
263
# NOTE: since storage is fastapi-based it returns file_id not url encoded and aiohttp does not like it
@@ -273,7 +273,9 @@ class _QueryParams(BaseModel):
273
273
file_upload_schema .links .abort_upload ,
274
274
url_encode = storage_encoded_file_id ,
275
275
)
276
- return create_data_response (jsonable_encoder (file_upload_schema ), status = status )
276
+ return create_data_response (
277
+ jsonable_encoder (file_upload_schema ), status = resp_status
278
+ )
277
279
278
280
279
281
@routes .post (
@@ -290,7 +292,7 @@ class _PathParams(BaseModel):
290
292
path_params = parse_request_path_parameters_as (_PathParams , request )
291
293
body_item = await parse_request_body_as (FileUploadCompletionBody , request )
292
294
293
- payload , status = await _forward_request_to_storage (
295
+ payload , resp_status = await _forward_request_to_storage (
294
296
request , "POST" , body = body_item .model_dump ()
295
297
)
296
298
data , _ = unwrap_envelope (payload )
@@ -299,7 +301,9 @@ class _PathParams(BaseModel):
299
301
file_upload_complete .links .state = _from_storage_url (
300
302
request , file_upload_complete .links .state , url_encode = storage_encoded_file_id
301
303
)
302
- return create_data_response (jsonable_encoder (file_upload_complete ), status = status )
304
+ return create_data_response (
305
+ jsonable_encoder (file_upload_complete ), status = resp_status
306
+ )
303
307
304
308
305
309
@routes .post (
@@ -315,8 +319,8 @@ class _PathParams(BaseModel):
315
319
316
320
parse_request_path_parameters_as (_PathParams , request )
317
321
318
- payload , status = await _forward_request_to_storage (request , "POST" , body = None )
319
- return create_data_response (payload , status = status )
322
+ payload , resp_status = await _forward_request_to_storage (request , "POST" , body = None )
323
+ return create_data_response (payload , status = resp_status )
320
324
321
325
322
326
@routes .post (
@@ -333,8 +337,8 @@ class _PathParams(BaseModel):
333
337
334
338
parse_request_path_parameters_as (_PathParams , request )
335
339
336
- payload , status = await _forward_request_to_storage (request , "POST" , body = None )
337
- return create_data_response (payload , status = status )
340
+ payload , resp_status = await _forward_request_to_storage (request , "POST" , body = None )
341
+ return create_data_response (payload , status = resp_status )
338
342
339
343
340
344
@routes .delete (
@@ -350,5 +354,7 @@ class _PathParams(BaseModel):
350
354
351
355
parse_request_path_parameters_as (_PathParams , request )
352
356
353
- payload , status = await _forward_request_to_storage (request , "DELETE" , body = None )
354
- return create_data_response (payload , status = status )
357
+ payload , resp_status = await _forward_request_to_storage (
358
+ request , "DELETE" , body = None
359
+ )
360
+ return create_data_response (payload , status = resp_status )
0 commit comments