added redirect via rpc

Author: Andrei Neagu

services/web/server/src/simcore_service_webserver/director_v2/_core_dynamic_services.py

@@ -7,11 +7,9 @@
 import logging
 
 from aiohttp import web
-from models_library.api_schemas_directorv2.dynamic_services import DynamicServiceGet
 from models_library.projects import ProjectID
 from models_library.services import ServicePortKey
-from pydantic import BaseModel, NonNegativeInt, TypeAdapter
-from pydantic.types import PositiveInt
+from pydantic import NonNegativeInt
 from servicelib.logging_utils import log_decorator
 from yarl import URL
 
@@ -22,36 +20,6 @@
 _log = logging.getLogger(__name__)
 
 
-class _Params(BaseModel):
-    user_id: PositiveInt | None = None
-    project_id: str | None = None
-
-
-async def list_dynamic_services(
-    app: web.Application,
-    user_id: PositiveInt | None = None,
-    project_id: str | None = None,
-) -> list[DynamicServiceGet]:
-    params = _Params(user_id=user_id, project_id=project_id)
-    params_dict = params.model_dump(exclude_none=True)
-    settings: DirectorV2Settings = get_plugin_settings(app)
-    if params_dict:  # Update query doesnt work with no params to unwrap
-        backend_url = (settings.base_url / "dynamic_services").update_query(
-            **params_dict
-        )
-    else:
-        backend_url = settings.base_url / "dynamic_services"
-
-    services = await request_director_v2(
-        app, "GET", backend_url, expected_status=web.HTTPOk
-    )
-
-    if services is None:
-        services = []
-    assert isinstance(services, list)  # nosec
-    return TypeAdapter(list[DynamicServiceGet]).validate_python(services)
-
-
 # NOTE: ANE https://github.com/ITISFoundation/osparc-simcore/issues/3191
 @log_decorator(logger=_log)
 async def retrieve(

services/web/server/src/simcore_service_webserver/director_v2/api.py

@@ -27,7 +27,6 @@
 )
 from ._core_dynamic_services import (
     get_project_inactivity,
-    list_dynamic_services,
     request_retrieve_dyn_service,
     restart_dynamic_service,
     retrieve,
@@ -59,7 +58,6 @@
     "is_healthy",
     "is_pipeline_running",
     "list_clusters",
-    "list_dynamic_services",
     "ping_cluster",
     "ping_specific_cluster",
     "request_retrieve_dyn_service",

services/web/server/src/simcore_service_webserver/dynamic_scheduler/api.py

@@ -18,19 +18,30 @@
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
 from models_library.rabbitmq_messages import ProgressRabbitMessageProject, ProgressType
+from models_library.users import UserID
 from pydantic.types import PositiveInt
 from servicelib.progress_bar import ProgressBarData
 from servicelib.rabbitmq import RabbitMQClient, RPCServerError
 from servicelib.rabbitmq.rpc_interfaces.dynamic_scheduler import services
 from servicelib.utils import logged_gather
 
-from ..director_v2.api import list_dynamic_services
 from ..rabbitmq import get_rabbitmq_client, get_rabbitmq_rpc_client
 from .settings import DynamicSchedulerSettings, get_plugin_settings
 
 _logger = logging.getLogger(__name__)
 
 
+async def list_dynamic_services(
+    app: web.Application,
+    *,
+    user_id: UserID | None = None,
+    project_id: ProjectID | None = None,
+) -> list[DynamicServiceGet]:
+    return await services.list_tracked_dynamic_services(
+        get_rabbitmq_rpc_client(app), user_id=user_id, project_id=project_id
+    )
+
+
 async def get_dynamic_service(
     app: web.Application, *, node_id: NodeID
 ) -> NodeGetIdle | NodeGetUnknown | DynamicServiceGet | NodeGet:

services/web/server/src/simcore_service_webserver/garbage_collector/_core_orphans.py

@@ -13,7 +13,6 @@
 from servicelib.utils import logged_gather
 from simcore_postgres_database.models.users import UserRole
 
-from ..director_v2 import api as director_v2_api
 from ..dynamic_scheduler import api as dynamic_scheduler_api
 from ..projects.api import has_user_project_access_rights
 from ..projects.projects_api import (
@@ -90,7 +89,7 @@ async def remove_orphaned_services(
     # in between and the GC would remove services that actually should be running.
 
     with log_catch(_logger, reraise=False):
-        running_services = await director_v2_api.list_dynamic_services(app)
+        running_services = await dynamic_scheduler_api.list_dynamic_services(app)
         if not running_services:
             # nothing to do
             return

services/web/server/src/simcore_service_webserver/projects/_trash_api.py

@@ -12,6 +12,7 @@
 from servicelib.utils import fire_and_forget_task
 
 from ..director_v2 import api as director_v2_api
+from ..dynamic_scheduler import api as dynamic_scheduler_api
 from . import projects_api
 from ._access_rights_api import check_user_project_permission
 from .exceptions import ProjectRunningConflictError
@@ -56,8 +57,8 @@ async def _is_project_running(
             app, user_id=user_id, project_id=project_id
         )
     ) or bool(
-        await director_v2_api.list_dynamic_services(
-            app, user_id=user_id, project_id=f"{project_id}"
+        await dynamic_scheduler_api.list_dynamic_services(
+            app, user_id=user_id, project_id=project_id
         )
     )
 

services/web/server/src/simcore_service_webserver/projects/projects_api.py

@@ -609,8 +609,8 @@ async def _start_dynamic_service(
             project_settings.PROJECTS_MAX_NUM_RUNNING_DYNAMIC_NODES
         ),
     ):
-        project_running_nodes = await director_v2_api.list_dynamic_services(
-            request.app, user_id, f"{project_uuid}"
+        project_running_nodes = await dynamic_scheduler_api.list_dynamic_services(
+            request.app, user_id=user_id, project_id=project_uuid
         )
         _nodes_api.check_num_service_per_projects_limit(
             app=request.app,
@@ -903,8 +903,10 @@ async def delete_project_node(
         permission="write",
     )
 
-    list_running_dynamic_services = await director_v2_api.list_dynamic_services(
-        request.app, project_id=f"{project_uuid}", user_id=user_id
+    list_running_dynamic_services = await dynamic_scheduler_api.list_dynamic_services(
+        request.app,
+        user_id=user_id,
+        project_id=project_uuid,
     )
 
     fire_and_forget_task(
@@ -1628,9 +1630,9 @@ async def run_project_dynamic_services(
     # first get the services if they already exist
     project_settings: ProjectsSettings = get_plugin_settings(request.app)
     running_services_uuids: list[NodeIDStr] = [
-        NodeIDStr(f"{d.node_uuid}")
-        for d in await director_v2_api.list_dynamic_services(
-            request.app, user_id, project["uuid"]
+        f"{d.node_uuid}"
+        for d in await dynamic_scheduler_api.list_dynamic_services(
+            request.app, user_id=user_id, project_id=ProjectID(project["uuid"])
         )
     ]
 

services/web/server/tests/unit/isolated/test_garbage_collector_core.py

@@ -91,7 +91,7 @@ async def mock_is_node_id_present_in_any_project_workbench(
 @pytest.fixture
 async def mock_list_dynamic_services(mocker: MockerFixture) -> mock.AsyncMock:
     return mocker.patch(
-        f"{MODULE_GC_CORE_ORPHANS}.director_v2_api.list_dynamic_services",
+        f"{MODULE_GC_CORE_ORPHANS}.dynamic_scheduler_api.list_dynamic_services",
         autospec=True,
         return_value=[],
     )

services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py

@@ -16,7 +16,6 @@
 from pytest_simcore.services_api_mocks_for_aiohttp_clients import AioResponsesMock
 from servicelib.aiohttp import status
 from simcore_service_webserver.db.models import UserRole
-from simcore_service_webserver.director_v2 import api
 
 
 @pytest.fixture
@@ -115,12 +114,3 @@ async def test_stop_computation(
         if user_role == UserRole.GUEST
         else expected.no_content,
     )
-
-
-async def test_regression_get_dynamic_services_empty_params(
-    director_v2_service_mock: AioResponsesMock,
-    client: TestClient,
-):
-    assert client.app
-    list_of_services = await api.list_dynamic_services(client.app)
-    assert list_of_services == []