refactor types

Author: Andrei Neagu

services/director-v2/src/simcore_service_director_v2/modules/dask_client.py

@@ -47,6 +47,7 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.resource_tracker import HardwareInfo
+from models_library.services import RunID
 from models_library.users import UserID
 from pydantic import TypeAdapter, ValidationError
 from pydantic.networks import AnyUrl
@@ -293,7 +294,7 @@ async def send_computation_tasks(
         remote_fct: ContainerRemoteFct | None = None,
         metadata: RunMetadataDict,
         hardware_info: HardwareInfo,
-        resource_tracking_run_id: str,
+        resource_tracking_run_id: RunID,
     ) -> list[PublishedComputationTask]:
         """actually sends the function remote_fct to be remotely executed. if None is kept then the default
         function that runs container will be started.

services/director-v2/src/simcore_service_director_v2/modules/osparc_variables/substitutions.py

@@ -225,7 +225,7 @@ async def resolve_and_substitute_session_variables_in_specs(
     product_name: str,
     project_id: ProjectID,
     node_id: NodeID,
-    run_id: RunID | str,
+    run_id: RunID,
 ) -> dict[str, Any]:
     table = OsparcSessionVariablesTable.get_from_app_state(app)
     resolver = SpecsSubstitutionsResolver(specs, upgrade=False)

services/director-v2/src/simcore_service_director_v2/utils/dask.py

@@ -26,6 +26,7 @@
 from models_library.projects import ProjectID, ProjectIDStr
 from models_library.projects_nodes_io import NodeID, NodeIDStr
 from models_library.services import ServiceKey, ServiceVersion
+from models_library.services_types import RunID
 from models_library.users import UserID
 from pydantic import AnyUrl, ByteSize, TypeAdapter, ValidationError
 from servicelib.logging_utils import log_catch, log_context
@@ -342,7 +343,7 @@ async def compute_task_envs(
     node_id: NodeID,
     node_image: Image,
     metadata: RunMetadataDict,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ) -> ContainerEnvsDict:
     product_name = metadata.get("product_name", UNDEFINED_DOCKER_LABEL)
     task_envs = node_image.envs

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

@@ -442,7 +442,7 @@ async def test_send_computation_task(
     task_labels: ContainerLabelsDict,
     empty_hardware_info: HardwareInfo,
     faker: Faker,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     _DASK_EVENT_NAME = faker.pystr()
 
@@ -561,7 +561,7 @@ async def test_computation_task_is_persisted_on_dask_scheduler(
     mocked_storage_service_api: respx.MockRouter,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     """rationale:
     When a task is submitted to the dask backend, a dask future is returned.
@@ -653,7 +653,7 @@ async def test_abort_computation_tasks(
     faker: Faker,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     _DASK_EVENT_NAME = faker.pystr()
 
@@ -744,7 +744,7 @@ async def test_failed_task_returns_exceptions(
     mocked_storage_service_api: respx.MockRouter,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     # NOTE: this must be inlined so that the test works,
     # the dask-worker must be able to import the function
@@ -808,7 +808,7 @@ async def test_send_computation_task_with_missing_resources_raises(
     mocked_storage_service_api: respx.MockRouter,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     # remove the workers that can handle gpu
     scheduler_info = dask_client.backend.client.scheduler_info()
@@ -854,7 +854,7 @@ async def test_send_computation_task_with_hardware_info_raises(
     mocked_storage_service_api: respx.MockRouter,
     comp_run_metadata: RunMetadataDict,
     hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     # NOTE: running on the default cluster will raise missing resources
     with pytest.raises(MissingComputationalResourcesError):
@@ -884,7 +884,7 @@ async def test_too_many_resources_send_computation_task(
     mocked_storage_service_api: respx.MockRouter,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     # create an image that needs a huge amount of CPU
     image = Image(
@@ -925,7 +925,7 @@ async def test_disconnected_backend_raises_exception(
     mocked_storage_service_api: respx.MockRouter,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     # DISCONNECT THE CLUSTER
     await dask_spec_local_cluster.close()  # type: ignore
@@ -958,7 +958,7 @@ async def test_changed_scheduler_raises_exception(
     unused_tcp_port_factory: Callable,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     # change the scheduler (stop the current one and start another at the same address)
     scheduler_address = URL(dask_spec_local_cluster.scheduler_address)
@@ -1006,7 +1006,7 @@ async def test_get_tasks_status(
     fail_remote_fct: bool,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     # NOTE: this must be inlined so that the test works,
     # the dask-worker must be able to import the function
@@ -1089,7 +1089,7 @@ async def test_dask_sub_handlers(
     fake_task_handlers: TaskHandlers,
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     dask_client.register_handlers(fake_task_handlers)
     _DASK_START_EVENT = "start"
@@ -1164,7 +1164,7 @@ async def test_get_cluster_details(
     comp_run_metadata: RunMetadataDict,
     empty_hardware_info: HardwareInfo,
     faker: Faker,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     cluster_details = await dask_client.get_cluster_details()
     assert cluster_details

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

@@ -18,6 +18,7 @@
 from fastapi import FastAPI
 from models_library.service_settings_labels import ComposeSpecLabelDict
 from models_library.services import ServiceKey, ServiceVersion
+from models_library.services_types import RunID
 from models_library.users import UserID
 from models_library.utils.specs_substitution import SubstitutionValue
 from models_library.utils.string_substitution import OSPARC_IDENTIFIER_PREFIX
@@ -184,7 +185,7 @@ async def test_resolve_and_substitute_session_variables_in_specs(
         product_name="a_product",
         project_id=faker.uuid4(cast_to=None),
         node_id=faker.uuid4(cast_to=None),
-        run_id="some_run_id",
+        run_id=RunID("some_run_id"),
     )
     print("REPLACED SPECS\n", replaced_specs)
 

services/director-v2/tests/unit/with_dbs/test_utils_dask.py

@@ -34,6 +34,7 @@
 from models_library.docker import to_simcore_runtime_docker_label_key
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID, SimCoreFileLink, SimcoreS3FileID
+from models_library.services import RunID
 from models_library.users import UserID
 from pydantic import ByteSize, TypeAdapter
 from pydantic.networks import AnyUrl
@@ -647,7 +648,7 @@ async def test_compute_task_envs(
     run_metadata: RunMetadataDict,
     input_task_envs: ContainerEnvsDict,
     expected_computed_task_envs: ContainerEnvsDict,
-    resource_tracking_run_id: str,
+    resource_tracking_run_id: RunID,
 ):
     sleeper_task: CompTaskAtDB = published_project.tasks[1]
     sleeper_task.image.envs = input_task_envs