Move rereading project config and collection actions in start_runners_with_presets, because these runners are always started only for this purpose

Author: Aksem

src/finecode/cli_app/dump_config.py

@@ -61,18 +61,6 @@ async def dump_config(workdir_path: pathlib.Path, project_name: str):
                 f"Starting runners with presets failed: {exception.message}"
             )
 
-        try:
-            await read_configs.read_project_config(
-                project=project, ws_context=ws_context
-            )
-            collect_actions.collect_actions(
-                project_path=project.dir_path, ws_context=ws_context
-            )
-        except config_models.ConfigurationError as exception:
-            raise DumpFailed(
-                f"Rereading project config with presets and collecting actions in {project.dir_path} failed: {exception.message}"
-            )
-
         try:
             await proxy_utils.start_required_environments(
                 actions_by_projects, ws_context

src/finecode/cli_app/prepare_envs.py

@@ -84,19 +84,6 @@ async def prepare_envs(workdir_path: pathlib.Path, recreate: bool) -> None:
                 f"Starting runners with presets failed: {exception.message}"
             )
 
-        for project in projects:
-            try:
-                await read_configs.read_project_config(
-                    project=project, ws_context=ws_context
-                )
-                collect_actions.collect_actions(
-                    project_path=project.dir_path, ws_context=ws_context
-                )
-            except config_models.ConfigurationError as exception:
-                raise PrepareEnvsFailed(
-                    f"Rereading project config with presets and collecting actions in {project.dir_path} failed: {exception.message}"
-                )
-
         # now all 'dev_workspace' envs are valid, run 'prepare_runners' in them to create
         # venvs and install runners and presets in them
         actions_by_projects: dict[pathlib.Path, list[str]] = {

src/finecode/cli_app/run.py

@@ -125,18 +125,6 @@ async def run_actions(
             logger.error("Unexpected exception:")
             logger.exception(exception)
 
-        # 2. Collect actions in relevant projects
-        for project in projects:
-            try:
-                await read_configs.read_project_config(
-                    project=project, ws_context=ws_context
-                )
-                collect_actions.collect_actions(
-                    project_path=project.dir_path, ws_context=ws_context
-                )
-            except config_models.ConfigurationError as exception:
-                raise RunFailed(f"Found configuration problem: {exception.message}")
-
         actions_by_projects: dict[pathlib.Path, list[str]] = {}
         if projects_names is not None:
             # check that all projects have all actions to detect problem and provide

src/finecode/find_project.py

@@ -4,6 +4,7 @@
 
 from finecode import domain
 from finecode.context import WorkspaceContext
+from finecode.runner import manager as runner_manager
 
 
 class FileNotInWorkspaceException(BaseException): ...
@@ -12,7 +13,7 @@ class FileNotInWorkspaceException(BaseException): ...
 class FileHasNotActionException(BaseException): ...
 
 
-def find_project_with_action_for_file(
+async def find_project_with_action_for_file(
     file_path: Path,
     action_name: str,
     ws_context: WorkspaceContext,
@@ -70,10 +71,22 @@ def find_project_with_action_for_file(
             if project.status == domain.ProjectStatus.NO_FINECODE:
                 continue
             else:
-                raise ValueError(
-                    f"Action is related to project {project_dir_path} but its action "
-                    f"cannot be resolved({project.status})"
-                )
+                if project.status == domain.ProjectStatus.CONFIG_VALID:
+                    try:
+                        await runner_manager.get_or_start_runners_with_presets(project_dir_path=project_dir_path, ws_context=ws_context)
+                    except runner_manager.RunnerFailedToStart as exception:
+                        raise ValueError(
+                            f"Action is related to project {project_dir_path} but runner "
+                            f"with presets failed to start in it: {exception.message}"
+                        )
+
+                    assert project.actions is not None
+                    project_actions = project.actions
+                else:
+                    raise ValueError(
+                        f"Action is related to project {project_dir_path} but its action "
+                        f"cannot be resolved({project.status})"
+                    )
 
         try:
             next(action for action in project_actions if action.name == action_name)

src/finecode/lsp_server/endpoints/document_sync.py

@@ -24,7 +24,7 @@ async def document_did_open(
     projects_paths = [
         project_path
         for project_path, project in global_state.ws_context.ws_projects.items()
-        if project.status == domain.ProjectStatus.RUNNING
+        if project.status == domain.ProjectStatus.CONFIG_VALID
         and file_path.is_relative_to(project_path)
     ]
 
@@ -34,17 +34,17 @@ async def document_did_open(
     try:
         async with asyncio.TaskGroup() as tg:
             for project_path in projects_paths:
-                runners_by_env = global_state.ws_context.ws_projects_extension_runners[
-                    project_path
-                ]
+                runners_by_env = global_state.ws_context.ws_projects_extension_runners.get(project_path, {})
                 for runner in runners_by_env.values():
                     tg.create_task(
                         runner_client.notify_document_did_open(
                             runner=runner, document_info=document_info
                         )
                     )
-    except ExceptionGroup as e:
-        logger.error(f"Error while sending opened document: {e}")
+    except ExceptionGroup as eg:
+        for exception in eg.exceptions:
+            logger.exception(exception)
+        logger.error(f"Error while sending opened document: {eg}")
 
 
 async def document_did_close(

src/finecode/lsp_server/services.py

@@ -78,19 +78,6 @@ async def add_workspace_dir(
     except runner_manager.RunnerFailedToStart as exception:
         raise ValueError(f"Starting runners with presets failed: {exception.message}")
 
-    for project in new_projects:
-        try:
-            await read_configs.read_project_config(
-                project=project, ws_context=global_state.ws_context
-            )
-            collect_actions.collect_actions(
-                project_path=project.dir_path, ws_context=global_state.ws_context
-            )
-        except config_models.ConfigurationError as exception:
-            raise ValueError(
-                f"Rereading project config with presets and collecting actions in {project.dir_path} failed: {exception.message}"
-            )
-
     return schemas.AddWorkspaceDirResponse()
 
 

src/finecode/proxy_utils.py

@@ -14,11 +14,11 @@
 from finecode.services import ActionRunFailed
 
 
-def find_action_project(
+async def find_action_project(
     file_path: pathlib.Path, action_name: str, ws_context: context.WorkspaceContext
 ) -> pathlib.Path:
     try:
-        project_path = find_project.find_project_with_action_for_file(
+        project_path = await find_project.find_project_with_action_for_file(
             file_path=file_path,
             action_name=action_name,
             ws_context=ws_context,
@@ -51,7 +51,7 @@ async def find_action_project_and_run(
     params: dict[str, Any],
     ws_context: context.WorkspaceContext,
 ) -> runner_client.RunActionResponse:
-    project_path = find_action_project(
+    project_path = await find_action_project(
         file_path=file_path, action_name=action_name, ws_context=ws_context
     )
     project = ws_context.ws_projects[project_path]
@@ -227,7 +227,7 @@ async def find_action_project_and_run_with_partial_results(
     ws_context: context.WorkspaceContext,
 ) -> collections.abc.AsyncIterator[runner_client.RunActionRawResult]:
     logger.trace(f"Run {action_name} on {file_path}")
-    project_path = find_action_project(
+    project_path = await find_action_project(
         file_path=file_path, action_name=action_name, ws_context=ws_context
     )
     return run_with_partial_results(

src/finecode/runner/manager.py

@@ -202,6 +202,7 @@ def stop_extension_runner_sync(runner: runner_info.ExtensionRunnerInfo) -> None:
 async def start_runners_with_presets(
     projects: list[domain.Project], ws_context: context.WorkspaceContext
 ) -> None:
+    # start runners with presets in projects, resolve presets and read project actions
     new_runners_tasks: list[asyncio.Task] = []
     try:
         # first start runner in 'dev_workspace' env to be able to resolve presets for
@@ -236,6 +237,35 @@ async def start_runners_with_presets(
         raise RunnerFailedToStart(
             "Failed to initialize runner(s). See previous logs for more details"
         )
+    
+    for project in projects:
+        try:
+            await read_configs.read_project_config(
+                project=project, ws_context=ws_context
+            )
+            collect_actions.collect_actions(
+                project_path=project.dir_path, ws_context=ws_context
+            )
+        except config_models.ConfigurationError as exception:
+            raise RunnerFailedToStart(
+                f"Reading project config with presets and collecting actions in {project.dir_path} failed: {exception.message}"
+            )
+
+
+async def get_or_start_runners_with_presets(project_dir_path: Path, ws_context: context.WorkspaceContext) -> runner_info.ExtensionRunnerInfo:
+    # project is expected to have status `ProjectStatus.CONFIG_VALID`
+    has_dev_workspace_runner = 'dev_workspace' in ws_context.ws_projects_extension_runners[project_dir_path]
+    if not has_dev_workspace_runner:
+        project = ws_context.ws_projects[project_dir_path]
+        await start_runners_with_presets([project], ws_context)
+    dev_workspace_runner = ws_context.ws_projects_extension_runners[project_dir_path]['dev_workspace']
+    if dev_workspace_runner.status == runner_info.RunnerStatus.RUNNING:
+        return dev_workspace_runner
+    elif dev_workspace_runner.status == runner_info.RunnerStatus.INITIALIZING:
+        await dev_workspace_runner.initialized_event.wait()
+        return dev_workspace_runner
+    else:
+        raise RunnerFailedToStart(f'Status of dev_workspace runner: {dev_workspace_runner.status}, logs: {dev_workspace_runner.logs_path}')
 
 
 async def start_runner(

src/finecode/watch_and_run.py

@@ -31,7 +31,7 @@ async def watch_and_run(
                 #       and lint?
                 for action in ["lint", "format"]:
                     # TODO: this can be cached
-                    project_root = find_project.find_project_with_action_for_file(
+                    project_root = await find_project.find_project_with_action_for_file(
                         file_path=path_to_apply_on,
                         action_name=action,
                         ws_context=ws_context,