Skip to content

Commit cb12cf2

Browse files
authored
⬆️ Upgrades dependencies of storage service (#5558)
1 parent 96e0a2a commit cb12cf2

File tree

16 files changed

+237
-467
lines changed

16 files changed

+237
-467
lines changed

api/specs/storage/scripts/storage.py

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from pydantic import AnyUrl, ByteSize
3131
from servicelib.long_running_tasks._models import TaskGet, TaskId, TaskStatus
3232
from settings_library.s3 import S3Settings
33-
from simcore_service_storage._meta import api_vtag
33+
from simcore_service_storage._meta import API_VTAG
3434
from simcore_service_storage.models import DatasetMetaData, FileMetaData
3535

3636
TAGS_DATASETS: list[str | Enum] = ["datasets"]
@@ -83,7 +83,7 @@
8383

8484

8585
@app.get(
86-
f"/{api_vtag}/locations/{{location_id}}/datasets",
86+
f"/{API_VTAG}/locations/{{location_id}}/datasets",
8787
response_model=Envelope[list[DatasetMetaData]],
8888
tags=TAGS_DATASETS,
8989
operation_id="get_datasets_metadata",
@@ -97,7 +97,7 @@ async def get_datasets_metadata(location_id: LocationID, user_id: UserID):
9797

9898

9999
@app.get(
100-
f"/{api_vtag}/locations/{{location_id}}/datasets/{{dataset_id}}/metadata",
100+
f"/{API_VTAG}/locations/{{location_id}}/datasets/{{dataset_id}}/metadata",
101101
response_model=Envelope[list[FileMetaDataGet]],
102102
tags=TAGS_DATASETS,
103103
operation_id="get_files_metadata_dataset",
@@ -118,7 +118,7 @@ async def get_files_metadata_dataset(
118118

119119

120120
@app.get(
121-
f"/{api_vtag}/locations",
121+
f"/{API_VTAG}/locations",
122122
response_model=list[DatasetMetaData],
123123
tags=TAGS_LOCATIONS,
124124
operation_id="get_storage_locations",
@@ -129,7 +129,7 @@ async def get_storage_locations(user_id: UserID):
129129

130130

131131
@app.post(
132-
f"/{api_vtag}/locations/{{location_id}}:sync",
132+
f"/{API_VTAG}/locations/{{location_id}}:sync",
133133
response_model=Envelope[TableSynchronisation],
134134
tags=TAGS_LOCATIONS,
135135
operation_id="synchronise_meta_data_table",
@@ -142,7 +142,7 @@ async def synchronise_meta_data_table(
142142

143143

144144
@app.get(
145-
f"/{api_vtag}/locations/{{location_id}}/files/metadata",
145+
f"/{API_VTAG}/locations/{{location_id}}/files/metadata",
146146
response_model=Envelope[list[DatasetMetaData]],
147147
tags=TAGS_FILES,
148148
operation_id="get_files_metadata",
@@ -162,7 +162,7 @@ async def get_files_metadata(
162162

163163

164164
@app.get(
165-
f"/{api_vtag}/locations/{{location_id}}/files/{{file_id}}/metadata",
165+
f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}/metadata",
166166
response_model=FileMetaData | Envelope[FileMetaDataGet],
167167
tags=TAGS_FILES,
168168
summary="Get File Metadata",
@@ -175,7 +175,7 @@ async def get_file_metadata(
175175

176176

177177
@app.get(
178-
f"/{api_vtag}/locations/{{location_id}}/files/{{file_id}}",
178+
f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}",
179179
response_model=Envelope[PresignedLink],
180180
tags=TAGS_FILES,
181181
operation_id="download_file",
@@ -191,7 +191,7 @@ async def download_file(
191191

192192

193193
@app.put(
194-
f"/{api_vtag}/locations/{{location_id}}/files/{{file_id}}",
194+
f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}",
195195
response_model=Envelope[FileUploadSchema] | Envelope[AnyUrl],
196196
tags=TAGS_FILES,
197197
operation_id="upload_file",
@@ -208,7 +208,7 @@ async def upload_file(
208208

209209

210210
@app.post(
211-
f"/{api_vtag}/locations/{{location_id}}/files/{{file_id}}:abort",
211+
f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}:abort",
212212
status_code=status.HTTP_204_NO_CONTENT,
213213
tags=TAGS_FILES,
214214
operation_id="abort_upload_file",
@@ -221,7 +221,7 @@ async def abort_upload_file(
221221

222222

223223
@app.post(
224-
f"/{api_vtag}/locations/{{location_id}}/files/{{file_id}}:complete",
224+
f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}:complete",
225225
status_code=status.HTTP_202_ACCEPTED,
226226
response_model=Envelope[FileUploadCompleteResponse],
227227
tags=TAGS_FILES,
@@ -237,7 +237,7 @@ async def complete_upload_file(
237237

238238

239239
@app.post(
240-
f"/{api_vtag}/locations/{{location_id}}/files/{{file_id}}:complete/futures/{{future_id}}",
240+
f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}:complete/futures/{{future_id}}",
241241
response_model=Envelope[FileUploadCompleteFutureResponse],
242242
tags=TAGS_FILES,
243243
summary="Check for upload completion",
@@ -253,7 +253,7 @@ async def is_completed_upload_file(
253253

254254

255255
@app.get(
256-
f"/{api_vtag}/",
256+
f"/{API_VTAG}/",
257257
response_model=Envelope[HealthCheck],
258258
tags=TAGS_HEALTH,
259259
summary="health check endpoint",
@@ -264,7 +264,7 @@ async def get_health():
264264

265265

266266
@app.get(
267-
f"/{api_vtag}/status",
267+
f"/{API_VTAG}/status",
268268
response_model=Envelope[AppStatusCheck],
269269
tags=TAGS_HEALTH,
270270
summary="returns the status of the services inside",
@@ -278,7 +278,7 @@ async def get_status():
278278

279279

280280
@app.delete(
281-
f"/{api_vtag}/locations/{{location_id}}/files/{{file_id}}",
281+
f"/{API_VTAG}/locations/{{location_id}}/files/{{file_id}}",
282282
status_code=status.HTTP_204_NO_CONTENT,
283283
tags=TAGS_FILES,
284284
operation_id="delete_file",
@@ -289,7 +289,7 @@ async def delete_file(location_id: LocationID, file_id: StorageFileID, user_id:
289289

290290

291291
@app.post(
292-
f"/{api_vtag}/files/{{file_id}}:soft-copy",
292+
f"/{API_VTAG}/files/{{file_id}}:soft-copy",
293293
response_model=FileMetaDataGet,
294294
tags=TAGS_FILES,
295295
summary="copy file as soft link",
@@ -305,7 +305,7 @@ async def copy_as_soft_link(
305305

306306

307307
@app.post(
308-
f"/{api_vtag}/simcore-s3:access",
308+
f"/{API_VTAG}/simcore-s3:access",
309309
response_model=Envelope[S3Settings],
310310
tags=TAGS_SIMCORE_S3,
311311
summary="gets or creates the a temporary access",
@@ -316,7 +316,7 @@ async def get_or_create_temporary_s3_access(user_id: UserID):
316316

317317

318318
@app.post(
319-
f"/{api_vtag}/simcore-s3/folders",
319+
f"/{API_VTAG}/simcore-s3/folders",
320320
response_model=Envelope[TaskGet],
321321
tags=TAGS_SIMCORE_S3,
322322
summary="copies folders from project",
@@ -327,7 +327,7 @@ async def copy_folders_from_project(body_item: FoldersBody, user_id: UserID):
327327

328328

329329
@app.delete(
330-
f"/{api_vtag}/simcore-s3/folders/{{folder_id}}",
330+
f"/{API_VTAG}/simcore-s3/folders/{{folder_id}}",
331331
status_code=status.HTTP_204_NO_CONTENT,
332332
tags=TAGS_SIMCORE_S3,
333333
summary="delete folders from project",
@@ -340,7 +340,7 @@ async def delete_folders_of_project(
340340

341341

342342
@app.post(
343-
f"/{api_vtag}/simcore-s3/files/metadata:search",
343+
f"/{API_VTAG}/simcore-s3/files/metadata:search",
344344
response_model=Envelope[FileMetaDataGet],
345345
tags=TAGS_SIMCORE_S3,
346346
summary="search for files starting with",
@@ -359,7 +359,7 @@ async def search_files(
359359

360360

361361
@app.get(
362-
f"/{api_vtag}/futures",
362+
f"/{API_VTAG}/futures",
363363
response_model=Envelope[TaskGet],
364364
tags=TAGS_TASKS,
365365
summary="list current long running tasks",
@@ -370,7 +370,7 @@ async def list_tasks():
370370

371371

372372
@app.get(
373-
f"/{api_vtag}/futures/{{task_id}}",
373+
f"/{API_VTAG}/futures/{{task_id}}",
374374
response_model=Envelope[TaskStatus],
375375
tags=TAGS_TASKS,
376376
summary="gets the status of the task",
@@ -381,7 +381,7 @@ async def get_task_status(task_id: TaskId):
381381

382382

383383
@app.get(
384-
f"/{api_vtag}/futures/{{task_id}}/result",
384+
f"/{API_VTAG}/futures/{{task_id}}/result",
385385
response_model=Any,
386386
tags=TAGS_TASKS,
387387
summary="get result of the task",
@@ -392,7 +392,7 @@ async def get_task_result(task_id: TaskId):
392392

393393

394394
@app.delete(
395-
f"/{api_vtag}/futures/{{task_id}}",
395+
f"/{API_VTAG}/futures/{{task_id}}",
396396
status_code=status.HTTP_204_NO_CONTENT,
397397
tags=TAGS_TASKS,
398398
summary="cancels and removes the task",

services/storage/requirements/_base.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ aiofiles # i/o
1818
aiohttp # server
1919
aiohttp-swagger[performance] # server
2020
aiopg[sa] # db
21-
semantic_version
21+
packaging
2222
tenacity
2323
typer
2424
types-aiobotocore[s3] # s3 storage

0 commit comments

Comments
 (0)