Skip to content

Add default ChatOptions to Prompt #2926

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

Add default ChatOptions to Prompt #2926

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
3 changes: 2 additions & 1 deletion ...-client-chat/src/test/java/org/springframework/ai/chat/client/DefaultChatClientTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ void whenPromptWithMessagesThenReturn() {
assertThat(spec.getMessages()).hasSize(2);
assertThat(spec.getMessages().get(0).getText()).isEqualTo("instructions");
assertThat(spec.getMessages().get(1).getText()).isEqualTo("my question");
assertThat(spec.getChatOptions()).isNull();
assertThat(spec.getChatOptions()).isNotNull();
assertThat(spec.getChatOptions()).isInstanceOf(ChatOptions.class);
}

@Test
Expand Down
14 changes: 6 additions & 8 deletions spring-ai-model/src/main/java/org/springframework/ai/chat/prompt/Prompt.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ public class Prompt implements ModelRequest<List<Message>> {

private final List<Message> messages;

@Nullable
private ChatOptions chatOptions;

public Prompt(String contents) {
Expand All @@ -57,24 +56,24 @@ public Prompt(Message message) {
}

public Prompt(List<Message> messages) {
this(messages, null);
this(messages, ChatOptions.builder().build());
}

public Prompt(Message... messages) {
this(Arrays.asList(messages), null);
this(Arrays.asList(messages), ChatOptions.builder().build());
}

public Prompt(String contents, @Nullable ChatOptions chatOptions) {
public Prompt(String contents, ChatOptions chatOptions) {
this(new UserMessage(contents), chatOptions);
}

public Prompt(Message message, @Nullable ChatOptions chatOptions) {
public Prompt(Message message, ChatOptions chatOptions) {
this(Collections.singletonList(message), chatOptions);
}

public Prompt(List<Message> messages, @Nullable ChatOptions chatOptions) {
public Prompt(List<Message> messages, ChatOptions chatOptions) {
this.messages = messages;
this.chatOptions = chatOptions;
this.chatOptions = (chatOptions != null) ? chatOptions : ChatOptions.builder().build();
}

public String getContents() {
Expand All @@ -86,7 +85,6 @@ public String getContents() {
}

@Override
@Nullable
public ChatOptions getOptions() {
return this.chatOptions;
}
Expand Down