exo/lm-lib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: Enhance tool call handling with support for multiple tools in conversation

Browse Source
This commit is contained in:
extio-de
2026-04-15 21:51:20 +02:00
parent a0d248d605
commit b8f47f2745
6 changed files with 109 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/de/extio/lmlib/agent/BaseAgent.java
View File

@@ -307,10 +307,9 @@ public interface BaseAgent {
}
private void appendToolCallResults(final Conversation conversation, final Completion completion, final List<ToolCallingAgentResponseHandler.ToolCallResult> toolCallResults) {
conversation.addTurn(new Conversation.Turn(TurnType.ASSISTANT, completion.response() == null ? "" : completion.response(), completion.toolCalls(), null));
for (final var toolCallResult : toolCallResults) {
conversation.addTurn(new Conversation.Turn(TurnType.TOOL, toolCallResult.output(), null, toolCallResult.toolCallId()));
}
conversation.appendToolCallRound(completion, toolCallResults.stream()
.map(toolCallResult -> new Conversation.ToolResult(toolCallResult.output(), toolCallResult.toolCallId()))
.toList());
}
private List<Split> applyTemplate(final AgentContext context) {

24
src/main/java/de/extio/lmlib/client/Conversation.java
View File

@@ -55,6 +55,23 @@ public final class Conversation {
}
}
public void appendToolCallRound(final Completion completion, final List<ToolResult> toolResults) {
if (completion == null) {
throw new IllegalArgumentException("completion must not be null");
}
this.appendToolCallRound(completion.response(), completion.toolCalls(), toolResults);
}
public void appendToolCallRound(final String assistantText, final List<ToolCall> toolCalls, final List<ToolResult> toolResults) {
this.addTurn(new Turn(TurnType.ASSISTANT, assistantText == null ? "" : assistantText, toolCalls, null));
if (toolResults == null || toolResults.isEmpty()) {
return;
}
for (final var toolResult : toolResults) {
this.addTurn(new Turn(TurnType.TOOL, toolResult.text(), null, toolResult.toolCallId()));
}
}
public void rewindTurn() {
synchronized (this.conversation) {
if (this.conversation.size() > 1) {
@@ -93,5 +110,12 @@ public final class Conversation {
this(type, text, List.of(), null);
}
}
public record ToolResult(String text, String toolCallId) {
public ToolResult {
text = text == null ? "" : text;
}
}
}

4
src/main/java/de/extio/lmlib/client/ToolCallData.java
View File

@@ -27,6 +27,10 @@ public record ToolCallData(List<ToolDefinition> tools, String toolChoice, String
return new ToolCallData(List.copyOf(tools), null, forcedToolName, null);
}
public ToolCallData withParallelToolCalls(final boolean parallelToolCalls) {
return new ToolCallData(this.tools, this.toolChoice, this.forcedToolName, parallelToolCalls);
}
public boolean hasTools() {
return !this.tools.isEmpty();
}

70
src/test/java/de/extio/lmlib/client/oai/CompletionClientTest.java
View File

@@ -27,6 +27,7 @@ import de.extio.lmlib.client.CompletionFinishReason;
import de.extio.lmlib.client.Conversation;
import de.extio.lmlib.client.Conversation.Turn;
import de.extio.lmlib.client.Conversation.TurnType;
import de.extio.lmlib.client.ToolCall;
import de.extio.lmlib.client.ToolCallData;
import de.extio.lmlib.client.ToolDefinition;
import de.extio.lmlib.client.ToolParameters;
@@ -153,15 +154,20 @@ public class CompletionClientTest {
@Test
void toolCallingChatCompletion() throws Exception {
final var modelProfile = this.modelProfileService.getModelProfile("profile.model.chatcompletion");
final var toolDefinition = new ToolDefinition(
final var weatherToolDefinition = new ToolDefinition(
"get_weather",
"Gets the current weather for a given location.",
ToolParameters.create(Map.of("location", "City and country, for example Berlin, Germany")),
true);
final var trafficToolDefinition = new ToolDefinition(
"get_traffic",
"Gets the current traffic for a given location.",
ToolParameters.create(Map.of("location", "City and country, for example Berlin, Germany")),
true);
final var conversation = Conversation.create(
"You are a helpful assistant. Use the provided tool when the user asks for weather information. After receiving tool results, answer using the forecast from the tool output.",
"What is the weather in Berlin, Germany? Use the tool.");
final var toolCallData = ToolCallData.required(List.of(toolDefinition));
"You are a helpful assistant. Use the provided tools when the user asks for location information. After receiving tool results, answer the question from the tool output.",
"What is the weather and how is the traffic in Berlin, Germany? Use the tool.");
final var toolCallData = ToolCallData.required(List.of(weatherToolDefinition, trafficToolDefinition)).withParallelToolCalls(true);
final var completion = this.chatCompletionclient.conversation(
modelProfile,
conversation,
@@ -172,16 +178,22 @@ public class CompletionClientTest {
assertFalse(this.textCompletionClient.supportsToolCalling());
assertTrue(this.clientService.supportsToolCalling(modelProfile));
assertTrue(completion.finishReason() == CompletionFinishReason.TOOL_CALLS);
assertFalse(completion.toolCalls().isEmpty());
assertEquals("get_weather", completion.toolCalls().getFirst().name());
assertTrue(completion.toolCalls().getFirst().arguments().contains("Berlin"));
assertEquals(2, completion.toolCalls().size());
final var weatherToolCall = this.findToolCall(completion.toolCalls(), "get_weather");
final var trafficToolCall = this.findToolCall(completion.toolCalls(), "get_traffic");
assertTrue(weatherToolCall.arguments().contains("Berlin"));
conversation.addTurn(new Turn(TurnType.ASSISTANT, "", completion.toolCalls(), null));
conversation.addTurn(new Turn(TurnType.TOOL, ToolParameters.create().add("forecast", "Berlin is rainy and 21C").json(), null, completion.toolCalls().getFirst().id()));
conversation.appendToolCallRound(completion, List.of(
new Conversation.ToolResult(ToolParameters.create()
.add("forecast", "Berlin is rainy and 21C")
.json(), weatherToolCall.id()),
new Conversation.ToolResult(ToolParameters.create()
.add("traffic", "Berlin Autobahn is congested")
.json(), trafficToolCall.id())));
final var finalCompletion = this.chatCompletionclient.conversation(modelProfile, conversation, ToolCallData.auto(List.of(toolDefinition)), false);
final var finalCompletion = this.chatCompletionclient.conversation(modelProfile, conversation, ToolCallData.auto(List.of(weatherToolDefinition, trafficToolDefinition)), false);
assertTrue(finalCompletion.finishReason() == CompletionFinishReason.DONE);
assertTrue(Grader2.assessScoreBinary("Does the text say that Berlin is rainy and 21C?", finalCompletion.response(), modelProfile, this.clientService));
assertTrue(Grader2.assessScoreBinary("Does the text say that Berlin is rainy and 21C and that traffic in Berlin is congested?", finalCompletion.response(), modelProfile, this.clientService));
}
@Test
@@ -197,11 +209,12 @@ public class CompletionClientTest {
"Gets the current CPU utilization.",
ToolParameters.create(Map.of("cpu", "CPU identifier, for example CPU0. Use CPU for overall utilization.")),
true);
final var conversation = Conversation.create(
"You are a helpful assistant. Use the provided tools when applicable. If multiple independent tools are needed, call them in the same turn.",
"What is the weather and how high is the current CPU utilization in Berlin, Germany? Use the tools.");
final var completion = this.chatCompletionclient.streamConversation(
modelProfile,
Conversation.create(
"You are a helpful assistant. Use the provided tool when applicable.",
"How high is the current CPU utilization?"),
conversation,
chunk -> {
if (chunk.reasoningContent() != null) {
System.out.print(chunk.reasoningContent());
@@ -210,16 +223,30 @@ public class CompletionClientTest {
System.out.print(chunk.content());
}
},
ToolCallData.required(List.of(getWeather, getCpu)),
ToolCallData.required(List.of(getWeather, getCpu)).withParallelToolCalls(true),
false);
assertTrue(this.chatCompletionclient.supportsToolCalling());
assertFalse(this.textCompletionClient.supportsToolCalling());
assertTrue(this.clientService.supportsToolCalling(modelProfile));
assertTrue(completion.finishReason() == CompletionFinishReason.TOOL_CALLS);
assertFalse(completion.toolCalls().isEmpty());
assertEquals("get_cpu", completion.toolCalls().getFirst().name());
assertTrue(completion.toolCalls().getFirst().arguments().contains("CPU"));
assertEquals(2, completion.toolCalls().size());
final var weatherToolCall = this.findToolCall(completion.toolCalls(), "get_weather");
final var cpuToolCall = this.findToolCall(completion.toolCalls(), "get_cpu");
assertTrue(weatherToolCall.arguments().contains("Berlin"));
assertTrue(cpuToolCall.arguments().contains("CPU"));
conversation.appendToolCallRound(completion, List.of(
new Conversation.ToolResult(ToolParameters.create()
.add("forecast", "Berlin is rainy and 21C")
.json(), weatherToolCall.id()),
new Conversation.ToolResult(ToolParameters.create()
.add("cpu", "CPU is at 37 percent utilization")
.json(), cpuToolCall.id())));
final var finalCompletion = this.chatCompletionclient.conversation(modelProfile, conversation, ToolCallData.auto(List.of(getWeather, getCpu)), false);
assertTrue(finalCompletion.finishReason() == CompletionFinishReason.DONE);
assertTrue(Grader2.assessScoreBinary("Does the text say that Berlin is rainy and 21C and that CPU utilization is 37 percent?", finalCompletion.response(), modelProfile, this.clientService));
}
@Disabled
@@ -277,6 +304,13 @@ public class CompletionClientTest {
LOGGER.info("Duration: " + java.time.Duration.between(start, LocalDateTime.now()));
}
private ToolCall findToolCall(final List<ToolCall> toolCalls, final String toolName) {
return toolCalls.stream()
.filter(toolCall -> toolName.equals(toolCall.name()))
.findFirst()
.orElseThrow(() -> new IllegalStateException("Missing tool call: " + toolName));
}
private Tasks createTasks() {
return new Tasks(() -> {