Spring/spring-ai
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "fix: corrected a logic error in the validateToolContextSupport method caused by incorrect parameter order."

Browse Source 
This reverts commit 2ca1be2b83.
This commit is contained in:
Ilayaperumal Gopinathan
2025-06-12 18:37:29 +01:00
parent 330986998a
commit 89d8f6a20e
2 changed files with 2 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-ai-model/src/main/java/org/springframework/ai/tool/method/MethodToolCallback.java
View File

@@ -118,8 +118,8 @@ public final class MethodToolCallback implements ToolCallback {
private void validateToolContextSupport(@Nullable ToolContext toolContext) {
var isNonEmptyToolContextProvided = toolContext != null && !CollectionUtils.isEmpty(toolContext.getContext());
var isToolContextAcceptedByMethod = Stream.of(this.toolMethod.getParameterTypes())
.anyMatch(type -> ClassUtils.isAssignable(ToolContext.class, type));
if (isNonEmptyToolContextProvided && !isToolContextAcceptedByMethod) {
.anyMatch(type -> ClassUtils.isAssignable(type, ToolContext.class));
if (isToolContextAcceptedByMethod && !isNonEmptyToolContextProvided) {
throw new IllegalArgumentException("ToolContext is required by the method as an argument");
}
}

77
spring-ai-model/src/test/java/org/springframework/ai/tool/method/MethodToolCallbackGenericTypesTest.java
View File

@@ -22,12 +22,10 @@ import java.util.Map;
import org.junit.jupiter.api.Test;
import org.springframework.ai.chat.model.ToolContext;
import org.springframework.ai.tool.definition.DefaultToolDefinition;
import org.springframework.ai.tool.definition.ToolDefinition;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
/**
* Tests for {@link MethodToolCallback} with generic types.
@@ -139,76 +137,6 @@ class MethodToolCallbackGenericTypesTest {
assertThat(result).isEqualTo("2 maps processed: [{a=1, b=2}, {c=3, d=4}]");
}
@Test
void testToolContextType() throws Exception {
// Create a test object with a method that takes a List<Map<String, Integer>>
TestGenericClass testObject = new TestGenericClass();
Method method = TestGenericClass.class.getMethod("processStringListInToolContext", ToolContext.class);
// Create a tool definition
ToolDefinition toolDefinition = DefaultToolDefinition.builder()
.name("processToolContext")
.description("Process tool context")
.inputSchema("{}")
.build();
// Create a MethodToolCallback
MethodToolCallback callback = MethodToolCallback.builder()
.toolDefinition(toolDefinition)
.toolMethod(method)
.toolObject(testObject)
.build();
// Create an empty JSON input
String toolInput = """
{}
""";
// Create a toolContext
ToolContext toolContext = new ToolContext(Map.of("foo", "bar"));
// Call the tool
String result = callback.call(toolInput, toolContext);
// Verify the result
assertThat(result).isEqualTo("1 entries processed {foo=bar}");
}
@Test
void testToolContextTypeWithNonToolContextArgs() throws Exception {
// Create a test object with a method that takes a List<String>
TestGenericClass testObject = new TestGenericClass();
Method method = TestGenericClass.class.getMethod("processStringList", List.class);
// Create a tool definition
ToolDefinition toolDefinition = DefaultToolDefinition.builder()
.name("processStringList")
.description("Process a list of strings")
.inputSchema("{}")
.build();
// Create a MethodToolCallback
MethodToolCallback callback = MethodToolCallback.builder()
.toolDefinition(toolDefinition)
.toolMethod(method)
.toolObject(testObject)
.build();
// Create a JSON input with a list of strings
String toolInput = """
{
"strings": ["one", "two", "three"]
}
""";
// Create a toolContext
ToolContext toolContext = new ToolContext(Map.of("foo", "bar"));
// Call the tool and verify
assertThatThrownBy(() -> callback.call(toolInput, toolContext)).isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("ToolContext is required by the method as an argument");
}
/**
* Test class with methods that use generic types.
*/
@@ -226,11 +154,6 @@ class MethodToolCallbackGenericTypesTest {
return listOfMaps.size() + " maps processed: " + listOfMaps;
}
public String processStringListInToolContext(ToolContext toolContext) {
Map<String, Object> context = toolContext.getContext();
return context.size() + " entries processed " + context;
}
}
}