Add possibility to define custom impls for services in config. Move last hardcoded services definitions from DI to config. Fix parsing of lists in CLI params.

Author: Aksem

finecode_dev_common_preset/src/finecode_dev_common_preset/preset.toml

@@ -35,6 +35,24 @@ fine_python_setuptools_scm = { path = "../../../extensions/fine_python_setuptool
 requires = ["setuptools>=64", "setuptools-scm>=8"]
 build-backend = "setuptools.build_meta"
 
+[[tool.finecode.service]]
+interface = "finecode_extension_api.interfaces.ihttpclient.IHttpClient"
+source = "finecode_httpclient.HttpClient"
+env = "dev_no_runtime"
+dependencies = ["finecode_httpclient~=0.1.0a1"]
+
+[[tool.finecode.service]]
+interface = "finecode_extension_api.interfaces.ijsonrpcclient.IJsonRpcClient"
+source = "finecode_jsonrpc.jsonrpc_client.JsonRpcClientImpl"
+env = "dev_no_runtime"
+dependencies = ["finecode_jsonrpc~=0.1.0a1"]
+
+[[tool.finecode.service]]
+interface = "finecode_extension_api.interfaces.ilspclient.ILspClient"
+source = "finecode_extension_runner.impls.lsp_client.LspClientImpl"
+env = "dev_no_runtime"
+dependencies = []
+
 # TODO: recognize minimal python version automatically
 [[tool.finecode.action_handler]]
 source = "fine_python_ruff.RuffLintFilesHandler"

finecode_extension_runner/src/finecode_extension_runner/di/bootstrap.py

@@ -7,17 +7,6 @@
 
 import ordered_set
 
-# TODO: get rid of these two tries
-try:
-    import finecode_httpclient
-except ImportError:
-    finecode_httpclient = None
-
-try:
-    from finecode_jsonrpc import jsonrpc_client
-except ImportError:
-    jsonrpc_client = None
-
 from loguru import logger
 
 from finecode_extension_api.interfaces import (  # idevenvinfoprovider,
@@ -27,17 +16,15 @@
     iextensionrunnerinfoprovider,
     ifileeditor,
     ifilemanager,
-    ihttpclient,
-    ijsonrpcclient,
     ilogger,
-    ilspclient,
     iprojectinfoprovider,
     irepositorycredentialsprovider,
 )
 
 from finecode_extension_runner import domain
 from finecode_extension_runner._services import run_action
 from finecode_extension_runner.di import _state, resolver
+from finecode_extension_runner.run_utils import import_module_member_by_source_str
 from finecode_extension_runner.impls import (  # dev_env_info_provider,
     action_runner,
     command_runner,
@@ -46,13 +33,11 @@
     file_manager,
     inmemory_cache,
     loguru_logger,
-    lsp_client,
     project_info_provider,
     repository_credentials_provider,
     service_registry,
 )
 
-
 def bootstrap(
     project_def_path_getter: Callable[[], pathlib.Path],
     project_raw_config_getter: Callable[
@@ -64,6 +49,7 @@ def bootstrap(
     action_by_name_getter: Callable[[str], domain.ActionDeclaration],
     current_env_name_getter: Callable[[], str],
     handler_packages: set[str],
+    service_declarations: list,
 ):
     # logger_instance = loguru_logger.LoguruLogger()
     logger_instance = loguru_logger.get_logger()
@@ -91,22 +77,10 @@ def bootstrap(
     _state.container[icache.ICache] = cache_instance
     _state.container[iactionrunner.IActionRunner] = action_runner_instance
 
-    if finecode_httpclient is not None:
-        _state.container[ihttpclient.IHttpClient] = finecode_httpclient.HttpClient(
-            logger=logger_instance
-        )
-
     _state.container[irepositorycredentialsprovider.IRepositoryCredentialsProvider] = (
         repository_credentials_provider.ConfigRepositoryCredentialsProvider()
     )
 
-    if jsonrpc_client is not None:
-        json_rpc_client_instance = jsonrpc_client.JsonRpcClientImpl()
-        _state.container[ijsonrpcclient.IJsonRpcClient] = json_rpc_client_instance
-        _state.container[ilspclient.ILspClient] = lsp_client.LspClientImpl(
-            json_rpc_client=json_rpc_client_instance,
-        )
-
     # _state.container[idevenvinfoprovider.IDevEnvInfoProvider] = dev_env_info_provider_instance
 
     _state.factories[iprojectinfoprovider.IProjectInfoProvider] = functools.partial(
@@ -124,6 +98,7 @@ def bootstrap(
     )
 
     _activate_extensions(handler_packages)
+    _apply_user_service_config(service_declarations)
 
 
 def _activate_extensions(handler_packages: set[str]) -> None:
@@ -143,6 +118,18 @@ def _activate_extensions(handler_packages: set[str]) -> None:
             logger.error(f"Failed to activate extension '{pkg_name}': {e}")
 
 
+def _apply_user_service_config(service_declarations: list[object]) -> None:
+    registry = service_registry.ServiceRegistry()
+    for svc in service_declarations:
+        try:
+            interface = import_module_member_by_source_str(svc.interface)
+            impl_cls = import_module_member_by_source_str(svc.source)
+            registry.register_impl(interface, impl_cls)
+            logger.trace(f"Configured service '{svc.source}' for '{svc.interface}'")
+        except Exception as e:
+            logger.error(f"Failed to configure service '{svc.source}': {e}")
+
+
 def _collect_activatable_packages(
     seed_packages: set[str],
     all_eps: dict[str, importlib.metadata.EntryPoint],

finecode_extension_runner/src/finecode_extension_runner/lsp_server.py

@@ -397,6 +397,13 @@ async def update_config(
                 for action in actions
             },
             action_handler_configs=action_handler_configs,
+            services=[
+                schemas.ServiceDeclaration(
+                    interface=svc["interface"],
+                    source=svc["source"],
+                )
+                for svc in config.get("services", [])
+            ],
         )
         response = await services.update_config(
             request=request,

finecode_extension_runner/src/finecode_extension_runner/schemas.py

@@ -26,13 +26,20 @@ class Action(BaseSchema):
     config: dict[str, Any] | None = None
 
 
+@dataclass
+class ServiceDeclaration(BaseSchema):
+    interface: str
+    source: str
+
+
 @dataclass
 class UpdateConfigRequest(BaseSchema):
     working_dir: Path
     project_name: str
     project_def_path: Path
     actions: dict[str, Action]
     action_handler_configs: dict[str, dict[str, Any]]
+    services: list[ServiceDeclaration] = field(default_factory=list)
 
 
 @dataclass

finecode_extension_runner/src/finecode_extension_runner/services.py

@@ -106,6 +106,8 @@ def current_env_name_getter() -> str:
         handler.source.split(".")[0]
         for action in actions.values()
         for handler in action.handlers
+    } | {
+        svc.source.split(".")[0] for svc in request.services
     }
 
     di_bootstrap.bootstrap(
@@ -117,6 +119,7 @@ def current_env_name_getter() -> str:
         action_by_name_getter=action_by_name_getter,
         current_env_name_getter=current_env_name_getter,
         handler_packages=handler_packages,
+        service_declarations=request.services,
     )
 
     return schemas.UpdateConfigResponse()

pyproject.toml

@@ -32,7 +32,11 @@ dev_workspace = [
     "debugpy==1.8.*",
 ]
 dev = [{ include-group = "runtime" }, "pytest==7.4.*", "debugpy==1.8.*"]
-docs = ["mkdocs==1.6.*", "mkdocs-material==9.7.*", "mkdocstrings[python]==1.0.*"]
+docs = [
+    "mkdocs==1.6.*",
+    "mkdocs-material==9.7.*",
+    "mkdocstrings[python]==1.0.*",
+]
 
 [build-system]
 requires = ["setuptools>=64", "setuptools-scm>=8"]

src/finecode/cli.py

@@ -107,8 +107,12 @@ def parse_handler_config_from_cli(
 
         # Remove --config. prefix and split by =
         config_part = arg[len("--config.") :]
-        key_part, value = config_part.split("=", 1)
-        value = value.strip('"').strip("'")
+        key_part, raw_value = config_part.split("=", 1)
+        try:
+            value = json.loads(raw_value)
+        except json.JSONDecodeError:
+            # fallback for literal string, all other types can be parsed by json.loads
+            value = raw_value
 
         # Split by . to determine if it's action-level or handler-specific
         parts = key_part.split(".")
@@ -228,7 +232,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("}")) or (value.startswith('[') and value.endswith(']')):
             try:
                 deserialized_value = json.loads(value)
             except json.JSONDecodeError:

src/finecode/config/collect_actions.py

@@ -62,6 +62,49 @@ def collect_actions(
     return actions
 
 
+def collect_services(
+    project_path: Path,
+    ws_context: context.WorkspaceContext,
+) -> list[domain.ServiceDeclaration]:
+    try:
+        project = ws_context.ws_projects[project_path]
+    except KeyError as exception:
+        raise ValueError(
+            f"Project {project_path} doesn't exist."
+            + f" Existing projects: {ws_context.ws_projects}"
+        ) from exception
+
+    try:
+        config = ws_context.ws_projects_raw_configs[project_path]
+    except KeyError as exception:
+        raise Exception("First you need to parse config of project") from exception
+
+    services = _collect_services_in_config(config)
+    project.services = services
+    return services
+
+
+def _collect_services_in_config(
+    config: dict[str, Any],
+) -> list[domain.ServiceDeclaration]:
+    services: list[domain.ServiceDeclaration] = []
+    for service_def_raw in config["tool"]["finecode"].get("service", []):
+        try:
+            service_def = config_models.ServiceDefinition(**service_def_raw)
+        except config_models.ValidationError as exception:
+            raise config_models.ConfigurationError(str(exception)) from exception
+
+        services.append(
+            domain.ServiceDeclaration(
+                interface=service_def.interface,
+                source=service_def.source,
+                env=service_def.env,
+                dependencies=service_def.dependencies,
+            )
+        )
+    return services
+
+
 def _collect_action_handler_configs_in_config(
     config: dict[str, Any],
 ) -> dict[str, dict[str, Any]]:

src/finecode/config/config_models.py

@@ -30,6 +30,13 @@ class ActionHandlerDefinition(BaseModel):
     enabled: bool = True
 
 
+class ServiceDefinition(BaseModel):
+    interface: str
+    source: str
+    env: str
+    dependencies: list[str] = []
+
+
 class ActionDefinition(BaseModel):
     source: str
     handlers: list[ActionHandlerDefinition] = []

src/finecode/config/read_configs.py

@@ -171,6 +171,7 @@ async def read_project_config(
         add_extension_runner_to_dependencies(project_config)
 
         merge_handlers_dependencies_into_groups(project_config)
+        merge_services_dependencies_into_groups(project_config)
 
         ws_context.ws_projects_raw_configs[project.dir_path] = project_config
 
@@ -400,6 +401,14 @@ def _merge_projects_configs(
                             _merge_object_array_by_key(
                                 existing_handlers, new_handlers, "name"
                             )
+        elif key == "service":
+            if key not in tool_finecode_config1:
+                tool_finecode_config1[key] = []
+            existing = tool_finecode_config1[key]
+            if isinstance(value, list):
+                _merge_object_array_by_key(existing, value, "interface")
+            else:
+                tool_finecode_config1[key] = value
         elif key == "action_handler":
             # Handle action_handler array merge by source
             if key not in tool_finecode_config1:
@@ -615,6 +624,35 @@ def merge_handlers_dependencies_into_groups(project_config: dict[str, Any]) -> N
         deps_groups[group_name] = unique_deps
 
 
+def merge_services_dependencies_into_groups(project_config: dict[str, Any]) -> None:
+    # tool.finecode.service[x].dependencies
+    services_list = project_config.get("tool", {}).get("finecode", {}).get("service", [])
+    if "dependency-groups" not in project_config:
+        project_config["dependency-groups"] = {}
+    deps_groups = project_config["dependency-groups"]
+
+    for service in services_list:
+        service_env = service.get("env", None)
+        if service_env is None:
+            logger.warning(f"Service {service} has no env, skip it")
+            continue
+        deps = service.get("dependencies", [])
+
+        if service_env not in deps_groups:
+            deps_groups[service_env] = []
+
+        env_deps = deps_groups[service_env]
+        env_deps += deps
+
+    for group_name in deps_groups.keys():
+        deps_list = deps_groups[group_name]
+        unique_deps = []
+        for dep in deps_list:
+            if dep not in unique_deps:
+                unique_deps.append(dep)
+        deps_groups[group_name] = unique_deps
+
+
 def add_extension_runner_to_dependencies(project_config: dict[str, Any]) -> None:
     try:
         deps_groups = project_config["dependency-groups"]