Build and run agents you can see, understand and trust.
Python agentchatbotlarge-language-modelsllmllm-agentmcpmulti-agentmulti-modalreact-agentrealtime-agentvoice-agentvoice-assistant
fix(skill): include tool group skills for the get_skill_instructions method (#1732)
Yufeng He42d2c72b5645
diff --git a/src/agentscope/agent/_agent.py b/src/agentscope/agent/_agent.pyindex 8e44cb199..9bbbd2b0f 100644--- a/src/agentscope/agent/_agent.py+++ b/src/agentscope/agent/_agent.py@@ -1972,7 +1972,9 @@ class Agent:prompt = [self._system_prompt]# Skill related instructions- skill_instructions = await self.toolkit.get_skill_instructions()+ skill_instructions = await self.toolkit.get_skill_instructions(+ self.state.tool_context.activated_groups,+ )if skill_instructions:prompt.append(skill_instructions)diff --git a/src/agentscope/tool/_toolkit.py b/src/agentscope/tool/_toolkit.pyindex 726777c6a..196415261 100644--- a/src/agentscope/tool/_toolkit.py+++ b/src/agentscope/tool/_toolkit.py@@ -424,7 +424,10 @@ class Toolkit:return skills- async def get_skill_instructions(self) -> str | None:+ async def get_skill_instructions(+ self,+ activated_groups: list[str] | None = None,+ ) -> str | None:"""Get the prompt for all registered agent skills, which can beattached to the system prompt for the agent.@@ -434,12 +437,22 @@ class Toolkit:.. note:: If no skill is registered, None will be returned.+ Args:+ activated_groups (`list[str] | None`, optional):+ The currently activated tool groups. If omitted, all groups+ will be included for backwards compatibility.+Returns:`str | None`:- The combined prompt for all registered agent skills, or None+ The combined prompt for registered agent skills, or Noneif no skill is registered."""- skills = await self._get_available_skills()+ if activated_groups is None:+ activated_groups = [_.name for _ in self.tool_groups]++ skills = await self._get_available_skills(+ activated_groups,+ )# If no skills were collected, return Noneif len(skills) == 0:@@ -474,7 +487,7 @@ class Toolkit:available_tools = {}# Built-in skill viewers- skills = await self._get_available_skills()+ skills = await self._get_available_skills(groups)if len(skills):available_tools[self.builtin_skill_viewer.tool.namediff --git a/tests/toolkit_skill_test.py b/tests/toolkit_skill_test.pyindex e98d70334..519435234 100644--- a/tests/toolkit_skill_test.py+++ b/tests/toolkit_skill_test.py@@ -8,7 +8,7 @@ from unittest.async_case import IsolatedAsyncioTestCasefrom utils import AnyStringfrom agentscope.skill import SkillLoaderBase, Skill-from agentscope.tool import Toolkit, ToolChunk, ToolResponse+from agentscope.tool import Toolkit, ToolChunk, ToolResponse, ToolGroupfrom agentscope.message import ToolCallBlockfrom agentscope.state import AgentState@@ -151,6 +151,61 @@ Skills are a collection of instructions, scripts, and resources to extend your cresult = await toolkit.get_skill_instructions()self.assertIsNone(result)+ async def test_get_skill_instructions_includes_tool_group_skills(+ self,+ ) -> None:+ """Test that skill instructions include skills from custom groups."""+ toolkit = Toolkit(+ tool_groups=[+ ToolGroup(+ name="repair",+ description="Repair tools",+ skills_or_loaders=[+ MockSkillLoader([_make_skill("repair_skill")]),+ ],+ ),+ ],+ )++ result = await toolkit.get_skill_instructions()++ self.assertIsNotNone(result)+ assert result is not None+ self.assertIn("<name>repair_skill</name>", result)++ async def test_get_skill_instructions_filters_inactive_group_skills(+ self,+ ) -> None:+ """Test that inactive group skills are hidden from the prompt."""+ toolkit = Toolkit(+ skills_or_loaders=[MockSkillLoader([_make_skill("basic_skill")])],+ tool_groups=[+ ToolGroup(+ name="repair",+ description="Repair tools",+ skills_or_loaders=[+ MockSkillLoader([_make_skill("repair_skill")]),+ ],+ ),+ ],+ )++ inactive_result = await toolkit.get_skill_instructions(+ activated_groups=[],+ )+ active_result = await toolkit.get_skill_instructions(+ activated_groups=["repair"],+ )++ self.assertIsNotNone(inactive_result)+ self.assertIsNotNone(active_result)+ assert inactive_result is not None+ assert active_result is not None+ self.assertIn("<name>basic_skill</name>", inactive_result)+ self.assertNotIn("<name>repair_skill</name>", inactive_result)+ self.assertIn("<name>basic_skill</name>", active_result)+ self.assertIn("<name>repair_skill</name>", active_result)+class ToolkitSkillViewerTest(IsolatedAsyncioTestCase):"""Test cases for Toolkit SkillViewer functionality."""@@ -312,3 +367,42 @@ class ToolkitSkillViewerTest(IsolatedAsyncioTestCase):"id": "test_call_2",},)++ async def test_skill_viewer_uses_active_tool_group_skills(self) -> None:+ """Test that activated custom-group skills expose SkillViewer."""+ skill = _make_skill("repair_skill")+ skill.markdown = "# Repair Skill\nUse this for repair tasks."+ toolkit = Toolkit(+ tool_groups=[+ ToolGroup(+ name="repair",+ description="Repair tools",+ skills_or_loaders=[MockSkillLoader([skill])],+ ),+ ],+ )++ schema_names = [+ schema["function"]["name"]+ for schema in await toolkit.get_tool_schemas(groups=["repair"])+ ]+ self.assertIn("Skill", schema_names)++ tool_call = ToolCallBlock(+ id="test_call_group_skill",+ name="Skill",+ input=json.dumps({"skill": "repair_skill"}),+ )+ state = AgentState()+ state.tool_context.activated_groups.append("repair")++ chunks = []+ async for result in toolkit.call_tool(tool_call, state):+ if isinstance(result, ToolChunk):+ chunks.append(result)++ self.assertEqual(len(chunks), 1)+ self.assertEqual(+ chunks[0].content[0].text,+ "# Repair Skill\nUse this for repair tasks.",+ )