Skip to content

Fix DefaultFunctionCallingOptionsBuilder #1982

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

Fix DefaultFunctionCallingOptionsBuilder #1982

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
10 changes: 9 additions & 1 deletion ...g-ai-core/src/main/java/org/springframework/ai/chat/prompt/DefaultChatOptionsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,15 @@
*/
public class DefaultChatOptionsBuilder<T extends DefaultChatOptionsBuilder<T>> implements ChatOptions.Builder<T> {

protected DefaultChatOptions options = new DefaultChatOptions();
protected DefaultChatOptions options;

public DefaultChatOptionsBuilder() {
this.options = new DefaultChatOptions();
}

protected DefaultChatOptionsBuilder(DefaultChatOptions options) {
this.options = options;
}

protected T self() {
return (T) this;
Expand Down
27 changes: 12 additions & 15 deletions ...main/java/org/springframework/ai/model/function/DefaultFunctionCallingOptionsBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,62 +36,59 @@ public class DefaultFunctionCallingOptionsBuilder
extends DefaultChatOptionsBuilder<DefaultFunctionCallingOptionsBuilder>
implements FunctionCallingOptions.Builder<DefaultFunctionCallingOptionsBuilder> {

private final DefaultFunctionCallingOptions functionCallingOptions;

public DefaultFunctionCallingOptionsBuilder() {
this.functionCallingOptions = new DefaultFunctionCallingOptions();
// Set the options in the parent class to be the same instance
super.options = this.functionCallingOptions;
super(new DefaultFunctionCallingOptions());
}

public DefaultFunctionCallingOptionsBuilder functionCallbacks(List<FunctionCallback> functionCallbacks) {
this.functionCallingOptions.setFunctionCallbacks(functionCallbacks);
((FunctionCallingOptions) this.options).setFunctionCallbacks(functionCallbacks);
return self();
}

public DefaultFunctionCallingOptionsBuilder functionCallbacks(FunctionCallback... functionCallbacks) {
Assert.notNull(functionCallbacks, "FunctionCallbacks must not be null");
this.functionCallingOptions.setFunctionCallbacks(List.of(functionCallbacks));
((FunctionCallingOptions) this.options).setFunctionCallbacks(List.of(functionCallbacks));
return self();
}

public DefaultFunctionCallingOptionsBuilder functions(Set<String> functions) {
this.functionCallingOptions.setFunctions(functions);
((FunctionCallingOptions) this.options).setFunctions(functions);
return self();
}

public DefaultFunctionCallingOptionsBuilder function(String function) {
Assert.notNull(function, "Function must not be null");
var set = new HashSet<>(this.functionCallingOptions.getFunctions());
var set = new HashSet<>(((FunctionCallingOptions) this.options).getFunctions());
set.add(function);
this.functionCallingOptions.setFunctions(set);
((FunctionCallingOptions) this.options).setFunctions(set);
return self();
}

public DefaultFunctionCallingOptionsBuilder proxyToolCalls(Boolean proxyToolCalls) {
this.functionCallingOptions.setProxyToolCalls(proxyToolCalls);
((FunctionCallingOptions) this.options).setProxyToolCalls(proxyToolCalls);
return self();
}

public DefaultFunctionCallingOptionsBuilder toolContext(Map<String, Object> context) {
Assert.notNull(context, "Tool context must not be null");
Map<String, Object> newContext = new HashMap<>(this.functionCallingOptions.getToolContext());
Map<String, Object> newContext = new HashMap<>(((FunctionCallingOptions) this.options).getToolContext());
newContext.putAll(context);
this.functionCallingOptions.setToolContext(newContext);
((FunctionCallingOptions) this.options).setToolContext(newContext);
return self();
}

public DefaultFunctionCallingOptionsBuilder toolContext(String key, Object value) {
Assert.notNull(key, "Key must not be null");
Assert.notNull(value, "Value must not be null");
Map<String, Object> newContext = new HashMap<>(this.functionCallingOptions.getToolContext());
Map<String, Object> newContext = new HashMap<>(((FunctionCallingOptions) this.options).getToolContext());
newContext.put(key, value);
this.functionCallingOptions.setToolContext(newContext);
((FunctionCallingOptions) this.options).setToolContext(newContext);
return self();
}

public FunctionCallingOptions build() {
return this.functionCallingOptions;
return ((FunctionCallingOptions) this.options);
}

}
Loading