Import shutdown service in WM instead of services package

Author: Aksem

src/finecode/cli_app/commands/dump_config_cmd.py

@@ -2,8 +2,8 @@
 
 from loguru import logger
 
-from finecode import context, services
-from finecode.services import run_service
+from finecode import context
+from finecode.services import run_service, shutdown_service
 from finecode.config import config_models, read_configs
 from finecode.runner import manager as runner_manager
 
@@ -86,4 +86,4 @@ async def dump_config(workdir_path: pathlib.Path, project_name: str):
         )
         logger.info(f"Dumped config into {dump_file_path}")
     finally:
-        services.on_shutdown(ws_context)
+        shutdown_service.on_shutdown(ws_context)

src/finecode/cli_app/commands/prepare_envs_cmd.py

@@ -3,8 +3,8 @@
 
 from loguru import logger
 
-from finecode import context, domain, services
-from finecode.services import run_service
+from finecode import context, domain
+from finecode.services import run_service, shutdown_service
 from finecode.cli_app import utils
 from finecode.config import collect_actions, config_models, read_configs
 from finecode.runner import manager as runner_manager
@@ -138,7 +138,7 @@ async def prepare_envs(workdir_path: pathlib.Path, recreate: bool) -> None:
         if result_return_code != 0:
             raise PrepareEnvsFailed(result_output)
     finally:
-        services.on_shutdown(ws_context)
+        shutdown_service.on_shutdown(ws_context)
 
 
 def remove_dev_workspace_envs(

src/finecode/cli_app/commands/run_cmd.py

@@ -6,8 +6,8 @@
 import ordered_set
 from loguru import logger
 
-from finecode import context, domain, services
-from finecode.services import run_service
+from finecode import context, domain
+from finecode.services import run_service, shutdown_service
 from finecode.config import collect_actions, config_models, read_configs
 from finecode.runner import manager as runner_manager
 
@@ -165,7 +165,7 @@ async def run_actions(
         except run_service.ActionRunFailed as exception:
             raise RunFailed(f"Failed to run actions: {exception.message}")
     finally:
-        services.on_shutdown(ws_context)
+        shutdown_service.on_shutdown(ws_context)
 
 
 def get_projects_by_names(

src/finecode/lsp_server/lsp_server.py

@@ -7,7 +7,7 @@
 from lsprotocol import types
 from pygls.lsp.server import LanguageServer
 
-from finecode import services as wm_services
+from finecode.services import shutdown_service
 from finecode.runner import manager as runner_manager
 from finecode.lsp_server import global_state, schemas, services
 from finecode.lsp_server.endpoints import action_tree as action_tree_endpoints
@@ -242,7 +242,7 @@ async def _workspace_did_change_workspace_folders(
 
 def _on_shutdown(ls: LanguageServer, params):
     logger.info("on shutdown handler", params)
-    wm_services.on_shutdown(global_state.ws_context)
+    shutdown_service.on_shutdown(global_state.ws_context)
 
 
 async def reset(ls: LanguageServer, params):

src/finecode/services/__init__.py

@@ -1,3 +0,0 @@
-from .shutdown import on_shutdown
-
-__all__ = ["on_shutdown"]