Update config in dev_workspace runner after start to provide config with resolved presets. This allows to customize behavior in presets of the most actions executed in dev_workspace. Add current package to runtime env deps. Add 'additional_dirs' config parameter to list_project_files_by_lang_python handler. Fix copying of action subresult.

Author: Aksem

extensions/fine_python_package_info/fine_python_package_info/list_project_files_by_lang_python.py

@@ -1,4 +1,4 @@
-from finecode_extension_api.interfaces import iprojectinfoprovider, ipypackagelayoutinfoprovider
+from finecode_extension_api.interfaces import iprojectinfoprovider, ipypackagelayoutinfoprovider, ilogger
 import dataclasses
 import pathlib
 
@@ -7,18 +7,28 @@
 
 
 @dataclasses.dataclass
-class ListProjectFilesByLangPythonHandlerConfig(code_action.ActionHandlerConfig): ...
-# TODO: parameter for additional dirs
+class ListProjectFilesByLangPythonHandlerConfig(code_action.ActionHandlerConfig):
+    # list of relative pathes relative to project directory with additional python
+    # sources if they are not in one of default pathes
+    additional_dirs: list[pathlib.Path] | None = None
 
 
 class ListProjectFilesByLangPythonHandler(
     code_action.ActionHandler[
         list_project_files_by_lang_action.ListProjectFilesByLangAction, ListProjectFilesByLangPythonHandlerConfig
     ]
 ):
-    def __init__(self, project_info_provider: iprojectinfoprovider.IProjectInfoProvider, py_package_layout_info_provider: ipypackagelayoutinfoprovider.IPyPackageLayoutInfoProvider) -> None:
+    def __init__(
+        self,
+        config: ListProjectFilesByLangPythonHandlerConfig,
+        project_info_provider: iprojectinfoprovider.IProjectInfoProvider,
+        py_package_layout_info_provider: ipypackagelayoutinfoprovider.IPyPackageLayoutInfoProvider,
+        logger: ilogger.ILogger
+    ) -> None:
+        self.config = config
         self.project_info_provider = project_info_provider
         self.py_package_layout_info_provider = py_package_layout_info_provider
+        self.logger = logger
 
         self.current_project_dir_path = self.project_info_provider.get_current_project_dir_path()
         self.tests_dir_path = self.current_project_dir_path / 'tests'
@@ -42,6 +52,15 @@ async def run(
 
         if self.setup_py_path.exists():
             py_files.append(self.setup_py_path)
+            
+        if self.config.additional_dirs is not None:
+            for dir_path in self.config.additional_dirs:
+                dir_absolute_path = self.current_project_dir_path / dir_path
+                if not dir_absolute_path.exists():
+                    self.logger.warning(f"Skip {dir_path} because {dir_absolute_path} doesn't exist")
+                    continue
+
+                py_files += list(dir_absolute_path.rglob('*.py'))
 
         return list_project_files_by_lang_action.ListProjectFilesByLangRunResult(
             files_by_lang={"python": py_files}

finecode_extension_runner/src/finecode_extension_runner/_services/run_action.py

@@ -556,8 +556,11 @@ async def run_subresult_coros_concurrently(
                 # in it and result from action handler must stay immutable (e.g. it can
                 # reference to cache)
                 action_subresult_type = type(coro_result)
+                # use pydantic dataclass as constructor because it instantiates classes
+                # recursively, normal dataclass only on the first level
+                action_subresult_type_pydantic = pydantic_dataclass(action_subresult_type)
                 action_subresult_dict = dataclasses.asdict(coro_result)
-                action_subresult = action_subresult_type(**action_subresult_dict)
+                action_subresult = action_subresult_type_pydantic(**action_subresult_dict)
             else:
                 action_subresult.update(coro_result)
 

src/finecode/config/read_configs.py

@@ -528,6 +528,39 @@ def handler_to_dict(handler: domain.ActionHandler) -> dict[str, str | list[str]]
 
 def add_runtime_dependency_group_if_new(project_config: dict[str, Any]) -> None:
     runtime_dependencies = project_config.get("project", {}).get("dependencies", [])
+    
+    # add root package to runtime env if it is not there yet. It is done here and not
+    # in package installer, because runtime deps group can be included in other groups
+    # and root package should be installed in them as well
+    root_package_name = project_config.get("project", {}).get("name", None)
+    if root_package_name is None:
+        raise config_models.ConfigurationError("project.name not found in config")
+    root_package_in_runtime_deps = any(
+        dep for dep in runtime_dependencies if get_dependency_name(dep) == root_package_name
+    )
+    if not root_package_in_runtime_deps:
+        runtime_dependencies.insert(0, root_package_name)
+        
+        # make editable. Example:
+        # [tool.finecode.env.runtime.dependencies]
+        # package_name = { path = "./", editable = true }
+        if 'tool' not in project_config:
+            project_config['tool'] = {}
+        tool_config = project_config['tool']
+        if 'finecode' not in tool_config:
+            tool_config['finecode'] = {}
+        finecode_config = tool_config['finecode']
+        if 'env' not in finecode_config:
+            finecode_config['env'] = {}
+        finecode_env_config = finecode_config['env']
+        if 'runtime' not in finecode_env_config:
+            finecode_env_config['runtime'] = {}
+        runtime_env_config = finecode_env_config['runtime']
+        if 'dependencies' not in runtime_env_config:
+            runtime_env_config['dependencies'] = {}
+        runtime_env_deps = runtime_env_config['dependencies']
+        if root_package_name not in runtime_env_deps:
+            runtime_env_deps[root_package_name] = { "path": "./", "editable": True}
 
     deps_groups = add_or_get_dict_key_value(project_config, "dependency-groups", {})
     if "runtime" not in deps_groups:

src/finecode/runner/manager.py

@@ -185,7 +185,7 @@ def stop_extension_runner_sync(runner: runner_info.ExtensionRunnerInfo) -> None:
         logger.debug("Send shutdown to server")
         try:
             runner_client.shutdown_sync(runner=runner)
-        except Exception as e:
+        except Exception:
             # currently we get (almost?) always this error. TODO: Investigate why
             # mute for now to make output less verbose
             # logger.error(f"Failed to shutdown: {e}")
@@ -240,6 +240,9 @@ async def start_runners_with_presets(
         )
 
     for project in projects:
+        if project_status != domain.ProjectStatus.CONFIG_VALID:
+            continue
+
         try:
             await read_configs.read_project_config(
                 project=project, ws_context=ws_context
@@ -251,6 +254,10 @@ async def start_runners_with_presets(
             raise RunnerFailedToStart(
                 f"Reading project config with presets and collecting actions in {project.dir_path} failed: {exception.message}"
             )
+        
+        # update config of dev_workspace runner, the new config contains resolved presets
+        dev_workspace_runner = ws_context.ws_projects_extension_runners[project.dir_path]['dev_workspace']
+        await update_runner_config(runner=dev_workspace_runner, project=project)
 
 
 async def get_or_start_runners_with_presets(