Merge branch 'master' into enh/retry-logout

Author: odeimaiz

services/director-v2/src/simcore_service_director_v2/api/routes/computations.py

@@ -37,6 +37,7 @@
 from models_library.utils.fastapi_encoders import jsonable_encoder
 from pydantic import AnyHttpUrl, parse_obj_as
 from servicelib.async_utils import run_sequentially_in_context
+from servicelib.logging_utils import log_decorator
 from servicelib.rabbitmq import RabbitMQRPCClient
 from simcore_postgres_database.utils_projects_metadata import DBProjectNotFoundError
 from starlette import status
@@ -150,6 +151,7 @@ async def _check_pipeline_startable(
 _UNKNOWN_NODE: Final[str] = "unknown node"
 
 
+@log_decorator(_logger)
 async def _get_project_metadata(
     project_id: ProjectID,
     project_repo: ProjectsRepository,
@@ -160,7 +162,7 @@ async def _get_project_metadata(
             project_id
         )
         if project_ancestors.parent_project_uuid is None:
-            # no parents here
+            _logger.debug("no parent found for project %s", project_id)
             return {}
 
         assert project_ancestors.parent_node_id is not None  # nosec

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

@@ -50,7 +50,7 @@ async def get(
             )
             row: RowProxy | None = await result.first()
             if not row:
-                raise ComputationalRunNotFoundError()
+                raise ComputationalRunNotFoundError
             return CompRunsAtDB.from_orm(row)
 
     async def list(
@@ -80,7 +80,7 @@ async def create(
         project_id: ProjectID,
         cluster_id: ClusterID,
         iteration: PositiveInt | None = None,
-        metadata: RunMetadataDict | None,
+        metadata: RunMetadataDict,
         use_on_demand_clusters: bool,
     ) -> CompRunsAtDB:
         try:
@@ -102,13 +102,13 @@ async def create(
                     .values(
                         user_id=user_id,
                         project_uuid=f"{project_id}",
-                        cluster_id=cluster_id
-                        if cluster_id != DEFAULT_CLUSTER_ID
-                        else None,
+                        cluster_id=(
+                            cluster_id if cluster_id != DEFAULT_CLUSTER_ID else None
+                        ),
                         iteration=iteration,
                         result=RUNNING_STATE_TO_DB[RunningState.PUBLISHED],
-                        started=datetime.datetime.now(tz=datetime.timezone.utc),
-                        metadata=jsonable_encoder(metadata) if metadata else None,
+                        started=datetime.datetime.now(tz=datetime.UTC),
+                        metadata=jsonable_encoder(metadata),
                         use_on_demand_clusters=use_on_demand_clusters,
                     )
                     .returning(literal_column("*"))
@@ -146,7 +146,7 @@ async def set_run_result(
     ) -> CompRunsAtDB | None:
         values: dict[str, Any] = {"result": RUNNING_STATE_TO_DB[result_state]}
         if final_state:
-            values.update({"ended": datetime.datetime.now(tz=datetime.timezone.utc)})
+            values.update({"ended": datetime.datetime.now(tz=datetime.UTC)})
         return await self.update(
             user_id,
             project_id,

services/director-v2/tests/unit/with_dbs/conftest.py

@@ -8,15 +8,16 @@
 import datetime
 import json
 from collections.abc import Awaitable, Callable, Iterator
-from typing import Any
+from typing import Any, cast
 from uuid import uuid4
 
 import pytest
 import sqlalchemy as sa
 from _helpers import PublishedProject, RunningProject
 from faker import Faker
+from fastapi.encoders import jsonable_encoder
 from models_library.clusters import Cluster
-from models_library.projects import ProjectAtDB
+from models_library.projects import ProjectAtDB, ProjectID
 from models_library.projects_nodes_io import NodeID
 from pydantic.main import BaseModel
 from simcore_postgres_database.models.cluster_to_groups import cluster_to_groups
@@ -25,7 +26,11 @@
 from simcore_postgres_database.models.comp_runs import comp_runs
 from simcore_postgres_database.models.comp_tasks import comp_tasks
 from simcore_service_director_v2.models.comp_pipelines import CompPipelineAtDB
-from simcore_service_director_v2.models.comp_runs import CompRunsAtDB, RunMetadataDict
+from simcore_service_director_v2.models.comp_runs import (
+    CompRunsAtDB,
+    ProjectMetadataDict,
+    RunMetadataDict,
+)
 from simcore_service_director_v2.models.comp_tasks import CompTaskAtDB, Image
 from simcore_service_director_v2.utils.computations import to_node_class
 from simcore_service_director_v2.utils.dask import generate_dask_job_id
@@ -84,28 +89,36 @@ def creator(
                 "project_id": f"{project.uuid}",
                 "node_id": f"{node_id}",
                 "schema": {"inputs": {}, "outputs": {}},
-                "inputs": {
-                    key: json.loads(value.json(by_alias=True, exclude_unset=True))
-                    if isinstance(value, BaseModel)
-                    else value
-                    for key, value in node_data.inputs.items()
-                }
-                if node_data.inputs
-                else {},
-                "outputs": {
-                    key: json.loads(value.json(by_alias=True, exclude_unset=True))
-                    if isinstance(value, BaseModel)
-                    else value
-                    for key, value in node_data.outputs.items()
-                }
-                if node_data.outputs
-                else {},
+                "inputs": (
+                    {
+                        key: (
+                            json.loads(value.json(by_alias=True, exclude_unset=True))
+                            if isinstance(value, BaseModel)
+                            else value
+                        )
+                        for key, value in node_data.inputs.items()
+                    }
+                    if node_data.inputs
+                    else {}
+                ),
+                "outputs": (
+                    {
+                        key: (
+                            json.loads(value.json(by_alias=True, exclude_unset=True))
+                            if isinstance(value, BaseModel)
+                            else value
+                        )
+                        for key, value in node_data.outputs.items()
+                    }
+                    if node_data.outputs
+                    else {}
+                ),
                 "image": Image(name=node_data.key, tag=node_data.version).dict(  # type: ignore
                     by_alias=True, exclude_unset=True
                 ),  # type: ignore
                 "node_class": to_node_class(node_data.key),
                 "internal_id": internal_id + 1,
-                "submit": datetime.datetime.now(tz=datetime.timezone.utc),
+                "submit": datetime.datetime.now(tz=datetime.UTC),
                 "job_id": generate_dask_job_id(
                     service_key=node_data.key,
                     service_version=node_data.version,
@@ -135,9 +148,26 @@ def creator(
         )
 
 
+@pytest.fixture
+def project_metadata(faker: Faker) -> ProjectMetadataDict:
+    return ProjectMetadataDict(
+        parent_node_id=cast(NodeID, faker.uuid4(cast_to=None)),
+        parent_node_name=faker.pystr(),
+        parent_project_id=cast(ProjectID, faker.uuid4(cast_to=None)),
+        parent_project_name=faker.pystr(),
+        root_parent_project_id=cast(ProjectID, faker.uuid4(cast_to=None)),
+        root_parent_project_name=faker.pystr(),
+        root_parent_node_id=cast(NodeID, faker.uuid4(cast_to=None)),
+        root_parent_node_name=faker.pystr(),
+    )
+
+
 @pytest.fixture
 def run_metadata(
-    osparc_product_name: str, simcore_user_agent: str, faker: Faker
+    osparc_product_name: str,
+    simcore_user_agent: str,
+    project_metadata: ProjectMetadataDict,
+    faker: Faker,
 ) -> RunMetadataDict:
     return RunMetadataDict(
         node_id_names_map={},
@@ -147,6 +177,7 @@ def run_metadata(
         user_email=faker.email(),
         wallet_id=faker.pyint(min_value=1),
         wallet_name=faker.name(),
+        project_metadata=project_metadata,
     )
 
 
@@ -171,7 +202,7 @@ def creator(
         with postgres_db.connect() as conn:
             result = conn.execute(
                 comp_runs.insert()
-                .values(**run_config)
+                .values(**jsonable_encoder(run_config))
                 .returning(sa.literal_column("*"))
             )
             new_run = CompRunsAtDB.from_orm(result.first())
@@ -298,7 +329,7 @@ async def running_project(
             project=created_project,
             state=StateType.RUNNING,
             progress=0.0,
-            start=datetime.datetime.now(tz=datetime.timezone.utc),
+            start=datetime.datetime.now(tz=datetime.UTC),
         ),
         runs=runs(user=user, project=created_project, result=StateType.RUNNING),
     )

services/director-v2/tests/unit/with_dbs/test_modules_comp_scheduler_dask_scheduler.py

@@ -381,22 +381,17 @@ async def test_misconfigured_pipeline_is_not_scheduled(
         )
         run_entry = CompRunsAtDB.parse_obj(await result.first())
     assert run_entry.result == RunningState.ABORTED
+    assert run_entry.metadata == run_metadata
 
 
 async def _assert_start_pipeline(
-    aiopg_engine, published_project: PublishedProject, scheduler: BaseCompScheduler
+    aiopg_engine,
+    published_project: PublishedProject,
+    scheduler: BaseCompScheduler,
+    run_metadata: RunMetadataDict,
 ) -> list[CompTaskAtDB]:
     exp_published_tasks = deepcopy(published_project.tasks)
     assert published_project.project.prj_owner
-    run_metadata = RunMetadataDict(
-        node_id_names_map={},
-        project_name="",
-        product_name="",
-        simcore_user_agent="",
-        user_email="",
-        wallet_id=231,
-        wallet_name="",
-    )
     await scheduler.run_new_pipeline(
         user_id=published_project.project.prj_owner,
         project_id=published_project.project.uuid,
@@ -618,11 +613,12 @@ async def test_proper_pipeline_is_scheduled(  # noqa: PLR0915
     mocked_clean_task_output_and_log_files_if_invalid: None,
     instrumentation_rabbit_client_parser: mock.AsyncMock,
     resource_tracking_rabbit_client_parser: mock.AsyncMock,
+    run_metadata: RunMetadataDict,
 ):
     _mock_send_computation_tasks(published_project.tasks, mocked_dask_client)
 
     expected_published_tasks = await _assert_start_pipeline(
-        aiopg_engine, published_project, scheduler
+        aiopg_engine, published_project, scheduler, run_metadata
     )
 
     # -------------------------------------------------------------------------------
@@ -990,10 +986,11 @@ async def test_task_progress_triggers(
     published_project: PublishedProject,
     mocked_parse_output_data_fct: None,
     mocked_clean_task_output_and_log_files_if_invalid: None,
+    run_metadata: RunMetadataDict,
 ):
     _mock_send_computation_tasks(published_project.tasks, mocked_dask_client)
     expected_published_tasks = await _assert_start_pipeline(
-        aiopg_engine, published_project, scheduler
+        aiopg_engine, published_project, scheduler, run_metadata
     )
     # -------------------------------------------------------------------------------
     # 1. first run will move comp_tasks to PENDING so the worker can take them
@@ -1286,10 +1283,11 @@ async def test_running_pipeline_triggers_heartbeat(
     aiopg_engine: aiopg.sa.engine.Engine,
     published_project: PublishedProject,
     resource_tracking_rabbit_client_parser: mock.AsyncMock,
+    run_metadata: RunMetadataDict,
 ):
     _mock_send_computation_tasks(published_project.tasks, mocked_dask_client)
     expected_published_tasks = await _assert_start_pipeline(
-        aiopg_engine, published_project, scheduler
+        aiopg_engine, published_project, scheduler, run_metadata
     )
     # -------------------------------------------------------------------------------
     # 1. first run will move comp_tasks to PENDING so the worker can take them

services/static-webserver/client/source/class/osparc/auth/ui/LoginView.js

@@ -93,15 +93,15 @@ qx.Class.define("osparc.auth.ui.LoginView", {
         createAccountBtn.setLabel(this.tr("Request Account"));
       }
       createAccountBtn.addListener("execute", () => {
-        createAccountBtn.setEnabled(false);
-        if (createAccountAction === "REGISTER") {
+        if (window.location.hostname === "tip.itis.swiss") {
+          this.__openTIPITISSWISSPhaseOutDialog();
+        } else if (createAccountAction === "REGISTER") {
           this.fireEvent("toRegister");
         } else if (createAccountAction === "REQUEST_ACCOUNT_FORM") {
           this.fireEvent("toRequestAccount");
         } else if (createAccountAction === "REQUEST_ACCOUNT_INSTRUCTIONS") {
           osparc.store.Support.openInvitationRequiredDialog();
         }
-        createAccountBtn.setEnabled(true);
       }, this);
       osparc.utils.Utils.setIdToWidget(createAccountBtn, "loginCreateAccountBtn");
 
@@ -162,6 +162,21 @@ qx.Class.define("osparc.auth.ui.LoginView", {
       }
     },
 
+    __openTIPITISSWISSPhaseOutDialog: function() {
+      const createAccountWindow = new osparc.ui.window.Dialog("Request Account").set({
+        maxWidth: 380
+      });
+      let message = "This version of the planning tool will be phased out soon and no longer accepts new users.";
+      message += "<br>";
+      const tipLiteLabel = osparc.utils.Utils.createHTMLLink("TIP.lite", "https://tip-lite.science/");
+      const tipLabel = osparc.utils.Utils.createHTMLLink("TIP", "https://tip.science/");
+      const hereLabel = osparc.utils.Utils.createHTMLLink("here", "https://itis.swiss/tools-and-systems/ti-planning/overview/");
+      message += `Please visit ${tipLiteLabel} or ${tipLabel} instead. See ${hereLabel} for more information.`;
+      createAccountWindow.setMessage(message);
+      createAccountWindow.center();
+      createAccountWindow.open();
+    },
+
     getEmail: function() {
       const email = this._form.getItems().email;
       return email.getValue();

services/static-webserver/client/source/class/osparc/utils/Utils.js

@@ -94,7 +94,7 @@ qx.Class.define("osparc.utils.Utils", {
     replaceTokens: function(str, key, value) {
       // `str` might be a a localized string, get the string first
       str = str.toString ? str.toString() : str;
-      const regex = new RegExp("${"+key+"}", "g");
+      const regex = new RegExp("\\${"+key+"\\}", "g");
       return str.replace(regex, value);
     },
 

services/static-webserver/client/source/resource/osparc/tours/s4l_tours.json

@@ -21,7 +21,7 @@
         "selector": "osparc-test-id=templatesTabBtn"
       },
       "anchorEl": "osparc-test-id=templatesTabBtn",
-      "text": "Clicking on a Tutorial will create a copy of that Study, which will appear in your own Project ts tab with thee same name as the Tutorial. Any changes you make to this copy will not affect the original Tutorial.",
+      "text": "Clicking on a Tutorial will create a copy of that Project, which will appear in your own Projects tab with the same name as the Tutorial. Any changes you make to this copy will not affect the original Tutorial.",
       "placement": "bottom"
     }, {
       "beforeClick": {
@@ -30,13 +30,6 @@
       "anchorEl": "osparc-test-id=servicesTabBtn",
       "text": "Every Project in Sim4Life is composed of at lease one so-called Service.<br>Services are building blocks for Studies and can provide data/files, visualize results (2D, 3D), implement code in Jupyter notebooks or perform computations to execute simulations within a Project.",
       "placement": "bottom"
-    }, {
-      "beforeClick": {
-        "selector": "osparc-test-id=dataTabBtn"
-      },
-      "anchorEl": "osparc-test-id=dataTabBtn",
-      "text": "The Data tab allow you to browse the output files of all of your active pipelines in one place. This is most useful for downloading the data created on the online platform.",
-      "placement": "bottom"
     }]
   },
   "navbar": {
@@ -50,7 +43,7 @@
         "event": "tap"
       },
       "anchorEl": "osparc-test-id=notificationsContainer",
-      "text": "By clicking on the Bell, you will you see notifications about what Studies, Credits and Organizations.",
+      "text": "By clicking on the Bell, you will you see notifications about which Projects, Credits and Organizations have been shared with you.",
       "placement": "bottom"
     }, {
       "beforeClick": {