review @sanderegg

Author: matusdrobuliak66

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

@@ -1,5 +1,3 @@
-import asyncio
-
 # pylint: disable=too-many-arguments
 from fastapi import FastAPI
 from models_library.api_schemas_directorv2.comp_runs import (
@@ -14,6 +12,7 @@
 from models_library.services_types import ServiceRunID
 from models_library.users import UserID
 from servicelib.rabbitmq import RPCRouter
+from servicelib.utils import limited_gather
 from simcore_service_director_v2.models.comp_tasks import ComputationTaskForRpcDBGet
 
 from ...modules.db.repositories.comp_runs import CompRunsRepository
@@ -94,8 +93,9 @@ async def list_computations_latest_iteration_tasks_page(
     )
 
     # Run all log fetches concurrently
-    log_files = await asyncio.gather(
-        *(_fetch_task_log(user_id, project_id, task) for task in comp_tasks)
+    log_files = await limited_gather(
+        *[_fetch_task_log(user_id, project_id, task) for task in comp_tasks],
+        limit=20,
     )
 
     comp_tasks_output = [

services/web/server/src/simcore_service_webserver/director_v2/_computations_service.py

@@ -1,4 +1,3 @@
-import asyncio
 from decimal import Decimal
 
 from aiohttp import web
@@ -15,6 +14,7 @@
 from servicelib.rabbitmq.rpc_interfaces.resource_usage_tracker import (
     credit_transactions,
 )
+from servicelib.utils import limited_gather
 
 from ..products.products_service import is_product_billable
 from ..projects.api import check_user_project_permission, get_project_dict_legacy
@@ -86,13 +86,14 @@ async def list_computations_latest_iteration_tasks(
     _service_run_osparc_credits: list[Decimal | None]
     if _is_product_billable:
         # NOTE: MD: can be improved with a single batch call
-        _service_run_osparc_credits = await asyncio.gather(
+        _service_run_osparc_credits = await limited_gather(
             *[
                 credit_transactions.get_transaction_current_credits_by_service_run_id(
                     rpc_client, service_run_id=_run_id
                 )
                 for _run_id in _service_run_ids
-            ]
+            ],
+            limit=20,
         )
     else:
         _service_run_osparc_credits = [None for _ in _service_run_ids]