review @sanderegg @pcrespov

Author: matusdrobuliak66

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

@@ -20,7 +20,7 @@
 )
 from ..projects.api import has_user_project_access_rights
 from ..resource_manager.registry import RedisResourceRegistry
-from ..resource_manager.registry_utils import list_opened_project_ids
+from ..resource_manager.service import list_opened_project_ids
 from ..users import users_service
 from ..users.exceptions import UserNotFoundError
 

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

@@ -26,7 +26,7 @@
     get_redis_lock_manager_client_sdk,
 )
 from ..resource_manager.registry import get_registry
-from ..resource_manager.registry_utils import list_opened_project_ids
+from ..resource_manager.service import list_opened_project_ids
 from ..socketio._utils import get_socket_server
 from . import _projects_repository
 
@@ -123,12 +123,12 @@ async def remove_project_documents_as_admin(app: web.Application) -> None:
     ):
         # Extract project UUID from the key pattern "projects:{project_uuid}:version"
         key_str = key.decode("utf-8") if isinstance(key, bytes) else key
-        match = re.match(r"projects:([0-9a-f-]+):version", key_str)
+        match = re.match(r"projects:(?P<project_uuid>[0-9a-f-]+):version", key_str)
 
         if not match:
             continue
 
-        project_uuid_str = match.group(1)
+        project_uuid_str = match.group("project_uuid")
         project_uuid = ProjectID(project_uuid_str)
         project_room = SocketIORoomStr.from_project_id(project_uuid)
 

services/web/server/src/simcore_service_webserver/resource_manager/registry_utils.py renamed to services/web/server/src/simcore_service_webserver/resource_manager/_registry_utils.py

@@ -13,6 +13,6 @@ async def list_opened_project_ids(registry: RedisResourceRegistry) -> list[Proje
     all_session_alive, _ = await registry.get_all_resource_keys()
     for alive_session in all_session_alive:
         resources = await registry.get_resources(alive_session)
-        if "project_id" in resources:
-            opened_projects.append(ProjectID(resources["project_id"]))
+        if projects_id := resources.get("project_id"):
+            opened_projects.append(ProjectID(projects_id))
     return opened_projects

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

@@ -0,0 +1,3 @@
+from ._registry_utils import list_opened_project_ids
+
+__all__ = ("list_opened_project_ids",)