dv2

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_service
+from ..director_v2 import 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

services/web/server/src/simcore_service_webserver/director_v2/api.py renamed to services/web/server/src/simcore_service_webserver/director_v2/director_v2_service.py

@@ -1,4 +1,4 @@
-""" plugin API
+"""plugin API
 
 PLEASE avoid importing from any other module to access this plugin's functionality
 """

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_service
+from ..director_v2 import director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..folders import _folders_repository as folders_folders_repository
 from ..redis import get_redis_lock_manager_client_sdk

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

@@ -13,7 +13,7 @@
 from models_library.projects import ProjectID
 from models_library.users import UserID
 
-from ..director_v2 import api
+from ..director_v2 import director_v2_service
 from ..storage.api import delete_data_folders_of_project
 from ..users.api import FullNameDict
 from ..users.exceptions import UserNotFoundError
@@ -110,7 +110,7 @@ async def delete_project(
 
         # stops computational services
         # - raises DirectorServiceError
-        await api.delete_pipeline(app, user_id, project_uuid)
+        await director_v2_service.delete_pipeline(app, user_id, project_uuid)
 
         # rm data from storage
         await delete_data_folders_of_project(app, project_uuid, user_id)

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

@@ -26,7 +26,7 @@
 from models_library.utils.services_io import JsonSchemaDict, get_service_io_json_schema
 from pydantic import ConfigDict, ValidationError
 
-from ..director_v2.api import get_batch_tasks_outputs
+from ..director_v2.director_v2_service import get_batch_tasks_outputs
 from .exceptions import InvalidInputValue
 
 

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_service
+from ..director_v2 import director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..products import products_web
 from ..rabbitmq import get_rabbitmq_rpc_client

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

@@ -10,7 +10,7 @@
 from servicelib.common_headers import UNDEFINED_DEFAULT_SIMCORE_USER_AGENT_VALUE
 from servicelib.redis._errors import ProjectLockError
 
-from ..director_v2 import api as director_v2_service
+from ..director_v2 import director_v2_service
 from . import _projects_repository as projects_repository
 from . import _projects_service
 from .exceptions import ProjectDeleteError, ProjectNotFoundError

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_service
+from ..director_v2 import director_v2_service
 from ..dynamic_scheduler import api as dynamic_scheduler_service
 from . import _crud_api_read
 from . import _projects_repository as projects_repository

services/web/server/src/simcore_service_webserver/studies_dispatcher/_projects.py

@@ -188,7 +188,7 @@ async def _add_new_project(
     # TODO: move this to projects_api
     # TODO: this piece was taken from the end of projects.projects_handlers.create_projects
 
-    from ..director_v2.api import create_or_update_pipeline
+    from ..director_v2.director_v2_service import create_or_update_pipeline
     from ..projects._projects_repository_legacy import APP_PROJECT_DBAPI
 
     db: ProjectDBAPI = app[APP_PROJECT_DBAPI]

services/web/server/tests/unit/with_dbs/01/test_director_v2.py

@@ -10,7 +10,7 @@
 from models_library.projects_pipeline import ComputationTask
 from models_library.projects_state import RunningState
 from models_library.users import UserID
-from simcore_service_webserver.director_v2 import api
+from simcore_service_webserver.director_v2 import director_v2_service
 
 
 @pytest.fixture()
@@ -37,7 +37,7 @@ async def test_create_pipeline(
     project_id: ProjectID,
     osparc_product_name: str,
 ):
-    task_out = await api.create_or_update_pipeline(
+    task_out = await director_v2_service.create_or_update_pipeline(
         client.app, user_id, project_id, osparc_product_name
     )
     assert task_out
@@ -51,7 +51,9 @@ async def test_get_computation_task(
     user_id: UserID,
     project_id: ProjectID,
 ):
-    task_out = await api.get_computation_task(client.app, user_id, project_id)
+    task_out = await director_v2_service.get_computation_task(
+        client.app, user_id, project_id
+    )
     assert task_out
     assert isinstance(task_out, ComputationTask)
     assert task_out.state == RunningState.NOT_STARTED
@@ -60,4 +62,4 @@ async def test_get_computation_task(
 async def test_delete_pipeline(
     mocked_director_v2, client, user_id: UserID, project_id: ProjectID
 ):
-    await api.delete_pipeline(client.app, user_id, project_id)
+    await director_v2_service.delete_pipeline(client.app, user_id, project_id)