Move cache dir of runner in venv. Unify logs abour runners by introducing runner readable_id and logs_dir_path. Migrate LSP server of ER to typed single parameters instead of one object, because pygls>=2.0.0-a5 seems to support only them in async handlers. Improve logs in case of error in prepare_env, run and runner process stop.

Author: Aksem

finecode_extension_runner/pyproject.toml

@@ -10,7 +10,6 @@ dependencies = [
     "tomlkit==0.11.*",
     "click==8.1.*",
     "pydantic==2.11.*",
-    "platformdirs==4.3.*",
     "pygls==2.0.0-a6",
     "finecode_extension_api==0.3.*",
     "deepmerge==2.0.*",

finecode_extension_runner/src/finecode_extension_runner/_services/run_action.py

@@ -15,7 +15,7 @@
 from finecode_extension_runner import (
     partial_result_sender as partial_result_sender_module,
 )
-from finecode_extension_runner import project_dirs, run_utils, schemas
+from finecode_extension_runner import run_utils, schemas
 from finecode_extension_runner.di import resolver as di_resolver
 
 last_run_id: int = 0
@@ -113,7 +113,10 @@ async def run_action(
 
     # instantiate only on demand?
     project_path = project_def.path
-    project_cache_dir = project_dirs.get_project_dir(project_path=project_path)
+    project_cache_dir = project_path / ".venvs" / global_state.env_name / "cache"
+    if not project_cache_dir.exists():
+        project_cache_dir.mkdir()
+
     action_context = code_action.ActionContext(
         project_dir=project_path, cache_dir=project_cache_dir
     )

finecode_extension_runner/src/finecode_extension_runner/app_dirs.py

@@ -47,6 +47,7 @@ def start(
 
     global_state.log_level = "INFO" if trace is False else "TRACE"
     global_state.project_dir_path = project_path
+    global_state.env_name = env_name
     # asyncio.run(runner_start.start_runner())
 
     # extension runner doesn't stop with async start after closing LS client(WM). Use

finecode_extension_runner/src/finecode_extension_runner/cli.py

@@ -8,3 +8,4 @@
 # the runner, not from updating the config
 project_dir_path: Path | None = None
 log_level: Literal["TRACE", "INFO"] = "INFO"
+env_name: str = ""

finecode_extension_runner/src/finecode_extension_runner/global_state.py

@@ -165,12 +165,9 @@ async def get_project_raw_config(
     return json.loads(raw_config.config)
 
 
-async def update_config(ls: lsp_server.LanguageServer, params):
-    logger.trace(f"Update config: {params}")
+async def update_config(ls: lsp_server.LanguageServer, working_dir: pathlib.Path, project_name: str, config: dict[str, typing.Any]):
+    logger.trace(f'Update config: {working_dir} {project_name} {config}')
     try:
-        working_dir = params[0]
-        project_name = params[1]
-        config = params[2]
         actions = config["actions"]
         action_handler_configs = config["action_handler_configs"]
 
@@ -225,14 +222,14 @@ def default(self, obj):
         return super().default(obj)
 
 
-async def run_action(ls: lsp_server.LanguageServer, params):
-    logger.trace(f"Run action: {params[0]}")
-    request = schemas.RunActionRequest(action_name=params[0], params=params[1])
-    options = schemas.RunActionOptions(**params[2] if params[2] is not None else {})
+async def run_action(ls: lsp_server.LanguageServer, action_name: str, params: dict[str, typing.Any], options: dict[str, typing.Any] | None):
+    logger.trace(f"Run action: {action_name}")
+    request = schemas.RunActionRequest(action_name=action_name, params=params)
+    options_schema = schemas.RunActionOptions(**options if options is not None else {})
     status: str = "success"
 
     try:
-        response = await services.run_action(request=request, options=options)
+        response = await services.run_action(request=request, options=options_schema)
     except Exception as exception:
         if isinstance(exception, services.StopWithResponse):
             status = "stopped"
@@ -263,15 +260,15 @@ async def run_action(ls: lsp_server.LanguageServer, params):
     }
 
 
-async def reload_action(ls: lsp_server.LanguageServer, params):
-    logger.trace(f"Reload action: {params}")
-    services.reload_action(params[0])
+async def reload_action(ls: lsp_server.LanguageServer, action_name: str):
+    logger.trace(f"Reload action: {action_name}")
+    services.reload_action(action_name)
     return {}
 
 
-async def resolve_package_path(ls: lsp_server.LanguageServer, params):
-    logger.trace(f"Resolve package path: {params}")
+async def resolve_package_path(ls: lsp_server.LanguageServer, package_name: str):
+    logger.trace(f"Resolve package path: {package_name}")
     # TODO: handle properly ValueError
-    result = services.resolve_package_path(params[0])
-    logger.trace(f"Resolved {params[0]} to {result}")
+    result = services.resolve_package_path(package_name)
+    logger.trace(f"Resolved {package_name} to {result}")
     return {"packagePath": result}

finecode_extension_runner/src/finecode_extension_runner/lsp_server.py

@@ -16,7 +16,6 @@
     context,
     domain,
     global_state,
-    project_dirs,
     run_utils,
     schemas,
 )

finecode_extension_runner/src/finecode_extension_runner/project_dirs.py

@@ -206,8 +206,9 @@ async def check_or_recreate_all_dev_workspace_envs(
             project_def=current_project, env_name="dev_workspace", ws_context=ws_context
         )
     except runner_manager.RunnerFailedToStart as exception:
-        # TODO
-        raise exception
+        raise PrepareEnvsFailed(
+            f"Failed to start `dev_workspace` runner in {current_project.name}: {exception.message}"
+        )
 
     envs = []
 

finecode_extension_runner/src/finecode_extension_runner/services.py

@@ -339,11 +339,12 @@ async def run_actions_in_running_project(
                     ws_context=ws_context,
                     result_format=services.RunResultFormat.STRING,
                 )
+            except services.ActionRunFailed as exception:
+                raise RunFailed(f"Running of action {action_name} failed: {exception.message}")
             except Exception as error:
-                # TODO: which are expected here?
                 logger.error("Unexpected exception")
                 logger.exception(error)
-                raise RunFailed(f"Running of action {action_name} failed")
+                raise RunFailed(f"Running of action {action_name} failed with unexpected exception")
 
             run_result_str = run_result_to_str(run_result.result, action_name)
             result_by_action[action_name] = ActionRunResult(