rename

Author: Andrei Neagu

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

@@ -61,7 +61,7 @@ class ServiceRunID(str):
     __slots__ = ()
 
     @classmethod
-    def create_for_dynamic_sidecar(cls) -> Self:
+    def get_resource_tracking_run_id_for_dynamic(cls) -> Self:
         """used for dynamic services"""
         # NOTE: there was a legacy version of this RunID
         # legacy version:
@@ -73,7 +73,7 @@ def create_for_dynamic_sidecar(cls) -> Self:
         return cls(run_id_format)
 
     @classmethod
-    def get_resource_tracking_run_id(
+    def get_resource_tracking_run_id_for_computational(
         cls,
         user_id: UserID,
         project_id: "ProjectID",

packages/models-library/tests/test_services_types.py

@@ -25,12 +25,16 @@ def test_run_id_get_resource_tracking_run_id(
     iteration: PositiveInt,
     expected_result: str,
 ):
-    resource_tracking_service_run_id = ServiceRunID.get_resource_tracking_run_id(
-        user_id, project_id, node_id, iteration
+    resource_tracking_service_run_id = (
+        ServiceRunID.get_resource_tracking_run_id_for_computational(
+            user_id, project_id, node_id, iteration
+        )
     )
     assert isinstance(resource_tracking_service_run_id, ServiceRunID)
     assert resource_tracking_service_run_id == expected_result
 
 
-def test_run_id_create_for_dynamic_sidecar():
-    assert isinstance(ServiceRunID.create_for_dynamic_sidecar(), ServiceRunID)
+def test_get_resource_tracking_run_id_for_dynamic():
+    assert isinstance(
+        ServiceRunID.get_resource_tracking_run_id_for_dynamic(), ServiceRunID
+    )

services/agent/tests/unit/conftest.py

@@ -57,7 +57,7 @@ def test_client(initialized_app: FastAPI) -> TestClient:
 
 @pytest.fixture
 def service_run_id() -> ServiceRunID:
-    return ServiceRunID.create_for_dynamic_sidecar()
+    return ServiceRunID.get_resource_tracking_run_id_for_dynamic()
 
 
 @pytest.fixture

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

@@ -377,7 +377,7 @@ class SchedulerData(CommonServiceDetails, DynamicSidecarServiceLabels):
         description="Name of the current dynamic-sidecar being observed",
     )
     run_id: ServiceRunID = Field(
-        default_factory=ServiceRunID.create_for_dynamic_sidecar,
+        default_factory=ServiceRunID.get_resource_tracking_run_id_for_dynamic,
         description=(
             "Uniquely identify the dynamic sidecar session (a.k.a. 2 "
             "subsequent exact same services will have a different run_id)"

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_scheduler_base.py

@@ -295,7 +295,7 @@ def _need_heartbeat(task: CompTaskAtDB) -> bool:
                 *(
                     publish_service_resource_tracking_heartbeat(
                         self.rabbitmq_client,
-                        ServiceRunID.get_resource_tracking_run_id(
+                        ServiceRunID.get_resource_tracking_run_id_for_computational(
                             user_id, t.project_id, t.node_id, iteration
                         ),
                     )
@@ -348,7 +348,7 @@ async def _process_started_tasks(
             *(
                 publish_service_resource_tracking_started(
                     self.rabbitmq_client,
-                    service_run_id=ServiceRunID.get_resource_tracking_run_id(
+                    service_run_id=ServiceRunID.get_resource_tracking_run_id_for_computational(
                         user_id, t.project_id, t.node_id, iteration
                     ),
                     wallet_id=run_metadata.get("wallet_id"),

services/director-v2/src/simcore_service_director_v2/modules/comp_scheduler/_scheduler_dask.py

@@ -129,7 +129,7 @@ async def _start_tasks(
                         hardware_info=task.hardware_info,
                         callback=wake_up_callback,
                         metadata=comp_run.metadata,
-                        resource_tracking_run_id=ServiceRunID.get_resource_tracking_run_id(
+                        resource_tracking_run_id=ServiceRunID.get_resource_tracking_run_id_for_computational(
                             user_id, project_id, node_id, comp_run.iteration
                         ),
                     )
@@ -322,7 +322,7 @@ async def _process_task_result(
             # resource tracking
             await publish_service_resource_tracking_stopped(
                 self.rabbitmq_client,
-                ServiceRunID.get_resource_tracking_run_id(
+                ServiceRunID.get_resource_tracking_run_id_for_computational(
                     user_id, project_id, node_id, iteration
                 ),
                 simcore_platform_status=simcore_platform_status,

services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/scheduler/_core/_event_create_sidecars.py

@@ -237,7 +237,7 @@ async def action(cls, app: FastAPI, scheduler_data: SchedulerData) -> None:
 
         # Each time a new dynamic-sidecar service is created
         # generate a new `run_id` to avoid resource collisions
-        scheduler_data.run_id = ServiceRunID.create_for_dynamic_sidecar()
+        scheduler_data.run_id = ServiceRunID.get_resource_tracking_run_id_for_dynamic()
 
         rpc_client: RabbitMQRPCClient = app.state.rabbitmq_rpc_client
 

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

@@ -80,14 +80,14 @@ def dynamic_sidecar_port() -> PortInt:
 
 @pytest.fixture
 def service_run_id() -> ServiceRunID:
-    return ServiceRunID.create_for_dynamic_sidecar()
+    return ServiceRunID.get_resource_tracking_run_id_for_dynamic()
 
 
 @pytest.fixture
 def resource_tracking_run_id(
     user_id: UserID, project_id: ProjectID, node_id: NodeID
 ) -> ServiceRunID:
-    return ServiceRunID.get_resource_tracking_run_id(
+    return ServiceRunID.get_resource_tracking_run_id_for_computational(
         user_id, project_id, node_id, iteration=42
     )
 

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

@@ -37,7 +37,7 @@ def state_paths() -> list[Path]:
 
 @pytest.fixture
 def service_run_id() -> ServiceRunID:
-    return ServiceRunID.create_for_dynamic_sidecar()
+    return ServiceRunID.get_resource_tracking_run_id_for_dynamic()
 
 
 @pytest.fixture
@@ -142,15 +142,15 @@ async def test_unique_name_creation_and_removal(faker: Faker):
     unique_volume_name = DynamicSidecarVolumesPathsResolver.source(
         path=Path("/some/random/path/to/a/workspace/folder"),
         node_uuid=faker.uuid4(cast_to=None),
-        service_run_id=ServiceRunID.create_for_dynamic_sidecar(),
+        service_run_id=ServiceRunID.get_resource_tracking_run_id_for_dynamic(),
     )
 
     await assert_creation_and_removal(unique_volume_name)
 
 
 def test_volumes_get_truncated_as_expected(faker: Faker):
     node_uuid = faker.uuid4(cast_to=None)
-    service_run_id = ServiceRunID.create_for_dynamic_sidecar()
+    service_run_id = ServiceRunID.get_resource_tracking_run_id_for_dynamic()
     assert node_uuid != service_run_id
     unique_volume_name = DynamicSidecarVolumesPathsResolver.source(
         path=Path(

services/dynamic-sidecar/tests/conftest.py

@@ -125,7 +125,7 @@ def node_id(faker: Faker) -> NodeID:
 
 @pytest.fixture
 def service_run_id() -> ServiceRunID:
-    return ServiceRunID.create_for_dynamic_sidecar()
+    return ServiceRunID.get_resource_tracking_run_id_for_dynamic()
 
 
 @pytest.fixture