Skip to content

Commit b0e0b87

Browse files
authored
Merge pull request #22 from CryoThrust/fix/skills-agent-hook-dynamic-grouped-tools
fix(skills): retain dynamic grouped tools
2 parents 855a1ad + 8c65205 commit b0e0b87

2 files changed

Lines changed: 16 additions & 3 deletions

File tree

‎agentic-spring-ai-agent-framework/src/main/java/io/github/agentic/spring/ai/graph/agent/hook/skills/SkillsAgentHook.java‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,9 +139,7 @@ public SkillRegistry getSkillRegistry() {
139139
@Override
140140
public List<ModelInterceptor> getModelInterceptors() {
141141
SkillsInterceptor.Builder interceptorBuilder = SkillsInterceptor.builder().skillRegistry(this.skillRegistry);
142-
if (!this.groupedTools.isEmpty()) {
143-
interceptorBuilder.groupedTools(this.groupedTools);
144-
}
142+
interceptorBuilder.groupedTools(this.groupedTools);
145143
if (this.toolCallbackResolver != null) {
146144
interceptorBuilder.toolCallbackResolver(this.toolCallbackResolver);
147145
}

‎agentic-spring-ai-agent-framework/src/test/java/io/github/agentic/spring/ai/graph/agent/interceptors/SkillsInterceptorEnhancementsTest.java‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import java.util.List;
4646
import java.util.Map;
4747
import java.util.concurrent.atomic.AtomicReference;
48+
import java.util.concurrent.ConcurrentHashMap;
4849

4950
import static java.util.List.of;
5051
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -155,4 +156,18 @@ void reactAgentBuilderDeduplicatesStaticToolsByName() throws Exception {
155156
assertEquals("duplicate_tool", toolCallbacks.get(0).getToolDefinition().name());
156157
}
157158

159+
@Test
160+
void hookRetainsInitiallyEmptyGroupedToolsForLaterUpdates() {
161+
Map<String, List<ToolCallback>> groupedTools = new ConcurrentHashMap<>();
162+
SkillsAgentHook hook = SkillsAgentHook.builder().skillRegistry(registry).groupedTools(groupedTools).build();
163+
SkillsInterceptor interceptor = (SkillsInterceptor) hook.getModelInterceptors().get(0);
164+
assertTrue(interceptor.getGroupedTools().isEmpty());
165+
166+
ToolCallback tool = FunctionToolCallback.builder("late_tool", args -> "ok")
167+
.description("Tool added after agent construction").inputType(String.class).build();
168+
groupedTools.put("allowed-tools-test", List.of(tool));
169+
assertEquals("late_tool", interceptor.getGroupedTools().get("allowed-tools-test").get(0)
170+
.getToolDefinition().name());
171+
}
172+
158173
}

0 commit comments

Comments
 (0)