fixes webserver tests

sanderegg · sanderegg · commit 198855d4f662 · 2024-12-03T10:14:02.000+01: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
@@ -1,11 +1,8 @@
 from pydantic import BaseModel
 
-from ..clusters import ClusterID
-
 
 class ComputationStart(BaseModel):
     force_restart: bool = False
-    cluster_id: ClusterID = 0
     subgraph: set[str] = set()
 
 
diff --git a/packages/models-library/src/models_library/clusters.py b/packages/models-library/src/models_library/clusters.py
@@ -113,7 +113,7 @@ class Cluster(BaseCluster):
         json_schema_extra={
             "examples": [
                 {
-                    "id": 432,
+                    "id": DEFAULT_CLUSTER_ID,
                     "name": "My awesome cluster",
                     "type": ClusterTypeInModel.ON_PREMISE,
                     "owner": 12,
@@ -126,7 +126,7 @@ class Cluster(BaseCluster):
                     },
                 },
                 {
-                    "id": 432546,
+                    "id": DEFAULT_CLUSTER_ID,
                     "name": "My AWS cluster",
                     "description": "a AWS cluster administered by me",
                     "type": ClusterTypeInModel.AWS,
@@ -144,25 +144,6 @@ class Cluster(BaseCluster):
                         7899: CLUSTER_USER_RIGHTS,  # type: ignore[dict-item]
                     },
                 },
-                {
-                    "id": 325436,
-                    "name": "My AWS cluster",
-                    "description": "a AWS cluster administered by me",
-                    "type": ClusterTypeInModel.AWS,
-                    "owner": 2321,
-                    "endpoint": "https://registry.osparc-development.fake2.dev",
-                    "authentication": {
-                        "type": "tls",
-                        "tls_ca_file": "/path/to/ca_file",
-                        "tls_client_cert": "/path/to/cert_file",
-                        "tls_client_key": "/path/to/key_file",
-                    },
-                    "access_rights": {
-                        154: CLUSTER_ADMIN_RIGHTS,  # type: ignore[dict-item]
-                        12: CLUSTER_MANAGER_RIGHTS,  # type: ignore[dict-item]
-                        7899: CLUSTER_USER_RIGHTS,  # type: ignore[dict-item]
-                    },
-                },
             ]
         },
     )
diff --git a/packages/models-library/src/models_library/projects_pipeline.py b/packages/models-library/src/models_library/projects_pipeline.py
@@ -82,7 +82,6 @@ class ComputationTask(BaseModel):
                         "progress": 0.0,
                     },
                     "iteration": None,
-                    "cluster_id": None,
                     "started": arrow.utcnow().shift(minutes=-50).datetime,  # type: ignore[dict-item]
                     "stopped": None,
                     "submitted": arrow.utcnow().shift(hours=-1).datetime,  # type: ignore[dict-item]
@@ -114,7 +113,6 @@ class ComputationTask(BaseModel):
                         "progress": 1.0,
                     },
                     "iteration": 2,
-                    "cluster_id": 0,
                     "started": arrow.utcnow().shift(minutes=-50).datetime,  # type: ignore[dict-item]
                     "stopped": arrow.utcnow().shift(minutes=-20).datetime,  # type: ignore[dict-item]
                     "submitted": arrow.utcnow().shift(hours=-1).datetime,  # type: ignore[dict-item]
diff --git a/packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py b/packages/pytest-simcore/src/pytest_simcore/services_api_mocks_for_aiohttp_clients.py
@@ -2,8 +2,6 @@
 # pylint: disable=unused-argument
 # pylint: disable=unused-variable
 
-import json
-import random
 import re
 from pathlib import Path
 from typing import Any
@@ -13,6 +11,7 @@
 from aioresponses import aioresponses as AioResponsesMock
 from aioresponses.core import CallbackResult
 from faker import Faker
+from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
 from models_library.api_schemas_storage import (
     FileMetaDataGet,
     FileUploadCompleteFutureResponse,
@@ -23,7 +22,6 @@
     LinkType,
     PresignedLink,
 )
-from models_library.clusters import Cluster
 from models_library.generics import Envelope
 from models_library.projects_pipeline import ComputationTask
 from models_library.projects_state import RunningState
@@ -81,7 +79,7 @@ def create_computation_cb(url, **kwargs) -> CallbackResult:
         assert param in body, f"{param} is missing from body: {body}"
     state = (
         RunningState.PUBLISHED
-        if "start_pipeline" in body and body["start_pipeline"]
+        if body.get("start_pipeline")
         else RunningState.NOT_STARTED
     )
     pipeline: dict[str, list[str]] = FULL_PROJECT_PIPELINE_ADJACENCY
@@ -131,8 +129,13 @@ def get_computation_cb(url, **kwargs) -> CallbackResult:
     state = RunningState.NOT_STARTED
     pipeline: dict[str, list[str]] = FULL_PROJECT_PIPELINE_ADJACENCY
     node_states = FULL_PROJECT_NODE_STATES
-    returned_computation = ComputationTask.model_validate(
-        ComputationTask.model_config["json_schema_extra"]["examples"][0]
+    assert "json_schema_extra" in ComputationGet.model_config
+    assert isinstance(ComputationGet.model_config["json_schema_extra"], dict)
+    assert isinstance(
+        ComputationGet.model_config["json_schema_extra"]["examples"], list
+    )
+    returned_computation = ComputationGet.model_validate(
+        ComputationGet.model_config["json_schema_extra"]["examples"][0]
     ).model_copy(
         update={
             "id": Path(url.path).name,
@@ -151,85 +154,6 @@ def get_computation_cb(url, **kwargs) -> CallbackResult:
     )
 
 
-def create_cluster_cb(url, **kwargs) -> CallbackResult:
-    assert "json" in kwargs, f"missing body in call to {url}"
-    assert url.query.get("user_id")
-    random_cluster = Cluster.model_validate(
-        random.choice(Cluster.model_config["json_schema_extra"]["examples"])
-    )
-    return CallbackResult(
-        status=201, payload=json.loads(random_cluster.model_dump_json(by_alias=True))
-    )
-
-
-def list_clusters_cb(url, **kwargs) -> CallbackResult:
-    assert url.query.get("user_id")
-    return CallbackResult(
-        status=200,
-        body=json.dumps(
-            [
-                json.loads(
-                    Cluster.model_validate(
-                        random.choice(
-                            Cluster.model_config["json_schema_extra"]["examples"]
-                        )
-                    ).model_dump_json(by_alias=True)
-                )
-                for _ in range(3)
-            ]
-        ),
-    )
-
-
-def get_cluster_cb(url, **kwargs) -> CallbackResult:
-    assert url.query.get("user_id")
-    cluster_id = url.path.split("/")[-1]
-    return CallbackResult(
-        status=200,
-        payload=json.loads(
-            Cluster.model_validate(
-                {
-                    **random.choice(
-                        Cluster.model_config["json_schema_extra"]["examples"]
-                    ),
-                    **{"id": cluster_id},
-                }
-            ).model_dump_json(by_alias=True)
-        ),
-    )
-
-
-def get_cluster_details_cb(url, **kwargs) -> CallbackResult:
-    assert url.query.get("user_id")
-    cluster_id = url.path.split("/")[-1]
-    assert cluster_id
-    return CallbackResult(
-        status=200,
-        payload={
-            "scheduler": {"status": "RUNNING"},
-            "dashboard_link": "https://dashboard.link.com",
-        },
-    )
-
-
-def patch_cluster_cb(url, **kwargs) -> CallbackResult:
-    assert url.query.get("user_id")
-    cluster_id = url.path.split("/")[-1]
-    return CallbackResult(
-        status=200,
-        payload=json.loads(
-            Cluster.model_validate(
-                {
-                    **random.choice(
-                        Cluster.model_config["json_schema_extra"]["examples"]
-                    ),
-                    **{"id": cluster_id},
-                }
-            ).model_dump_json(by_alias=True)
-        ),
-    )
-
-
 @pytest.fixture
 async def director_v2_service_mock(
     aioresponses_mocker: AioResponsesMock,
@@ -280,73 +204,6 @@ async def director_v2_service_mock(
     aioresponses_mocker.delete(delete_computation_pattern, status=204, repeat=True)
     aioresponses_mocker.patch(projects_networks_pattern, status=204, repeat=True)
 
-    # clusters
-    aioresponses_mocker.post(
-        re.compile(
-            r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters\?(\w+(?:=\w+)?\&?){1,}$"
-        ),
-        callback=create_cluster_cb,
-        status=status.HTTP_201_CREATED,
-        repeat=True,
-    )
-
-    aioresponses_mocker.get(
-        re.compile(
-            r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters\?(\w+(?:=\w+)?\&?){1,}$"
-        ),
-        callback=list_clusters_cb,
-        status=status.HTTP_201_CREATED,
-        repeat=True,
-    )
-
-    aioresponses_mocker.get(
-        re.compile(
-            r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters(/[0-9]+)\?(\w+(?:=\w+)?\&?){1,}$"
-        ),
-        callback=get_cluster_cb,
-        status=status.HTTP_201_CREATED,
-        repeat=True,
-    )
-
-    aioresponses_mocker.get(
-        re.compile(
-            r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters/[0-9]+/details\?(\w+(?:=\w+)?\&?){1,}$"
-        ),
-        callback=get_cluster_details_cb,
-        status=status.HTTP_201_CREATED,
-        repeat=True,
-    )
-
-    aioresponses_mocker.patch(
-        re.compile(
-            r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters(/[0-9]+)\?(\w+(?:=\w+)?\&?){1,}$"
-        ),
-        callback=patch_cluster_cb,
-        status=status.HTTP_201_CREATED,
-        repeat=True,
-    )
-    aioresponses_mocker.delete(
-        re.compile(
-            r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters(/[0-9]+)\?(\w+(?:=\w+)?\&?){1,}$"
-        ),
-        status=status.HTTP_204_NO_CONTENT,
-        repeat=True,
-    )
-
-    aioresponses_mocker.post(
-        re.compile(r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters:ping$"),
-        status=status.HTTP_204_NO_CONTENT,
-        repeat=True,
-    )
-
-    aioresponses_mocker.post(
-        re.compile(
-            r"^http://[a-z\-_]*director-v2:[0-9]+/v2/clusters(/[0-9]+):ping\?(\w+(?:=\w+)?\&?){1,}$"
-        ),
-        status=status.HTTP_204_NO_CONTENT,
-        repeat=True,
-    )
-
     return aioresponses_mocker
 
 
diff --git a/services/web/server/src/simcore_service_webserver/director_v2/_handlers.py b/services/web/server/src/simcore_service_webserver/director_v2/_handlers.py
@@ -4,10 +4,9 @@
 
 from aiohttp import web
 from common_library.json_serialization import json_dumps
+from models_library.api_schemas_directorv2.comp_tasks import ComputationGet
 from models_library.api_schemas_webserver.computations import ComputationStart
-from models_library.clusters import ClusterID
 from models_library.projects import ProjectID
-from models_library.users import UserID
 from pydantic import BaseModel, Field, TypeAdapter, ValidationError
 from servicelib.aiohttp import status
 from servicelib.aiohttp.rest_responses import create_http_error, exception_to_response
@@ -206,10 +205,6 @@ async def stop_computation(request: web.Request) -> web.Response:
         )
 
 
-class ComputationTaskGet(BaseModel):
-    cluster_id: ClusterID | None
-
-
 @routes.get(f"/{VTAG}/computations/{{project_id}}", name="get_computation")
 @login_required
 @permission_required("services.pipeline.*")
@@ -219,15 +214,15 @@ async def get_computation(request: web.Request) -> web.Response:
     run_policy = get_project_run_policy(request.app)
     assert run_policy  # nosec
 
-    user_id = UserID(request[RQT_USERID_KEY])
+    user_id = request[RQT_USERID_KEY]
     project_id = ProjectID(request.match_info["project_id"])
 
     try:
         project_ids: list[ProjectID] = await run_policy.get_runnable_projects_ids(
             request, project_id
         )
         _logger.debug("Project %s will get %d variants", project_id, len(project_ids))
-        list_computation_tasks = TypeAdapter(list[ComputationTaskGet]).validate_python(
+        list_computation_tasks = TypeAdapter(list[ComputationGet]).validate_python(
             await asyncio.gather(
                 *[
                     computations.get(project_id=pid, user_id=user_id)
@@ -236,12 +231,7 @@ async def get_computation(request: web.Request) -> web.Response:
             ),
         )
         assert len(list_computation_tasks) == len(project_ids)  # nosec
-        # NOTE: until changed all the versions of a meta project shall use the same cluster
-        # this should fail the day that changes
-        assert all(
-            c.cluster_id == list_computation_tasks[0].cluster_id
-            for c in list_computation_tasks
-        )
+
         return web.json_response(
             data={"data": list_computation_tasks[0].model_dump(by_alias=True)},
             dumps=json_dumps,
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
@@ -111,9 +111,11 @@ async def test_stop_computation(
     rsp = await client.post(f"{url}")
     await assert_status(
         rsp,
-        status.HTTP_204_NO_CONTENT
-        if user_role == UserRole.GUEST
-        else expected.no_content,
+        (
+            status.HTTP_204_NO_CONTENT
+            if user_role == UserRole.GUEST
+            else expected.no_content
+        ),
     )
 
 
