Merge branch 'master' into add_wbserver_functions_rest

Author: wvangeit

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

@@ -16,3 +16,5 @@ class ActivityInfo(BaseModel):
 
 
 ActivityInfoOrNone: TypeAlias = ActivityInfo | None
+
+DockerComposeYamlStr: TypeAlias = str

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

@@ -0,0 +1,6 @@
+from models_library.projects_nodes_io import NodeID
+from models_library.rabbitmq_basic_types import RPCNamespace
+
+
+def get_rpc_namespace(node_id: NodeID) -> RPCNamespace:
+    return RPCNamespace.from_entries({"service": "dy-sidecar", "node_id": f"{node_id}"})

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

@@ -0,0 +1,25 @@
+import logging
+
+from models_library.projects_nodes_io import NodeID
+from models_library.rabbitmq_basic_types import RPCMethodName
+from pydantic import TypeAdapter
+
+from ....logging_utils import log_decorator
+from ... import RabbitMQRPCClient
+from ._utils import get_rpc_namespace
+
+_logger = logging.getLogger(__name__)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def free_reserved_disk_space(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    node_id: NodeID,
+) -> None:
+    rpc_namespace = get_rpc_namespace(node_id)
+    result = await rabbitmq_rpc_client.request(
+        rpc_namespace,
+        TypeAdapter(RPCMethodName).validate_python("free_reserved_disk_space"),
+    )
+    assert result is None  # nosec

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

@@ -1,20 +1,16 @@
 import logging
-from typing import Final
 
 from models_library.api_schemas_dynamic_sidecar.telemetry import DiskUsage
 from models_library.projects_nodes_io import NodeID
-from models_library.rabbitmq_basic_types import RPCMethodName, RPCNamespace
+from models_library.rabbitmq_basic_types import RPCMethodName
 from pydantic import TypeAdapter
 
 from ....logging_utils import log_decorator
 from ... import RabbitMQRPCClient
+from ._utils import get_rpc_namespace
 
 _logger = logging.getLogger(__name__)
 
-_UPDATE_DISK_USAGE: Final[RPCMethodName] = TypeAdapter(RPCMethodName).validate_python(
-    "update_disk_usage"
-)
-
 
 @log_decorator(_logger, level=logging.DEBUG)
 async def update_disk_usage(
@@ -23,12 +19,10 @@ async def update_disk_usage(
     node_id: NodeID,
     usage: dict[str, DiskUsage],
 ) -> None:
-    rpc_namespace = RPCNamespace.from_entries(
-        {"service": "dy-sidecar", "node_id": f"{node_id}"}
-    )
+    rpc_namespace = get_rpc_namespace(node_id)
     result = await rabbitmq_rpc_client.request(
         rpc_namespace,
-        _UPDATE_DISK_USAGE,
+        TypeAdapter(RPCMethodName).validate_python("update_disk_usage"),
         usage=usage,
     )
     assert result is None  # nosec

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

@@ -0,0 +1,30 @@
+import logging
+
+from models_library.projects_nodes_io import NodeID
+from models_library.rabbitmq_basic_types import RPCMethodName
+from models_library.sidecar_volumes import VolumeCategory, VolumeStatus
+from pydantic import TypeAdapter
+
+from ....logging_utils import log_decorator
+from ... import RabbitMQRPCClient
+from ._utils import get_rpc_namespace
+
+_logger = logging.getLogger(__name__)
+
+
+@log_decorator(_logger, level=logging.DEBUG)
+async def save_volume_state(
+    rabbitmq_rpc_client: RabbitMQRPCClient,
+    *,
+    node_id: NodeID,
+    status: VolumeStatus,
+    category: VolumeCategory,
+) -> None:
+    rpc_namespace = get_rpc_namespace(node_id)
+    result = await rabbitmq_rpc_client.request(
+        rpc_namespace,
+        TypeAdapter(RPCMethodName).validate_python("save_volume_state"),
+        status=status,
+        category=category,
+    )
+    assert result is None  # nosec

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/containers.py

@@ -24,8 +24,8 @@
 from ...core.settings import ApplicationSettings
 from ...core.validation import (
     ComposeSpecValidation,
+    get_and_validate_compose_spec,
     parse_compose_spec,
-    validate_compose_spec,
 )
 from ...models.schemas.containers import ContainersComposeSpec
 from ...models.shared_store import SharedStore
@@ -76,10 +76,12 @@ async def store_compose_spec(
     _ = request
 
     async with shared_store:
-        compose_spec_validation: ComposeSpecValidation = await validate_compose_spec(
-            settings=settings,
-            compose_file_content=containers_compose_spec.docker_compose_yaml,
-            mounted_volumes=mounted_volumes,
+        compose_spec_validation: ComposeSpecValidation = (
+            await get_and_validate_compose_spec(
+                settings=settings,
+                compose_file_content=containers_compose_spec.docker_compose_yaml,
+                mounted_volumes=mounted_volumes,
+            )
         )
         shared_store.compose_spec = compose_spec_validation.compose_spec
         shared_store.container_names = compose_spec_validation.current_container_names

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/disk.py

@@ -1,6 +1,6 @@
 from fastapi import APIRouter, status
 
-from ...core.reserved_space import remove_reserved_disk_space
+from ...services import disk
 
 router = APIRouter()
 
@@ -11,4 +11,4 @@
     status_code=status.HTTP_204_NO_CONTENT,
 )
 async def free_reserved_disk_space() -> None:
-    remove_reserved_disk_space()
+    disk.remove_reserved_disk_space()

services/dynamic-sidecar/src/simcore_service_dynamic_sidecar/api/rest/volumes.py

@@ -1,11 +1,13 @@
-from fastapi import APIRouter, Depends
+from typing import Annotated
+
+from fastapi import APIRouter, Depends, FastAPI
 from fastapi import Path as PathParam
 from fastapi import status
-from models_library.sidecar_volumes import VolumeCategory, VolumeState, VolumeStatus
+from models_library.sidecar_volumes import VolumeCategory, VolumeStatus
 from pydantic import BaseModel
 
-from ...models.shared_store import SharedStore
-from ._dependencies import get_shared_store
+from ...services import volumes
+from ._dependencies import get_application
 
 router = APIRouter()
 
@@ -21,8 +23,7 @@ class PutVolumeItem(BaseModel):
 )
 async def put_volume_state(
     item: PutVolumeItem,
-    volume_category: VolumeCategory = PathParam(..., alias="id"),
-    shared_store: SharedStore = Depends(get_shared_store),
+    app: Annotated[FastAPI, Depends(get_application)],
+    volume_category: Annotated[VolumeCategory, PathParam(..., alias="id")],
 ) -> None:
-    async with shared_store:
-        shared_store.volume_states[volume_category] = VolumeState(status=item.status)
+    await volumes.save_volume_state(app, status=item.status, category=volume_category)

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

@@ -0,0 +1,11 @@
+from fastapi import FastAPI
+from servicelib.rabbitmq import RPCRouter
+
+from ...services import disk
+
+router = RPCRouter()
+
+
+@router.expose()
+async def free_reserved_disk_space(_: FastAPI) -> None:
+    disk.remove_reserved_disk_space()

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

@@ -1,5 +1,6 @@
 from fastapi import FastAPI
 from models_library.api_schemas_dynamic_sidecar.telemetry import DiskUsage
+from pydantic import validate_call
 from servicelib.rabbitmq import RPCRouter
 
 from ...modules.system_monitor import get_disk_usage_monitor
@@ -8,5 +9,6 @@
 
 
 @router.expose()
+@validate_call(config={"arbitrary_types_allowed": True})
 async def update_disk_usage(app: FastAPI, *, usage: dict[str, DiskUsage]) -> None:
     get_disk_usage_monitor(app).set_disk_usage_for_path(usage)