Fix saving dumped config if target dir doesn't exist. Add create_dir method in ifilemanager. Install dependency in dev_workspace env also if they exist already

Aksem · Aksem · commit b37a87c8e215 · 2025-08-14T12:52:45.000+02:00
diff --git a/.python-version b/.python-version
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ With FineCode you can:
   dev_workspace = ["finecode==0.2.*"]
   ```
 
-1.1.2 Create dev_workspace venv: `python -m venv .venvs/dev_workspace` (https://docs.python.org/3/library/venv.html#creating-virtual-environments )
+1.1.2 Create dev_workspace venv: `python -m venv .venvs/dev_workspace` ([Python Docs](https://docs.python.org/3/library/venv.html#creating-virtual-environments ))
 
 1.1.3 Activate this venv and install dependencies from `dev_workspace` group:
   ```
@@ -45,10 +45,10 @@ NOTE: `pip install` supports `--group` parameter since pip 25.1. Make sure you h
 
 For list of presets from FineCode authors see 'Presets' section below.
 
-1.2.1 Run `prepare_env` finecode action:
+1.2.1 Run `prepare_envs` finecode command:
 
   ```bash
-  python -m finecode run prepare_env
+  python -m finecode prepare_envs
   ```
 
 1.3 Enable finecode and preset
diff --git a/extensions/fine_python_pip/pyproject.toml b/extensions/fine_python_pip/pyproject.toml
@@ -8,7 +8,7 @@ requires-python = ">=3.11, < 3.14"
 dependencies = ["finecode_extension_api==0.1.0"]
 
 [dependency-groups]
-dev_workspace = ["finecode==0.2.0"]
+dev_workspace = ["finecode==0.2.*"]
 dev_no_runtime = ["finecode_dev_common_preset==0.1.*"]
 
 [tool.finecode]
diff --git a/extensions/fine_python_virtualenv/pyproject.toml b/extensions/fine_python_virtualenv/pyproject.toml
@@ -11,7 +11,7 @@ dependencies = [
 ]
 
 [dependency-groups]
-dev_workspace = ["finecode==0.2.0"]
+dev_workspace = ["finecode==0.2.*"]
 dev_no_runtime = ["finecode_dev_common_preset==0.1.*"]
 
 [tool.finecode]
diff --git a/finecode_extension_api/src/finecode_extension_api/interfaces/ifilemanager.py b/finecode_extension_api/src/finecode_extension_api/interfaces/ifilemanager.py
@@ -10,3 +10,6 @@ async def get_file_version(self, file_path: Path) -> str:
         ...
 
     async def save_file(self, file_path: Path, file_content) -> None: ...
+
+    async def create_dir(self, dir_path: Path, create_parents: bool = True, exist_ok: bool = True):
+        ...
diff --git a/poetry.toml b/poetry.toml
diff --git a/pyproject.toml b/pyproject.toml
@@ -1,8 +1,6 @@
 [project]
 name = "finecode"
-version = "0.2.0"
-# dynamic version from setuptools-scm is not compatible with poetry, because it requires explicit version in pyproject.toml. Will be used after migration from poetry.
-# dynamic = ["version"]
+dynamic = ["version"]
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "aders1234@gmail.com" }]
 readme = "README.md"
@@ -17,10 +15,17 @@ dependencies = [
     "pygls==2.0.0-a2",
     "finecode_extension_api==0.1.0",
     "ordered-set==4.1.*",
+    "mcp==1.9.*",
+    "fine_python_virtualenv @ git+https://github.com/finecode-dev/finecode.git#subdirectory=extensions/fine_python_virtualenv",
+    "fine_python_pip @ git+https://github.com/finecode-dev/finecode.git#subdirectory=extensions/fine_python_pip",
 ]
 
 [dependency-groups]
-dev_workspace = ["build==1.2.2.post1"]
+dev_workspace = ["build==1.2.2.post1", "finecode==0.2.*"]
+dev = [{ include-group = "runtime" }, "pytest==7.4.*", "debugpy==1.8.*"]
+dev_no_runtime = [
+    "fine_python_import_linter @ git+https://github.com/finecode-dev/finecode.git#subdirectory=extensions/fine_python_import_linter",
+]
 
 [build-system]
 requires = ["setuptools>=64", "setuptools-scm>=8"]
@@ -29,13 +34,8 @@ build-backend = "setuptools.build_meta"
 [tool.poetry]
 packages = [{ include = "finecode", from = "src" }]
 
-[tool.poetry.group.dev.dependencies]
-pytest = "^7.4.3"
-finecode_dev_common_preset = { path = "./finecode_dev_common_preset", develop = true }
-fine_python_import_linter = { git = "https://github.com/finecode-dev/finecode.git", subdirectory = "extensions/fine_python_import_linter" }
-anyio = "^4.4.0"
-debugpy = "^1.8.9"
-
+# TODO: intall finecode_dev_common_preset as a dependency from local path using finecode?
+# TODO: add import linter handler to lint action
 
 [tool.finecode]
 presets = [{ source = "finecode_dev_common_preset" }]
diff --git a/src/finecode/extension_runner/action_handlers/dump_config_save.py b/src/finecode/extension_runner/action_handlers/dump_config_save.py
@@ -24,7 +24,9 @@ async def run(
         self, payload: dump_config_action.DumpConfigRunPayload, run_context: dump_config_action.DumpConfigRunContext
     ) -> dump_config_action.DumpConfigRunResult:
         raw_config_str = tomlkit.dumps(run_context.raw_config_dump)
+        target_file_dir_path = payload.target_file_path.parent
 
+        await self.file_manager.create_dir(dir_path=target_file_dir_path)
         await self.file_manager.save_file(
             file_path=payload.target_file_path, file_content=raw_config_str
         )
diff --git a/src/finecode/extension_runner/cli.py b/src/finecode/extension_runner/cli.py
@@ -1,5 +1,6 @@
 import os
 from pathlib import Path
+from importlib import metadata
 
 import click
 from loguru import logger
@@ -8,7 +9,13 @@
 from finecode.extension_runner import global_state
 
 
-@click.command()
+@click.group()
+def main():
+    """FineCode Extension Runner CLI"""
+    pass
+
+
+@main.command()
 @click.option("--trace", "trace", is_flag=True, default=False)
 @click.option("--debug", "debug", is_flag=True, default=False)
 @click.option("--debug-port", "debug_port", type=int, default=5680)
@@ -19,7 +26,7 @@
     required=True,
 )
 @click.option("--env-name", "env_name", type=str, default="unknown")
-def main(trace: bool, debug: bool, debug_port: int, project_path: Path, env_name: str):
+def start(trace: bool, debug: bool, debug_port: int, project_path: Path, env_name: str):
     if debug is True:
         import debugpy
 
@@ -40,5 +47,12 @@ def main(trace: bool, debug: bool, debug_port: int, project_path: Path, env_name
     runner_start.start_runner_sync(env_name)
 
 
+@main.command()
+def version():
+    """Show version information"""
+    package_version = metadata.version('finecode')
+    click.echo(f'FineCode Extension Runner {package_version}')
+
+
 if __name__ == "__main__":
     main()
diff --git a/src/finecode/extension_runner/impls/file_manager.py b/src/finecode/extension_runner/impls/file_manager.py
@@ -75,6 +75,10 @@ async def save_file(self, file_path: Path, file_content: str) -> None:
             with open(file_path, "w") as f:
                 f.write(file_content)
 
+    async def create_dir(self, dir_path: Path, create_parents: bool = True, exist_ok: bool = True):
+        # currently only local file system is supported
+        dir_path.mkdir(parents=create_parents, exist_ok=exist_ok)
+
     # helper methods
     def read_content_file_from_fs(self, file_path: Path) -> str:
         # don't use this method directly, use `get_content` instead
diff --git a/src/finecode/workspace_manager/cli_app/prepare_envs.py b/src/finecode/workspace_manager/cli_app/prepare_envs.py
@@ -43,7 +43,7 @@ async def prepare_envs(workdir_path: pathlib.Path) -> None:
     try:
         # try to start runner in 'dev_workspace' env of each project. If venv doesn't
         # exist or doesn't work, recreate it by running actions in the current env.
-        await start_or_recreate_all_dev_workspace_envs(projects=projects, ws_context=ws_context)
+        await start_or_recreate_all_dev_workspace_envs(projects=projects, workdir_path=workdir_path, ws_context=ws_context)
         
         # now all 'dev_workspace' envs are valid, run 'prepare_envs' in them to create
         # envs in each subproject.
@@ -59,51 +59,75 @@ async def prepare_envs(workdir_path: pathlib.Path) -> None:
         services.on_shutdown(ws_context)
 
 
-async def start_or_recreate_all_dev_workspace_envs(projects: list[domain.Project], ws_context: context.WorkspaceContext) -> None:
+async def start_or_recreate_all_dev_workspace_envs(projects: list[domain.Project], workdir_path: pathlib.Path, ws_context: context.WorkspaceContext) -> None:
+    projects_dirs_with_valid_envs: list[pathlib.Path] = []
     projects_dirs_with_invalid_envs: list[pathlib.Path] = []
     
     for project in projects:
-        try:
-            runner = await runner_manager.start_runner(
-                project_def=project,
-                env_name='dev_workspace', 
-                ws_context=ws_context
-            )
-        except runner_manager.RunnerFailedToStart as e:
-            logger.warning(f"Failed to start runner for env 'dev_workspace' in project '{project.name}': {e}, recreate it")
+        if project.dir_path == workdir_path:
+            # skip checking `dev_workspace` env of the current project, because user
+            # is responsible for keeping it correct
+            continue
+        
+        runner_is_valid = await runner_manager.check_runner(
+            runner_dir=project.dir_path,
+            env_name='dev_workspace'
+        )
+        if runner_is_valid:
+            projects_dirs_with_valid_envs.append(project.dir_path)
+        else:
+            logger.warning(f"Runner for env 'dev_workspace' in project '{project.name}' is invalid, recreate it")
             projects_dirs_with_invalid_envs.append(project.dir_path)
 
-    if len(projects_dirs_with_invalid_envs) > 0:
-        # to recreate dev_workspace env, run `prepare_envs` in runner of current project
-        current_project_dir_path = ws_context.ws_dirs_paths[0]
-        current_project = ws_context.ws_projects[current_project_dir_path]
-        try:
-            runner = await runner_manager.start_runner(project_def=current_project, env_name='dev_workspace', ws_context=ws_context)
-        except runner_manager.RunnerFailedToStart as exception:
-            # TODO
-            raise exception
+    # to recreate dev_workspace env, run `prepare_envs` in runner of current project
+    current_project_dir_path = ws_context.ws_dirs_paths[0]
+    current_project = ws_context.ws_projects[current_project_dir_path]
+    try:
+        runner = await runner_manager.start_runner(project_def=current_project, env_name='dev_workspace', ws_context=ws_context)
+    except runner_manager.RunnerFailedToStart as exception:
+        # TODO
+        raise exception
 
+    try:
         envs = []
-        for project_dir_path in projects_dirs_with_invalid_envs:
+        
+        # run pip install in dev_workspace even if env exists to make sure that correct
+        # dependencies are installed
+        for project_dir_path in projects_dirs_with_valid_envs:
+            if project_dir_path == workdir_path:
+                # skip installation of dependencies in `dev_workspace` env of the
+                # current project, because user is responsible for keeping them
+                # up-to-date
+                continue
+            
             # dependencies in `dev_workspace` should be simple and installable without
             # dumping
             envs.append({"name": "dev_workspace", "venv_dir_path": project_dir_path / '.venvs' / 'dev_workspace', "project_def_path": project_dir_path / 'pyproject.toml' })
-        
-        # remove existing invalid envs
-        for env_info in envs:
-            if env_info["venv_dir_path"].exists():
-                logger.trace(f"{env_info['venv_dir_path']} was invalid, remove it")
-                shutil.rmtree(env_info["venv_dir_path"])
 
-        try:
-            # TODO: check result
-            await services.run_action(
-                action_name='prepare_dev_workspaces_envs',
-                params={ "envs": envs, },
-                project_def=current_project,
-                ws_context=ws_context,
-                result_format=services.RunResultFormat.STRING,
-                preprocess_payload=False
-            )
-        finally:
-            runner_manager.stop_extension_runner_sync(runner)
+        if len(projects_dirs_with_invalid_envs) > 0:
+            invalid_envs = []
+
+            for project_dir_path in projects_dirs_with_invalid_envs:
+                # dependencies in `dev_workspace` should be simple and installable without
+                # dumping
+                invalid_envs.append({"name": "dev_workspace", "venv_dir_path": project_dir_path / '.venvs' / 'dev_workspace', "project_def_path": project_dir_path / 'pyproject.toml' })
+            
+            # remove existing invalid envs
+            for env_info in invalid_envs:
+                if env_info["venv_dir_path"].exists():
+                    logger.trace(f"{env_info['venv_dir_path']} was invalid, remove it")
+                    shutil.rmtree(env_info["venv_dir_path"])
+            
+            envs += invalid_envs
+
+        # TODO: check result
+        await services.run_action(
+            action_name='prepare_dev_workspaces_envs',
+            params={ "envs": envs, },
+            project_def=current_project,
+            ws_context=ws_context,
+            result_format=services.RunResultFormat.STRING,
+            preprocess_payload=False
+        )
+    finally:
+        runner_manager.stop_extension_runner_sync(runner)
diff --git a/src/finecode/workspace_manager/runner/manager.py b/src/finecode/workspace_manager/runner/manager.py
@@ -94,7 +94,7 @@ async def start_extension_runner(
     process_args_str: str = " ".join(process_args)
     client = await create_lsp_client_io(
         runner_info.CustomJsonRpcClient,
-        f"{python_cmd} -m finecode.extension_runner.cli {process_args_str}",
+        f"{python_cmd} -m finecode.extension_runner.cli start {process_args_str}",
         runner_dir,
     )
     runner_info_instance.client = client
@@ -427,3 +427,37 @@ async def send_opened_files(
                 )
     except ExceptionGroup as eg:
         logger.error(f"Error while sending opened document: {eg.exceptions}")
+
+
+async def check_runner(runner_dir: Path, env_name: str) -> bool:
+    try:
+        python_cmd = finecode_cmd.get_python_cmd(runner_dir, env_name)
+    except ValueError:
+        logger.debug(f"No venv for {env_name} of {runner_dir}")
+        # no venv
+        return False
+
+    # get version of extension runner. If it works and we get valid
+    # value, assume extension runner works correctly
+    cmd = f'{python_cmd} -m finecode.extension_runner.cli version'
+    logger.debug(f"Run '{cmd}' in {runner_dir}")
+    async_subprocess = await asyncio.create_subprocess_shell(
+        cmd,
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE,
+        cwd=runner_dir,
+    )
+    try:
+        raw_stdout, raw_stderr = await asyncio.wait_for(
+            async_subprocess.communicate(), timeout=5
+        )
+    except asyncio.TimeoutError:
+        logger.debug(f"Timeout 5 sec({runner_dir})")
+        return False
+
+    if async_subprocess.returncode != 0:
+        logger.debug(f"Return code: {async_subprocess.returncode}, stderr: {raw_stderr.decode()}")
+        return False
+    
+    stdout = raw_stdout.decode()
+    return 'FineCode Extension Runner ' in stdout

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ dependencies = [`
`11`	`11`	`]`
`12`	`12`
`13`	`13`	`[dependency-groups]`
`14`		`-dev_workspace = ["finecode==0.2.0"]`
	`14`	`+dev_workspace = ["finecode==0.2.*"]`
`15`	`15`	`dev_no_runtime = ["finecode_dev_common_preset==0.1.*"]`
`16`	`16`
`17`	`17`	`[tool.finecode]`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,9 @@ async def run(`
`24`	`24`	`self, payload: dump_config_action.DumpConfigRunPayload, run_context: dump_config_action.DumpConfigRunContext`
`25`	`25`	`) -> dump_config_action.DumpConfigRunResult:`
`26`	`26`	`raw_config_str = tomlkit.dumps(run_context.raw_config_dump)`
	`27`	`+ target_file_dir_path = payload.target_file_path.parent`
`27`	`28`
	`29`	`+ await self.file_manager.create_dir(dir_path=target_file_dir_path)`
`28`	`30`	`await self.file_manager.save_file(`
`29`	`31`	`file_path=payload.target_file_path, file_content=raw_config_str`
`30`	`32`	`)`