review @pcrespov

Author: matusdrobuliak66

api/specs/web-server/_computations.py

@@ -2,6 +2,7 @@
 
 from _common import as_query
 from fastapi import APIRouter, Depends, status
+from fastapi_pagination import Page
 from models_library.api_schemas_webserver.computations import (
     ComputationGet,
     ComputationPathParams,
@@ -67,7 +68,7 @@ async def stop_computation(_path: Annotated[ComputationPathParams, Depends()]):
 
 @router.get(
     "/computations/-/iterations/latest",
-    response_model=Envelope[list[ComputationRunRestGet]],
+    response_model=Page[ComputationRunRestGet],
 )
 async def list_computations_latest_iteration(
     _query: Annotated[as_query(ComputationRunWithFiltersListQueryParams), Depends()],
@@ -76,7 +77,7 @@ async def list_computations_latest_iteration(
 
 @router.get(
     "/computations/{project_id}/iterations",
-    response_model=Envelope[list[ComputationRunRestGet]],
+    response_model=Page[ComputationRunRestGet],
 )
 async def list_computation_iterations(
     _query: Annotated[as_query(ComputationRunListQueryParams), Depends()],
@@ -86,7 +87,7 @@ async def list_computation_iterations(
 
 @router.get(
     "/computations/{project_id}/iterations/latest/tasks",
-    response_model=Envelope[list[ComputationTaskRestGet]],
+    response_model=Page[ComputationTaskRestGet],
 )
 async def list_computations_latest_iteration_tasks(
     _query: Annotated[as_query(ComputationTaskListQueryParams), Depends()],

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

@@ -23,7 +23,7 @@
 
 
 @pytest.fixture()
-def registered_user(
+def create_registered_user(
     postgres_db: sa.engine.Engine, faker: Faker
 ) -> Iterator[Callable[..., dict]]:
     created_user_ids = []

services/director-v2/tests/integration/01/test_computation_api.py

@@ -188,12 +188,12 @@ def test_invalid_computation(
 
 async def test_start_empty_computation_is_refused(
     async_client: httpx.AsyncClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     osparc_product_name: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
-    user = registered_user()
+    user = create_registered_user()
     empty_project = await project(user)
     with pytest.raises(
         httpx.HTTPStatusError, match=f"{status.HTTP_422_UNPROCESSABLE_ENTITY}"
@@ -391,15 +391,15 @@ class PartialComputationParams:
 async def test_run_partial_computation(
     wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
     async_client: httpx.AsyncClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     update_project_workbench_with_comp_tasks: Callable,
     fake_workbench_without_outputs: dict[str, Any],
     params: PartialComputationParams,
     osparc_product_name: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
-    user = registered_user()
+    user = create_registered_user()
     await wait_for_catalog_service(user["id"], osparc_product_name)
     sleepers_project: ProjectAtDB = await project(
         user, workbench=fake_workbench_without_outputs
@@ -539,7 +539,7 @@ def _convert_to_pipeline_details(
 async def test_run_computation(
     wait_for_catalog_service: Callable[[UserID, str], Awaitable[None]],
     async_client: httpx.AsyncClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     update_project_workbench_with_comp_tasks: Callable,
@@ -548,7 +548,7 @@ async def test_run_computation(
     osparc_product_name: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
-    user = registered_user()
+    user = create_registered_user()
     await wait_for_catalog_service(user["id"], osparc_product_name)
     sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
     # send a valid project with sleepers
@@ -653,14 +653,14 @@ async def test_run_computation(
 
 async def test_abort_computation(
     async_client: httpx.AsyncClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     fake_workbench_computational_pipeline_details: PipelineDetails,
     osparc_product_name: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
-    user = registered_user()
+    user = create_registered_user()
     # we need long running tasks to ensure cancellation is done properly
     for node in fake_workbench_without_outputs.values():
         if "sleeper" in node["key"]:
@@ -730,15 +730,15 @@ async def test_abort_computation(
 
 async def test_update_and_delete_computation(
     async_client: httpx.AsyncClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     fake_workbench_computational_pipeline_details_not_started: PipelineDetails,
     fake_workbench_computational_pipeline_details: PipelineDetails,
     osparc_product_name: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
-    user = registered_user()
+    user = create_registered_user()
     sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
     # send a valid project with sleepers
     task_out = await create_pipeline(
@@ -852,13 +852,13 @@ async def test_update_and_delete_computation(
 
 async def test_pipeline_with_no_computational_services_still_create_correct_comp_tasks_in_db(
     async_client: httpx.AsyncClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     jupyter_service: dict[str, Any],
     osparc_product_name: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
-    user = registered_user()
+    user = create_registered_user()
     # create a workbench with just a dynamic service
     project_with_dynamic_node = await project(
         user,
@@ -895,12 +895,12 @@ async def test_pipeline_with_no_computational_services_still_create_correct_comp
 
 async def test_pipeline_with_control_loop_made_of_dynamic_services_is_allowed(
     client: TestClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     jupyter_service: dict[str, Any],
     osparc_product_name: str,
 ):
-    user = registered_user()
+    user = create_registered_user()
     # create a workbench with just 2 dynamic service in a cycle
     project_with_dynamic_node = await project(
         user,
@@ -963,13 +963,13 @@ async def test_pipeline_with_control_loop_made_of_dynamic_services_is_allowed(
 
 async def test_pipeline_with_cycle_containing_a_computational_service_is_forbidden(
     client: TestClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     sleeper_service: dict[str, Any],
     jupyter_service: dict[str, Any],
     osparc_product_name: str,
 ):
-    user = registered_user()
+    user = create_registered_user()
     # create a workbench with just 2 dynamic service in a cycle
     project_with_cycly_and_comp_service = await project(
         user,
@@ -1044,7 +1044,7 @@ async def test_pipeline_with_cycle_containing_a_computational_service_is_forbidd
 
 async def test_burst_create_computations(
     async_client: httpx.AsyncClient,
-    registered_user: Callable,
+    create_registered_user: Callable,
     project: Callable[..., Awaitable[ProjectAtDB]],
     fake_workbench_without_outputs: dict[str, Any],
     update_project_workbench_with_comp_tasks: Callable,
@@ -1053,7 +1053,7 @@ async def test_burst_create_computations(
     osparc_product_name: str,
     create_pipeline: Callable[..., Awaitable[ComputationGet]],
 ):
-    user = registered_user()
+    user = create_registered_user()
     sleepers_project = await project(user, workbench=fake_workbench_without_outputs)
     sleepers_project2 = await project(user, workbench=fake_workbench_without_outputs)
 

services/director-v2/tests/integration/02/test_dynamic_services_routes.py

@@ -77,18 +77,16 @@ def minimal_configuration(
     simcore_services_ready: None,
     rabbit_service: RabbitSettings,
     storage_service: URL,
-):
-    ...
+): ...
 
 
 @pytest.fixture
-def mock_env(mock_env: EnvVarsDict, minimal_configuration) -> None:
-    ...
+def mock_env(mock_env: EnvVarsDict, minimal_configuration) -> None: ...
 
 
 @pytest.fixture
-def user_db(registered_user: Callable[..., dict[str, Any]]) -> dict[str, Any]:
-    user = registered_user()
+def user_db(create_registered_user: Callable[..., dict[str, Any]]) -> dict[str, Any]:
+    user = create_registered_user()
     return user
 
 

services/director-v2/tests/integration/02/test_dynamic_sidecar_nodeports_integration.py

@@ -254,8 +254,8 @@ def _get_node_uuid(registry_service_data: dict) -> str:
 
 
 @pytest.fixture
-def current_user(registered_user: Callable) -> dict[str, Any]:
-    return registered_user()
+def current_user(create_registered_user: Callable) -> dict[str, Any]:
+    return create_registered_user()
 
 
 @pytest.fixture

services/director-v2/tests/integration/02/test_mixed_dynamic_sidecar_and_legacy_project.py

@@ -112,8 +112,7 @@ def minimal_configuration(
     dy_static_file_server_dynamic_sidecar_compose_spec_service: dict,
     simcore_services_ready: None,
     ensure_swarm_and_networks: None,
-):
-    ...
+): ...
 
 
 @pytest.fixture
@@ -132,8 +131,8 @@ def uuid_dynamic_sidecar_compose(faker: Faker) -> str:
 
 
 @pytest.fixture
-def user_dict(registered_user: Callable) -> dict[str, Any]:
-    return registered_user()
+def user_dict(create_registered_user: Callable) -> dict[str, Any]:
+    return create_registered_user()
 
 
 @pytest.fixture