fixed tests and renaming endpoints

Author: Andrei Neagu

packages/models-library/src/models_library/api_schemas_dynamic_sidecar/__init__.py

@@ -0,0 +1,9 @@
+from typing import Final
+
+from pydantic import parse_obj_as
+
+from ..rabbitmq_basic_types import RPCNamespace
+
+DYNAMIC_SIDECAR_RPC_NAMESPACE: Final[RPCNamespace] = parse_obj_as(
+    RPCNamespace, "dynamic-sidecar"
+)

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_sidecar/__init__.py

@@ -0,0 +1,22 @@
+import logging
+
+from models_library.api_schemas_dynamic_sidecar import DYNAMIC_SIDECAR_RPC_NAMESPACE
+from models_library.rabbitmq_basic_types import RPCMethodName
+from pydantic import parse_obj_as
+from servicelib.logging_utils import log_decorator
+from servicelib.rabbitmq import RabbitMQRPCClient
+from simcore_service_dynamic_sidecar.api.rpc._disk_usage import DiskUsage
+
+_logger = logging.getLogger(__name__)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def update_disk_usage(
+    rabbitmq_rpc_client: RabbitMQRPCClient, *, usage: dict[str, DiskUsage]
+) -> None:
+    result = await rabbitmq_rpc_client.request(
+        DYNAMIC_SIDECAR_RPC_NAMESPACE,
+        parse_obj_as(RPCMethodName, "update_disk_usage"),
+        usage=usage,
+    )
+    assert result is None  # nosec

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/dynamic_sidecar/disk_usage.py

@@ -0,0 +1,12 @@
+from fastapi import FastAPI
+from models_library.api_schemas_dynamic_sidecar.telemetry import DiskUsage
+from servicelib.rabbitmq import RPCRouter
+
+from ...modules.system_monitor import get_disk_usage_monitor
+
+router = RPCRouter()
+
+
+@router.expose()
+async def update_disk_usage(app: FastAPI, *, usage: dict[str, DiskUsage]) -> None:
+    await get_disk_usage_monitor(app).set_disk_usage_for_path(usage)

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rpc/_disk_usage.py

@@ -0,0 +1,19 @@
+from fastapi import FastAPI
+from models_library.api_schemas_dynamic_sidecar import DYNAMIC_SIDECAR_RPC_NAMESPACE
+from servicelib.rabbitmq import RPCRouter
+
+from ...core.rabbitmq import get_rabbitmq_rpc_server
+from . import _disk_usage
+
+ROUTERS: list[RPCRouter] = [
+    _disk_usage.router,
+]
+
+
+def setup_rpc_api_routes(app: FastAPI) -> None:
+    async def startup() -> None:
+        rpc_server = get_rabbitmq_rpc_server(app)
+        for router in ROUTERS:
+            await rpc_server.register_router(router, DYNAMIC_SIDECAR_RPC_NAMESPACE, app)
+
+    app.add_event_handler("startup", startup)

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rpc/routes.py

@@ -14,6 +14,7 @@
 
 from .._meta import API_VERSION, API_VTAG, PROJECT_NAME, SUMMARY, __version__
 from ..api.rest import get_main_router
+from ..api.rpc.routes import setup_rpc_api_routes
 from ..models.schemas.application_health import ApplicationHealth
 from ..models.shared_store import SharedStore, setup_shared_store
 from ..modules.attribute_monitor import setup_attribute_monitor
@@ -171,6 +172,7 @@ def create_app():
     application_settings: ApplicationSettings = app.state.settings
 
     setup_rabbitmq(app)
+    setup_rpc_api_routes(app)
     setup_background_log_fetcher(app)
     setup_resource_tracking(app)
     setup_notifications(app)

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/core/application.py

@@ -1,3 +1,7 @@
+from ._disk_usage import get_disk_usage_monitor
 from ._setup import setup_system_monitor
 
-__all__: tuple[str, ...] = ("setup_system_monitor",)
+__all__: tuple[str, ...] = (
+    "get_disk_usage_monitor",
+    "setup_system_monitor",
+)

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/modules/system_monitor/__init__.py

@@ -328,6 +328,11 @@ def mock_core_rabbitmq(mocker: MockerFixture) -> dict[str, AsyncMock]:
             return_value=None,
             autospec=True,
         ),
+        "rpc.register_router": mocker.patch(
+            "simcore_service_dynamic_sidecar.core.rabbitmq.RabbitMQRPCClient.register_router",
+            return_value=None,
+            autospec=True,
+        ),
     }
 
 

services/dynamic-sidecar/tests/conftest.py

@@ -772,7 +772,7 @@ def mock_inactive_since_command_response(
     activity_response: ActivityInfo,
 ) -> None:
     mocker.patch(
-        "simcore_service_dynamic_sidecar.api.containers.run_command_in_container",
+        "simcore_service_dynamic_sidecar.api.rest.containers.run_command_in_container",
         return_value=activity_response.json(),
     )
 
@@ -792,7 +792,7 @@ async def test_containers_activity_inactive_since(
 @pytest.fixture
 def mock_inactive_response_wrong_format(mocker: MockerFixture) -> None:
     mocker.patch(
-        "simcore_service_dynamic_sidecar.api.containers.run_command_in_container",
+        "simcore_service_dynamic_sidecar.api.rest.containers.run_command_in_container",
         return_value="This is an unparsable json response {}",
     )