Merge branch 'master' into hotfix-get-computation-run-remove-user-id

Author: pcrespov

api/specs/web-server/_auth.py

@@ -15,7 +15,7 @@
 from models_library.rest_error import EnvelopedError, Log
 from pydantic import BaseModel, Field, confloat
 from simcore_service_webserver._meta import API_VTAG
-from simcore_service_webserver.login._controller.rest.auth import (
+from simcore_service_webserver.login._controller.rest.auth_schemas import (
     LoginBody,
     LoginNextPage,
     LoginTwoFactorAuthBody,
@@ -30,7 +30,7 @@
     PhoneConfirmationBody,
     ResetPasswordConfirmation,
 )
-from simcore_service_webserver.login._controller.rest.registration import (
+from simcore_service_webserver.login._controller.rest.registration_schemas import (
     InvitationCheck,
     InvitationInfo,
     RegisterBody,

packages/postgres-database/src/simcore_postgres_database/migration/versions/61b98a60e934_computational_collection_uniquencess.py

@@ -0,0 +1,35 @@
+"""computational collection uniquencess
+
+Revision ID: 61b98a60e934
+Revises: df61d1b2b967
+Create Date: 2025-07-08 15:40:12.714684+00:00
+
+"""
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "61b98a60e934"
+down_revision = "df61d1b2b967"
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_unique_constraint(
+        "client_or_system_generated_id_uniqueness",
+        "comp_runs_collections",
+        ["client_or_system_generated_id"],
+    )
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(
+        "client_or_system_generated_id_uniqueness",
+        "comp_runs_collections",
+        type_="unique",
+    )
+    # ### end Alembic commands ###

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

@@ -35,4 +35,7 @@
         "ix_comp_runs_collections_client_or_system_generated_id",
         "client_or_system_generated_id",
     ),
+    sa.UniqueConstraint(
+        "client_or_system_generated_id", name="client_or_system_generated_id_uniqueness"
+    ),
 )

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

@@ -5,11 +5,11 @@
 
 from aiohttp.test_utils import TestClient
 from servicelib.aiohttp import status
-from simcore_service_webserver.login._constants import MSG_LOGGED_IN
 from simcore_service_webserver.login._invitations_service import create_invitation_token
 from simcore_service_webserver.login._login_repository_legacy import (
     get_plugin_storage,
 )
+from simcore_service_webserver.login.constants import MSG_LOGGED_IN
 from simcore_service_webserver.security import security_service
 from yarl import URL
 

packages/service-library/src/servicelib/aiohttp/monitoring.py

@@ -25,7 +25,7 @@
 )
 from .typing_extension import Handler
 
-log = logging.getLogger(__name__)
+_logger = logging.getLogger(__name__)
 
 _PROMETHEUS_METRICS: Final[str] = f"{__name__}.prometheus_metrics"  # noqa: N816
 
@@ -59,7 +59,6 @@ def middleware_factory(
     async def middleware_handler(request: web.Request, handler: Handler):
         # See https://prometheus.io/docs/concepts/metric_types
 
-        log_exception: BaseException | None = None
         response: web.StreamResponse = web.HTTPInternalServerError()
 
         canonical_endpoint = request.path
@@ -68,7 +67,7 @@ async def middleware_handler(request: web.Request, handler: Handler):
         start_time = perf_counter()
         try:
             if enter_middleware_cb:
-                with log_catch(logger=log, reraise=False):
+                with log_catch(logger=_logger, reraise=False):
                     await enter_middleware_cb(request)
 
             metrics = request.app[_PROMETHEUS_METRICS]
@@ -92,16 +91,10 @@ async def middleware_handler(request: web.Request, handler: Handler):
 
         except web.HTTPServerError as exc:
             response = exc
-            log_exception = exc
             raise
 
         except web.HTTPException as exc:
             response = exc
-            log_exception = None
-            raise
-
-        except Exception as exc:  # pylint: disable=broad-except
-            log_exception = exc
             raise
 
         finally:
@@ -117,23 +110,9 @@ async def middleware_handler(request: web.Request, handler: Handler):
             )
 
             if exit_middleware_cb:
-                with log_catch(logger=log, reraise=False):
+                with log_catch(logger=_logger, reraise=False):
                     await exit_middleware_cb(request, response)
 
-            if log_exception:
-                log.error(
-                    'Unexpected server error "%s" from access: %s "%s %s" done '
-                    "in %3.2f secs. Responding with status %s",
-                    type(log_exception),
-                    request.remote,
-                    request.method,
-                    request.path,
-                    response_latency_seconds,
-                    response.status,
-                    exc_info=log_exception,
-                    stack_info=True,
-                )
-
         return response
 
     setattr(  # noqa: B010

packages/service-library/src/servicelib/rabbitmq/rpc_interfaces/director_v2/computations.py

@@ -126,6 +126,7 @@ async def list_computation_collection_runs_page(
     product_name: ProductName,
     user_id: UserID,
     project_ids: list[ProjectID] | None,
+    filter_only_running: bool = False,
     # pagination
     offset: int = 0,
     limit: int = 20,
@@ -138,6 +139,7 @@ async def list_computation_collection_runs_page(
         product_name=product_name,
         user_id=user_id,
         project_ids=project_ids,
+        filter_only_running=filter_only_running,
         offset=offset,
         limit=limit,
         timeout_s=_DEFAULT_TIMEOUT_S,

services/director-v2/src/simcore_service_director_v2/api/rpc/_computations.py

@@ -102,15 +102,24 @@ async def list_computation_collection_runs_page(
     product_name: ProductName,
     user_id: UserID,
     project_ids: list[ProjectID] | None,
+    filter_only_running: bool = False,
     # pagination
     offset: int = 0,
     limit: int = 20,
 ) -> ComputationCollectionRunRpcGetPage:
     comp_runs_repo = CompRunsRepository.instance(db_engine=app.state.engine)
+
+    collection_run_ids: list[CollectionRunID] | None = None
+    if filter_only_running is True:
+        collection_run_ids = await comp_runs_repo.list_all_collection_run_ids_for_user_currently_running_computations(
+            product_name=product_name, user_id=user_id
+        )
+
     total, comp_runs_output = await comp_runs_repo.list_group_by_collection_run_id(
         product_name=product_name,
         user_id=user_id,
-        project_ids=project_ids,
+        project_ids_or_none=project_ids,
+        collection_run_ids_or_none=collection_run_ids,
         offset=offset,
         limit=limit,
     )

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

@@ -393,12 +393,46 @@ async def list_for_user_and_project_all_iterations(
 
             return cast(int, total_count), items
 
+    async def list_all_collection_run_ids_for_user_currently_running_computations(
+        self,
+        *,
+        product_name: str,
+        user_id: UserID,
+    ) -> list[CollectionRunID]:
+
+        list_query = (
+            sa.select(
+                comp_runs.c.collection_run_id,
+            )
+            .where(
+                (comp_runs.c.user_id == user_id)
+                & (
+                    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()
+                        ]
+                    )
+                )
+            )
+            .distinct()
+        )
+
+        async with pass_or_acquire_connection(self.db_engine) as conn:
+            return [
+                CollectionRunID(row[0]) async for row in await conn.stream(list_query)
+            ]
+
     async def list_group_by_collection_run_id(
         self,
         *,
         product_name: str,
         user_id: UserID,
-        project_ids: list[ProjectID] | None = None,
+        project_ids_or_none: list[ProjectID] | None = None,
+        collection_run_ids_or_none: list[CollectionRunID] | None = None,
         # pagination
         offset: int,
         limit: int,
@@ -424,10 +458,19 @@ async def list_group_by_collection_run_id(
             & (comp_runs.c.metadata["product_name"].astext == product_name)
         )
 
-        if project_ids:
+        if project_ids_or_none:
             base_select_query = base_select_query.where(
                 comp_runs.c.project_uuid.in_(
-                    [f"{project_id}" for project_id in project_ids]
+                    [f"{project_id}" for project_id in project_ids_or_none]
+                )
+            )
+        if collection_run_ids_or_none:
+            base_select_query = base_select_query.where(
+                comp_runs.c.collection_run_id.in_(
+                    [
+                        f"{collection_run_id}"
+                        for collection_run_id in collection_run_ids_or_none
+                    ]
                 )
             )
 

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_api_rpc_computations.py

@@ -265,18 +265,29 @@ async def test_rpc_list_computation_collection_runs_page_and_collection_run_task
         not_default_collection_run_id,
     ]
 
-    for proj, collection_run_id in zip(projects, collection_run_id_project_list):
+    running_state_project_list = [
+        RunningState.SUCCESS,
+        RunningState.PENDING,
+        RunningState.SUCCESS,
+    ]
+
+    for proj, collection_run_id, running_state in zip(
+        projects,
+        collection_run_id_project_list,
+        running_state_project_list,
+        strict=True,
+    ):
         await create_pipeline(
             project_id=f"{proj.uuid}",
             dag_adjacency_list=fake_workbench_adjacency,
         )
         await create_tasks_from_project(
-            user=user, project=proj, state=StateType.PUBLISHED, progress=None
+            user=user, project=proj, state=running_state, progress=None
         )
         run = await create_comp_run(
             user=user,
             project=proj,
-            result=RunningState.SUCCESS,
+            result=running_state,
             started=datetime.now(tz=UTC) - timedelta(minutes=120),
             ended=datetime.now(tz=UTC) - timedelta(minutes=100),
             iteration=1,
@@ -317,3 +328,16 @@ async def test_rpc_list_computation_collection_runs_page_and_collection_run_task
     assert output.total == 4
     assert len(output.items) == 4
     isinstance(output, ComputationCollectionRunTaskRpcGetPage)
+
+    # Test filtering only running collection runs
+    output = await rpc_computations.list_computation_collection_runs_page(
+        rpc_client,
+        product_name="osparc",
+        user_id=user["id"],
+        project_ids=None,
+        filter_only_running=True,  # <-- This is the tested filter
+    )
+    assert output.total == 1
+    assert len(output.items) == 1
+    assert isinstance(output, ComputationCollectionRunRpcGetPage)
+    assert len(output.items[0].project_ids) == 2

services/director-v2/tests/unit/with_dbs/comp_scheduler/test_db_repositories_comp_runs.py

@@ -1019,7 +1019,7 @@ async def test_list_group_by_collection_run_id_with_project_filter(
     total_count, items = await repo.list_group_by_collection_run_id(
         product_name=run_metadata.get("product_name"),
         user_id=published_project_1.user["id"],
-        project_ids=[
+        project_ids_or_none=[
             published_project_1.project.uuid,
             published_project_2.project.uuid,
         ],