fix

Author: matusdrobuliak66

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

@@ -377,7 +377,7 @@ async def test_computation_create_validators(
     product_name: str,
     product_api_base_url: AnyHttpUrl,
     with_product: dict[str, Any],
-    faker_collection_run_id: CollectionRunID,
+    fake_collection_run_id: CollectionRunID,
 ):
     user = create_registered_user()
     proj = await create_project(user, workbench=fake_workbench_without_outputs)
@@ -387,15 +387,15 @@ async def test_computation_create_validators(
         product_name=product_name,
         product_api_base_url=product_api_base_url,
         use_on_demand_clusters=True,
-        collection_run_id=faker_collection_run_id,
+        collection_run_id=fake_collection_run_id,
     )
     ComputationCreate(
         user_id=user["id"],
         project_id=proj.uuid,
         product_name=product_name,
         product_api_base_url=product_api_base_url,
         use_on_demand_clusters=False,
-        collection_run_id=faker_collection_run_id,
+        collection_run_id=fake_collection_run_id,
     )
 
 
@@ -409,7 +409,7 @@ async def test_create_computation(
     create_registered_user: Callable[..., dict[str, Any]],
     create_project: Callable[..., Awaitable[ProjectAtDB]],
     async_client: httpx.AsyncClient,
-    faker_collection_run_id: CollectionRunID,
+    fake_collection_run_id: CollectionRunID,
 ):
     user = create_registered_user()
     proj = await create_project(user, workbench=fake_workbench_without_outputs)
@@ -422,7 +422,7 @@ async def test_create_computation(
                 project_id=proj.uuid,
                 product_name=product_name,
                 product_api_base_url=product_api_base_url,
-                collection_run_id=faker_collection_run_id,
+                collection_run_id=fake_collection_run_id,
             )
         ),
     )
@@ -518,7 +518,7 @@ async def test_create_computation_with_wallet(
     sqlalchemy_async_engine: AsyncEngine,
     fake_ec2_cpus: PositiveInt,
     fake_ec2_ram: ByteSize,
-    faker_collection_run_id: CollectionRunID,
+    fake_collection_run_id: CollectionRunID,
 ):
     # In billable product a wallet is passed, with a selected pricing plan
     # the pricing plan contains information about the hardware that should be used
@@ -540,7 +540,7 @@ async def test_create_computation_with_wallet(
                 product_name=product_name,
                 product_api_base_url=product_api_base_url,
                 wallet_info=wallet_info,
-                collection_run_id=faker_collection_run_id,
+                collection_run_id=fake_collection_run_id,
             )
         ),
     )
@@ -627,7 +627,7 @@ async def test_create_computation_with_wallet_with_invalid_pricing_unit_name_rai
     create_project: Callable[..., Awaitable[ProjectAtDB]],
     async_client: httpx.AsyncClient,
     wallet_info: WalletInfo,
-    faker_collection_run_id: CollectionRunID,
+    fake_collection_run_id: CollectionRunID,
 ):
     user = create_registered_user()
     proj = await create_project(
@@ -644,7 +644,7 @@ async def test_create_computation_with_wallet_with_invalid_pricing_unit_name_rai
                 product_name=product_name,
                 product_api_base_url=product_api_base_url,
                 wallet_info=wallet_info,
-                collection_run_id=faker_collection_run_id,
+                collection_run_id=fake_collection_run_id,
             )
         ),
     )
@@ -672,7 +672,7 @@ async def test_create_computation_with_wallet_with_no_clusters_keeper_raises_503
     create_project: Callable[..., Awaitable[ProjectAtDB]],
     async_client: httpx.AsyncClient,
     wallet_info: WalletInfo,
-    faker_collection_run_id: CollectionRunID,
+    fake_collection_run_id: CollectionRunID,
 ):
     user = create_registered_user()
     proj = await create_project(user, workbench=fake_workbench_without_outputs)
@@ -686,7 +686,7 @@ async def test_create_computation_with_wallet_with_no_clusters_keeper_raises_503
                 product_name=product_name,
                 product_api_base_url=product_api_base_url,
                 wallet_info=wallet_info,
-                collection_run_id=faker_collection_run_id,
+                collection_run_id=fake_collection_run_id,
             )
         ),
     )
@@ -727,7 +727,7 @@ async def test_start_computation(
     create_registered_user: Callable[..., dict[str, Any]],
     create_project: Callable[..., Awaitable[ProjectAtDB]],
     async_client: httpx.AsyncClient,
-    faker_collection_run_id: CollectionRunID,
+    fake_collection_run_id: CollectionRunID,
 ):
     user = create_registered_user()
     proj = await create_project(user, workbench=fake_workbench_without_outputs)
@@ -741,7 +741,7 @@ async def test_start_computation(
                 start_pipeline=True,
                 product_name=product_name,
                 product_api_base_url=product_api_base_url,
-                collection_run_id=faker_collection_run_id,
+                collection_run_id=fake_collection_run_id,
             )
         ),
     )
@@ -813,7 +813,7 @@ async def test_start_computation_with_deprecated_services_raises_406(
     create_registered_user: Callable[..., dict[str, Any]],
     create_project: Callable[..., Awaitable[ProjectAtDB]],
     async_client: httpx.AsyncClient,
-    faker_collection_run_id: CollectionRunID,
+    fake_collection_run_id: CollectionRunID,
 ):
     user = create_registered_user()
     proj = await create_project(user, workbench=fake_workbench_without_outputs)
@@ -827,7 +827,7 @@ async def test_start_computation_with_deprecated_services_raises_406(
                 start_pipeline=True,
                 product_name=product_name,
                 product_api_base_url=product_api_base_url,
-                collection_run_id=faker_collection_run_id,
+                collection_run_id=fake_collection_run_id,
             )
         ),
     )

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

@@ -239,19 +239,21 @@ async def test_rpc_list_computation_collection_runs_page_and_collection_run_task
     fake_workbench_without_outputs: dict[str, Any],  # <-- Has 4 nodes
     fake_workbench_adjacency: dict[str, Any],
     create_registered_user: Callable[..., dict[str, Any]],
-    project: Callable[..., Awaitable[ProjectAtDB]],
+    create_project: Callable[..., Awaitable[ProjectAtDB]],
     create_pipeline: Callable[..., Awaitable[CompPipelineAtDB]],
-    create_tasks: Callable[..., Awaitable[list[CompTaskAtDB]]],
+    create_tasks_from_project: Callable[..., Awaitable[list[CompTaskAtDB]]],
     create_comp_run_snapshot_tasks: Callable[
         ..., Awaitable[list[CompRunSnapshotTaskDBGet]]
     ],
     create_comp_run: Callable[..., Awaitable[CompRunsAtDB]],
     rpc_client: RabbitMQRPCClient,
     faker: Faker,
+    with_product: dict[str, Any],
 ):
     user = create_registered_user()
     projects = [
-        await project(user, workbench=fake_workbench_without_outputs) for _ in range(3)
+        await create_project(user, workbench=fake_workbench_without_outputs)
+        for _ in range(3)
     ]
 
     default_collection_run_id = CollectionRunID(f"{faker.uuid4(cast_to=None)}")
@@ -268,7 +270,7 @@ async def test_rpc_list_computation_collection_runs_page_and_collection_run_task
             project_id=f"{proj.uuid}",
             dag_adjacency_list=fake_workbench_adjacency,
         )
-        await create_tasks(
+        await create_tasks_from_project(
             user=user, project=proj, state=StateType.PUBLISHED, progress=None
         )
         run = await create_comp_run(

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

@@ -558,6 +558,7 @@ async def test_list_group_by_collection_run_id(
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
     fake_collection_run_id: CollectionRunID,
+    with_product: dict[str, Any],
 ):
     """Test list_group_by_collection_run_id function with simple data insertion and retrieval."""
     # Create a few published projects
@@ -624,6 +625,7 @@ async def test_list_group_by_collection_run_id_with_mixed_states_returns_started
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
     fake_collection_run_id: CollectionRunID,
+    with_product: dict[str, Any],
 ):
     """Test that if any state is not final, the grouped state returns STARTED."""
     # Create published projects
@@ -708,6 +710,7 @@ async def test_list_group_by_collection_run_id_all_success_returns_success(
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
     fake_collection_run_id: CollectionRunID,
+    with_product: dict[str, Any],
 ):
     """Test that if all states are SUCCESS, the grouped state returns SUCCESS."""
     published_project_1 = await publish_project()
@@ -773,6 +776,7 @@ async def test_list_group_by_collection_run_id_with_failed_returns_failed(
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
     fake_collection_run_id: CollectionRunID,
+    with_product: dict[str, Any],
 ):
     """Test that if any state is FAILED (among final states), the grouped state returns FAILED."""
     published_project_1 = await publish_project()
@@ -840,6 +844,7 @@ async def test_list_group_by_collection_run_id_with_aborted_returns_aborted(
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
     fake_collection_run_id: CollectionRunID,
+    with_product: dict[str, Any],
 ):
     """Test that if any state is ABORTED (but no FAILED), the grouped state returns ABORTED."""
     published_project_1 = await publish_project()
@@ -905,6 +910,7 @@ async def test_list_group_by_collection_run_id_with_unknown_returns_unknown(
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
     fake_collection_run_id: CollectionRunID,
+    with_product: dict[str, Any],
 ):
     """Test that if any state is UNKNOWN (but no FAILED/ABORTED), the grouped state returns UNKNOWN."""
     published_project_1 = await publish_project()
@@ -969,6 +975,7 @@ async def test_list_group_by_collection_run_id_with_project_filter(
     run_metadata: RunMetadataDict,
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
+    with_product: dict[str, Any],
 ):
     """Test list_group_by_collection_run_id with project_ids filter."""
     published_project_1 = await publish_project()
@@ -1033,6 +1040,7 @@ async def test_list_group_by_collection_run_id_pagination(
     run_metadata: RunMetadataDict,
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
+    with_product: dict[str, Any],
 ):
     """Test pagination functionality of list_group_by_collection_run_id."""
     published_project = await publish_project()
@@ -1093,6 +1101,7 @@ async def test_list_group_by_collection_run_id_empty_result(
     sqlalchemy_async_engine: AsyncEngine,
     run_metadata: RunMetadataDict,
     fake_user_id: UserID,
+    with_product: dict[str, Any],
 ):
     """Test list_group_by_collection_run_id returns empty when no runs exist."""
     repo = CompRunsRepository(sqlalchemy_async_engine)
@@ -1114,6 +1123,7 @@ async def test_list_group_by_collection_run_id_with_different_users(
     run_metadata: RunMetadataDict,
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
+    with_product: dict[str, Any],
 ):
     """Test that list_group_by_collection_run_id filters by user_id correctly."""
     published_project_user1 = await publish_project()
@@ -1184,6 +1194,7 @@ async def test_list_group_by_collection_run_id_state_priority_precedence(
     faker: Faker,
     publish_project: Callable[[], Awaitable[PublishedProject]],
     fake_collection_run_id: CollectionRunID,
+    with_product: dict[str, Any],
 ):
     """Test that state resolution follows correct priority: FAILED > ABORTED > UNKNOWN."""
     published_projects = [await publish_project() for _ in range(4)]