Self-improving AI Employees for everyone
Python ai-agentsai-employeeai-employeesassistantautonomous-agentsco-employeescompanygrok-botinstinctloop-agentsmuseown-your-datapersonalself-hosted
refactor(edge_walker): break skill_loader coupling via plugin-registered expander (Wave 11.I, X3)
trohitge1b5d463b5ea
diff --git a/server/nodes/skill/__init__.py b/server/nodes/skill/__init__.pyindex f410e6bb..d1ec88d0 100644--- a/server/nodes/skill/__init__.py+++ b/server/nodes/skill/__init__.py@@ -1 +1,21 @@-"""Plugins for the 'skill' palette group. See ../__init__.py for the package layout."""+"""Plugins for the 'skill' palette group.++Self-contained plugin folder. Owns:++- ``master_skill.py`` -- the :class:`MasterSkillNode` plugin.+- ``simple_memory.py`` -- the :class:`SimpleMemoryNode` plugin.+- ``_expander.py`` -- Master-Skill expansion callback registered with+ :func:`services.plugin.edge_walker.register_master_skill_expander`+ so the framework-side edge walker doesn't need to know about+ ``services.skill_loader``.+"""++from services.plugin.edge_walker import register_master_skill_expander++from ._expander import expand_master_skill++# Edge-walker calls back into the plugin to expand Master-Skill nodes+# into per-skill entries. Wave 11.I, X3 -- replaces the inline+# ``from services.skill_loader import get_skill_loader`` import that+# previously lived in ``edge_walker._append_skill_entries``.+register_master_skill_expander(expand_master_skill)diff --git a/server/nodes/skill/_expander.py b/server/nodes/skill/_expander.pynew file mode 100644index 00000000..60522bfa--- /dev/null+++ b/server/nodes/skill/_expander.py@@ -0,0 +1,73 @@+"""Master-Skill expander (registered with services.plugin.edge_walker).++Wave 11.I, X3: extracted from ``services.plugin.edge_walker._append_skill_entries``+so the framework-side edge walker no longer imports+``services.skill_loader`` directly. The skill plugin package owns the+expansion logic and registers this callback from its ``__init__.py``;+edge_walker calls the registered callback through the+:func:`services.plugin.edge_walker.get_master_skill_expander` lookup.++Per-enabled-skill instructions come from the DB config first (the+user-customised version in the Master-Skill node parameters), with a+fallback to the disk SKILL.md via :mod:`services.skill_loader`.+"""++from __future__ import annotations++from typing import Any, Dict, List++from core.logging import get_logger++logger = get_logger(__name__)+++async def expand_master_skill(+ source_node_id: str,+ skills_config: Dict[str, Any],+) -> List[Dict[str, Any]]:+ """Expand a Master-Skill node's enabled-skills config into per-skill entries.++ Args:+ source_node_id: The Master-Skill node's id; used to mint+ per-skill child node_ids (``{source}_{skill_key}``) so+ downstream agent dispatch can address each skill+ independently.+ skills_config: The ``skills_config`` dict from the Master-Skill+ node's parameters: ``{skill_key: {enabled: bool,+ instructions: str}}``.++ Returns:+ A list of ``{node_id, node_type, skill_name, parameters,+ label}`` dicts matching the shape ``edge_walker._append_skill_entries``+ produces for non-master skills.+ """+ from services.skill_loader import get_skill_loader++ skill_loader = get_skill_loader()+ entries: List[Dict[str, Any]] = []++ for skill_key, skill_cfg in skills_config.items():+ if not skill_cfg.get("enabled", False):+ continue++ instructions = skill_cfg.get("instructions", "")+ if not instructions:+ try:+ skill = skill_loader.load_skill(skill_key)+ if skill:+ instructions = skill.instructions+ except Exception as exc: # noqa: BLE001 -- log + skip+ logger.warning(f"[MasterSkill] Failed to load skill {skill_key}: {exc}")++ entries.append({+ "node_id": f"{source_node_id}_{skill_key}",+ "node_type": "masterSkill",+ "skill_name": skill_key,+ "parameters": {"instructions": instructions, "skillName": skill_key},+ "label": skill_key,+ })++ return entries+++__all__ = ["expand_master_skill"]diff --git a/server/services/plugin/edge_walker.py b/server/services/plugin/edge_walker.pyindex 4dee29b0..331b8ab4 100644--- a/server/services/plugin/edge_walker.py+++ b/server/services/plugin/edge_walker.py@@ -18,14 +18,22 @@ Three helpers:- :func:`format_task_context` — renders ``taskTrigger`` payload as aprompt prepend block.+Wave 11.I, X3: the Master-Skill expansion logic moved out of this+module (it used to ``from services.skill_loader import get_skill_loader``+inline). The :mod:`nodes.skill` package registers an expander callback+via :func:`register_master_skill_expander` from its ``__init__.py``;+edge_walker calls the registered callback instead of importing+``skill_loader`` directly.+These functions have **no service dependencies** beyond the-``Database`` instance. They mutate nothing. Wave 11.D.6 inlines the-old ``handlers/ai.py:_collect_*`` shims to call here directly.+``Database`` instance and the registered expander callback. They+mutate nothing. Wave 11.D.6 inlines the old ``handlers/ai.py:_collect_*``+shims to call here directly."""from __future__ import annotations-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Tuple+from typing import TYPE_CHECKING, Any, Awaitable, Callable, Dict, List, Optional, Tuplefrom constants import AI_AGENT_TYPES, ANDROID_SERVICE_NODE_TYPESfrom core.logging import get_logger@@ -36,6 +44,44 @@ if TYPE_CHECKING:logger = get_logger(__name__)+# ---- Master-Skill expander callback registry ----------------------------++MasterSkillExpander = Callable[+ [str, Dict[str, Any]],+ Awaitable[List[Dict[str, Any]]],+]+"""Async callable that expands a Master Skill node's ``skills_config``+into a list of per-skill entries (the same shape ``_append_skill_entries``+produces for non-master skills). Signature:+``(source_node_id, skills_config) -> list[entry]``."""++_MASTER_SKILL_EXPANDER: Optional[MasterSkillExpander] = None+++def register_master_skill_expander(fn: MasterSkillExpander) -> None:+ """Publish the Master-Skill expander callback.++ Idempotent on equality. The :mod:`nodes.skill` plugin package+ registers its expander from ``__init__.py`` on package import.+ Edge-walking code calls :func:`get_master_skill_expander` and runs+ whatever's registered; the framework has no skill_loader coupling.+ """+ global _MASTER_SKILL_EXPANDER+ if _MASTER_SKILL_EXPANDER is not None and _MASTER_SKILL_EXPANDER != fn:+ raise ValueError(+ "register_master_skill_expander: callback already registered "+ "by a different callable; refusing to overwrite"+ )+ _MASTER_SKILL_EXPANDER = fn+++def get_master_skill_expander() -> Optional[MasterSkillExpander]:+ """Return the registered expander callback, or None when no skill+ plugin has wired it (in which case Master-Skill nodes silently+ expand to no entries -- the agent still runs without skills)."""+ return _MASTER_SKILL_EXPANDER++async def collect_agent_connections(node_id: str,context: Dict[str, Any],@@ -196,37 +242,23 @@ async def _append_skill_entries(skill_params = await database.get_node_parameters(source_node_id) or {}if skill_type == "masterSkill":- from services.skill_loader import get_skill_loader+ expander = get_master_skill_expander()+ if expander is None:+ logger.warning(+ f"{log_prefix} Master Skill node found but no expander "+ "registered. Skipping expansion -- ensure nodes.skill "+ "is on the import path."+ )+ returnskills_config = skill_params.get("skills_config", {})- logger.debug(f"{log_prefix} Master Skill found with {len(skills_config)} configured skills")- skill_loader = get_skill_loader()-- for skill_key, skill_cfg in skills_config.items():- if not skill_cfg.get("enabled", False):- continue- instructions = skill_cfg.get("instructions", "")- if instructions:- logger.debug(f"{log_prefix} Using DB instructions for {skill_key}")- else:- try:- skill = skill_loader.load_skill(skill_key)- if skill:- instructions = skill.instructions- logger.debug(- f"{log_prefix} Fallback: loaded instructions from skill folder for {skill_key}"- )- except Exception as e:- logger.warning(f"{log_prefix} Failed to load skill {skill_key}: {e}")-- skill_data.append({- "node_id": f"{source_node_id}_{skill_key}",- "node_type": "masterSkill",- "skill_name": skill_key,- "parameters": {"instructions": instructions, "skillName": skill_key},- "label": skill_key,- })- logger.debug(f"{log_prefix} Master Skill enabled: {skill_key}")+ logger.debug(+ f"{log_prefix} Master Skill found with {len(skills_config)} configured skills"+ )+ entries = await expander(source_node_id, skills_config)+ skill_data.extend(entries)+ for entry in entries:+ logger.debug(f"{log_prefix} Master Skill enabled: {entry['skill_name']}")else:skill_data.append({"node_id": source_node_id,