Skip to content

Commit 878c301

Browse files
giancarloromeogiancarloromeo
committed
fix config field
1 parent db35ec7 commit 878c301

12 files changed

+57
-57
lines changed

‎services/director-v2/tests/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ async def wrapper(*args, **kwargs):
336336
@pytest.fixture
337337
def mock_osparc_variables_api_auth_rpc(mocker: MockerFixture) -> None:
338338

339-
fake_data = ApiKeyGet.parse_obj(ApiKeyGet.Config.schema_extra["examples"][0])
339+
fake_data = ApiKeyGet.parse_obj(ApiKeyGet.model_config["json_schema_extra"]["examples"][0])
340340

341341
async def _create(
342342
app: FastAPI,

‎services/director-v2/tests/integration/02/conftest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ def mock_projects_networks_repository(mocker: MockerFixture) -> None:
7474
def service_resources() -> ServiceResourcesDict:
7575
return parse_obj_as(
7676
ServiceResourcesDict,
77-
ServiceResourcesDictHelpers.Config.schema_extra["examples"][0],
77+
ServiceResourcesDictHelpers.model_config["json_schema_extra"]["examples"][0],
7878
)
7979

8080

8181
@pytest.fixture
8282
def mock_resource_usage_tracker(mocker: MockerFixture) -> None:
8383
base_module = "simcore_service_director_v2.modules.resource_usage_tracker_client"
8484
service_pricing_plan = PricingPlanGet.parse_obj(
85-
PricingPlanGet.Config.schema_extra["examples"][1]
85+
PricingPlanGet.model_config["json_schema_extra"]["examples"][1]
8686
)
8787
for unit in service_pricing_plan.pricing_units:
8888
unit.specific_info.aws_ec2_instances.clear()

‎services/director-v2/tests/unit/conftest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ def simcore_services_network_name() -> str:
5353
@pytest.fixture
5454
def simcore_service_labels() -> SimcoreServiceLabels:
5555
simcore_service_labels = SimcoreServiceLabels.parse_obj(
56-
SimcoreServiceLabels.Config.schema_extra["examples"][1]
56+
SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][1]
5757
)
5858
simcore_service_labels.callbacks_mapping = parse_obj_as(CallbacksMapping, {})
5959
return simcore_service_labels
@@ -62,7 +62,7 @@ def simcore_service_labels() -> SimcoreServiceLabels:
6262
@pytest.fixture
6363
def dynamic_service_create() -> DynamicServiceCreate:
6464
return DynamicServiceCreate.parse_obj(
65-
DynamicServiceCreate.Config.schema_extra["example"]
65+
DynamicServiceCreate.model_config["json_schema_extra"]["example"]
6666
)
6767

6868

‎services/director-v2/tests/unit/test_modules_dask_client.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ def task_labels(comp_run_metadata: RunMetadataDict) -> ContainerLabelsDict:
482482

483483
@pytest.fixture
484484
def hardware_info() -> HardwareInfo:
485-
return HardwareInfo.parse_obj(HardwareInfo.Config.schema_extra["examples"][0])
485+
return HardwareInfo.parse_obj(HardwareInfo.model_config["json_schema_extra"]["examples"][0])
486486

487487

488488
@pytest.fixture

‎services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ def mocked_director_v0(
162162
),
163163
name="service labels",
164164
).respond(
165-
json={"data": SimcoreServiceLabels.Config.schema_extra["examples"][0]}
165+
json={"data": SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][0]}
166166
)
167167
yield mock
168168

‎services/director-v2/tests/unit/with_dbs/conftest.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def cluster(
223223
created_cluster_ids: list[str] = []
224224

225225
def creator(user: dict[str, Any], **cluster_kwargs) -> Cluster:
226-
cluster_config = Cluster.Config.schema_extra["examples"][1]
226+
cluster_config = Cluster.model_config["json_schema_extra"]["examples"][1]
227227
cluster_config["owner"] = user["primary_gid"]
228228
cluster_config.update(**cluster_kwargs)
229229
new_cluster = Cluster.parse_obj(cluster_config)

‎services/director-v2/tests/unit/with_dbs/test_api_route_computations.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ def fake_service_details(mocks_dir: Path) -> ServiceMetaDataPublished:
109109

110110
@pytest.fixture
111111
def fake_service_extras() -> ServiceExtras:
112-
extra_example = ServiceExtras.Config.schema_extra["examples"][2]
112+
extra_example = ServiceExtras.model_config["json_schema_extra"]["examples"][2]
113113
random_extras = ServiceExtras(**extra_example)
114114
assert random_extras is not None
115115
return random_extras
@@ -119,13 +119,13 @@ def fake_service_extras() -> ServiceExtras:
119119
def fake_service_resources() -> ServiceResourcesDict:
120120
return parse_obj_as(
121121
ServiceResourcesDict,
122-
ServiceResourcesDictHelpers.Config.schema_extra["examples"][0],
122+
ServiceResourcesDictHelpers.model_config["json_schema_extra"]["examples"][0],
123123
)
124124

125125

126126
@pytest.fixture
127127
def fake_service_labels() -> dict[str, Any]:
128-
return choice(SimcoreServiceLabels.Config.schema_extra["examples"]) # noqa: S311
128+
return choice(SimcoreServiceLabels.model_config["json_schema_extra"]["examples"]) # noqa: S311
129129

130130

131131
@pytest.fixture
@@ -257,7 +257,7 @@ def _mocked_services_details(
257257

258258

259259
@pytest.fixture(
260-
params=PricingPlanGet.Config.schema_extra["examples"],
260+
params=PricingPlanGet.model_config["json_schema_extra"]["examples"],
261261
ids=["with ec2 restriction", "without"],
262262
)
263263
def default_pricing_plan(request: pytest.FixtureRequest) -> PricingPlanGet:
@@ -301,7 +301,7 @@ def _mocked_get_pricing_unit(request, pricing_plan_id: int) -> httpx.Response:
301301
(
302302
default_pricing_plan.pricing_units[0]
303303
if default_pricing_plan.pricing_units
304-
else PricingUnitGet.Config.schema_extra["examples"][0]
304+
else PricingUnitGet.model_config["json_schema_extra"]["examples"][0]
305305
),
306306
by_alias=True,
307307
),
@@ -461,7 +461,7 @@ def mocked_clusters_keeper_service_get_instance_type_details_with_invalid_name(
461461
)
462462

463463

464-
@pytest.fixture(params=ServiceResourcesDictHelpers.Config.schema_extra["examples"])
464+
@pytest.fixture(params=ServiceResourcesDictHelpers.model_config["json_schema_extra"]["examples"])
465465
def project_nodes_overrides(request: pytest.FixtureRequest) -> dict[str, Any]:
466466
return request.param
467467

@@ -570,7 +570,7 @@ async def test_create_computation_with_wallet(
570570

571571
@pytest.mark.parametrize(
572572
"default_pricing_plan",
573-
[PricingPlanGet.construct(**PricingPlanGet.Config.schema_extra["examples"][0])],
573+
[PricingPlanGet.construct(**PricingPlanGet.model_config["json_schema_extra"]["examples"][0])],
574574
)
575575
async def test_create_computation_with_wallet_with_invalid_pricing_unit_name_raises_422(
576576
minimal_configuration: None,
@@ -608,7 +608,7 @@ async def test_create_computation_with_wallet_with_invalid_pricing_unit_name_rai
608608

609609
@pytest.mark.parametrize(
610610
"default_pricing_plan",
611-
[PricingPlanGet.construct(**PricingPlanGet.Config.schema_extra["examples"][0])],
611+
[PricingPlanGet.construct(**PricingPlanGet.model_config["json_schema_extra"]["examples"][0])],
612612
)
613613
async def test_create_computation_with_wallet_with_no_clusters_keeper_raises_503(
614614
minimal_configuration: None,
@@ -709,7 +709,7 @@ async def test_start_computation_with_project_node_resources_defined(
709709
proj = await project(
710710
user,
711711
project_nodes_overrides={
712-
"required_resources": ServiceResourcesDictHelpers.Config.schema_extra[
712+
"required_resources": ServiceResourcesDictHelpers.model_config["json_schema_extra"][
713713
"examples"
714714
][0]
715715
},

‎services/director-v2/tests/unit/with_dbs/test_api_route_dynamic_services.py‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -163,11 +163,11 @@ async def mock_retrieve_features(
163163
) as respx_mock:
164164
if is_legacy:
165165
service_details = RunningDynamicServiceDetails.parse_obj(
166-
RunningDynamicServiceDetails.Config.schema_extra["examples"][0]
166+
RunningDynamicServiceDetails.model_config["json_schema_extra"]["examples"][0]
167167
)
168168
respx_mock.post(
169169
f"{service_details.legacy_service_url}/retrieve", name="retrieve"
170-
).respond(json=RetrieveDataOutEnveloped.Config.schema_extra["examples"][0])
170+
).respond(json=RetrieveDataOutEnveloped.model_config["json_schema_extra"]["examples"][0])
171171

172172
yield respx_mock
173173
# no cleanup required
@@ -230,7 +230,7 @@ def mocked_director_v0_service_api(
230230
name="running interactive service",
231231
).respond(
232232
json={
233-
"data": RunningDynamicServiceDetails.Config.schema_extra["examples"][0]
233+
"data": RunningDynamicServiceDetails.model_config["json_schema_extra"]["examples"][0]
234234
}
235235
)
236236

@@ -247,7 +247,7 @@ def get_stack_status(node_uuid: NodeID) -> RunningDynamicServiceDetails:
247247
raise DynamicSidecarNotFoundError(node_uuid)
248248

249249
return RunningDynamicServiceDetails.parse_obj(
250-
RunningDynamicServiceDetails.Config.schema_extra["examples"][0]
250+
RunningDynamicServiceDetails.model_config["json_schema_extra"]["examples"][0]
251251
)
252252

253253
module_base = "simcore_service_director_v2.modules.dynamic_sidecar.scheduler"
@@ -279,26 +279,26 @@ def remove_service(node_uuid: NodeID, *ars: Any, **kwargs: Any) -> None:
279279
[
280280
pytest.param(
281281
*ServiceParams(
282-
service=DynamicServiceCreate.Config.schema_extra["example"],
283-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][0],
282+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
283+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][0],
284284
exp_status_code=status.HTTP_307_TEMPORARY_REDIRECT,
285285
is_legacy=True,
286286
),
287287
id="LEGACY",
288288
),
289289
pytest.param(
290290
*ServiceParams(
291-
service=DynamicServiceCreate.Config.schema_extra["example"],
292-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][1],
291+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
292+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][1],
293293
exp_status_code=status.HTTP_201_CREATED,
294294
is_legacy=False,
295295
),
296296
id="DYNAMIC",
297297
),
298298
pytest.param(
299299
*ServiceParams(
300-
service=DynamicServiceCreate.Config.schema_extra["example"],
301-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][2],
300+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
301+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][2],
302302
exp_status_code=status.HTTP_201_CREATED,
303303
is_legacy=False,
304304
),
@@ -351,26 +351,26 @@ def test_create_dynamic_services(
351351
[
352352
pytest.param(
353353
*ServiceParams(
354-
service=DynamicServiceCreate.Config.schema_extra["example"],
355-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][0],
354+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
355+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][0],
356356
exp_status_code=status.HTTP_307_TEMPORARY_REDIRECT,
357357
is_legacy=True,
358358
),
359359
id="LEGACY",
360360
),
361361
pytest.param(
362362
*ServiceParams(
363-
service=DynamicServiceCreate.Config.schema_extra["example"],
364-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][1],
363+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
364+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][1],
365365
exp_status_code=status.HTTP_200_OK,
366366
is_legacy=False,
367367
),
368368
id="DYNAMIC",
369369
),
370370
pytest.param(
371371
*ServiceParams(
372-
service=DynamicServiceCreate.Config.schema_extra["example"],
373-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][2],
372+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
373+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][2],
374374
exp_status_code=status.HTTP_200_OK,
375375
is_legacy=False,
376376
),
@@ -409,26 +409,26 @@ def test_get_service_status(
409409
[
410410
pytest.param(
411411
*ServiceParams(
412-
service=DynamicServiceCreate.Config.schema_extra["example"],
413-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][0],
412+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
413+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][0],
414414
exp_status_code=status.HTTP_307_TEMPORARY_REDIRECT,
415415
is_legacy=True,
416416
),
417417
id="LEGACY",
418418
),
419419
pytest.param(
420420
*ServiceParams(
421-
service=DynamicServiceCreate.Config.schema_extra["example"],
422-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][1],
421+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
422+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][1],
423423
exp_status_code=status.HTTP_204_NO_CONTENT,
424424
is_legacy=False,
425425
),
426426
id="DYNAMIC",
427427
),
428428
pytest.param(
429429
*ServiceParams(
430-
service=DynamicServiceCreate.Config.schema_extra["example"],
431-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][2],
430+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
431+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][2],
432432
exp_status_code=status.HTTP_204_NO_CONTENT,
433433
is_legacy=False,
434434
),
@@ -481,8 +481,8 @@ def dynamic_sidecar_scheduler(minimal_app: FastAPI) -> DynamicSidecarsScheduler:
481481
[
482482
pytest.param(
483483
*ServiceParams(
484-
service=DynamicServiceCreate.Config.schema_extra["example"],
485-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][1],
484+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
485+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][1],
486486
exp_status_code=status.HTTP_201_CREATED,
487487
is_legacy=False,
488488
)
@@ -528,26 +528,26 @@ def test_delete_service_waiting_for_manual_intervention(
528528
[
529529
pytest.param(
530530
*ServiceParams(
531-
service=DynamicServiceCreate.Config.schema_extra["example"],
532-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][0],
531+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
532+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][0],
533533
exp_status_code=status.HTTP_200_OK,
534534
is_legacy=True,
535535
),
536536
id="LEGACY",
537537
),
538538
pytest.param(
539539
*ServiceParams(
540-
service=DynamicServiceCreate.Config.schema_extra["example"],
541-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][1],
540+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
541+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][1],
542542
exp_status_code=status.HTTP_200_OK,
543543
is_legacy=False,
544544
),
545545
id="DYNAMIC",
546546
),
547547
pytest.param(
548548
*ServiceParams(
549-
service=DynamicServiceCreate.Config.schema_extra["example"],
550-
service_labels=SimcoreServiceLabels.Config.schema_extra["examples"][2],
549+
service=DynamicServiceCreate.model_config["json_schema_extra"]["example"],
550+
service_labels=SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][2],
551551
exp_status_code=status.HTTP_200_OK,
552552
is_legacy=False,
553553
),
@@ -571,7 +571,7 @@ def test_retrieve(
571571
response.status_code == exp_status_code
572572
), f"expected status code {exp_status_code}, received {response.status_code}: {response.text}"
573573
assert (
574-
response.json() == RetrieveDataOutEnveloped.Config.schema_extra["examples"][0]
574+
response.json() == RetrieveDataOutEnveloped.model_config["json_schema_extra"]["examples"][0]
575575
)
576576

577577

‎services/director-v2/tests/unit/with_dbs/test_cli.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ def mock_get_node_state(mocker: MockerFixture) -> None:
107107
mocker.patch(
108108
"simcore_service_director_v2.cli._core._get_dy_service_state",
109109
return_value=DynamicServiceGet.parse_obj(
110-
RunningDynamicServiceDetails.Config.schema_extra["examples"][0]
110+
RunningDynamicServiceDetails.model_config["json_schema_extra"]["examples"][0]
111111
),
112112
)
113113

‎services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ def service_name() -> str:
331331
@pytest.fixture(
332332
params=[
333333
SimcoreServiceLabels.parse_obj(example)
334-
for example in SimcoreServiceLabels.Config.schema_extra["examples"]
334+
for example in SimcoreServiceLabels.model_config["json_schema_extra"]["examples"]
335335
],
336336
)
337337
def labels_example(request: pytest.FixtureRequest) -> SimcoreServiceLabels:

0 commit comments

Comments
 (0)