Merge branch 'master' into add-notifications-service

Author: giancarloromeo

packages/pytest-simcore/src/pytest_simcore/helpers/playwright.py

@@ -302,6 +302,29 @@ def __call__(self, message: str) -> bool:
             return False
 
 
+@dataclass
+class SocketIOWaitNodeForOutputs:
+    logger: logging.Logger
+    expected_number_of_outputs: int
+    node_id: str
+
+    def __call__(self, message: str) -> bool:
+        if message.startswith(SOCKETIO_MESSAGE_PREFIX):
+            decoded_message = decode_socketio_42_message(message)
+            if decoded_message.name == _OSparcMessages.NODE_UPDATED:
+                assert "data" in decoded_message.obj
+                assert "node_id" in decoded_message.obj
+                if decoded_message.obj["node_id"] == self.node_id:
+                    assert "outputs" in decoded_message.obj["data"]
+
+                    return (
+                        len(decoded_message.obj["data"]["outputs"])
+                        == self.expected_number_of_outputs
+                    )
+
+        return False
+
+
 @dataclass
 class SocketIOOsparcMessagePrinter:
     include_logger_messages: bool = False

services/agent/src/simcore_service_agent/services/backup.py

@@ -1,6 +1,7 @@
 import asyncio
+import json
 import logging
-import os
+import socket
 import tempfile
 from asyncio.streams import StreamReader
 from datetime import timedelta
@@ -9,6 +10,7 @@
 from typing import Final
 from uuid import uuid4
 
+import httpx
 from fastapi import FastAPI
 from servicelib.container_utils import run_command_in_container
 from settings_library.utils_r_clone import resolve_provider
@@ -112,8 +114,28 @@ def _log_expected_operation(
     _logger.log(log_level, formatted_message)
 
 
+def _get_self_container_ip() -> str:
+    return socket.gethostbyname(socket.gethostname())
+
+
+async def _get_self_container() -> str:
+    ip = _get_self_container_ip()
+
+    async with httpx.AsyncClient(
+        transport=httpx.AsyncHTTPTransport(uds="/var/run/docker.sock")
+    ) as client:
+        response = await client.get("http://localhost/containers/json")
+        for entry in response.json():
+            if ip in json.dumps(entry):
+                container_id: str = entry["Id"]
+                return container_id
+
+    msg = "Could not determine self container ID"
+    raise RuntimeError(msg)
+
+
 async def _ensure_permissions_on_source_dir(source_dir: Path) -> None:
-    self_container = os.environ["HOSTNAME"]
+    self_container = await _get_self_container()
     await run_command_in_container(
         self_container,
         command=f"chmod -R o+rX '{source_dir}'",

services/agent/tests/unit/test_services_backup.py

@@ -15,6 +15,8 @@
 from models_library.projects_nodes_io import NodeID
 from models_library.services_types import ServiceRunID
 from pydantic import NonNegativeInt
+from pytest_mock import MockerFixture
+from servicelib.container_utils import run_command_in_container
 from simcore_service_agent.core.settings import ApplicationSettings
 from simcore_service_agent.services.backup import backup_volume
 from simcore_service_agent.services.docker_utils import get_volume_details
@@ -42,7 +44,7 @@ def volume_content(tmpdir: Path) -> Path:
 @pytest.fixture
 async def mock_container_with_data(
     volume_content: Path, monkeypatch: pytest.MonkeyPatch
-) -> AsyncIterable[None]:
+) -> AsyncIterable[str]:
     async with aiodocker.Docker() as client:
         container = await client.containers.run(
             config={
@@ -56,7 +58,7 @@ async def mock_container_with_data(
         container_name = container_inspect["Name"][1:]
         monkeypatch.setenv("HOSTNAME", container_name)
 
-        yield None
+        yield container_inspect["Id"]
 
         await container.delete(force=True)
 
@@ -68,8 +70,24 @@ def downlaoded_from_s3(tmpdir: Path) -> Path:
     return path
 
 
+@pytest.fixture
+async def mock__get_self_container_ip(
+    mock_container_with_data: str,
+    mocker: MockerFixture,
+) -> None:
+    container_ip = await run_command_in_container(
+        mock_container_with_data, command="hostname -i"
+    )
+
+    mocker.patch(
+        "simcore_service_agent.services.backup._get_self_container_ip",
+        return_value=container_ip.strip(),
+    )
+
+
 async def test_backup_volume(
-    mock_container_with_data: None,
+    mock_container_with_data: str,
+    mock__get_self_container_ip: None,
     volume_content: Path,
     project_id: ProjectID,
     swarm_stack_name: str,

services/static-webserver/client/source/class/osparc/dashboard/GridButtonItem.js

@@ -250,7 +250,8 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     _applyOwner: function(value, old) {
       const label = this.getChildControl("subtitle-text");
       if (osparc.utils.Resources.isFunction(this.getResourceData())) {
-        const canIWrite = Boolean(this.getResourceData()["accessRights"]["write"]);
+        // Functions don't have 'owner'
+        const canIWrite = osparc.data.model.Function.canIWrite(this.getResourceData()["accessRights"]);
         label.setValue(canIWrite ? "My Function" : "Read Only");
       } else {
         const user = this.__createOwner(value);
@@ -262,20 +263,15 @@ qx.Class.define("osparc.dashboard.GridButtonItem", {
     _applyAccessRights: function(value) {
       if (value && Object.keys(value).length) {
         const shareIcon = this.getChildControl("subtitle-icon");
-        if (this.isResourceType("function")) {
-          // in case of functions, the access rights are actually myAccessRights
-          osparc.dashboard.CardBase.populateMyAccessRightsIcon(shareIcon, value);
-        } else {
-          shareIcon.addListener("tap", e => {
-            e.stopPropagation();
-            this.openAccessRights();
-          }, this);
-          shareIcon.addListener("pointerdown", e => e.stopPropagation());
-          osparc.dashboard.CardBase.populateShareIcon(shareIcon, value);
+        shareIcon.addListener("tap", e => {
+          e.stopPropagation();
+          this.openAccessRights();
+        }, this);
+        shareIcon.addListener("pointerdown", e => e.stopPropagation());
+        osparc.dashboard.CardBase.populateShareIcon(shareIcon, value);
 
-          if (this.isResourceType("study")) {
-            this._setStudyPermissions(value);
-          }
+        if (this.isResourceType("study")) {
+          this._setStudyPermissions(value);
         }
       }
     },

services/static-webserver/client/source/class/osparc/dashboard/ListButtonItem.js

@@ -244,7 +244,8 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
     _applyOwner: function(value, old) {
       const label = this.getChildControl("owner");
       if (osparc.utils.Resources.isFunction(this.getResourceData())) {
-        const canIWrite = Boolean(this.getResourceData()["accessRights"]["write"]);
+        // Functions don't have 'owner'
+        const canIWrite = osparc.data.model.Function.canIWrite(this.getResourceData()["accessRights"]);
         label.setValue(canIWrite ? "My Function" : "Read Only");
       } else {
         const user = this.__createOwner(value);
@@ -257,20 +258,15 @@ qx.Class.define("osparc.dashboard.ListButtonItem", {
     _applyAccessRights: function(value) {
       if (value && Object.keys(value).length) {
         const shareIcon = this.getChildControl("shared-icon");
-        if (this.isResourceType("function")) {
-          // in case of functions, the access rights are actually myAccessRights
-          osparc.dashboard.CardBase.populateMyAccessRightsIcon(shareIcon, value);
-        } else {
-          shareIcon.addListener("tap", e => {
-            e.stopPropagation();
-            this.openAccessRights();
-          }, this);
-          shareIcon.addListener("pointerdown", e => e.stopPropagation());
-          osparc.dashboard.CardBase.populateShareIcon(shareIcon, value);
+        shareIcon.addListener("tap", e => {
+          e.stopPropagation();
+          this.openAccessRights();
+        }, this);
+        shareIcon.addListener("pointerdown", e => e.stopPropagation());
+        osparc.dashboard.CardBase.populateShareIcon(shareIcon, value);
 
-          if (this.isResourceType("study")) {
-            this._setStudyPermissions(value);
-          }
+        if (this.isResourceType("study")) {
+          this._setStudyPermissions(value);
         }
       }
     },

services/static-webserver/client/source/class/osparc/dashboard/ResourceContainerManager.js

@@ -163,6 +163,7 @@ qx.Class.define("osparc.dashboard.ResourceContainerManager", {
               text = this.tr("No Public Projects found");
               break;
             case osparc.dashboard.StudyBrowser.CONTEXT.FUNCTIONS:
+            case osparc.dashboard.StudyBrowser.CONTEXT.SEARCH_FUNCTIONS:
               text = this.tr("No Functions found");
               break;
           }

services/static-webserver/client/source/class/osparc/dashboard/ResourceDetails.js

@@ -409,6 +409,7 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
         return;
       } else if (osparc.utils.Resources.isFunction(this.__resourceData)) {
         this.__addInfoPage();
+        this.__addPermissionsPage();
         if (this.__resourceModel.getFunctionClass() === osparc.data.model.Function.FUNCTION_CLASS.PROJECT) {
           this.__addPreviewPage();
         }
@@ -641,6 +642,12 @@ qx.Class.define("osparc.dashboard.ResourceDetails", {
             const updatedData = e.getData();
             this.__fireUpdateEvent(resourceData, updatedData);
           }, this);
+        } else if (osparc.utils.Resources.isFunction(resourceData)) {
+          collaboratorsView = new osparc.share.CollaboratorsFunction(resourceData);
+          collaboratorsView.addListener("updateAccessRights", e => {
+            const updatedData = e.getData();
+            this.__fireUpdateEvent(resourceData, updatedData);
+          }, this);
         } else {
           collaboratorsView = new osparc.share.CollaboratorsStudy(resourceData);
           if (osparc.utils.Resources.isStudy(resourceData)) {