Merge branch 'master' into feature/wallets-direct-link

Author: odeimaiz

packages/models-library/src/models_library/api_schemas_webserver/catalog.py

@@ -4,7 +4,7 @@
 from pydantic import Extra, Field
 from pydantic.main import BaseModel
 
-from ..api_schemas_catalog import services
+from ..api_schemas_catalog import services as api_schemas_catalog_services
 from ..services import ServiceInput, ServiceOutput, ServicePortKey
 from ..utils.change_case import snake_to_camel
 from ._base import InputSchema, OutputSchema
@@ -19,21 +19,6 @@ def _orjson_dumps(v, *, default=None) -> str:
     return dump
 
 
-class ServiceGet(services.ServiceGet):  # pylint: disable=too-many-ancestors
-    class Config(OutputSchema.Config):
-        ...
-
-
-class ServiceUpdate(services.ServiceUpdate):
-    class Config(InputSchema.Config):
-        ...
-
-
-class ServiceResourcesGet(services.ServiceResourcesGet):
-    class Config(OutputSchema.Config):
-        ...
-
-
 class _BaseCommonApiExtension(BaseModel):
     unit_long: str | None = Field(
         None,
@@ -53,6 +38,8 @@ class Config:
 
 
 class ServiceInputGet(ServiceInput, _BaseCommonApiExtension):
+    """Extends fields of api_schemas_catalog.services.ServiceGet.outputs[*]"""
+
     key_id: ServiceInputKey = Field(
         ..., description="Unique name identifier for this input"
     )
@@ -91,6 +78,8 @@ class Config(_BaseCommonApiExtension.Config):
 
 
 class ServiceOutputGet(ServiceOutput, _BaseCommonApiExtension):
+    """Extends fields of api_schemas_catalog.services.ServiceGet.outputs[*]"""
+
     key_id: ServiceOutputKey = Field(
         ..., description="Unique name identifier for this input"
     )
@@ -108,3 +97,65 @@ class Config(_BaseCommonApiExtension.Config):
                 "keyId": "output_2",
             }
         }
+
+
+ServiceInputsGetDict: TypeAlias = dict[ServicePortKey, ServiceInputGet]
+ServiceOutputsGetDict: TypeAlias = dict[ServicePortKey, ServiceOutputGet]
+
+
+class ServiceGet(api_schemas_catalog_services.ServiceGet):
+    # pylint: disable=too-many-ancestors
+    inputs: ServiceInputsGetDict = Field(  # type: ignore[assignment]
+        ..., description="inputs with extended information"
+    )
+    outputs: ServiceOutputsGetDict = Field(  # type: ignore[assignment]
+        ..., description="outputs with extended information"
+    )
+
+    class Config(OutputSchema.Config):
+        schema_extra: ClassVar[dict[str, Any]] = {
+            "example": {
+                "name": "File Picker",
+                "thumbnail": None,
+                "description": "description",
+                "classifiers": [],
+                "quality": {},
+                "accessRights": {
+                    "1": {"execute_access": True, "write_access": False},
+                    "4": {"execute_access": True, "write_access": True},
+                },
+                "key": "simcore/services/frontend/file-picker",
+                "version": "1.0.0",
+                "integration-version": None,
+                "type": "dynamic",
+                "badges": None,
+                "authors": [
+                    {
+                        "name": "Red Pandas",
+                        "email": "[email protected]",
+                        "affiliation": None,
+                    }
+                ],
+                "contact": "[email protected]",
+                "inputs": {
+                    f"input{i}": example
+                    for i, example in enumerate(
+                        ServiceInputGet.Config.schema_extra["examples"]
+                    )
+                },
+                "outputs": {
+                    "outFile": ServiceOutputGet.Config.schema_extra["example"],
+                },
+                "owner": "[email protected]",
+            }
+        }
+
+
+class ServiceUpdate(api_schemas_catalog_services.ServiceUpdate):
+    class Config(InputSchema.Config):
+        ...
+
+
+class ServiceResourcesGet(api_schemas_catalog_services.ServiceResourcesGet):
+    class Config(OutputSchema.Config):
+        ...

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

@@ -1,7 +1,7 @@
 import re
 from datetime import datetime
 from enum import Enum
-from typing import Any, ClassVar, Final
+from typing import Any, ClassVar, Final, TypeAlias
 from uuid import uuid4
 
 import arrow
@@ -476,8 +476,8 @@ def validate_thumbnail(cls, value):  # pylint: disable=no-self-argument,no-self-
         return value
 
 
-ServiceInputsDict = dict[ServicePortKey, ServiceInput]
-ServiceOutputsDict = dict[ServicePortKey, ServiceOutput]
+ServiceInputsDict: TypeAlias = dict[ServicePortKey, ServiceInput]
+ServiceOutputsDict: TypeAlias = dict[ServicePortKey, ServiceOutput]
 
 
 class ServiceDockerData(ServiceKeyVersion, _BaseServiceCommonDataModel):

packages/postgres-database/src/simcore_postgres_database/models/projects.py

@@ -1,7 +1,5 @@
 """ Projects table
 
-    - Every row fits a project document schemed as api/specs/webserver/v0/components/schemas/project-v0.0.1.json
-
 """
 import enum
 

packages/postgres-database/tests/products/test_utils_products.py

@@ -101,6 +101,9 @@ async def test_get_or_create_group_product(
             assert product_group_id is None
 
 
+@pytest.mark.skip(
+    reason="Not relevant. Will review in https://github.com/ITISFoundation/osparc-simcore/issues/3754"
+)
 async def test_get_or_create_group_product_concurrent(
     pg_engine: Engine, make_products_table: Callable
 ):

packages/pytest-simcore/src/pytest_simcore/schemas.py

@@ -105,8 +105,7 @@ def _run_diff(schema_lhs: dict, schema_rhs: dict) -> subprocess.CompletedProcess
 
         # NOTE: When debugging the differences, as of now both schemas come from
         # pydantic model, now it is possible to visually compare the difference. To do so,
-        # just dereference the current pydantic schema. Example can be seen here:
-        # /osparc-simcore/api/specs/webserver/scripts/openapi_project.py
+        # just dereference the current pydantic schema.
 
         return subprocess.run(
             [json_diff_script, schema_lhs_path, schema_rhs_path],

services/static-webserver/client/source/class/osparc/data/model/Node.js

@@ -578,18 +578,6 @@ qx.Class.define("osparc.data.model.Node", {
         });
     },
 
-    __deleteInBackend: function() {
-      // remove node in the backend
-      const params = {
-        url: {
-          studyId: this.getStudy().getUuid(),
-          nodeId: this.getNodeId()
-        }
-      };
-      osparc.data.Resources.fetch("studies", "deleteNode", params)
-        .catch(err => console.error(err));
-    },
-
     __applyPropsForm: function() {
       const checkIsPipelineRunning = () => {
         const isPipelineRunning = this.getStudy().isPipelineRunning();
@@ -1503,8 +1491,28 @@ qx.Class.define("osparc.data.model.Node", {
     },
 
     removeNode: function() {
-      this.__deleteInBackend();
-      this.removeIFrame();
+      return new Promise(resolve => {
+        this.__deleteInBackend()
+          .then(() => {
+            resolve(true);
+            this.removeIFrame();
+          })
+          .catch(err => {
+            console.error(err);
+            resolve(false);
+          });
+      });
+    },
+
+    __deleteInBackend: function() {
+      // remove node in the backend
+      const params = {
+        url: {
+          studyId: this.getStudy().getUuid(),
+          nodeId: this.getNodeId()
+        }
+      };
+      return osparc.data.Resources.fetch("studies", "deleteNode", params);
     },
 
     stopRequestingStatus: function() {

services/static-webserver/client/source/class/osparc/data/model/Workbench.js

@@ -503,34 +503,35 @@ qx.Class.define("osparc.data.model.Workbench", {
       this.fireEvent("pipelineChanged");
     },
 
-    removeNode: function(nodeId) {
+    removeNode: async function(nodeId) {
       if (!osparc.data.Permissions.getInstance().canDo("study.node.delete", true)) {
         return false;
       }
 
-      // remove first the connected edges
-      const connectedEdges = this.getConnectedEdges(nodeId);
-      connectedEdges.forEach(connectedEdgeId => {
-        this.removeEdge(connectedEdgeId);
-      });
-
       let node = this.getNode(nodeId);
       if (node) {
-        node.removeNode();
+        const removed = await node.removeNode();
+        if (removed) {
+          // remove first the connected edges
+          const connectedEdges = this.getConnectedEdges(nodeId);
+          connectedEdges.forEach(connectedEdgeId => {
+            this.removeEdge(connectedEdgeId);
+          });
 
-        const isTopLevel = Object.prototype.hasOwnProperty.call(this.__rootNodes, nodeId);
-        if (isTopLevel) {
-          delete this.__rootNodes[nodeId];
-        }
+          const isTopLevel = Object.prototype.hasOwnProperty.call(this.__rootNodes, nodeId);
+          if (isTopLevel) {
+            delete this.__rootNodes[nodeId];
+          }
 
-        // remove it from slideshow
-        if (this.getStudy()) {
-          this.getStudy().getUi().getSlideshow()
-            .removeNode(nodeId);
-        }
+          // remove it from slideshow
+          if (this.getStudy()) {
+            this.getStudy().getUi().getSlideshow()
+              .removeNode(nodeId);
+          }
 
-        this.fireEvent("pipelineChanged");
-        return true;
+          this.fireEvent("pipelineChanged");
+          return true;
+        }
       }
       return false;
     },

services/static-webserver/client/source/class/osparc/desktop/WorkbenchView.js

@@ -1276,10 +1276,11 @@ qx.Class.define("osparc.desktop.WorkbenchView", {
       }
     },
 
-    __doRemoveNode: function(nodeId) {
+    __doRemoveNode: async function(nodeId) {
       const workbench = this.getStudy().getWorkbench();
       const connectedEdges = workbench.getConnectedEdges(nodeId);
-      if (workbench.removeNode(nodeId)) {
+      const removed = await workbench.removeNode(nodeId);
+      if (removed) {
         // remove first the connected edges
         for (let i = 0; i < connectedEdges.length; i++) {
           const edgeId = connectedEdges[i];

services/web/server/Makefile

@@ -15,4 +15,4 @@ requirements: ## compiles pip requirements (.in -> .txt)
 
 .PHONY: openapi-specs
 openapi-specs: ## updates and validates openapi specifications
-	$(MAKE_C) $(CURDIR)/src/simcore_service_${APP_NAME}/api $@
+	$(MAKE_C) $(REPO_BASE_DIR)/api/specs/web-server all

services/web/server/setup.cfg

@@ -7,14 +7,12 @@ commit_args = --no-verify
 
 [bumpversion:file:VERSION]
 
-[bumpversion:file:../../../api/specs/webserver/openapi.yaml]
-
 [bumpversion:file:./src/simcore_service_webserver/api/v0/openapi.yaml]
 
 [tool:pytest]
 addopts = --strict-markers
 asyncio_mode = auto
-markers = 
+markers =
 	slow: marks tests as slow (deselect with '-m "not slow"')
 	acceptance_test: "marks tests as 'acceptance tests' i.e. does the system do what the user expects? Typically those are workflows."
 	testit: "marks test to run during development"

services/web/server/src/simcore_service_webserver/api/Makefile

@@ -1 +1,6 @@
-To modify the OpenAPI Specs, please do it in api/specs/webserver and then run `make openapi-specs` in the current dir
+To modify the OpenAPI Specs, please run
+```cmd
+cd api/specs/web-server
+make install
+make all
+```