minor

Author: sanderegg

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

@@ -1,9 +1,6 @@
 # mypy: disable-error-code=truthy-function
 from typing import Annotated, Any, Literal, TypeAlias
 
-from models_library.groups import GroupID
-from models_library.projects import ProjectID
-from models_library.services_history import ServiceRelease
 from pydantic import ConfigDict, Field
 
 from ..access_rights import ExecutableAccessRights
@@ -13,8 +10,11 @@
 from ..projects_nodes_io import NodeID
 from ..services import ServiceKey, ServicePortKey, ServiceVersion
 from ..services_enums import ServiceState
+from ..services_history import ServiceRelease
 from ..services_resources import ServiceResourcesDict
 from ._base import InputSchemaWithoutCamelCase, OutputSchema
+from .groups import GroupID
+from .projects import ProjectID
 
 assert ServiceResourcesDict  # nosec
 __all__: tuple[str, ...] = ("ServiceResourcesDict",)

services/web/server/src/simcore_service_webserver/resource_manager/models.py

@@ -21,7 +21,7 @@ def to_redis_hash_key(self) -> RedisHashKey:
 
     @classmethod
     def from_redis_hash_key(cls, hash_key: RedisHashKey) -> Self:
-        key = dict(x.split("=") for x in hash_key.split(":") if "=" in x)
+        key = dict(x.split("=", 1) for x in hash_key.split(":") if "=" in x)
         return cls.model_validate(key)
 
     @staticmethod

services/web/server/src/simcore_service_webserver/resource_manager/user_sessions.py

@@ -2,6 +2,7 @@
 from collections.abc import Iterator
 from contextlib import contextmanager
 from dataclasses import dataclass
+from functools import cached_property
 from typing import Final
 
 from aiohttp import web
@@ -62,7 +63,8 @@ class UserSessionResourcesRegistry:
     def _registry(self) -> RedisResourceRegistry:
         return get_registry(self.app)
 
-    def _resource_key(self) -> UserSession:
+    @cached_property
+    def resource_key(self) -> UserSession:
         return UserSession(
             user_id=self.user_id,
             client_session_id=self.client_session_id or "*",
@@ -78,14 +80,12 @@ async def set_socket_id(self, socket_id: str) -> None:
         )
 
         await self._registry.set_resource(
-            self._resource_key(), (_SOCKET_ID_FIELDNAME, socket_id)
+            self.resource_key, (_SOCKET_ID_FIELDNAME, socket_id)
         )
         # NOTE: hearthbeat is not emulated in tests, make sure that with very small GC intervals
         # the resources do not expire; this value is usually in the order of minutes
         timeout = max(3, _get_service_deletion_timeout(self.app))
-        await self._registry.set_key_alive(
-            self._resource_key(), expiration_time=timeout
-        )
+        await self._registry.set_key_alive(self.resource_key, expiration_time=timeout)
 
     async def get_socket_id(self) -> str | None:
         _logger.debug(
@@ -94,15 +94,15 @@ async def get_socket_id(self) -> str | None:
             self.client_session_id,
         )
 
-        resources = await self._registry.get_resources(self._resource_key())
+        resources = await self._registry.get_resources(self.resource_key)
         key: str | None = resources.get("socket_id", None)
         return key
 
     async def user_pressed_disconnect(self) -> None:
         """When the user disconnects expire as soon as possible the alive key
         to ensure garbage collection will trigger in the next 2 cycles."""
 
-        await self._registry.set_key_alive(self._resource_key(), expiration_time=1)
+        await self._registry.set_key_alive(self.resource_key, expiration_time=1)
 
     async def remove_socket_id(self) -> None:
         _logger.debug(
@@ -112,17 +112,17 @@ async def remove_socket_id(self) -> None:
             extra=get_log_record_extra(user_id=self.user_id),
         )
 
-        await self._registry.remove_resource(self._resource_key(), _SOCKET_ID_FIELDNAME)
+        await self._registry.remove_resource(self.resource_key, _SOCKET_ID_FIELDNAME)
         await self._registry.set_key_alive(
-            self._resource_key(),
+            self.resource_key,
             expiration_time=_get_service_deletion_timeout(self.app),
         )
 
     async def set_heartbeat(self) -> None:
         """Extends TTL to avoid expiration of all resources under this session"""
 
         await self._registry.set_key_alive(
-            self._resource_key(),
+            self.resource_key,
             expiration_time=_get_service_deletion_timeout(self.app),
         )
 
@@ -160,7 +160,7 @@ async def find(self, resource_name: str) -> list[str]:
             extra=get_log_record_extra(user_id=self.user_id),
         )
 
-        return await self._registry.find_resources(self._resource_key(), resource_name)
+        return await self._registry.find_resources(self.resource_key, resource_name)
 
     async def add(self, key: str, value: str) -> None:
         _logger.debug(
@@ -172,7 +172,7 @@ async def add(self, key: str, value: str) -> None:
             extra=get_log_record_extra(user_id=self.user_id),
         )
 
-        await self._registry.set_resource(self._resource_key(), (key, value))
+        await self._registry.set_resource(self.resource_key, (key, value))
 
     async def remove(self, key: str) -> None:
         _logger.debug(
@@ -183,7 +183,7 @@ async def remove(self, key: str) -> None:
             extra=get_log_record_extra(user_id=self.user_id),
         )
 
-        await self._registry.remove_resource(self._resource_key(), key)
+        await self._registry.remove_resource(self.resource_key, key)
 
     @staticmethod
     async def find_users_of_resource(

services/web/server/tests/unit/with_dbs/02/test_projects_states_handlers.py

@@ -657,6 +657,7 @@ async def test_open_template_project_for_edition(
     )
 
     # Only create socketio connection for non-anonymous users
+    client_id = None
     if expected != status.HTTP_401_UNAUTHORIZED:
         _, client_id, _ = await create_socketio_connection_with_handlers(client)
     url = client.app.router["open_project"].url_for(project_id=template_project["uuid"])
@@ -1158,6 +1159,7 @@ async def test_get_active_project(
     mocked_notifications_plugin: dict[str, mock.Mock],
 ):
     # login with socket using client session id
+    client_id1 = ""
     try:
         sio, client_id1 = await create_socketio_connection(None, client)
         assert sio.sid
@@ -1203,6 +1205,7 @@ async def test_get_active_project(
         mocked_notifications_plugin["subscribe"].assert_not_called()
 
     # login with socket using client session id2
+    client_id2 = ""
     try:
         sio, client_id2 = await create_socketio_connection(None, client)
         assert sio.sid

services/web/server/tests/unit/with_dbs/04/garbage_collector/test_resource_manager_user_sessions.py

@@ -275,7 +275,7 @@ async def test_users_sessions_resources_registry(
                 user_session_key = UserSession(
                     user_id=user_id, client_session_id=client_session_id
                 )
-                assert rt._resource_key() == user_session_key  # noqa: SLF001
+                assert rt.resource_key() == user_session_key  # noqa: SLF001
 
                 # set the socket id and check it is rightfully there
                 await rt.set_socket_id(socket_id)