imports

Author: pcrespov

services/web/server/src/simcore_service_webserver/garbage_collector/_core_orphans.py

@@ -14,7 +14,7 @@
 from servicelib.logging_utils import log_catch, log_context
 from servicelib.utils import limited_as_completed, logged_gather
 
-from ..dynamic_scheduler import api as dynamic_scheduler_api
+from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..projects._projects_service import (
     is_node_id_present_in_any_project_workbench,
     list_node_ids_in_project,
@@ -55,7 +55,7 @@ async def _remove_service(
         logging.INFO,
         msg=f"removing {(service.node_uuid, service.host)} with {save_service_state=}",
     ):
-        await dynamic_scheduler_api.stop_dynamic_service(
+        await dynamic_scheduler_service.stop_dynamic_service(
             app,
             dynamic_service_stop=DynamicServiceStop(
                 user_id=service.user_id,
@@ -90,7 +90,7 @@ async def remove_orphaned_services(
     # in between and the GC would remove services that actually should be running.
 
     with log_catch(_logger, reraise=False):
-        running_services = await dynamic_scheduler_api.list_dynamic_services(app)
+        running_services = await dynamic_scheduler_service.list_dynamic_services(app)
         if not running_services:
             # nothing to do
             return

services/web/server/src/simcore_service_webserver/projects/_controller/nodes_rest.py

@@ -58,7 +58,7 @@
 
 from ..._meta import API_VTAG as VTAG
 from ...catalog import catalog_service
-from ...dynamic_scheduler import api as dynamic_scheduler_api
+from ...dynamic_scheduler import api as dynamic_scheduler_service
 from ...groups.api import get_group_from_gid, list_all_user_groups_ids
 from ...groups.exceptions import GroupNotFoundError
 from ...login.decorators import login_required
@@ -163,7 +163,7 @@ async def get_node(request: web.Request) -> web.Response:
         )
 
     service_data: NodeGetIdle | NodeGetUnknown | DynamicServiceGet | NodeGet = (
-        await dynamic_scheduler_api.get_dynamic_service(
+        await dynamic_scheduler_service.get_dynamic_service(
             app=request.app, node_id=path_params.node_id
         )
     )
@@ -232,7 +232,7 @@ async def retrieve_node(request: web.Request) -> web.Response:
     retrieve = await parse_request_body_as(NodeRetrieve, request)
 
     return web.json_response(
-        await dynamic_scheduler_api.retrieve_inputs(
+        await dynamic_scheduler_service.retrieve_inputs(
             request.app, path_params.node_id, retrieve.port_keys
         ),
         dumps=json_dumps,
@@ -297,7 +297,7 @@ async def _stop_dynamic_service_task(
 ):
     # NOTE: _handle_project_nodes_exceptions only decorate handlers
     try:
-        await dynamic_scheduler_api.stop_dynamic_service(
+        await dynamic_scheduler_service.stop_dynamic_service(
             app, dynamic_service_stop=dynamic_service_stop
         )
         return web.json_response(status=status.HTTP_204_NO_CONTENT)
@@ -364,7 +364,7 @@ async def restart_node(request: web.Request) -> web.Response:
 
     path_params = parse_request_path_parameters_as(NodePathParams, request)
 
-    await dynamic_scheduler_api.restart_user_services(
+    await dynamic_scheduler_service.restart_user_services(
         request.app, node_id=path_params.node_id
     )
 

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

@@ -29,7 +29,7 @@
 from ..application_settings import get_application_settings
 from ..catalog import catalog_service
 from ..director_v2 import api as director_v2_service
-from ..dynamic_scheduler import api as dynamic_scheduler_api
+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
 from ..storage.api import (
@@ -389,7 +389,7 @@ async def create_project(  # pylint: disable=too-many-arguments,too-many-branche
             )
 
         # update the network information in director-v2
-        await dynamic_scheduler_api.update_projects_networks(
+        await dynamic_scheduler_service.update_projects_networks(
             request.app, project_id=ProjectID(new_project["uuid"])
         )
         task_progress.update()

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

@@ -96,7 +96,7 @@
 from ..application_settings import get_application_settings
 from ..catalog import catalog_service
 from ..director_v2 import api as director_v2_service
-from ..dynamic_scheduler import api as dynamic_scheduler_api
+from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..products import products_web
 from ..rabbitmq import get_rabbitmq_rpc_client
 from ..redis import get_redis_lock_manager_client_sdk
@@ -638,7 +638,7 @@ async def _start_dynamic_service(  # noqa: C901
         ),
     )
     async def _() -> None:
-        project_running_nodes = await dynamic_scheduler_api.list_dynamic_services(
+        project_running_nodes = await dynamic_scheduler_service.list_dynamic_services(
             request.app, user_id=user_id, project_id=project_uuid
         )
         _nodes_service.check_num_service_per_projects_limit(
@@ -761,7 +761,7 @@ async def _() -> None:
             service_key=service_key,
             service_version=service_version,
         )
-        await dynamic_scheduler_api.run_dynamic_service(
+        await dynamic_scheduler_service.run_dynamic_service(
             app=request.app,
             dynamic_service_start=DynamicServiceStart(
                 product_name=product_name,
@@ -845,7 +845,7 @@ async def add_project_node(
     await director_v2_service.create_or_update_pipeline(
         request.app, user_id, project["uuid"], product_name
     )
-    await dynamic_scheduler_api.update_projects_networks(
+    await dynamic_scheduler_service.update_projects_networks(
         request.app, project_id=ProjectID(project["uuid"])
     )
 
@@ -900,7 +900,7 @@ async def _remove_service_and_its_data_folders(
 ) -> None:
     if stop_service:
         # no need to save the state of the node when deleting it
-        await dynamic_scheduler_api.stop_dynamic_service(
+        await dynamic_scheduler_service.stop_dynamic_service(
             app,
             dynamic_service_stop=DynamicServiceStop(
                 user_id=user_id,
@@ -936,10 +936,12 @@ async def delete_project_node(
         permission="write",
     )
 
-    list_running_dynamic_services = await dynamic_scheduler_api.list_dynamic_services(
-        request.app,
-        user_id=user_id,
-        project_id=project_uuid,
+    list_running_dynamic_services = (
+        await dynamic_scheduler_service.list_dynamic_services(
+            request.app,
+            user_id=user_id,
+            project_id=project_uuid,
+        )
     )
 
     fire_and_forget_task(
@@ -968,7 +970,7 @@ async def delete_project_node(
     await director_v2_service.create_or_update_pipeline(
         request.app, user_id, project_uuid, product_name
     )
-    await dynamic_scheduler_api.update_projects_networks(
+    await dynamic_scheduler_service.update_projects_networks(
         request.app, project_id=project_uuid
     )
 
@@ -1099,7 +1101,9 @@ async def patch_project_node(
         app, user_id, project_id, product_name=product_name
     )
     if _node_patch_exclude_unset.get("label"):
-        await dynamic_scheduler_api.update_projects_networks(app, project_id=project_id)
+        await dynamic_scheduler_service.update_projects_networks(
+            app, project_id=project_id
+        )
 
     # 5. Updates project states for user, if inputs/outputs have been changed
     if {"inputs", "outputs"} & _node_patch_exclude_unset.keys():
@@ -1203,7 +1207,7 @@ async def _safe_retrieve(
     app: web.Application, node_id: NodeID, port_keys: list[str]
 ) -> None:
     try:
-        await dynamic_scheduler_api.retrieve_inputs(app, node_id, port_keys)
+        await dynamic_scheduler_service.retrieve_inputs(app, node_id, port_keys)
     except RPCServerError as exc:
         log.warning(
             "Unable to call :retrieve endpoint on service %s, keys: [%s]: error: [%s]",
@@ -1733,7 +1737,7 @@ async def run_project_dynamic_services(
     project_settings: ProjectsSettings = get_plugin_settings(request.app)
     running_services_uuids: list[NodeIDStr] = [
         f"{d.node_uuid}"
-        for d in await dynamic_scheduler_api.list_dynamic_services(
+        for d in await dynamic_scheduler_service.list_dynamic_services(
             request.app, user_id=user_id, project_id=ProjectID(project["uuid"])
         )
     ]
@@ -1849,7 +1853,7 @@ async def _locked_stop_dynamic_serivces_in_project() -> None:
             ServiceWasNotFoundError,
         ):
             # here RPC exceptions are suppressed. in case the service is not found to preserve old behavior
-            await dynamic_scheduler_api.stop_dynamic_services_in_project(
+            await dynamic_scheduler_service.stop_dynamic_services_in_project(
                 app=app,
                 user_id=user_id,
                 project_id=project_uuid,
@@ -1940,7 +1944,7 @@ async def get_project_inactivity(
     app: web.Application, project_id: ProjectID
 ) -> GetProjectInactivityResponse:
     project_settings: ProjectsSettings = get_plugin_settings(app)
-    return await dynamic_scheduler_api.get_project_inactivity(
+    return await dynamic_scheduler_service.get_project_inactivity(
         app,
         project_id=project_id,
         # NOTE: project is considered inactive if all services exposing an /inactivity

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

@@ -14,7 +14,7 @@
 from servicelib.utils import fire_and_forget_task
 
 from ..director_v2 import api as director_v2_service
-from ..dynamic_scheduler import api as dynamic_scheduler_api
+from ..dynamic_scheduler import api as dynamic_scheduler_service
 from . import _crud_api_read
 from . import _projects_repository as projects_repository
 from . import _projects_service, _projects_service_delete
@@ -42,7 +42,7 @@ async def _is_project_running(
             app, user_id=user_id, project_id=project_id
         )
     ) or bool(
-        await dynamic_scheduler_api.list_dynamic_services(
+        await dynamic_scheduler_service.list_dynamic_services(
             app, user_id=user_id, project_id=project_id
         )
     )

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

@@ -1,6 +1,4 @@
-""" Handles request to the viewers redirection entrypoints
-
-"""
+"""Handles request to the viewers redirection entrypoints"""
 
 import functools
 import logging
@@ -18,7 +16,7 @@
 from servicelib.aiohttp.typing_extension import Handler
 from servicelib.logging_errors import create_troubleshotting_log_kwargs
 
-from ..dynamic_scheduler import api as dynamic_scheduler_api
+from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..products import products_web
 from ..utils import compose_support_error_msg
 from ..utils_aiohttp import create_redirect_to_page_response
@@ -169,8 +167,7 @@ def ensure_extension_upper_and_dotless(cls, v):
         return v
 
 
-class ServiceAndFileParams(FileQueryParams, ServiceParams):
-    ...
+class ServiceAndFileParams(FileQueryParams, ServiceParams): ...
 
 
 class ViewerQueryParams(BaseModel):
@@ -253,7 +250,7 @@ async def get_redirection_to_viewer(request: web.Request):
             file_params.download_link,
             product_name=products_web.get_product_name(request),
         )
-        await dynamic_scheduler_api.update_projects_networks(
+        await dynamic_scheduler_service.update_projects_networks(
             request.app, project_id=project_id
         )
 
@@ -284,7 +281,7 @@ async def get_redirection_to_viewer(request: web.Request):
             service_info=_create_service_info_from(valid_service),
             product_name=products_web.get_product_name(request),
         )
-        await dynamic_scheduler_api.update_projects_networks(
+        await dynamic_scheduler_service.update_projects_networks(
             request.app, project_id=project_id
         )
 
@@ -322,7 +319,7 @@ async def get_redirection_to_viewer(request: web.Request):
             ).STUDIES_DEFAULT_FILE_THUMBNAIL,
             product_name=products_web.get_product_name(request),
         )
-        await dynamic_scheduler_api.update_projects_networks(
+        await dynamic_scheduler_service.update_projects_networks(
             request.app, project_id=project_id
         )
 

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

@@ -28,7 +28,7 @@
 
 from ..constants import INDEX_RESOURCE_NAME
 from ..director_v2._core_computations import create_or_update_pipeline
-from ..dynamic_scheduler import api as dynamic_scheduler_api
+from ..dynamic_scheduler import api as dynamic_scheduler_service
 from ..products import products_web
 from ..projects._groups_respository import get_project_group
 from ..projects._projects_repository_legacy import ProjectDBAPI
@@ -212,7 +212,7 @@ async def copy_study_to_account(
         await create_or_update_pipeline(
             request.app, user["id"], project["uuid"], product_name
         )
-        await dynamic_scheduler_api.update_projects_networks(
+        await dynamic_scheduler_service.update_projects_networks(
             request.app, project_id=ProjectID(project["uuid"])
         )