Compare commits

...

4 Commits

3 changed files with 14 additions and 16 deletions

19
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>io.github.amithkoujalgi</groupId> <groupId>io.github.amithkoujalgi</groupId>
<artifactId>ollama4j</artifactId> <artifactId>ollama4j</artifactId>
<version>1.0.73-SNAPSHOT</version> <version>1.0.72-1</version>
<name>Ollama4j</name> <name>Ollama4j</name>
<description>Java library for interacting with Ollama API.</description> <description>Java library for interacting with Ollama API.</description>
@ -139,6 +139,13 @@
</plugins> </plugins>
</build> </build>
<repositories>
<repository>
<id>gitea</id>
<url>https://gitea.seeseepuff.be/api/packages/seeseemelk/maven</url>
</repository>
</repositories>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.projectlombok</groupId> <groupId>org.projectlombok</groupId>
@ -189,12 +196,12 @@
<distributionManagement> <distributionManagement>
<snapshotRepository> <snapshotRepository>
<id>ossrh</id> <id>gitea</id>
<url>https://s01.oss.sonatype.org/content/repositories/snapshots</url> <url>https://gitea.seeseepuff.be/api/packages/seeseemelk/maven</url>
</snapshotRepository> </snapshotRepository>
<repository> <repository>
<id>ossrh</id> <id>gitea</id>
<url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url> <url>https://gitea.seeseepuff.be/api/packages/seeseemelk/maven</url>
</repository> </repository>
</distributionManagement> </distributionManagement>
@ -308,4 +315,4 @@
</profile> </profile>
</profiles> </profiles>
</project> </project>

View File

@ -16,16 +16,10 @@ public class OllamaChatResult extends OllamaResult{
List<OllamaChatMessage> chatHistory) { List<OllamaChatMessage> chatHistory) {
super(response, responseTime, httpStatusCode); super(response, responseTime, httpStatusCode);
this.chatHistory = chatHistory; this.chatHistory = chatHistory;
appendAnswerToChatHistory(response);
} }
public List<OllamaChatMessage> getChatHistory() { public List<OllamaChatMessage> getChatHistory() {
return chatHistory; return chatHistory;
}
private void appendAnswerToChatHistory(String answer){
OllamaChatMessage assistantMessage = new OllamaChatMessage(OllamaChatMessageRole.ASSISTANT, answer);
this.chatHistory.add(assistantMessage);
} }

View File

@ -11,8 +11,6 @@ public class OllamaChatStreamObserver {
private List<OllamaChatResponseModel> responseParts = new ArrayList<>(); private List<OllamaChatResponseModel> responseParts = new ArrayList<>();
private String message = "";
public OllamaChatStreamObserver(OllamaStreamHandler streamHandler) { public OllamaChatStreamObserver(OllamaStreamHandler streamHandler) {
this.streamHandler = streamHandler; this.streamHandler = streamHandler;
} }
@ -23,8 +21,7 @@ public class OllamaChatStreamObserver {
} }
protected void handleCurrentResponsePart(OllamaChatResponseModel currentResponsePart){ protected void handleCurrentResponsePart(OllamaChatResponseModel currentResponsePart){
message = message + currentResponsePart.getMessage().getContent(); streamHandler.accept(currentResponsePart.getMessage().getContent());
streamHandler.accept(message);
} }