Bugfix/2038/groups breaks list services (#2039)

* fix regex to prevent " in the name of servicess
* skip frontend services other than file-picker

Author: sanderegg

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

@@ -11,8 +11,7 @@
 
 from .basic_regex import VERSION_RE
 
-
-SERVICE_KEY_RE = r"^(simcore)/(services)/(comp|dynamic|frontend)(/[^\s/]+)+$"
+SERVICE_KEY_RE = r"^(simcore)/(services)/(comp|dynamic|frontend)(/[\w/-]+)+$"
 KEY_RE = SERVICE_KEY_RE  # TODO: deprecate this global constant by SERVICE_KEY_RE
 
 PROPERTY_TYPE_RE = r"^(number|integer|boolean|string|data:([^/\s,]+/[^/\s,]+|\[[^/\s,]+/[^/\s,]+(,[^/\s]+/[^/,\s]+)*\]))$"

services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_tasks.py

@@ -1,6 +1,6 @@
 import logging
 from datetime import datetime
-from typing import List
+from typing import List, Optional
 
 import sqlalchemy as sa
 from models_library.projects import ProjectID
@@ -27,30 +27,32 @@
 
 
 @log_decorator(logger=logger)
-def _get_fake_service_details(service: ServiceKeyVersion) -> ServiceDockerData:
+def _get_fake_service_details(
+    service: ServiceKeyVersion,
+) -> Optional[ServiceDockerData]:
+
     if "file-picker" in service.key:
         file_picker_outputs = {
             "outFile": {
-                "label": "the output",
+                "label": "File",
                 "displayOrder": 0,
-                "description": "a file",
+                "description": "Chosen File",
                 "type": "data:*/*",
             }
         }
-        file_picker_type = ServiceType.FRONTEND
         return ServiceDockerData(
             **service.dict(),
-            name="file-picker",
-            description="file-picks",
+            name="File Picker",
+            description="File Picker",
             authors=[
-                Author(name="ITIS", email="[email protected]", affiliation="IT'IS")
+                Author(name="Odei Maiz", email="[email protected]", affiliation="IT'IS")
             ],
-            contact="[email protected]",
+            contact="[email protected]",
             inputs={},
             outputs=file_picker_outputs,
-            type=file_picker_type,
+            type=ServiceType.FRONTEND,
         )
-    raise ValueError("")
+    return None
 
 
 class CompTasksRepository(BaseRepository):
@@ -101,6 +103,9 @@ async def upsert_tasks_from_project(
                 node_extras: ServiceExtras = await director_client.get_service_extras(
                     service_key_version
                 )
+            if not node_details:
+                continue
+
             requires_mpi = False
             requires_gpu = False
             if node_extras:

services/director-v2/tests/mocks/fake_service.json

@@ -1,7 +1,7 @@
 {
   "name": "laborum Lorem ullamco minim",
   "description": "qui Lorem quis ut occaecat",
-  "key": "simcore/services/frontend/I2HZjlT;/@.c!hG~/u`9+c#W,/L/^XQd3z@T\"o/>Wpe@N*quV",
+  "key": "simcore/services/frontend/sdflkjslfk---2342___23423/sdfkgjdlfkgd/sdkfjsdflgkj",
   "version": "844863.7218662994.388740048-9.127142757Xir8O6z.uPzMFCH.3399Y.214.7112.4935048219Qh4-k9LZJAA.0.18549123X+55gl.av.enudGN6.QszV6RAx3eF.VFWA3Vv7oo3.WV5Zd.K22.idGnQwZMb",
   "type": "frontend",
   "authors": [

services/director-v2/tests/mocks/fake_task.json

@@ -49,7 +49,7 @@
   },
   "inputs": {},
   "image": {
-    "name": "simcore/services/dynamic/u]=HS,C[vOK/_9%;j%&7#/3iY,hff5qL/--<R)M+YM\"/z+:DP5VS/7\\'1_V]\";/B/hB#?]w>V/up#`/N5/YHv",
+    "name": "simcore/services/dynamic/sdfkljhsdffsd121231/sdfkjhsdjf/12kdfsjlsj98u0923----dsdljklsd_",
     "tag": "0.5824.51",
     "requires_gpu": false,
     "requires_mpi": true

services/director-v2/tests/unit/test_db_comp_tasks.py

@@ -0,0 +1,60 @@
+# pylint:disable=unused-variable
+# pylint:disable=unused-argument
+# pylint:disable=redefined-outer-name
+# pylint:disable=protected-access
+# pylint:disable=broad-except
+
+import re
+from pathlib import Path
+from typing import Pattern, Set
+
+import pytest
+from models_library.services import SERVICE_KEY_RE, ServiceDockerData, ServiceKeyVersion
+from simcore_service_director_v2.modules.db.repositories.comp_tasks import (
+    _get_fake_service_details,
+)
+
+
+@pytest.fixture(scope="session")
+def frontend_client_dir(osparc_simcore_root_dir: Path) -> Path:
+    frontend_client_dir = osparc_simcore_root_dir / "services" / "web" / "client"
+    assert frontend_client_dir.exists()
+    return frontend_client_dir
+
+
+@pytest.fixture(scope="session")
+def frontend_service_pattern() -> Pattern:
+    frontend_service_re = r"(simcore)/(services)/(frontend)(/[\w/-]+)+"
+    dummy_service = "simcore/services/frontend/file-picker"
+    assert re.match(
+        SERVICE_KEY_RE, dummy_service
+    ), f"Service key regex changed, please change frontend_service_re accordingly: currently is {frontend_service_re} and service re is {SERVICE_KEY_RE}"
+    return re.compile(frontend_service_re)
+
+
+@pytest.fixture(scope="session")
+def all_frontend_services(
+    frontend_service_pattern: Pattern, frontend_client_dir: Path
+) -> Set[str]:
+
+    frontend_services: Set[str] = set()
+    for f in frontend_client_dir.glob("**/*.js"):
+        for line in f.open("r"):
+            for match in re.finditer(frontend_service_pattern, line):
+                frontend_services.add(match.group())
+
+    return frontend_services
+
+
+def test_only_filepicker_service_gets_some_service_details(
+    all_frontend_services: Set[str],
+):
+    for frontend_service in all_frontend_services:
+        service_key_version = ServiceKeyVersion(key=frontend_service, version="24.34.5")
+        # check that it does not assert
+        service_docker_data: ServiceDockerData = _get_fake_service_details(
+            service_key_version
+        )
+        if service_docker_data:
+            assert service_docker_data.key == "simcore/services/frontend/file-picker"
+            assert service_docker_data.outputs["outFile"].property_type == "data:*/*"