Move presets in dev_workspace from dev_no_runtime to simplify finecode usage

.github/workflows/ci-cd.yml

@@ -31,7 +31,12 @@ jobs:
             name: Windows
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
+        with:
+          # setuptools-scm uses tags to get the current version, fetch history and tags
+          # to get correct version
+          fetch-depth: 0
+          fetch-tags: 'true'
 
       - name: Set up Python ${{ env.DEV_WORKSPACE_PYTHON_VERSION }}
         uses: actions/setup-python@v5
@@ -43,7 +48,12 @@ jobs:
           python -m venv .venvs/dev_workspace
           source .venvs/dev_workspace/bin/activate
           python -m pip install --upgrade pip==25.1.1
-          python -m pip install --group="dev_workspace"
+
+          # split installation into 2 steps: first internal preset because it is not
+          # published as pypi package, so pip will fail to resolve it in dev_workspace
+          # group and only then other dependencies
+          python -m pip install -e ./finecode_dev_common_preset
+          python -m pip install --group="dev_workspace" -e . -e ./finecode_extension_runner
 
           python -m finecode prepare-envs
         shell: bash

README.md

@@ -18,7 +18,7 @@ With FineCode you can:
 
   ```toml
   [dependency-groups]
-  dev_workspace = ["finecode==0.2.*"]
+  dev_workspace = ["finecode==0.3.*"]
   ```
 
 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 ))
@@ -33,12 +33,11 @@ NOTE: `pip install` supports `--group` parameter since pip 25.1. Make sure you h
 
 1.2 Using existing preset
 
-1.2.1 Add `dev_no_runtime` dependency group and put `fine_python_recommended` dependency in it:
+1.2.1 Put `fine_python_recommended` dependency in `dev_workspace` dependency group:
 
   ```toml
   [dependency-groups]
-  dev_workspace = ["finecode==0.2.*"]
-  dev_no_runtime = ["fine_python_recommended==0.1.*"]
+  dev_workspace = ["finecode==0.3.*", "fine_python_recommended==0.2.*"]
   ```
 
 For list of presets from FineCode authors see 'Presets' section below.

extensions/fine_python_ast/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-ast"
+name = "fine_python_ast"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

extensions/fine_python_flake8/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-flake8"
+name = "fine_python_flake8"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

extensions/fine_python_isort/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-isort"
+name = "fine_python_isort"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

extensions/fine_python_module_exports/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-module-exports"
+name = "fine_python_module_exports"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

extensions/fine_python_mypy/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-mypy"
+name = "fine_python_mypy"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

extensions/fine_python_pip/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-pip"
+name = "fine_python_pip"
 version = "0.1.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]
@@ -8,11 +8,12 @@ requires-python = ">=3.11, < 3.14"
 dependencies = ["finecode_extension_api==0.3.*"]
 
 [dependency-groups]
-dev_workspace = ["finecode==0.3.0"]
-dev_no_runtime = ["finecode_dev_common_preset==0.2.*"]
+dev_workspace = ["finecode==0.3.*", "finecode_dev_common_preset==0.2.*"]
 
 [tool.finecode]
 presets = [{ source = "finecode_dev_common_preset" }]
 
-[tool.finecode.env.dev_no_runtime.dependencies]
+[tool.finecode.env.dev_workspace.dependencies]
 finecode_dev_common_preset = { path = "../../finecode_dev_common_preset", editable = true }
+finecode = { path = "../../", editable = true }
+finecode_extension_runner = { path = "../../finecode_extension_runner", editable = true }

extensions/fine_python_virtualenv/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-virtualenv"
+name = "fine_python_virtualenv"
 version = "0.1.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]
@@ -11,11 +11,12 @@ dependencies = [
 ]
 
 [dependency-groups]
-dev_workspace = ["finecode==0.3.0"]
-dev_no_runtime = ["finecode_dev_common_preset==0.2.*"]
+dev_workspace = ["finecode==0.3.*", "finecode_dev_common_preset==0.2.*"]
 
 [tool.finecode]
 presets = [{ source = "finecode_dev_common_preset" }]
 
-[tool.finecode.env.dev_no_runtime.dependencies]
+[tool.finecode.env.dev_workspace.dependencies]
 finecode_dev_common_preset = { path = "../../finecode_dev_common_preset", editable = true }
+finecode = { path = "../../", editable = true }
+finecode_extension_runner = { path = "../../finecode_extension_runner", editable = true }

finecode_dev_common_preset/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "finecode-dev-common-preset"
+name = "finecode_dev_common_preset"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

finecode_dev_common_preset/src/finecode_dev_common_preset/preset.toml

@@ -8,6 +8,18 @@ presets = [
 source = "fine_python_black.BlackFormatHandler"
 config.preview = true
 
+# in development finecode can only be started with local version of finecode_extension_runner,
+# otherwise version conflict occurs, because versions of finecode and
+# finecode_extension_runner must match
+[tool.finecode.env.runtime.dependencies]
+finecode_extension_runner = { path = "../../../finecode_extension_runner", editable = true }
+
+[tool.finecode.env.dev.dependencies]
+finecode_extension_runner = { path = "../../../finecode_extension_runner", editable = true }
+
+[tool.finecode.env.dev_no_runtime.dependencies]
+finecode_extension_runner = { path = "../../../finecode_extension_runner", editable = true }
+
 # currently, all packages in finecode repository are pure python packages, reuse
 # setuptools build in all of them
 [build-system]

finecode_extension_api/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "finecode-extension-api"
+name = "finecode_extension_api"
 version = "0.3.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]
@@ -8,11 +8,12 @@ requires-python = ">=3.11, < 3.14"
 dependencies = ["typing-extensions (>=4.12.2,<5.0.0)"]
 
 [dependency-groups]
-dev_workspace = ["finecode==0.3.0"]
-dev_no_runtime = ["finecode_dev_common_preset==0.2.*"]
+dev_workspace = ["finecode==0.3.*", "finecode_dev_common_preset==0.2.*"]
 
 [tool.finecode]
 presets = [{ source = "finecode_dev_common_preset" }]
 
-[tool.finecode.env.dev_no_runtime.dependencies]
+[tool.finecode.env.dev_workspace.dependencies]
 finecode_dev_common_preset = { path = "../finecode_dev_common_preset", editable = true }
+finecode = { path = "../", editable = true }
+finecode_extension_runner = { path = "../finecode_extension_runner", editable = true }

finecode_extension_runner/pyproject.toml

@@ -9,24 +9,27 @@ dependencies = [
     "loguru==0.7.*",
     "tomlkit==0.11.*",
     "click==8.1.*",
-    "pydantic==2.10.*",
+    "pydantic==2.11.*",
     "platformdirs==4.3.*",
     "pygls==2.0.0-a2",
     "finecode_extension_api==0.3.*",
     "deepmerge==2.0.*",
 ]
 
 [dependency-groups]
-dev_workspace = ["build==1.2.2.post1", "finecode==0.3.0"]
-dev = [{ include-group = "runtime" }, "pytest==7.4.*", "debugpy==1.8.*"]
-dev_no_runtime = [
+# file_python_import_linter is temporary disabled, because it isn't ported to the new finecode_extension_api yet
+# "fine_python_import_linter @ git+https://github.com/finecode-dev/finecode.git#subdirectory=extensions/fine_python_import_linter"
+dev_workspace = [
+    "build==1.2.2.post1",
+    "finecode==0.3.*",
     "finecode_dev_common_preset==0.2.*",
-    # file_python_import_linter is temporary disabled, because it isn't ported to the new finecode_extension_api yet
-    # "fine_python_import_linter @ git+https://github.com/finecode-dev/finecode.git#subdirectory=extensions/fine_python_import_linter",
 ]
+dev = [{ include-group = "runtime" }, "pytest==7.4.*", "debugpy==1.8.*"]
 
-[tool.finecode.env.dev_no_runtime.dependencies]
+[tool.finecode.env.dev_workspace.dependencies]
 finecode_dev_common_preset = { path = "../finecode_dev_common_preset", editable = true }
+finecode = { path = "../", editable = true }
+finecode_extension_runner = { path = "../finecode_extension_runner", editable = true }
 
 [build-system]
 requires = ["setuptools>=64", "setuptools-scm>=8"]

finecode_extension_runner/src/finecode_extension_runner/action_handlers/dependency_config_utils.py

@@ -41,6 +41,7 @@ def make_env_deps_pip_compatible(
             # check all dependencies because it can be duplicated: e.g. as explicit
             # dependency and as dependency of action handler.
             dep_indexes_in_group: list[int] = []
+            configured_dep_found_in_dep_group = False
             for idx, dep in enumerate(env_deps_group):
                 if isinstance(dep, dict):
                     if "include-group" in dep:
@@ -53,9 +54,7 @@ def make_env_deps_pip_compatible(
                 elif isinstance(dep, str):
                     if get_dependency_name(dep) == dep_name:
                         dep_indexes_in_group.append(idx)
-
-            if len(dep_indexes_in_group) == 0:
-                continue
+                        configured_dep_found_in_dep_group = True
 
             resolved_path_to_dep = pathlib.Path(dep_params["path"])
             if not resolved_path_to_dep.is_absolute():
@@ -67,6 +66,12 @@ def make_env_deps_pip_compatible(
             for idx in dep_indexes_in_group:
                 env_deps_group[idx] = new_dep_str_in_group
 
+            if not configured_dep_found_in_dep_group:
+                # if dependency has configuration, but was not found in dependency
+                # group of environment, still add it, because it can be deeper in the
+                # dependency tree and user wants to overwrite it
+                env_deps_group.append(new_dep_str_in_group)
+
 
 def get_dependency_name(dependency_str: str) -> str:
     # simplified way for now: find the first character which is not allowed in package

finecode_extension_runner/src/finecode_extension_runner/action_handlers/prepare_runners_install_runner_and_presets.py

@@ -54,7 +54,7 @@ async def run(
                 )
             except FailedToGetDependencies as exception:
                 raise code_action.ActionFailedException(
-                    f"Failed to get dependencies of env {env.name} in {project_def_path} (install_runner_and_presets handler)"
+                    f"Failed to get dependencies of env {env.name} in {project_def_path}: {exception.message} (install_runner_and_presets handler)"
                 )
             dependencies_by_env[env.name] = dependencies
 
@@ -161,10 +161,10 @@ def get_dependencies_in_project_raw_config(
                 and dependency_config_utils.get_dependency_name(dep) == preset_package
             )
         except StopIteration:
-            if env_name == "dev_no_runtime":
-                # all preset packages must be in 'dev_no_runtime' env
+            if env_name == "dev_workspace":
+                # all preset packages must be in 'dev_workspace' env
                 raise FailedToGetDependencies(
-                    f"'{preset_package}' is used as preset source, but not declared in 'dev_no_runtime' dependency group"
+                    f"'{preset_package}' is used as preset source, but not declared in 'dev_workspace' dependency group"
                 )
             else:
                 continue

presets/fine_python_format/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-format"
+name = "fine_python_format"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

presets/fine_python_lint/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-lint"
+name = "fine_python_lint"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

presets/fine_python_recommended/pyproject.toml

@@ -1,5 +1,5 @@
 [project]
-name = "fine-python-recommended"
+name = "fine_python_recommended"
 version = "0.2.0"
 description = ""
 authors = [{ name = "Vladyslav Hnatiuk", email = "[email protected]" }]

pyproject.toml

@@ -10,25 +10,27 @@ dependencies = [
     "tomlkit==0.11.*",
     "watchdog==4.0.*",
     "click==8.1.*",
-    "pydantic==2.10.*",
+    "pydantic==2.11.*",
     "platformdirs==4.3.*",
     "pygls==2.0.0-a2",
     "finecode_extension_api==0.3.*",
     "finecode_extension_runner==0.3.*",
     "ordered-set==4.1.*",
-    "mcp==1.9.*",
+    "mcp==1.13.*",
     "fine_python_virtualenv==0.1.*",
     "fine_python_pip==0.1.*",
 ]
 
 [dependency-groups]
-dev_workspace = ["build==1.2.2.post1", "finecode==0.3.0", "debugpy==1.8.*"]
-dev = [{ include-group = "runtime" }, "pytest==7.4.*", "debugpy==1.8.*"]
-dev_no_runtime = [
+# file_python_import_linter is temporary disabled, because it isn't ported to the new finecode_extension_api yet
+# "fine_python_import_linter @ git+https://github.com/finecode-dev/finecode.git#subdirectory=extensions/fine_python_import_linter",
+dev_workspace = [
+    "build==1.2.2.post1",
+    "finecode==0.3.*",
     "finecode_dev_common_preset==0.2.*",
-    # file_python_import_linter is temporary disabled, because it isn't ported to the new finecode_extension_api yet
-    # "fine_python_import_linter @ git+https://github.com/finecode-dev/finecode.git#subdirectory=extensions/fine_python_import_linter",
+    "debugpy==1.8.*",
 ]
+dev = [{ include-group = "runtime" }, "pytest==7.4.*", "debugpy==1.8.*"]
 
 [build-system]
 requires = ["setuptools>=64", "setuptools-scm>=8"]
@@ -39,8 +41,9 @@ build-backend = "setuptools.build_meta"
 [tool.finecode]
 presets = [{ source = "finecode_dev_common_preset" }]
 
-[tool.finecode.env.dev_no_runtime.dependencies]
+[tool.finecode.env.dev_workspace.dependencies]
 finecode_dev_common_preset = { path = "./finecode_dev_common_preset", editable = true }
+finecode_extension_runner = { path = "./finecode_extension_runner", editable = true }
 
 [tool.importlinter]
 root_package = "finecode"

src/finecode/cli.py

@@ -2,8 +2,8 @@
 import json
 import os
 import pathlib
-import typing
 import sys
+import typing
 
 import click
 from loguru import logger
@@ -89,7 +89,7 @@ async def show_user_message(message: str, message_type: str) -> None:
 def deserialize_action_payload(raw_payload: dict[str, str]) -> dict[str, typing.Any]:
     deserialized_payload = {}
     for key, value in raw_payload.items():
-        if value.startswith('{') and value.endswith('}'):
+        if value.startswith("{") and value.endswith("}"):
             try:
                 deserialized_value = json.loads(value)
             except json.JSONDecodeError:
@@ -168,17 +168,21 @@ def run(ctx) -> None:
                 sys.exit(1)
             else:
                 arg_name, arg_value = arg[2:].split("=")
-                arg_name = arg_name.replace('-', '_')
+                arg_name = arg_name.replace("-", "_")
                 action_payload[arg_name] = arg_value.strip('"').strip("'")
         processed_args_count += 1
 
     user_messages._notification_sender = show_user_message
 
-    deserialized_payload= deserialize_action_payload(action_payload)
+    deserialized_payload = deserialize_action_payload(action_payload)
     try:
         output, return_code = asyncio.run(
             run_cmd.run_actions(
-                workdir_path, projects, actions_to_run, deserialized_payload, concurrently
+                workdir_path,
+                projects,
+                actions_to_run,
+                deserialized_payload,
+                concurrently,
             )
         )
         click.echo(output)