Skip to content

Fix the judge bug #3733

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 3, 2025
Merged

Fix the judge bug #3733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1953024
Fix the judge bug
TheEterna Jul 2, 2025
9953084
Add unit testing
TheEterna Jul 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...g-ai-model/src/main/java/org/springframework/ai/util/json/schema/JsonSchemaGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public static String generateForMethodInput(Method method, SchemaOption... schem
String parameterName = method.getParameters()[i].getName();
Type parameterType = method.getGenericParameterTypes()[i];
if (parameterType instanceof Class<?> parameterClass
&& ClassUtils.isAssignable(parameterClass, ToolContext.class)) {
&& ClassUtils.isAssignable(ToolContext.class, parameterClass)) {
// A ToolContext method parameter is not included in the JSON Schema
// generation.
// It's a special type used by Spring AI to pass contextual data to tools
Expand Down
26 changes: 26 additions & 0 deletions spring-ai-model/src/test/java/org/springframework/ai/util/json/JsonSchemaGeneratorTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,29 @@ void generateSchemaForMethodWithOpenApiSchemaAnnotations() throws Exception {
assertThat(schema).isEqualToIgnoringWhitespace(expectedJsonSchema);
}

@Test
void generateSchemaForMethodWithObjectParam() throws Exception {
Method method = TestMethods.class.getDeclaredMethod("objectParamMethod", Object.class);

String schema = JsonSchemaGenerator.generateForMethodInput(method);
String expectedJsonSchema = """
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"type": "object",
"properties": {
"object": {
}
},
"required": [
"object"
],
"additionalProperties": false
}
""";

assertThat(schema).isEqualToIgnoringWhitespace(expectedJsonSchema);
}

@Test
void generateSchemaForMethodWithJacksonAnnotations() throws Exception {
Method method = TestMethods.class.getDeclaredMethod("jacksonMethod", String.class, String.class);
Expand Down Expand Up @@ -662,6 +685,9 @@ static class TestMethods {
public void simpleMethod(String name, int age) {
}

public void objectParamMethod(Object object) {
}

public void annotatedMethod(
@ToolParam(required = false, description = "The username of the customer") String username,
@ToolParam(required = true) String password) {
Expand Down