continue fixing

Author: giancarloromeo

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

@@ -1,4 +1,6 @@
-from typing import Any, TypedDict
+from typing import Any
+
+from typing_extensions import TypedDict
 
 Loc = tuple[int | str, ...]
 

services/director-v2/src/simcore_service_director_v2/models/comp_runs.py

@@ -1,14 +1,14 @@
 import datetime
 from contextlib import suppress
-from typing import Any, ClassVar, TypedDict
 
 from models_library.clusters import DEFAULT_CLUSTER_ID, ClusterID
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.projects_state import RunningState
 from models_library.users import UserID
-from pydantic import field_validator, ConfigDict, BaseModel, PositiveInt
+from pydantic import BaseModel, ConfigDict, PositiveInt, field_validator
 from simcore_postgres_database.models.comp_pipeline import StateType
+from typing_extensions import TypedDict
 
 from ..utils.db import DB_TO_RUNNING_STATE
 
@@ -81,6 +81,7 @@ def convert_null_to_empty_metadata(cls, v):
         if v is None:
             v = RunMetadataDict()
         return v
+
     model_config = ConfigDict(
         from_attributes=True,
         json_schema_extra={
@@ -118,5 +119,5 @@ def convert_null_to_empty_metadata(cls, v):
                     "use_on_demand_clusters": False,
                 },
             ]
-        }
+        },
     )

services/director-v2/src/simcore_service_director_v2/models/comp_tasks.py

@@ -15,10 +15,14 @@
 from models_library.services_regex import SERVICE_KEY_RE
 from models_library.services_resources import BootMode
 from pydantic import (
-    TypeAdapter, ValidationInfo, field_validator, ConfigDict, BaseModel,
+    BaseModel,
     ByteSize,
+    ConfigDict,
     Field,
     PositiveInt,
+    TypeAdapter,
+    ValidationInfo,
+    field_validator,
 )
 from simcore_postgres_database.models.comp_pipeline import StateType
 from simcore_postgres_database.models.comp_tasks import NodeClass
@@ -37,7 +41,9 @@ class Image(BaseModel):
         default=None, deprecated=True, description="Use instead node_requirements"
     )
     node_requirements: NodeRequirements | None = Field(
-        default=None, description="the requirements for the service to run on a node", validate_default=True
+        default=None,
+        description="the requirements for the service to run on a node",
+        validate_default=True,
     )
     boot_mode: BootMode = BootMode.CPU
     command: list[str] = Field(
@@ -64,6 +70,7 @@ def migrate_from_requirements(cls, v, info: ValidationInfo):
                 RAM=TypeAdapter(ByteSize).validate_python("128 MiB"),
             )
         return v
+
     model_config = ConfigDict(
         from_attributes=True,
         json_schema_extra={
@@ -73,7 +80,9 @@ def migrate_from_requirements(cls, v, info: ValidationInfo):
                     "tag": "1.3.1",
                     "node_requirements": node_req_example,
                 }
-                for node_req_example in NodeRequirements.model_config["json_schema_extra"]["examples"]
+                for node_req_example in NodeRequirements.model_config[
+                    "json_schema_extra"
+                ]["examples"]
             ]
             +
             # old version
@@ -85,16 +94,14 @@ def migrate_from_requirements(cls, v, info: ValidationInfo):
                     "requires_mpi": False,
                 }
             ]
-        }
+        },
     )
 
 
 # NOTE: for a long time defaultValue field was added to ServiceOutput wrongly in the DB.
 # this flags allows parsing of the outputs without error. This MUST not leave the director-v2!
 class _ServiceOutputOverride(ServiceOutput):
-    model_config = ConfigDict(
-        extra = "ignore"
-    )
+    model_config = ConfigDict(extra="ignore")
 
 
 _ServiceOutputsOverride = dict[ServicePortKey, _ServiceOutputOverride]
@@ -103,7 +110,7 @@ class _ServiceOutputOverride(ServiceOutput):
 class NodeSchema(BaseModel):
     inputs: ServiceInputsDict = Field(..., description="the inputs scheam")
     outputs: _ServiceOutputsOverride = Field(..., description="the outputs schema")
-    model_config = ConfigDict(extra="ignore", extra="forbid", from_attributes=True)
+    model_config = ConfigDict(extra="forbid", from_attributes=True)
 
 
 class CompTaskAtDB(BaseModel):
@@ -170,8 +177,73 @@ def backward_compatible_null_value(cls, v: HardwareInfo | None) -> HardwareInfo:
         return v
 
     def to_db_model(self, **exclusion_rules) -> dict[str, Any]:
-        comp_task_dict = self.model_dump(by_alias=True, exclude_unset=True, **exclusion_rules)
+        comp_task_dict = self.model_dump(
+            by_alias=True, exclude_unset=True, **exclusion_rules
+        )
         if "state" in comp_task_dict:
             comp_task_dict["state"] = RUNNING_STATE_TO_DB[comp_task_dict["state"]].value
         return comp_task_dict
-    model_config = ConfigDict(extra="forbid", from_attributes=True)
+
+    model_config = ConfigDict(
+        extra="forbid",
+        from_attributes=True,
+        json_schema_extra={
+            "examples": [
+                # DB model
+                {
+                    "task_id": 324,
+                    "project_id": "341351c4-23d1-4366-95d0-bc01386001a7",
+                    "node_id": "7f62be0e-1298-4fe4-be76-66b6e859c260",
+                    "job_id": None,
+                    "internal_id": 3,
+                    "schema": {
+                        "inputs": {
+                            "input_1": {
+                                "label": "input_files",
+                                "description": "Any input files. One or serveral files compressed in a zip will be downloaded in an inputs folder.",
+                                "type": "data:*/*",
+                                "displayOrder": 1.0,
+                            }
+                        },
+                        "outputs": {
+                            "output_1": {
+                                "label": "Output files",
+                                "description": "Output files uploaded from the outputs folder",
+                                "type": "data:*/*",
+                                "displayOrder": 1.0,
+                            }
+                        },
+                    },
+                    "inputs": {
+                        "input_1": {
+                            "nodeUuid": "48a7ac7a-cfc3-44a6-ba9b-5a1a578b922c",
+                            "output": "output_1",
+                        }
+                    },
+                    "outputs": {
+                        "output_1": {
+                            "store": 0,
+                            "path": "341351c4-23d1-4366-95d0-bc01386001a7/7f62be0e-1298-4fe4-be76-66b6e859c260/output_1.zip",
+                        }
+                    },
+                    "image": image_example,
+                    "submit": "2021-03-01 13:07:34.19161",
+                    "node_class": "INTERACTIVE",
+                    "state": "NOT_STARTED",
+                    "progress": 0.44,
+                    "last_heartbeat": None,
+                    "created": "2022-05-20 13:28:31.139+00",
+                    "modified": "2023-06-23 15:58:32.833081+00",
+                    "pricing_info": {
+                        "pricing_plan_id": 1,
+                        "pricing_unit_id": 1,
+                        "pricing_unit_cost_id": 1,
+                    },
+                    "hardware_info": HardwareInfo.model_config["json_schema_extra"][
+                        "examples"
+                    ][0],
+                }
+                for image_example in Image.model_config["json_schema_extra"]["examples"]
+            ]
+        },
+    )

services/director-v2/tests/unit/test_models_schemas_dynamic_services_scheduler.py

@@ -5,7 +5,7 @@
 from pathlib import Path
 
 import pytest
-from pydantic import parse_file_as
+from pydantic import TypeAdapter
 from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData
 
 
@@ -20,13 +20,13 @@ def test_regression_as_label_data(scheduler_data: SchedulerData) -> None:
     # old tested implementation
     scheduler_data_copy = deepcopy(scheduler_data)
     scheduler_data_copy.compose_spec = json.dumps(scheduler_data_copy.compose_spec)
-    json_encoded = scheduler_data_copy.json()
+    json_encoded = scheduler_data_copy.model_dump_json()
 
     # using pydantic's internals
     label_data = scheduler_data.as_label_data()
 
-    parsed_json_encoded = SchedulerData.parse_raw(json_encoded)
-    parsed_label_data = SchedulerData.parse_raw(label_data)
+    parsed_json_encoded = SchedulerData.model_validate_json(json_encoded)
+    parsed_label_data = SchedulerData.model_validate_json(label_data)
     assert parsed_json_encoded == parsed_label_data
 
 
@@ -35,4 +35,6 @@ def test_ensure_legacy_format_compatibility(legacy_scheduler_data_format: Path):
 
     # PRs applying changes to the legacy format:
     # - https://github.com/ITISFoundation/osparc-simcore/pull/3610
-    assert parse_file_as(list[SchedulerData], legacy_scheduler_data_format)
+    assert TypeAdapter(list[SchedulerData]).validate_json(
+        legacy_scheduler_data_format.read_text()
+    )

services/director-v2/tests/unit/test_modules_dynamic_sidecar_client_api_thin.py

@@ -11,7 +11,7 @@
 from httpx import Response
 from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from models_library.sidecar_volumes import VolumeCategory, VolumeStatus
-from pydantic import AnyHttpUrl, parse_obj_as
+from pydantic import AnyHttpUrl, TypeAdapter, parse_obj_as
 from pytest_simcore.helpers.typing_env import EnvVarsDict
 from respx import MockRouter, Route
 from respx.types import SideEffectTypes

services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_compose_specs.py

@@ -156,7 +156,7 @@ async def test_inject_resource_limits_and_reservations(
     [
         pytest.param(
             json.loads(
-                SimcoreServiceLabels.Config.schema_extra["examples"][2][
+                SimcoreServiceLabels.model_config["json_schema_extra"]["examples"][2][
                     "simcore.service.compose-spec"
                 ]
             ),

services/director-v2/tests/unit/test_utils_comp_scheduler.py

@@ -78,8 +78,8 @@ def test_get_resource_tracking_run_id(
 @pytest.mark.parametrize(
     "task",
     [
-        CompTaskAtDB.parse_obj(example)
-        for example in CompTaskAtDB.Config.schema_extra["examples"]
+        CompTaskAtDB.model_validate(example)
+        for example in CompTaskAtDB.model_config["json_schema_extra"]["examples"]
     ],
     ids=str,
 )