Skip to content

Commit 614d4c2

Browse files
sandereggsanderegg
committed
remove all parse_obj
1 parent 6b4789c commit 614d4c2

File tree

5 files changed

+19
-17
lines changed

5 files changed

+19
-17
lines changed

‎services/storage/src/simcore_service_storage/utils.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515

1616

1717
def convert_db_to_model(x: FileMetaDataAtDB) -> FileMetaData:
18-
model: FileMetaData = FileMetaData.parse_obj(
18+
model: FileMetaData = FileMetaData.model_validate(
1919
x.model_dump()
2020
| {
2121
"file_uuid": x.file_id,

‎services/storage/tests/conftest.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,9 @@ async def _uploader(
363363
data, error = await assert_status(response, status.HTTP_202_ACCEPTED)
364364
assert not error
365365
assert data
366-
file_upload_complete_response = FileUploadCompleteResponse.parse_obj(data)
366+
file_upload_complete_response = FileUploadCompleteResponse.model_validate(
367+
data
368+
)
367369
state_url = URL(f"{file_upload_complete_response.links.state}").relative()
368370

369371
completion_etag = None
@@ -382,7 +384,7 @@ async def _uploader(
382384
data, error = await assert_status(response, status.HTTP_200_OK)
383385
assert not error
384386
assert data
385-
future = FileUploadCompleteFutureResponse.parse_obj(data)
387+
future = FileUploadCompleteFutureResponse.model_validate(data)
386388
if future.state == FileUploadCompleteState.NOK:
387389
msg = f"{data=}"
388390
raise ValueError(msg)
@@ -479,7 +481,7 @@ async def _directory_creator(dir_name: str):
479481
data, error = await assert_status(response, status.HTTP_202_ACCEPTED)
480482
assert not error
481483
assert data
482-
file_upload_complete_response = FileUploadCompleteResponse.parse_obj(data)
484+
file_upload_complete_response = FileUploadCompleteResponse.model_validate(data)
483485
state_url = URL(f"{file_upload_complete_response.links.state}").relative()
484486

485487
# check that it finished updating
@@ -500,7 +502,7 @@ async def _directory_creator(dir_name: str):
500502
data, error = await assert_status(response, status.HTTP_200_OK)
501503
assert not error
502504
assert data
503-
future = FileUploadCompleteFutureResponse.parse_obj(data)
505+
future = FileUploadCompleteFutureResponse.model_validate(data)
504506
assert future.state == FileUploadCompleteState.OK
505507
assert future.e_tag is None
506508
ctx.logger.info(

‎services/storage/tests/unit/test_handlers_files.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ async def test_upload_real_file_with_emulated_storage_restart_after_completion_w
631631
data, error = await assert_status(response, status.HTTP_202_ACCEPTED)
632632
assert not error
633633
assert data
634-
file_upload_complete_response = FileUploadCompleteResponse.parse_obj(data)
634+
file_upload_complete_response = FileUploadCompleteResponse.model_validate(data)
635635
state_url = URL(f"{file_upload_complete_response.links.state}").relative()
636636

637637
# here we do not check now for the state completion. instead we simulate a restart where the tasks disappear
@@ -652,7 +652,7 @@ async def test_upload_real_file_with_emulated_storage_restart_after_completion_w
652652
data, error = await assert_status(response, status.HTTP_200_OK)
653653
assert not error
654654
assert data
655-
future = FileUploadCompleteFutureResponse.parse_obj(data)
655+
future = FileUploadCompleteFutureResponse.model_validate(data)
656656
assert future.state == FileUploadCompleteState.OK
657657
assert future.e_tag is not None
658658
completion_etag = future.e_tag
@@ -769,7 +769,7 @@ async def test_upload_real_file_with_s3_client(
769769
data, error = await assert_status(response, status.HTTP_202_ACCEPTED)
770770
assert not error
771771
assert data
772-
file_upload_complete_response = FileUploadCompleteResponse.parse_obj(data)
772+
file_upload_complete_response = FileUploadCompleteResponse.model_validate(data)
773773
state_url = URL(f"{file_upload_complete_response.links.state}").relative()
774774
completion_etag = None
775775
async for attempt in AsyncRetrying(
@@ -787,7 +787,7 @@ async def test_upload_real_file_with_s3_client(
787787
data, error = await assert_status(response, status.HTTP_200_OK)
788788
assert not error
789789
assert data
790-
future = FileUploadCompleteFutureResponse.parse_obj(data)
790+
future = FileUploadCompleteFutureResponse.model_validate(data)
791791
if future.state != FileUploadCompleteState.OK:
792792
msg = f"{data=}"
793793
raise ValueError(msg)

‎services/storage/tests/unit/test_handlers_health.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ async def test_health_check(client: TestClient):
2626
assert data
2727
assert not error
2828

29-
app_health = HealthCheck.parse_obj(data)
29+
app_health = HealthCheck.model_validate(data)
3030
assert app_health.name == simcore_service_storage._meta.PROJECT_NAME # noqa: SLF001
3131
assert app_health.version == str(
3232
simcore_service_storage._meta.VERSION
@@ -41,7 +41,7 @@ async def test_health_status(client: TestClient):
4141
assert data
4242
assert not error
4343

44-
app_status_check = AppStatusCheck.parse_obj(data)
44+
app_status_check = AppStatusCheck.model_validate(data)
4545
assert (
4646
app_status_check.app_name == simcore_service_storage._meta.PROJECT_NAME
4747
) # noqa: SLF001
@@ -68,7 +68,7 @@ async def test_bad_health_status_if_bucket_missing(
6868
data, error = await assert_status(response, status.HTTP_200_OK)
6969
assert data
7070
assert not error
71-
app_status_check = AppStatusCheck.parse_obj(data)
71+
app_status_check = AppStatusCheck.model_validate(data)
7272
assert app_status_check.services["s3"]["healthy"] == "connected"
7373
# now delete the bucket
7474
await s3_client.delete_bucket(Bucket=storage_s3_bucket)
@@ -77,7 +77,7 @@ async def test_bad_health_status_if_bucket_missing(
7777
data, error = await assert_status(response, status.HTTP_200_OK)
7878
assert data
7979
assert not error
80-
app_status_check = AppStatusCheck.parse_obj(data)
80+
app_status_check = AppStatusCheck.model_validate(data)
8181
assert app_status_check.services["s3"]["healthy"] == "no access to S3 bucket"
8282

8383

@@ -90,7 +90,7 @@ async def test_bad_health_status_if_s3_server_missing(
9090
data, error = await assert_status(response, status.HTTP_200_OK)
9191
assert data
9292
assert not error
93-
app_status_check = AppStatusCheck.parse_obj(data)
93+
app_status_check = AppStatusCheck.model_validate(data)
9494
assert app_status_check.services["s3"]["healthy"] == "connected"
9595
# now disable the s3 server
9696
mocked_aws_server.stop()
@@ -99,7 +99,7 @@ async def test_bad_health_status_if_s3_server_missing(
9999
data, error = await assert_status(response, status.HTTP_200_OK)
100100
assert data
101101
assert not error
102-
app_status_check = AppStatusCheck.parse_obj(data)
102+
app_status_check = AppStatusCheck.model_validate(data)
103103
assert app_status_check.services["s3"]["healthy"] == "failed"
104104
# start the server again
105105
mocked_aws_server.start()
@@ -108,5 +108,5 @@ async def test_bad_health_status_if_s3_server_missing(
108108
data, error = await assert_status(response, status.HTTP_200_OK)
109109
assert data
110110
assert not error
111-
app_status_check = AppStatusCheck.parse_obj(data)
111+
app_status_check = AppStatusCheck.model_validate(data)
112112
assert app_status_check.services["s3"]["healthy"] == "connected"

‎services/storage/tests/unit/test_handlers_simcore_s3.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ async def test_simcore_s3_access_returns_default(client: TestClient):
8282
data, error = await assert_status(response, status.HTTP_200_OK)
8383
assert not error
8484
assert data
85-
received_settings = S3Settings.parse_obj(data)
85+
received_settings = S3Settings.model_validate(data)
8686
assert received_settings
8787

8888

0 commit comments

Comments
 (0)