erge remote-tracking branch 'upstream/master' into pr-osparc-introduce-template-type2

Andrei Neagu · Andrei Neagu · commit 41c18dff021d · 2025-05-14T09:36:35.000+02:00
diff --git a/packages/models-library/src/models_library/api_schemas_webserver/computations.py b/packages/models-library/src/models_library/api_schemas_webserver/computations.py
@@ -81,7 +81,11 @@ class ComputationStarted(OutputSchemaWithoutCamelCase):
 class ComputationRunListQueryParams(
     PageQueryParameters,
     ComputationRunListOrderParams,  # type: ignore[misc, valid-type]
-): ...
+):
+    filter_only_running: bool = Field(
+        default=False,
+        description="If true, only running computations are returned",
+    )
 
 
 class ComputationRunRestGet(OutputSchema):
@@ -92,6 +96,8 @@ class ComputationRunRestGet(OutputSchema):
     submitted_at: datetime
     started_at: datetime | None
     ended_at: datetime | None
+    root_project_name: str
+    project_custom_metadata: dict[str, Any]
 
 
 ### Computation Task
diff --git a/packages/models-library/src/models_library/computations.py b/packages/models-library/src/models_library/computations.py
@@ -22,3 +22,17 @@ class ComputationTaskWithAttributes(BaseModel):
     # Attributes added by the webserver
     node_name: str
     osparc_credits: Decimal | None
+
+
+class ComputationRunWithAttributes(BaseModel):
+    project_uuid: ProjectID
+    iteration: int
+    state: RunningState
+    info: dict[str, Any]
+    submitted_at: datetime
+    started_at: datetime | None
+    ended_at: datetime | None
+
+    # Attributes added by the webserver
+    root_project_name: str
+    project_custom_metadata: dict[str, Any]
diff --git a/packages/models-library/src/models_library/projects_state.py b/packages/models-library/src/models_library/projects_state.py
@@ -35,14 +35,18 @@ class RunningState(str, Enum):
     ABORTED = "ABORTED"
     WAITING_FOR_CLUSTER = "WAITING_FOR_CLUSTER"
 
-    def is_running(self) -> bool:
-        return self in (
+    @staticmethod
+    def list_running_states() -> list["RunningState"]:
+        return [
             RunningState.PUBLISHED,
             RunningState.PENDING,
             RunningState.WAITING_FOR_RESOURCES,
             RunningState.STARTED,
             RunningState.WAITING_FOR_CLUSTER,
-        )
+        ]
+
+    def is_running(self) -> bool:
+        return self in self.list_running_states()
 
 
 @unique
diff --git a/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/director_v2/computations.py b/packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/director_v2/computations.py
@@ -33,6 +33,8 @@ async def list_computations_latest_iteration_page(
     *,
     product_name: ProductName,
     user_id: UserID,
+    # filters
+    filter_only_running: bool = False,
     # pagination
     offset: int = 0,
     limit: int = 20,
@@ -46,6 +48,7 @@ async def list_computations_latest_iteration_page(
         ),
         product_name=product_name,
         user_id=user_id,
+        filter_only_running=filter_only_running,
         offset=offset,
         limit=limit,
         order_by=order_by,
diff --git a/services/director-v2/src/simcore_service_director_v2/api/rpc/_computations.py b/services/director-v2/src/simcore_service_director_v2/api/rpc/_computations.py
@@ -28,6 +28,8 @@ async def list_computations_latest_iteration_page(
     *,
     product_name: ProductName,
     user_id: UserID,
+    # filters
+    filter_only_running: bool = False,
     # pagination
     offset: int = 0,
     limit: int = 20,
@@ -39,6 +41,7 @@ async def list_computations_latest_iteration_page(
         await comp_runs_repo.list_for_user__only_latest_iterations(
             product_name=product_name,
             user_id=user_id,
+            filter_only_running=filter_only_running,
             offset=offset,
             limit=limit,
             order_by=order_by,
diff --git a/services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_runs.py b/services/director-v2/src/simcore_service_director_v2/modules/db/repositories/comp_runs.py
@@ -195,6 +195,8 @@ async def list_for_user__only_latest_iterations(
         *,
         product_name: str,
         user_id: UserID,
+        # filters
+        filter_only_running: bool,
         # pagination
         offset: int,
         limit: int,
@@ -229,6 +231,16 @@ async def list_for_user__only_latest_iterations(
                 & (
                     comp_runs.c.metadata["product_name"].astext == product_name
                 )  # <-- NOTE: We might create a separate column for this for fast retrieval
+                & (
+                    comp_runs.c.result.in_(
+                        [
+                            RUNNING_STATE_TO_DB[item]
+                            for item in RunningState.list_running_states()
+                        ]
+                    )
+                )
+                if filter_only_running
+                else True
             )
             .group_by(comp_runs.c.project_uuid)
             .subquery("latest_runs")
diff --git a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/proxy.py
@@ -83,7 +83,7 @@ def get_dynamic_proxy_spec(
         "endpoint_spec": {"Ports": ports} if ports else {},
         "labels": {
             "io.simcore.zone": f"{dynamic_services_scheduler_settings.TRAEFIK_SIMCORE_ZONE}",
-            "traefik.docker.network": swarm_network_name,
+            "traefik.swarm.network": swarm_network_name,
             "traefik.enable": "true",
             # security
             f"traefik.http.middlewares.{scheduler_data.proxy_service_name}-security-headers.headers.accesscontrolallowcredentials": "true",
diff --git a/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py b/services/director-v2/tests/unit/with_dbs/test_modules_dynamic_sidecar_docker_api.py
@@ -187,7 +187,7 @@ def dynamic_sidecar_service_spec(
         "name": dynamic_sidecar_service_name,
         "task_template": {"ContainerSpec": {"Image": "joseluisq/static-web-server"}},
         "labels": {
-            "traefik.docker.network": "",
+            "traefik.swarm.network": "",
             "io.simcore.zone": "",
             f"{to_simcore_runtime_docker_label_key('project_id')}": f"{uuid4()}",
             f"{to_simcore_runtime_docker_label_key('user_id')}": "123",
@@ -339,7 +339,7 @@ def labels_example(request: pytest.FixtureRequest) -> SimcoreServiceLabels:
     return request.param
 
 
-@pytest.fixture(params=[None, datetime.datetime.now(tz=datetime.timezone.utc)])
+@pytest.fixture(params=[None, datetime.datetime.now(tz=datetime.UTC)])
 def time_dy_sidecar_became_unreachable(
     request: pytest.FixtureRequest,
 ) -> datetime.datetime | None:
diff --git a/services/director/src/simcore_service_director/producer.py b/services/director/src/simcore_service_director/producer.py
@@ -431,7 +431,7 @@ async def _create_docker_service_params(
     swarm_network_id = swarm_network["Id"]
     swarm_network_name = swarm_network["Name"]
     docker_params["networks"].append(swarm_network_id)
-    docker_params["labels"]["traefik.docker.network"] = swarm_network_name
+    docker_params["labels"]["traefik.swarm.network"] = swarm_network_name
 
     # set labels for CPU and Memory limits
     nano_cpus_limit = str(
diff --git a/services/docker-compose-dev-vendors.yml b/services/docker-compose-dev-vendors.yml
@@ -13,7 +13,7 @@ services:
       labels:
         - io.simcore.zone=${TRAEFIK_SIMCORE_ZONE}
         - traefik.enable=true
-        - traefik.docker.network=${SWARM_STACK_NAME}_default
+        - traefik.swarm.network=${SWARM_STACK_NAME}_default
         # auth: https://doc.traefik.io/traefik/middlewares/http/forwardauth
         - traefik.http.middlewares.${SWARM_STACK_NAME}_manual-auth.forwardauth.address=http://${WEBSERVER_HOST}:${WEBSERVER_PORT}/v0/auth:check
         - traefik.http.middlewares.${SWARM_STACK_NAME}_manual-auth.forwardauth.trustForwardHeader=true
diff --git a/services/docker-compose.yml b/services/docker-compose.yml
@@ -1363,7 +1363,7 @@ services:
       retries: 50
 
   traefik:
-    image: "traefik:v3.1.2@sha256:ec1a82940b8e00eaeef33fb4113aa1d1573b2ebb6440e10c023743fe96f08475"
+    image: "traefik:v3.4.0@sha256:4cf907247939b5d20bf4eff73abd21cb413c339600dde76dbc94a874b2578a27"
     init: true
     hostname: "{{.Node.Hostname}}-{{.Task.Slot}}"
     command:
@@ -1381,13 +1381,9 @@ services:
       - "--metrics.prometheus.entryPoint=metrics"
       - "--entryPoints.http.address=:80"
       - "--entryPoints.http.forwardedHeaders.insecure"
-      - "--entryPoints.http.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
-      - "--entryPoints.http.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
       - "--entryPoints.http.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805      - "--entryPoints.simcore_api.address=:10081"
       - "--entryPoints.simcore_api.address=:10081"
       - "--entryPoints.simcore_api.forwardedHeaders.insecure"
-      - "--entryPoints.simcore_api.transport.respondingTimeouts.idleTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
-      - "--entryPoints.simcore_api.transport.respondingTimeouts.writeTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
       - "--entryPoints.simcore_api.transport.respondingTimeouts.readTimeout=21600s" #6h, for https://github.com/traefik/traefik/issues/10805
       - "--entryPoints.traefik_monitor.address=:8080"
       - "--entryPoints.traefik_monitor.forwardedHeaders.insecure"
diff --git a/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml b/services/web/server/src/simcore_service_webserver/api/v0/openapi.yaml
@@ -2567,6 +2567,13 @@ paths:
           type: integer
           default: 0
           title: Offset
+      - name: filter_only_running
+        in: query
+        required: false
+        schema:
+          type: boolean
+          default: false
+          title: Filter Only Running
       responses:
         '200':
           description: Successful Response
@@ -9102,6 +9109,12 @@ components:
             format: date-time
           - type: 'null'
           title: Endedat
+        rootProjectName:
+          type: string
+          title: Rootprojectname
+        projectCustomMetadata:
+          type: object
+          title: Projectcustommetadata
       type: object
       required:
       - projectUuid
@@ -9111,6 +9124,8 @@ components:
       - submittedAt
       - startedAt
       - endedAt
+      - rootProjectName
+      - projectCustomMetadata
       title: ComputationRunRestGet
     ComputationStart:
       properties:
diff --git a/services/web/server/src/simcore_service_webserver/director_v2/_computations_service.py b/services/web/server/src/simcore_service_webserver/director_v2/_computations_service.py
@@ -1,10 +1,10 @@
 from decimal import Decimal
 
 from aiohttp import web
-from models_library.api_schemas_directorv2.comp_runs import (
-    ComputationRunRpcGetPage,
+from models_library.computations import (
+    ComputationRunWithAttributes,
+    ComputationTaskWithAttributes,
 )
-from models_library.computations import ComputationTaskWithAttributes
 from models_library.products import ProductName
 from models_library.projects import ProjectID
 from models_library.rest_ordering import OrderBy
@@ -17,36 +17,86 @@
 from servicelib.utils import limited_gather
 
 from ..products.products_service import is_product_billable
-from ..projects.api import check_user_project_permission, get_project_dict_legacy
+from ..projects.api import (
+    batch_get_project_name,
+    check_user_project_permission,
+    get_project_dict_legacy,
+)
+from ..projects.projects_metadata_service import (
+    get_project_custom_metadata_or_empty_dict,
+)
 from ..rabbitmq import get_rabbitmq_rpc_client
 
 
 async def list_computations_latest_iteration(
     app: web.Application,
     product_name: ProductName,
     user_id: UserID,
+    # filters
+    filter_only_running: bool,  # noqa: FBT001
     # pagination
     offset: int,
     limit: NonNegativeInt,
     # ordering
     order_by: OrderBy,
-) -> ComputationRunRpcGetPage:
+) -> tuple[int, list[ComputationRunWithAttributes]]:
     """Returns the list of computations (only latest iterations)"""
     rpc_client = get_rabbitmq_rpc_client(app)
     _runs_get = await computations.list_computations_latest_iteration_page(
         rpc_client,
         product_name=product_name,
         user_id=user_id,
+        filter_only_running=filter_only_running,
         offset=offset,
         limit=limit,
         order_by=order_by,
     )
 
-    # NOTE: MD: Get project metadata
-    # NOTE: MD: Get Root project name
-    assert _runs_get  # nosec
+    # Get projects metadata (NOTE: MD: can be improved with a single batch call)
+    _projects_metadata = await limited_gather(
+        *[
+            get_project_custom_metadata_or_empty_dict(
+                app, project_uuid=item.project_uuid
+            )
+            for item in _runs_get.items
+        ],
+        limit=20,
+    )
+
+    # Get Root project names
+    _projects_root_uuids: list[ProjectID] = []
+    for item in _runs_get.items:
+        if (
+            prj_root_id := item.info.get("project_metadata", {}).get(
+                "root_parent_project_id", None
+            )
+        ) is not None:
+            _projects_root_uuids.append(ProjectID(prj_root_id))
+        else:
+            _projects_root_uuids.append(item.project_uuid)
+
+    _projects_root_names = await batch_get_project_name(
+        app, projects_uuids=_projects_root_uuids
+    )
+
+    _computational_runs_output = [
+        ComputationRunWithAttributes(
+            project_uuid=item.project_uuid,
+            iteration=item.iteration,
+            state=item.state,
+            info=item.info,
+            submitted_at=item.submitted_at,
+            started_at=item.started_at,
+            ended_at=item.ended_at,
+            root_project_name=project_name,
+            project_custom_metadata=project_metadata,
+        )
+        for item, project_metadata, project_name in zip(
+            _runs_get.items, _projects_metadata, _projects_root_names, strict=True
+        )
+    ]
 
-    return _runs_get
+    return _runs_get.total, _computational_runs_output
 
 
 async def list_computations_latest_iteration_tasks(
diff --git a/services/web/server/src/simcore_service_webserver/director_v2/_controller/computations_rest.py b/services/web/server/src/simcore_service_webserver/director_v2/_controller/computations_rest.py
@@ -53,10 +53,12 @@ async def list_computations_latest_iteration(request: web.Request) -> web.Respon
         ComputationRunListQueryParams, request
     )
 
-    _get = await _computations_service.list_computations_latest_iteration(
+    total, items = await _computations_service.list_computations_latest_iteration(
         request.app,
         product_name=req_ctx.product_name,
         user_id=req_ctx.user_id,
+        # filters
+        filter_only_running=query_params.filter_only_running,
         # pagination
         offset=query_params.offset,
         limit=query_params.limit,
@@ -67,10 +69,10 @@ async def list_computations_latest_iteration(request: web.Request) -> web.Respon
     page = Page[ComputationRunRestGet].model_validate(
         paginate_data(
             chunk=[
-                ComputationRunRestGet.model_validate(task, from_attributes=True)
-                for task in _get.items
+                ComputationRunRestGet.model_validate(run, from_attributes=True)
+                for run in items
             ],
-            total=_get.total,
+            total=total,
             limit=query_params.limit,
             offset=query_params.offset,
             request_url=request.url,
diff --git a/services/web/server/src/simcore_service_webserver/projects/_controller/metadata_rest.py b/services/web/server/src/simcore_service_webserver/projects/_controller/metadata_rest.py
@@ -47,7 +47,7 @@ async def get_project_metadata(request: web.Request) -> web.Response:
     req_ctx = RequestContext.model_validate(request)
     path_params = parse_request_path_parameters_as(ProjectPathParams, request)
 
-    custom_metadata = await _metadata_service.get_project_custom_metadata(
+    custom_metadata = await _metadata_service.get_project_custom_metadata_for_user(
         request.app, user_id=req_ctx.user_id, project_uuid=path_params.project_id
     )
 
diff --git a/services/web/server/src/simcore_service_webserver/projects/_metadata_service.py b/services/web/server/src/simcore_service_webserver/projects/_metadata_service.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_projects_repository.py b/services/web/server/src/simcore_service_webserver/projects/_projects_repository.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/_projects_service.py b/services/web/server/src/simcore_service_webserver/projects/_projects_service.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/api.py b/services/web/server/src/simcore_service_webserver/projects/api.py
diff --git a/services/web/server/src/simcore_service_webserver/projects/projects_metadata_service.py b/services/web/server/src/simcore_service_webserver/projects/projects_metadata_service.py
diff --git a/services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py b/services/web/server/tests/unit/with_dbs/01/test_director_v2_handlers.py
