Skip to content

Commit be4e077

Browse files
fix mypy
1 parent a1be63c commit be4e077

File tree

9 files changed

+22
-100
lines changed

9 files changed

+22
-100
lines changed

packages/models-library/src/models_library/api_schemas_directorv2/dynamic_services.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -65,24 +65,10 @@ class DynamicServiceCreate(ServiceDetails):
6565
"basepath": "/x/75c7f3f4-18f9-4678-8610-54a2ade78eaa",
6666
"product_name": "osparc",
6767
"can_save": True,
68-
"service_resources": ServiceResourcesDictHelpers.model_config[
69-
"json_schema_extra"
70-
]["examples"][
71-
0
72-
], # type: ignore [index]
73-
"wallet_info": WalletInfo.model_config["json_schema_extra"]["examples"][
74-
0
75-
], # type: ignore [index]
76-
"pricing_info": PricingInfo.model_config["json_schema_extra"][
77-
"examples"
78-
][
79-
0
80-
], # type: ignore [index]
81-
"hardware_info": HardwareInfo.model_config["json_schema_extra"][
82-
"examples"
83-
][
84-
0
85-
], # type: ignore [index]
68+
"service_resources": ServiceResourcesDictHelpers.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
69+
"wallet_info": WalletInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
70+
"pricing_info": PricingInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
71+
"hardware_info": HardwareInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
8672
}
8773
}
8874
)

packages/models-library/src/models_library/api_schemas_dynamic_scheduler/dynamic_services.py

Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -26,24 +26,10 @@ class DynamicServiceStart(DynamicServiceCreate):
2626
"request_dns": "some.local",
2727
"request_scheme": "http",
2828
"simcore_user_agent": "",
29-
"service_resources": ServiceResourcesDictHelpers.model_config[
30-
"json_schema_extra"
31-
]["examples"][
32-
0
33-
], # type: ignore [index]
34-
"wallet_info": WalletInfo.model_config["json_schema_extra"]["examples"][
35-
0
36-
], # type: ignore [index]
37-
"pricing_info": PricingInfo.model_config["json_schema_extra"][
38-
"examples"
39-
][
40-
0
41-
], # type: ignore [index]
42-
"hardware_info": HardwareInfo.model_config["json_schema_extra"][
43-
"examples"
44-
][
45-
0
46-
], # type: ignore [index]
29+
"service_resources": ServiceResourcesDictHelpers.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
30+
"wallet_info": WalletInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
31+
"pricing_info": PricingInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
32+
"hardware_info": HardwareInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
4733
}
4834
}
4935
)

packages/models-library/src/models_library/api_schemas_resource_usage_tracker/pricing_plans.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ class PricingUnitGet(BaseModel):
2929
{
3030
"pricing_unit_id": 1,
3131
"unit_name": "SMALL",
32-
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"][
33-
"examples"
34-
][
35-
0
36-
], # type: ignore[index]
32+
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
3733
"current_cost_per_unit": 5.7,
3834
"current_cost_per_unit_id": 1,
3935
"default": True,

packages/models-library/src/models_library/api_schemas_webserver/catalog.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,7 @@ class ServiceOutputGet(ServiceOutput, _BaseCommonApiExtension):
9797

9898

9999
_EXAMPLE_FILEPICKER: dict[str, Any] = {
100-
**api_schemas_catalog_services.ServiceGet.model_config["json_schema_extra"][
101-
"examples"
102-
][
103-
1
104-
], # type: ignore[index,dict-item]
100+
**api_schemas_catalog_services.ServiceGet.model_config["json_schema_extra"]["examples"][1], # type: ignore [index,dict-item]
105101
"inputs": {},
106102
"outputs": {
107103
"outFile": {
@@ -116,11 +112,7 @@ class ServiceOutputGet(ServiceOutput, _BaseCommonApiExtension):
116112
}
117113

118114
_EXAMPLE_SLEEPER: dict[str, Any] = {
119-
**api_schemas_catalog_services.ServiceGet.model_config["json_schema_extra"][
120-
"examples"
121-
][
122-
0
123-
], # type: ignore[index,dict-item]
115+
**api_schemas_catalog_services.ServiceGet.model_config["json_schema_extra"]["examples"][0], # type: ignore[index,dict-item]
124116
"inputs": {
125117
"input_1": {
126118
"displayOrder": 1,
@@ -255,11 +247,7 @@ class CatalogServiceGet(api_schemas_catalog_services.ServiceGetV2):
255247
**OutputSchema.model_config,
256248
json_schema_extra={
257249
"example": {
258-
**api_schemas_catalog_services.ServiceGetV2.model_config[
259-
"json_schema_extra"
260-
]["examples"][
261-
0
262-
], # type: ignore[index,dict-item]
250+
**api_schemas_catalog_services.ServiceGetV2.model_config["json_schema_extra"]["examples"][0], # type: ignore [index,dict-item]
263251
"inputs": {
264252
f"input{i}": example
265253
for i, example in enumerate(

packages/models-library/src/models_library/payments.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,7 @@ class InvoiceDataGet(BaseModel):
5656
"credit_amount": Decimal(15.5), # type: ignore[dict-item]
5757
"stripe_price_id": "stripe-price-id",
5858
"stripe_tax_rate_id": "stripe-tax-rate-id",
59-
"user_invoice_address": UserInvoiceAddress.model_config[
60-
"json_schema_extra"
61-
]["examples"][
62-
0
63-
], # type: ignore[index]
59+
"user_invoice_address": UserInvoiceAddress.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
6460
"user_display_name": "My Name",
6561
"user_email": "[email protected]",
6662
},

packages/models-library/src/models_library/progress_bar.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,11 +97,7 @@ def composed_message(self) -> str:
9797
{
9898
"actual_value": 0.3,
9999
"total": 1.0,
100-
"message": ProgressStructuredMessage.model_config[
101-
"json_schema_extra"
102-
]["examples"][
103-
2
104-
], # type: ignore[index]
100+
"message": ProgressStructuredMessage.model_config["json_schema_extra"]["examples"][2], # type: ignore [index]
105101
},
106102
]
107103
},

packages/models-library/src/models_library/resource_tracker.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -236,11 +236,7 @@ class PricingUnitWithCostCreate(BaseModel):
236236
{
237237
"pricing_plan_id": 1,
238238
"unit_name": "My pricing plan",
239-
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"][
240-
"examples"
241-
][
242-
0
243-
], # type: ignore[index]
239+
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
244240
"default": True,
245241
"specific_info": {"aws_ec2_instances": ["t3.medium"]},
246242
"cost_per_unit": 10,
@@ -272,11 +268,7 @@ class PricingUnitWithCostUpdate(BaseModel):
272268
"pricing_plan_id": 1,
273269
"pricing_unit_id": 1,
274270
"unit_name": "My pricing plan",
275-
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"][
276-
"examples"
277-
][
278-
0
279-
], # type: ignore[index]
271+
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
280272
"default": True,
281273
"specific_info": {"aws_ec2_instances": ["t3.medium"]},
282274
"pricing_unit_cost_update": {
@@ -288,11 +280,7 @@ class PricingUnitWithCostUpdate(BaseModel):
288280
"pricing_plan_id": 1,
289281
"pricing_unit_id": 1,
290282
"unit_name": "My pricing plan",
291-
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"][
292-
"examples"
293-
][
294-
0
295-
], # type: ignore[index]
283+
"unit_extra_info": UnitExtraInfo.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
296284
"default": True,
297285
"specific_info": {"aws_ec2_instances": ["t3.medium"]},
298286
"pricing_unit_cost_update": None,

packages/models-library/src/models_library/service_settings_labels.py

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -540,9 +540,7 @@ class SimcoreServiceLabels(DynamicSidecarServiceLabels):
540540
] # type: ignore[index]
541541
),
542542
"simcore.service.paths-mapping": json_dumps(
543-
PathMappingsLabel.model_config["json_schema_extra"]["examples"][
544-
0
545-
] # type: ignore[index]
543+
PathMappingsLabel.model_config["json_schema_extra"]["examples"][0] # type: ignore [index]
546544
),
547545
"simcore.service.restart-policy": RestartPolicy.NO_RESTART.value,
548546
"simcore.service.callbacks-mapping": json_dumps(
@@ -568,9 +566,7 @@ class SimcoreServiceLabels(DynamicSidecarServiceLabels):
568566
] # type: ignore[index]
569567
),
570568
"simcore.service.paths-mapping": json_dumps(
571-
PathMappingsLabel.model_config["json_schema_extra"]["examples"][
572-
0
573-
] # type: ignore[index]
569+
PathMappingsLabel.model_config["json_schema_extra"]["examples"][0], # type: ignore[index]
574570
),
575571
"simcore.service.compose-spec": json_dumps(
576572
{
@@ -598,9 +594,7 @@ class SimcoreServiceLabels(DynamicSidecarServiceLabels):
598594
"simcore.service.container-http-entrypoint": "rt-web",
599595
"simcore.service.restart-policy": RestartPolicy.ON_INPUTS_DOWNLOADED.value,
600596
"simcore.service.callbacks-mapping": json_dumps(
601-
CallbacksMapping.model_config["json_schema_extra"]["examples"][
602-
3
603-
] # type: ignore[index]
597+
CallbacksMapping.model_config["json_schema_extra"]["examples"][3] # type: ignore [index]
604598
),
605599
},
606600
]

packages/models-library/src/models_library/services_metadata_published.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -76,16 +76,8 @@
7676
}
7777
},
7878
"boot-options": {
79-
"example_service_defined_boot_mode": BootOption.model_config[
80-
"json_schema_extra"
81-
]["examples"][
82-
0
83-
], # type: ignore[index]
84-
"example_service_defined_theme_selection": BootOption.model_config[
85-
"json_schema_extra"
86-
]["examples"][
87-
1
88-
], # type: ignore[index]
79+
"example_service_defined_boot_mode": BootOption.model_config["json_schema_extra"]["examples"][0], # type: ignore [index]
80+
"example_service_defined_theme_selection": BootOption.model_config["json_schema_extra"]["examples"][1], # type: ignore [index]
8981
},
9082
"min-visible-inputs": 2,
9183
}

0 commit comments

Comments
 (0)