Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@
import java.util.Map;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.agent.Agent;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down Expand Up @@ -235,6 +237,22 @@ public ChatResponse call(Prompt prompt) {
if (!isProxyToolCalls(prompt, this.defaultOptions) && response != null
&& this.isToolCall(response, Set.of("tool_use"))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.call(prompt);
}
return this.call(new Prompt(toolCallConversation, prompt.getOptions()));
}

Expand Down Expand Up @@ -266,6 +284,22 @@ public Flux<ChatResponse> stream(Prompt prompt) {

if (!isProxyToolCalls(prompt, this.defaultOptions) && this.isToolCall(chatResponse, Set.of("tool_use"))) {
var toolCallConversation = handleToolCalls(prompt, chatResponse);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses()
.stream()
.flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
} else {
return Stream.of(toolResponse.agent());
}
}).toList();
if(!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.stream(prompt);
}
return this.stream(new Prompt(toolCallConversation, prompt.getOptions()));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.stream.Stream;

import com.azure.ai.openai.OpenAIAsyncClient;
import com.azure.ai.openai.OpenAIClient;
Expand Down Expand Up @@ -57,6 +58,7 @@
import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
import org.springframework.ai.agent.Agent;
import reactor.core.publisher.Flux;

import org.springframework.ai.azure.openai.metadata.AzureOpenAiUsage;
Expand Down Expand Up @@ -218,6 +220,22 @@ public ChatResponse call(Prompt prompt) {
if (!isProxyToolCalls(prompt, this.defaultOptions)
&& isToolCall(response, Set.of(String.valueOf(CompletionsFinishReason.TOOL_CALLS).toLowerCase()))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.call(prompt);
}
// Recursively call the call method with the tool call message
// conversation that contains the call responses.
return this.call(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down Expand Up @@ -282,6 +300,22 @@ public Flux<ChatResponse> stream(Prompt prompt) {
if (!isProxyToolCalls(prompt, this.defaultOptions) && isToolCall(chatResponse,
Set.of(String.valueOf(CompletionsFinishReason.TOOL_CALLS).toLowerCase()))) {
var toolCallConversation = handleToolCalls(prompt, chatResponse);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.stream(prompt);
}
// Recursively call the call method with the tool call message
// conversation that contains the call responses.
return this.stream(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,14 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.stream.Stream;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.agent.Agent;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;
import reactor.core.publisher.Sinks;
Expand Down Expand Up @@ -195,6 +197,22 @@ public ChatResponse call(Prompt prompt) {
if (!this.isProxyToolCalls(prompt, this.defaultOptions) && chatResponse != null
&& this.isToolCall(chatResponse, Set.of("tool_use"))) {
var toolCallConversation = this.handleToolCalls(prompt, chatResponse);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.call(prompt);
}
return this.call(new Prompt(toolCallConversation, prompt.getOptions()));
}

Expand Down Expand Up @@ -510,6 +528,22 @@ public Flux<ChatResponse> stream(Prompt prompt) {
if (!this.isProxyToolCalls(prompt, this.defaultOptions) && chatResponse != null
&& this.isToolCall(chatResponse, Set.of("tool_use"))) {
var toolCallConversation = this.handleToolCalls(prompt, chatResponse);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.stream(prompt);
}
return this.stream(new Prompt(toolCallConversation, prompt.getOptions()));
}
return Mono.just(chatResponse);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.agent.Agent;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down Expand Up @@ -269,6 +271,22 @@ else if (!CollectionUtils.isEmpty(choice.messages())) {
if (!isProxyToolCalls(prompt, this.defaultOptions) && isToolCall(response,
Set.of(ChatCompletionFinishReason.TOOL_CALLS.name(), ChatCompletionFinishReason.STOP.name()))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.call(prompt);
}
// Recursively call the call method with the tool call message
// conversation that contains the call responses.
return this.call(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down Expand Up @@ -337,6 +355,22 @@ public Flux<ChatResponse> stream(Prompt prompt) {
if (!isProxyToolCalls(prompt, this.defaultOptions) && isToolCall(response,
Set.of(ChatCompletionFinishReason.TOOL_CALLS.name(), ChatCompletionFinishReason.STOP.name()))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses()
.stream()
.flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
} else {
return Stream.of(toolResponse.agent());
}
}).toList();
if(!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.stream(prompt);
}
// Recursively call the stream method with the tool call message
// conversation that contains the call responses.
return this.stream(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.agent.Agent;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down Expand Up @@ -204,6 +206,22 @@ public ChatResponse call(Prompt prompt) {
&& isToolCall(response, Set.of(MistralAiApi.ChatCompletionFinishReason.TOOL_CALLS.name(),
MistralAiApi.ChatCompletionFinishReason.STOP.name()))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.call(prompt);
}
// Recursively call the call method with the tool call message
// conversation that contains the call responses.
return this.call(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down Expand Up @@ -275,6 +293,22 @@ public Flux<ChatResponse> stream(Prompt prompt) {
Flux<ChatResponse> chatResponseFlux = chatResponse.flatMap(response -> {
if (!isProxyToolCalls(prompt, this.defaultOptions) && isToolCall(response, Set.of(MistralAiApi.ChatCompletionFinishReason.TOOL_CALLS.name()))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation.get(toolCallConversation.size()-1);
List<Agent> agentList = toolResponseMessage.getResponses()
.stream()
.flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
} else {
return Stream.of(toolResponse.agent());
}
}).toList();
if(!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.stream(prompt);
}
// Recursively call the stream method with the tool call message
// conversation that contains the call responses.
return this.stream(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,14 @@
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Stream;

import io.micrometer.observation.Observation;
import io.micrometer.observation.ObservationRegistry;
import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.agent.Agent;
import reactor.core.publisher.Flux;
import reactor.core.publisher.Mono;

Expand Down Expand Up @@ -229,6 +231,22 @@ public ChatResponse call(Prompt prompt) {
&& isToolCall(response, Set.of(MoonshotApi.ChatCompletionFinishReason.TOOL_CALLS.name(),
MoonshotApi.ChatCompletionFinishReason.STOP.name()))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.call(prompt);
}
// Recursively call the call method with the tool call message
// conversation that contains the call responses.
return this.call(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down Expand Up @@ -300,6 +318,22 @@ public Flux<ChatResponse> stream(Prompt prompt) {
if (!isProxyToolCalls(prompt, this.defaultOptions) && isToolCall(response,
Set.of(ChatCompletionFinishReason.TOOL_CALLS.name(), ChatCompletionFinishReason.STOP.name()))) {
var toolCallConversation = handleToolCalls(prompt, response);
// process agent transfer
ToolResponseMessage toolResponseMessage = (ToolResponseMessage) toolCallConversation
.get(toolCallConversation.size() - 1);
List<Agent> agentList = toolResponseMessage.getResponses().stream().flatMap(toolResponse -> {
if (null == toolResponse.agent()) {
return Stream.empty();
}
else {
return Stream.of(toolResponse.agent());
}
}).toList();
if (!CollectionUtils.isEmpty(agentList)) {
Agent agent = agentList.get(0);
// transfer task to other agent
return agent.stream(prompt);
}
// Recursively call the stream method with the tool call message
// conversation that contains the call responses.
return this.stream(new Prompt(toolCallConversation, prompt.getOptions()));
Expand Down
Loading
Loading