cleanup

Author: pcrespov

services/web/server/src/simcore_service_webserver/_constants.py

@@ -29,8 +29,8 @@
 
 
 __all__: tuple[str, ...] = (
-    "APP_CONFIG_KEY",
     "APP_AIOPG_ENGINE_KEY",
+    "APP_CONFIG_KEY",
     "APP_FIRE_AND_FORGET_TASKS_KEY",
     "APP_SETTINGS_KEY",
     "RQT_USERID_KEY",

services/web/server/src/simcore_service_webserver/studies_dispatcher/_catalog.py

@@ -1,7 +1,7 @@
 import logging
+from collections.abc import AsyncIterator
 from contextlib import suppress
 from dataclasses import dataclass
-from typing import AsyncIterator
 
 import sqlalchemy as sa
 from aiohttp import web

services/web/server/src/simcore_service_webserver/studies_dispatcher/_constants.py

@@ -28,7 +28,7 @@
 )
 
 MSG_UNEXPECTED_DISPATCH_ERROR: Final[str] = (
-    "Sorry, but looks like something unexpected went wrong!<br/>"
-    "We track these errors automatically, but if the problem persists feel free to contact us. "
+    "Sorry, but looks like something unexpected went wrong!"
+    "We track these errors automatically, but if the problem persists feel free to contact us."
     "In the meantime, try refreshing."
 )

services/web/server/src/simcore_service_webserver/studies_dispatcher/_core.py

@@ -28,8 +28,7 @@
 @lru_cache
 def compose_uuid_from(*values) -> uuid.UUID:
     composition: str = "/".join(map(str, values))
-    new_uuid = uuid.uuid5(_BASE_UUID, composition)
-    return new_uuid
+    return uuid.uuid5(_BASE_UUID, composition)
 
 
 async def list_viewers_info(
@@ -58,9 +57,8 @@ async def list_viewers_info(
         async for row in await conn.execute(query):
             try:
                 # TODO: filter in database (see test_list_default_compatible_services )
-                if only_default:
-                    if row["filetype"] in listed_filetype:
-                        continue
+                if only_default and row["filetype"] in listed_filetype:
+                    continue
                 listed_filetype.add(row["filetype"])
                 consumer = ViewerInfo.create_from_db(row)
                 consumers.append(consumer)

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects.py

@@ -92,7 +92,7 @@ def _create_project(
         access_rights.write = access_rights.delete = False
 
     # Assambles project instance
-    project = Project(
+    return Project(
         uuid=project_id,
         name=name,
         description=description,
@@ -105,8 +105,6 @@ def _create_project(
         ui=StudyUI(workbench=workbench_ui),  # type: ignore[arg-type]
     )
 
-    return project
-
 
 def _create_project_with_service(
     project_id: ProjectID,
@@ -275,7 +273,7 @@ async def get_or_create_project_with_file_and_service(
                 download_link,
             )
             # FIXME: CANNOT GUARANTEE!!, DELETE?? ERROR?? and cannot be viewed until verified?
-            raise web.HTTPInternalServerError()
+            raise web.HTTPInternalServerError
 
     except (ProjectNotFoundError, ProjectInvalidRightsError):
         exists = False

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects_permalinks.py

@@ -31,6 +31,7 @@ class _GroupAccessRightsDict(TypedDict):
 
 def create_permalink_for_study(
     request: web.Request,
+    *,
     project_uuid: ProjectID | ProjectIDStr,
     project_type: ProjectType,
     project_access_rights: dict[_GroupID, _GroupAccessRightsDict],
@@ -44,19 +45,21 @@ def create_permalink_for_study(
 
     # check: criterias/conditions on a project to have a permalink
     if project_type != ProjectType.TEMPLATE:
-        raise PermalinkNotAllowedError(
+        msg = (
             "Can only create permalink from a template project. "
             f"Got {project_uuid=} with {project_type=}"
         )
+        raise PermalinkNotAllowedError(msg)
 
     project_access_rights_group_1_or_empty: _GroupAccessRightsDict | dict = (
         project_access_rights.get("1", {})
     )
     if not project_access_rights_group_1_or_empty.get("read", False):
-        raise PermalinkNotAllowedError(
+        msg = (
             "Cannot create permalink if not shared with everyone. "
             f"Got {project_uuid=} with {project_access_rights=}"
         )
+        raise PermalinkNotAllowedError(msg)
 
     # create
     url_for = create_url_for_function(request)
@@ -114,14 +117,13 @@ async def permalink_factory(
         if not row:
             raise ProjectNotFoundError(project_uuid=project_uuid)
 
-    permalink_info = create_permalink_for_study(
+    return create_permalink_for_study(
         request,
         project_uuid=row.uuid,
         project_type=row.type,
         project_access_rights=row.access_rights,
         project_is_public=row.published,
     )
-    return permalink_info
 
 
 def setup_projects_permalinks(

services/web/server/src/simcore_service_webserver/studies_dispatcher/_redirects_handlers.py

@@ -73,12 +73,12 @@ def _create_redirect_response_to_error_page(
 
 
 def _create_service_info_from(service: ValidService) -> ServiceInfo:
-    values_map = dict(
-        key=service.key,
-        version=service.version,
-        label=service.title,
-        is_guest_allowed=service.is_public,
-    )
+    values_map = {
+        "key": service.key,
+        "version": service.version,
+        "label": service.title,
+        "is_guest_allowed": service.is_public,
+    }
     if service.thumbnail:
         values_map["thumbnail"] = service.thumbnail
     return ServiceInfo.model_construct(_fields_set=set(values_map.keys()), **values_map)
@@ -335,7 +335,7 @@ async def get_redirection_to_viewer(request: web.Request):
 
     else:
         # NOTE: if query is done right, this should never happen
-        raise InvalidRedirectionParams()
+        raise InvalidRedirectionParams
 
     # Adds auth cookies (login)
     await ensure_authentication(user, request, response)

services/web/server/src/simcore_service_webserver/utils.py

@@ -156,13 +156,13 @@ def get_tracemalloc_info(top=10) -> list[str]:
 def compose_support_error_msg(
     msg: str, error_code: ErrorCodeStr, support_email: str = "support"
 ) -> str:
-    sentences = []
-    for line in msg.split("\n"):
-        if sentence := line.strip(" ."):
-            sentences.append(sentence[0].upper() + sentence[1:])
-
+    sentences = [
+        sentence[0].upper() + sentence[1:]
+        for line in msg.split("\n")
+        if (sentence := line.strip(" ."))
+    ]
     sentences.append(
-        f"For more information please forward this message to {support_email} [{error_code}]"
+        f"For more information please forward this message to {support_email} (supportID={error_code})"
     )
 
     return ". ".join(sentences)

services/web/server/tests/unit/isolated/test_utils.py

@@ -128,5 +128,5 @@ def test_compose_support_error_msg():
     )
     assert (
         msg == "First sentence for Mr.X. Second sentence."
-        " For more information please forward this message to [email protected] [OEC:139641204989600]"
+        " For more information please forward this message to [email protected] (supportID=OEC:139641204989600)"
     )