Skip to content

Fix ChatHistory.getLast #172

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

Merged
johnoliver merged 1 commit into from
Aug 14, 2024
Merged

Fix ChatHistory.getLast #172

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
11 changes: 5 additions & 6 deletions ...l-api/src/main/java/com/microsoft/semantickernel/services/chatcompletion/ChatHistory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,11 @@
import com.microsoft.semantickernel.services.chatcompletion.message.ChatMessageTextContent;
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Optional;
import java.util.Spliterator;
import java.util.concurrent.ConcurrentLinkedQueue;
import java.util.function.Consumer;
import javax.annotation.Nullable;

Expand All @@ -20,7 +18,7 @@
*/
public class ChatHistory implements Iterable<ChatMessageContent<?>> {

private final Collection<ChatMessageContent<?>> chatMessageContents;
private final List<ChatMessageContent<?>> chatMessageContents;

/**
* The default constructor
Expand All @@ -35,7 +33,7 @@ public ChatHistory() {
* @param instructions The instructions to add to the chat history
*/
public ChatHistory(@Nullable String instructions) {
this.chatMessageContents = new ConcurrentLinkedQueue<>();
this.chatMessageContents = Collections.synchronizedList(new ArrayList<>());
if (instructions != null) {
this.chatMessageContents.add(
ChatMessageTextContent.systemMessage(instructions));
Expand All @@ -48,7 +46,8 @@ public ChatHistory(@Nullable String instructions) {
* @param chatMessageContents The chat message contents to add to the chat history
*/
public ChatHistory(List<? extends ChatMessageContent<?>> chatMessageContents) {
this.chatMessageContents = new ConcurrentLinkedQueue<>(chatMessageContents);
this.chatMessageContents = Collections
.synchronizedList(new ArrayList<>(chatMessageContents));
}

/**
Expand All @@ -70,7 +69,7 @@ public Optional<ChatMessageContent<?>> getLastMessage() {
return Optional.empty();
}
return Optional
.of(((ConcurrentLinkedQueue<ChatMessageContent<?>>) chatMessageContents).peek());
.of(chatMessageContents.get(chatMessageContents.size() - 1));
}

/**
Expand Down