Merge branch 'master' into is5646/use-project-nodes-table-instead-of-workbench

Author: giancarloromeo

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

@@ -40,7 +40,7 @@
     "whoami",
     "sto-worker",
     "sto-worker-cpu-bound",
-    "traefik-configuration-placeholder",
+    "traefik-config-placeholder",
 }
 # TODO: unify healthcheck policies see  https://github.com/ITISFoundation/osparc-simcore/pull/2281
 DEFAULT_SERVICE_HEALTHCHECK_ENTRYPOINT: Final[str] = "/v0/"

services/api-server/src/simcore_service_api_server/api/routes/function_job_collections_routes.py

@@ -1,4 +1,3 @@
-import asyncio
 from typing import Annotated, Final
 
 from fastapi import APIRouter, Depends, status
@@ -14,19 +13,18 @@
 )
 from models_library.products import ProductName
 from models_library.users import UserID
+from servicelib.utils import limited_gather
 from simcore_service_api_server._service_function_jobs import FunctionJobService
-from simcore_service_api_server.api.dependencies.functions import (
-    get_stored_job_status,  # Import UserID
-)
-from simcore_service_api_server.api.dependencies.functions import (
-    get_function_from_functionjobid,
-)
 
 from ...models.pagination import Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
 from ...services_http.director_v2 import DirectorV2Api
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.authentication import get_current_user_id, get_product_name
+from ..dependencies.functions import (
+    get_function_from_functionjobid,
+    get_stored_job_status,
+)
 from ..dependencies.models_schemas_function_filters import (
     get_function_job_collections_filters,
 )
@@ -269,7 +267,7 @@ async def function_job_collection_status(
         product_name=product_name,
     )
 
-    job_statuses = await asyncio.gather(
+    job_statuses = await limited_gather(
         *[
             function_job_status(
                 function_job=await get_function_job(
@@ -286,9 +284,9 @@ async def function_job_collection_status(
                 ),
                 stored_job_status=await get_stored_job_status(
                     function_job_id=function_job_id,
+                    wb_api_rpc=wb_api_rpc,
                     user_id=user_id,
                     product_name=product_name,
-                    wb_api_rpc=wb_api_rpc,
                 ),
                 wb_api_rpc=wb_api_rpc,
                 director2_api=director2_api,

services/api-server/src/simcore_service_api_server/api/routes/function_jobs_routes.py

@@ -21,21 +21,12 @@
 from models_library.projects_state import RunningState
 from models_library.users import UserID
 from servicelib.fastapi.dependencies import get_app
-from simcore_service_api_server._service_function_jobs import FunctionJobService
-from simcore_service_api_server.api.dependencies.functions import (
-    get_function_from_functionjob,
-    get_function_job_dependency,
-    get_stored_job_outputs,
-    get_stored_job_status,
-)
-from simcore_service_api_server.api.dependencies.models_schemas_function_filters import (
-    get_function_jobs_filters,
-)
 from simcore_service_api_server.models.schemas.functions_filters import (
     FunctionJobsListFilters,
 )
 from sqlalchemy.ext.asyncio import AsyncEngine
 
+from ..._service_function_jobs import FunctionJobService
 from ..._service_jobs import JobService
 from ...models.pagination import Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
@@ -45,6 +36,13 @@
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.authentication import get_current_user_id, get_product_name
 from ..dependencies.database import get_db_asyncpg_engine
+from ..dependencies.functions import (
+    get_function_from_functionjob,
+    get_function_job_dependency,
+    get_stored_job_outputs,
+    get_stored_job_status,
+)
+from ..dependencies.models_schemas_function_filters import get_function_jobs_filters
 from ..dependencies.services import (
     get_api_client,
     get_function_job_service,

services/api-server/src/simcore_service_api_server/api/routes/functions_routes.py

@@ -36,11 +36,10 @@
 from models_library.projects_state import RunningState
 from models_library.users import UserID
 from servicelib.fastapi.dependencies import get_reverse_url_mapper
-from simcore_service_api_server._service_function_jobs import FunctionJobService
-from simcore_service_api_server._service_functions import FunctionService
-from simcore_service_api_server._service_jobs import JobService
-from simcore_service_api_server.api.dependencies.functions import get_stored_job_status
 
+from ..._service_function_jobs import FunctionJobService
+from ..._service_functions import FunctionService
+from ..._service_jobs import JobService
 from ..._service_solvers import SolverService
 from ...models.pagination import Page, PaginationParams
 from ...models.schemas.errors import ErrorGet
@@ -49,6 +48,7 @@
 from ...services_http.webserver import AuthSession
 from ...services_rpc.wb_api_server import WbApiRpcClient
 from ..dependencies.authentication import get_current_user_id, get_product_name
+from ..dependencies.functions import get_stored_job_status
 from ..dependencies.services import (
     get_api_client,
     get_function_job_service,

services/api-server/src/simcore_service_api_server/api/routes/studies_jobs.py

@@ -60,9 +60,6 @@
 )
 from .solvers_jobs import JOBS_STATUS_CODES
 
-# pylint: disable=too-many-arguments
-
-
 _logger = logging.getLogger(__name__)
 
 

services/docker-compose.yml

@@ -1550,7 +1550,7 @@ services:
   #
   # use fallback routes to return proper 503 (instead of 404)
   # this service must be running at all times
-  traefik-configuration-placeholder:
+  traefik-config-placeholder:
     image: busybox:1.35.0
     command: sleep infinity
     networks:

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

@@ -117,7 +117,7 @@ qx.Class.define("osparc.data.model.IframeHandler", {
       }
 
       const node = this.getNode();
-      const thumbnail = node.getMetaData()["thumbnail"];
+      const thumbnail = node.getMetadata()["thumbnail"];
       if (thumbnail) {
         loadingPage.setLogo(thumbnail);
       }
@@ -141,7 +141,7 @@ qx.Class.define("osparc.data.model.IframeHandler", {
         status = node.getStatus().getInteractive();
       }
       const statusText = status ? (status.charAt(0).toUpperCase() + status.slice(1)) : this.tr("Starting");
-      const metadata = node.getMetaData();
+      const metadata = node.getMetadata();
       const versionDisplay = osparc.service.Utils.extractVersionDisplay(metadata);
       return statusText + " " + node.getLabel() + " <span style='font-size: 16px;font-weight: normal;'><sub>v" + versionDisplay + "</sub></span>";
     },