Merge branch 'master' into pr-osparc-fixes-for-new-services

Author: mergify[bot]

.eslintignore

@@ -0,0 +1,6 @@
+module.exports = {
+  ignores: [
+    "services/static-webserver/client/source/resource/",
+    "services/static-webserver/client/source-output/",
+  ]
+};

eslint.config.js

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

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

@@ -261,6 +261,7 @@ class ProjectPatch(InputSchema):
         ),
     ] = None
     quality: dict[str, Any] | None = None
+    template_type: ProjectTemplateType | None = None
 
     def to_domain_model(self) -> dict[str, Any]:
         return self.model_dump(exclude_unset=True, by_alias=False)

packages/models-library/src/models_library/api_schemas_webserver/projects.py

@@ -3,7 +3,7 @@
 """
 
 from datetime import datetime
-from enum import Enum, auto
+from enum import Enum
 from typing import Annotated, Any, Final, TypeAlias
 from uuid import UUID
 
@@ -54,9 +54,9 @@ class ProjectType(str, Enum):
 
 
 class ProjectTemplateType(StrAutoEnum):
-    TEMPLATE = auto()
-    TUTORIAL = auto()
-    HYPERTOOL = auto()
+    TEMPLATE = "TEMPLATE"
+    TUTORIAL = "TUTORIAL"
+    HYPERTOOL = "HYPERTOOL"
 
 
 class BaseProjectModel(BaseModel):

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

@@ -1,17 +1,18 @@
-""" Facade for webserver service
+"""Facade for webserver service
 
-    Facade to direct access to models in the database by
-    the  webserver service
+Facade to direct access to models in the database by
+the  webserver service
 
 """
+
 from .models.api_keys import api_keys
 from .models.classifiers import group_classifiers
 from .models.comp_pipeline import StateType, comp_pipeline
 from .models.comp_tasks import DB_CHANNEL_NAME, NodeClass, comp_tasks
 from .models.confirmations import ConfirmationAction, confirmations
 from .models.groups import GroupType, groups, user_to_groups
 from .models.products import products
-from .models.projects import ProjectType, projects
+from .models.projects import ProjectTemplateType, ProjectType, projects
 from .models.projects_nodes import projects_nodes
 from .models.projects_tags import projects_tags
 from .models.projects_to_wallet import projects_to_wallet
@@ -35,6 +36,7 @@
     "projects",
     "projects_nodes",
     "ProjectType",
+    "ProjectTemplateType",
     "scicrunch_resources",
     "StateType",
     "projects_tags",

packages/postgres-database/src/simcore_postgres_database/webserver_models.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/_utils.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.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/disk_usage.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