Replace ActionContext by iextensionrunnerinfoprovider. Add file classifier: distinguish source files and tests. Services for getting venv dir, venv site packages.

Author: Aksem

extensions/fine_python_mypy/fine_python_mypy/action.py

@@ -15,6 +15,8 @@
     icommandrunner,
     ifilemanager,
     ilogger,
+    iextensionrunnerinfoprovider,
+    iprojectinfoprovider
 )
 
 
@@ -44,14 +46,16 @@ class MypyLintHandler(
 
     def __init__(
         self,
-        context: code_action.ActionContext,
+        extension_runner_info_provider: iextensionrunnerinfoprovider.IExtensionRunnerInfoProvider,
+        project_info_provider: iprojectinfoprovider.IProjectInfoProvider,
         cache: icache.ICache,
         logger: ilogger.ILogger,
         file_manager: ifilemanager.IFileManager,
         lifecycle: code_action.ActionHandlerLifecycle,
         command_runner: icommandrunner.ICommandRunner,
     ) -> None:
-        self.context = context
+        self.extension_runner_info_provider = extension_runner_info_provider
+        self.project_info_provider = project_info_provider
         self.cache = cache
         self.logger = logger
         self.file_manager = file_manager
@@ -189,7 +193,7 @@ async def run(
         file_paths = [file_path async for file_path in payload]
 
         files_by_projects: dict[Path, list[Path]] = self.group_files_by_projects(
-            file_paths, self.context.project_dir
+            file_paths, self.project_info_provider.get_current_project_dir_path()
         )
 
         for project_path, project_files in files_by_projects.items():
@@ -225,7 +229,7 @@ def exit(self) -> None:
                     self.logger.error(str(error))
 
     def _get_status_file_path(self, dmypy_cwd: Path) -> Path:
-        file_dir_path = self.context.cache_dir
+        file_dir_path = self.extension_runner_info_provider.get_cache_dir_path()
         # use hash to avoid name conflict if python packages have the same name
         file_dir_path_hash = hashlib.md5(str(dmypy_cwd).encode("utf-8")).hexdigest()
         file_path = (

extensions/fine_python_pyrefly/fine_python_pyrefly/lint_handler.py

@@ -7,7 +7,7 @@
 
 from finecode_extension_api import code_action
 from finecode_extension_api.actions import lint as lint_action
-from finecode_extension_api.interfaces import icache, icommandrunner, ilogger, ifilemanager
+from finecode_extension_api.interfaces import icache, icommandrunner, ilogger, ifilemanager, iprojectfileclassifier, iextensionrunnerinfoprovider
 
 
 @dataclasses.dataclass
@@ -32,12 +32,16 @@ def __init__(
         logger: ilogger.ILogger,
         file_manager: ifilemanager.IFileManager,
         command_runner: icommandrunner.ICommandRunner,
+        project_file_classifier: iprojectfileclassifier.IProjectFileClassifier,
+        extension_runner_info_provider: iextensionrunnerinfoprovider.IExtensionRunnerInfoProvider
     ) -> None:
         self.config = config
         self.cache = cache
         self.logger = logger
         self.file_manager = file_manager
         self.command_runner = command_runner
+        self.project_file_classifier = project_file_classifier
+        self.extension_runner_info_provider = extension_runner_info_provider
 
         self.pyrefly_bin_path = Path(sys.executable).parent / "pyrefly"
 
@@ -82,15 +86,31 @@ async def run_pyrefly_lint_on_single_file(
     ) -> list[lint_action.LintMessage]:
         """Run pyrefly type checking on a single file"""
         lint_messages: list[lint_action.LintMessage] = []
+        
+        try:
+            # project file classifier caches result, we can just get it each time again
+            file_type = self.project_file_classifier.get_project_file_type(file_path=file_path)
+            file_env = self.project_file_classifier.get_env_for_file_type(file_type=file_type)
+        except NotImplementedError:
+            self.logger.warning(f"Skip {file_path} because file type or env for it could be determined")
+            return lint_messages
+
+        venv_dir_path = self.extension_runner_info_provider.get_venv_dir_path_of_env(env_name=file_env)
+        site_package_pathes = self.extension_runner_info_provider.get_venv_site_packages(venv_dir_path=venv_dir_path)
 
         cmd = [
             str(self.pyrefly_bin_path),
             "check",
-            "--output-format",
-            "json",
-            str(file_path),
+            "--output-format=json",
+            "--disable-search-path-heuristics=true",
+            "--skip-interpreter-query",
+            "--python-version='3.11'" # TODO
         ]
 
+        for path in site_package_pathes:
+            cmd.append(f'--site-package-path={str(path)}')
+        cmd.append(str(file_path))
+
         cmd_str = " ".join(cmd)
         pyrefly_process = await self.command_runner.run(cmd_str)
 

extensions/fine_python_ruff/fine_python_ruff/format_handler.py

@@ -11,7 +11,7 @@
 
 from finecode_extension_api import code_action
 from finecode_extension_api.actions import format as format_action
-from finecode_extension_api.interfaces import icache, icommandrunner, ilogger
+from finecode_extension_api.interfaces import icache, icommandrunner, ilogger, iextensionrunnerinfoprovider
 
 
 @dataclasses.dataclass
@@ -31,7 +31,7 @@ class RuffFormatHandler(
     def __init__(
         self,
         config: RuffFormatHandlerConfig,
-        context: code_action.ActionContext,
+        extension_runner_info_provider: iextensionrunnerinfoprovider.IExtensionRunnerInfoProvider,
         logger: ilogger.ILogger,
         cache: icache.ICache,
         command_runner: icommandrunner.ICommandRunner,
@@ -41,6 +41,7 @@ def __init__(
         self.logger = logger
         self.cache = cache
         self.command_runner = command_runner
+        self.extension_runner_info_provider = extension_runner_info_provider
 
         self.ruff_bin_path = Path(sys.executable).parent / "ruff"
 
@@ -89,7 +90,7 @@ async def format_one(self, file_path: Path, file_content: str) -> tuple[str, boo
             str(self.ruff_bin_path),
             "format",
             "--cache-dir",
-            str(self.context.cache_dir / ".ruff_cache"),
+            str(self.extension_runner_info_provider.get_cache_dir_path() / ".ruff_cache"),
             "--line-length",
             str(self.config.line_length),
             f'--config="indent-width={str(self.config.indent_width)}"',

finecode_builtin_handlers/src/finecode_builtin_handlers/prepare_envs_install_deps.py

@@ -1,14 +1,12 @@
 import asyncio
 import dataclasses
 import itertools
-import shutil
 
 from finecode_extension_api import code_action
 from finecode_extension_api.actions import prepare_envs as prepare_envs_action
 from finecode_extension_api.interfaces import (
     iactionrunner,
     ilogger,
-    iprojectinfoprovider,
 )
 from finecode_builtin_handlers import dependency_config_utils
 

finecode_builtin_handlers/src/finecode_builtin_handlers/prepare_runners_install_runner_and_presets.py

@@ -1,15 +1,13 @@
 import asyncio
 import dataclasses
 import itertools
-import shutil
 import typing
 
 from finecode_extension_api import code_action
 from finecode_extension_api.actions import prepare_runners as prepare_runners_action
 from finecode_extension_api.interfaces import (
     iactionrunner,
     ilogger,
-    iprojectinfoprovider,
 )
 from finecode_builtin_handlers import dependency_config_utils
 

finecode_builtin_handlers/src/finecode_builtin_handlers/prepare_runners_read_configs.py

@@ -1,7 +1,6 @@
 import asyncio
 import dataclasses
 import pathlib
-import shutil
 import typing
 
 from finecode_extension_api import code_action

finecode_extension_api/src/finecode_extension_api/code_action.py

@@ -5,7 +5,6 @@
 import dataclasses
 import enum
 import typing
-from pathlib import Path
 from typing import Generic, Protocol, TypeVar
 
 from finecode_extension_api import partialresultscheduler, textstyler
@@ -73,13 +72,6 @@ def __init__(self, run_id: int) -> None:
         self.partial_result_scheduler = partialresultscheduler.PartialResultScheduler()
 
 
-class ActionContext:
-    def __init__(self, project_dir: Path, cache_dir: Path) -> None:
-        self.project_dir = project_dir
-        # runner-specific cache dir
-        self.cache_dir = cache_dir
-
-
 @dataclasses.dataclass
 class ActionConfig:
     run_handlers_concurrently: bool = False

finecode_extension_api/src/finecode_extension_api/interfaces/iextensionrunnerinfoprovider.py

@@ -0,0 +1,12 @@
+import pathlib
+from typing import Protocol
+
+
+class IExtensionRunnerInfoProvider(Protocol):
+    def get_cache_dir_path(self) -> pathlib.Path: ...
+
+    def get_venv_dir_path_of_env(self, env_name: str) -> pathlib.Path:
+        ...
+    
+    def get_venv_site_packages(self, venv_dir_path: pathlib.Path) -> list[pathlib.Path]:
+        ...

finecode_extension_api/src/finecode_extension_api/interfaces/iprocessexecutor.py

@@ -1,11 +1,10 @@
 import typing
-from asyncio import BaseProtocol
 
 T = typing.TypeVar("T")
 P = typing.ParamSpec("P")
 
 
-class IProcessExecutor(BaseProtocol):
+class IProcessExecutor(typing.Protocol):
     async def submit(
         self, func: typing.Callable[P, T], *args: P.args, **kwargs: P.kwargs
     ): ...

finecode_extension_api/src/finecode_extension_api/interfaces/iprojectfileclassifier.py

@@ -0,0 +1,17 @@
+import enum
+import typing
+import pathlib
+
+
+class ProjectFileType(enum.Enum):
+    SOURCE = enum.auto()
+    TEST = enum.auto()
+    UNKNOWN = enum.auto()
+
+
+class IProjectFileClassifier(typing.Protocol):
+    def get_project_file_type(self, file_path: pathlib.Path) -> ProjectFileType:
+        ...
+
+    def get_env_for_file_type(self, file_type: ProjectFileType) -> str:
+        ...