Skip to content

Relaxed toolCallArguments validation #3236

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

Closed
wants to merge 1 commit into from
Closed

Relaxed toolCallArguments validation #3236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 2 additions & 3 deletions .../src/main/java/org/springframework/ai/tool/observation/ToolCallingObservationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,13 @@ public final class ToolCallingObservationContext extends Observation.Context {
private String toolCallResult;

private ToolCallingObservationContext(ToolDefinition toolDefinition, ToolMetadata toolMetadata,
String toolCallArguments, @Nullable String toolCallResult) {
@Nullable String toolCallArguments, @Nullable String toolCallResult) {
Assert.notNull(toolDefinition, "toolDefinition cannot be null");
Assert.notNull(toolMetadata, "toolMetadata cannot be null");
Assert.hasText(toolCallArguments, "toolCallArguments cannot be null or empty");

this.toolDefinition = toolDefinition;
this.toolMetadata = toolMetadata;
this.toolCallArguments = toolCallArguments;
this.toolCallArguments = toolCallArguments != null ? toolCallArguments : "{}";
this.toolCallResult = toolCallResult;
}

Expand Down
37 changes: 19 additions & 18 deletions ...test/java/org/springframework/ai/tool/observation/ToolCallingObservationContextTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,30 @@ class ToolCallingObservationContextTests {

@Test
void whenMandatoryRequestOptionsThenReturn() {
var observationContext = ToolCallingObservationContext.builder()
.toolDefinition(ToolDefinition.builder().name("toolA").description("description").inputSchema("{}").build())
.build();
assertThat(observationContext).isNotNull();
}

@Test
void whenToolArgumentsIsNullThenReturn() {
var observationContext = ToolCallingObservationContext.builder()
.toolDefinition(ToolDefinition.builder().name("toolA").description("description").inputSchema("{}").build())
.toolCallArguments(null)
.build();
assertThat(observationContext).isNotNull();
assertThat(observationContext.getToolCallArguments()).isEqualTo("{}");
}

@Test
void whenToolArgumentsIsNotNullThenReturn() {
var observationContext = ToolCallingObservationContext.builder()
.toolDefinition(ToolDefinition.builder().name("toolA").description("description").inputSchema("{}").build())
.toolCallArguments("lizard")
.build();
assertThat(observationContext).isNotNull();
assertThat(observationContext.getToolCallArguments()).isEqualTo("lizard");
}

@Test
Expand All @@ -55,22 +74,4 @@ void whenToolMetadataIsNullThenThrow() {
.build()).isInstanceOf(IllegalArgumentException.class).hasMessageContaining("toolMetadata cannot be null");
}

@Test
void whenToolCallInputIsNullThenThrow() {
assertThatThrownBy(() -> ToolCallingObservationContext.builder()
.toolDefinition(ToolDefinition.builder().name("toolA").description("description").inputSchema("{}").build())
.toolCallArguments(null)
.build()).isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("toolCallArguments cannot be null or empty");
}

@Test
void whenToolCallInputIsEmptyThenThrow() {
assertThatThrownBy(() -> ToolCallingObservationContext.builder()
.toolDefinition(ToolDefinition.builder().name("toolA").description("description").inputSchema("{}").build())
.toolCallArguments("")
.build()).isInstanceOf(IllegalArgumentException.class)
.hasMessageContaining("toolCallArguments cannot be null or empty");
}

}