refactor

Author: Andrei Neagu

services/dynamic-sidecar/tests/unit/test_api_rest_containers_long_running_tasks.py

@@ -19,6 +19,7 @@
 from fastapi import FastAPI
 from fastapi.routing import APIRoute
 from httpx import ASGITransport, AsyncClient
+from models_library.api_schemas_dynamic_sidecar.containers import DcokerComposeYamlStr
 from models_library.api_schemas_long_running_tasks.base import (
     ProgressMessage,
     ProgressPercent,
@@ -150,7 +151,7 @@ def dynamic_sidecar_network_name() -> str:
         },
     ]
 )
-def compose_spec(request: pytest.FixtureRequest) -> str:
+def compose_spec(request: pytest.FixtureRequest) -> DcokerComposeYamlStr:
     spec_dict: dict[str, Any] = request.param  # type: ignore
     return json.dumps(spec_dict)
 
@@ -282,7 +283,7 @@ async def _get_task_id_pull_user_servcices_docker_images(
 
 async def _get_task_id_create_service_containers(
     httpx_async_client: AsyncClient,
-    compose_spec: str,
+    compose_spec: DcokerComposeYamlStr,
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
     *args,
     **kwargs,
@@ -389,11 +390,9 @@ async def test_create_containers_task(
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
     shared_store: SharedStore,
 ) -> None:
-    last_progress_message: tuple[str, ProgressPercent | None] | None = None
+    last_progress_message: tuple[str, float] | None = None
 
-    async def create_progress(
-        message: str, percent: ProgressPercent | None, _: TaskId
-    ) -> None:
+    async def create_progress(message: str, percent: float, _: TaskId) -> None:
         nonlocal last_progress_message
         last_progress_message = (message, percent)
         print(message, percent)
@@ -522,7 +521,6 @@ def _get_awaitable() -> Awaitable:
 
 
 async def test_containers_down_after_starting(
-    mock_ensure_read_permissions_on_user_service_data: None,
     httpx_async_client: AsyncClient,
     client: Client,
     compose_spec: str,

services/dynamic-sidecar/tests/unit/test_api_rest_prometheus_metrics.py

@@ -12,6 +12,7 @@
 from asgi_lifespan import LifespanManager
 from fastapi import FastAPI, status
 from httpx import ASGITransport, AsyncClient
+from models_library.api_schemas_dynamic_sidecar.containers import DcokerComposeYamlStr
 from models_library.callbacks_mapping import CallbacksMapping
 from models_library.services_creation import CreateServiceMetricsAdditionalParams
 from pydantic import AnyHttpUrl, TypeAdapter
@@ -85,7 +86,7 @@ def client(
 
 
 @pytest.fixture
-def compose_spec() -> str:
+def compose_spec() -> DcokerComposeYamlStr:
     return json.dumps(
         {
             "version": "3",
@@ -101,7 +102,7 @@ def compose_spec() -> str:
 
 async def _get_task_id_create_service_containers(
     httpx_async_client: AsyncClient,
-    compose_spec: str,
+    compose_spec: DcokerComposeYamlStr,
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
 ) -> TaskId:
     ctontainers_compose_spec = ContainersComposeSpec(

services/dynamic-sidecar/tests/unit/test_api_rest_workflow_service_metrics.py

@@ -18,6 +18,7 @@
 from asgi_lifespan import LifespanManager
 from fastapi import FastAPI
 from httpx import ASGITransport, AsyncClient
+from models_library.api_schemas_dynamic_sidecar.containers import DcokerComposeYamlStr
 from models_library.generated_models.docker_rest_api import ContainerState
 from models_library.generated_models.docker_rest_api import Status2 as ContainerStatus
 from models_library.rabbitmq_messages import (
@@ -73,7 +74,7 @@ def raw_compose_spec(container_names: list[str]) -> dict[str, Any]:
 
 
 @pytest.fixture
-def compose_spec(raw_compose_spec: dict[str, Any]) -> str:
+def compose_spec(raw_compose_spec: dict[str, Any]) -> DcokerComposeYamlStr:
     return json.dumps(raw_compose_spec)
 
 
@@ -145,7 +146,7 @@ def mock_user_services_fail_to_stop(mocker: MockerFixture) -> None:
 
 async def _get_task_id_create_service_containers(
     httpx_async_client: AsyncClient,
-    compose_spec: str,
+    compose_spec: DcokerComposeYamlStr,
     mock_metrics_params: CreateServiceMetricsAdditionalParams,
 ) -> TaskId:
     containers_compose_spec = ContainersComposeSpec(
@@ -200,7 +201,6 @@ async def _wait_for_containers_to_be_running(app: FastAPI) -> None:
 
 
 async def test_service_starts_and_closes_as_expected(
-    mock_ensure_read_permissions_on_user_service_data: None,
     mock_core_rabbitmq: dict[str, AsyncMock],
     app: FastAPI,
     httpx_async_client: AsyncClient,
@@ -384,7 +384,6 @@ async def _mocked_get_container_states(
 
 @pytest.mark.parametrize("expected_platform_state", SimcorePlatformStatus)
 async def test_user_services_crash_when_running(
-    mock_ensure_read_permissions_on_user_service_data: None,
     mock_core_rabbitmq: dict[str, AsyncMock],
     app: FastAPI,
     httpx_async_client: AsyncClient,