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

copy constructor for ChatClient#call incantations based on defaults.

Browse Source
This commit is contained in:
Josh Long
2024-05-19 15:42:02 +02:00
committed by Christian Tzolov
parent 9ffc315e1f
commit c89ac8a622
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-ai-core/src/main/java/org/springframework/ai/chat/ChatClient.java
View File

@@ -175,7 +175,7 @@ public interface ChatClient {
private final List<Media> media = new ArrayList<>();
private final Set<String> functionNames = new HashSet<>();
private final List<String> functionNames = new ArrayList<>();
private final List<FunctionCallback> functionCallbacks = new ArrayList<>();
@@ -185,6 +185,12 @@ public interface ChatClient {
private final Map<String, Object> systemParams = new HashMap<>();
/* copy constructor */
ChatClientRequest(ModelCall connector, ChatClientRequest ccr) {
this(connector, ccr.userText, ccr.systemText, ccr.functionCallbacks, ccr.functionNames, ccr.media,
ccr.chatOptions);
}
public ChatClientRequest(ModelCall connector, String userText, String systemText,
List<FunctionCallback> functionCallbacks, List<String> functionNames, List<Media> media,
ChatOptions chatOptions) {
@@ -299,7 +305,7 @@ public interface ChatClient {
}
if (this.request.chatOptions instanceof FunctionCallingOptionsBuilder.PortableFunctionCallingOptions functionCallingOptions) {
if (!this.request.functionNames.isEmpty()) {
functionCallingOptions.setFunctions(this.request.functionNames);
functionCallingOptions.setFunctions(new HashSet<>(this.request.functionNames));
}
if (!this.request.functionCallbacks.isEmpty()) {
functionCallingOptions.setFunctionCallbacks(this.request.functionCallbacks);

2
spring-ai-core/src/main/java/org/springframework/ai/chat/DefaultChatClient.java
View File

@@ -21,7 +21,7 @@ class DefaultChatClient implements ChatClient {
@Override
public ChatClientRequest call() {
return this.defaultChatClientRequest;
return new ChatClientRequest(this.modelCall, this.defaultChatClientRequest);
}
/**