imports

Author: pcrespov

services/web/server/src/simcore_service_webserver/diagnostics/_handlers.py

@@ -15,7 +15,7 @@
 from .._meta import API_VERSION, APP_NAME, api_version_prefix
 from ..catalog import catalog_service
 from ..db import plugin
-from ..director_v2 import api as director_v2_api
+from ..director_v2 import api as director_v2_service
 from ..login.decorators import login_required
 from ..resource_usage._client import is_resource_usage_tracking_service_responsive
 from ..security.decorators import permission_required
@@ -124,7 +124,7 @@ async def _check_storage():
 
     async def _check_director2():
         check.services["director_v2"] = {
-            "healthy": await director_v2_api.is_healthy(request.app)
+            "healthy": await director_v2_service.is_healthy(request.app)
         }
 
     async def _check_catalog():

services/web/server/src/simcore_service_webserver/projects/_crud_api_create.py

@@ -28,7 +28,7 @@
 
 from ..application_settings import get_application_settings
 from ..catalog import catalog_service
-from ..director_v2 import api as director_v2_api
+from ..director_v2 import api as director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_api
 from ..folders import _folders_repository as folders_folders_repository
 from ..redis import get_redis_lock_manager_client_sdk
@@ -395,7 +395,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
         task_progress.update()
 
         # This is a new project and every new graph needs to be reflected in the pipeline tables
-        await director_v2_api.create_or_update_pipeline(
+        await director_v2_service.create_or_update_pipeline(
             request.app, user_id, new_project["uuid"], product_name
         )
         # get the latest state of the project (lastChangeDate for instance)

services/web/server/src/simcore_service_webserver/projects/_projects_service.py

@@ -95,7 +95,7 @@
 
 from ..application_settings import get_application_settings
 from ..catalog import catalog_service
-from ..director_v2 import api as director_v2_api
+from ..director_v2 import api as director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_api
 from ..products import products_web
 from ..rabbitmq import get_rabbitmq_rpc_client
@@ -842,7 +842,7 @@ async def add_project_node(
 
     # also ensure the project is updated by director-v2 since services
     # are due to access comp_tasks at some point see [https://github.com/ITISFoundation/osparc-simcore/issues/3216]
-    await director_v2_api.create_or_update_pipeline(
+    await director_v2_service.create_or_update_pipeline(
         request.app, user_id, project["uuid"], product_name
     )
     await dynamic_scheduler_api.update_projects_networks(
@@ -965,7 +965,7 @@ async def delete_project_node(
     await db.remove_project_node(user_id, project_uuid, NodeID(node_uuid))
     # also ensure the project is updated by director-v2 since services
     product_name = products_web.get_product_name(request)
-    await director_v2_api.create_or_update_pipeline(
+    await director_v2_service.create_or_update_pipeline(
         request.app, user_id, project_uuid, product_name
     )
     await dynamic_scheduler_api.update_projects_networks(
@@ -1095,7 +1095,7 @@ async def patch_project_node(
     )
 
     # 4. Make calls to director-v2 to keep data in sync (ex. comp_tasks DB table)
-    await director_v2_api.create_or_update_pipeline(
+    await director_v2_service.create_or_update_pipeline(
         app, user_id, project_id, product_name=product_name
     )
     if _node_patch_exclude_unset.get("label"):
@@ -1550,7 +1550,7 @@ async def get_project_states_for_user(
     running_state = RunningState.UNKNOWN
     lock_state, computation_task = await logged_gather(
         _get_project_lock_state(user_id, project_uuid, app),
-        director_v2_api.get_computation_task(app, user_id, UUID(project_uuid)),
+        director_v2_service.get_computation_task(app, user_id, UUID(project_uuid)),
     )
     if computation_task:
         # get the running state
@@ -1577,7 +1577,7 @@ async def add_project_states_for_user(
     running_state = RunningState.UNKNOWN
 
     if not is_template and (
-        computation_task := await director_v2_api.get_computation_task(
+        computation_task := await director_v2_service.get_computation_task(
             app, user_id, project["uuid"]
         )
     ):

services/web/server/src/simcore_service_webserver/projects/_trash_service.py

@@ -13,7 +13,7 @@
 from servicelib.aiohttp.application_keys import APP_FIRE_AND_FORGET_TASKS_KEY
 from servicelib.utils import fire_and_forget_task
 
-from ..director_v2 import api as director_v2_api
+from ..director_v2 import api as director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_api
 from . import _crud_api_read
 from . import _projects_repository as projects_repository
@@ -38,7 +38,7 @@ async def _is_project_running(
     project_id: ProjectID,
 ) -> bool:
     return bool(
-        await director_v2_api.is_pipeline_running(
+        await director_v2_service.is_pipeline_running(
             app, user_id=user_id, project_id=project_id
         )
     ) or bool(