Compare commits

...

4 Commits
1.0.87 ... main

4 changed files with 47 additions and 12 deletions

View File

@@ -0,0 +1,32 @@
name: Build and Publish
on: push
jobs:
build:
runs-on: standard-22.04
steps:
- name: Check out
uses: actions/checkout@v4
- name: Set Up Java
uses: actions/setup-java@v4
with:
distribution: 'temurin'
java-version: '21'
#cache: 'maven'
#server-id: 'gitea'
- name: Set up Maven
uses: stCarolas/setup-maven@v5
with:
maven-version: 3.8.2
- run: cat /root/.m2/toolchains.xml
- run: cat /root/.m2/settings.xml
- name: Build
run: mvn -B package --file pom.xml
- name: Publish
run: mvn deploy

16
pom.xml
View File

@@ -129,6 +129,13 @@
</plugins>
</build>
<repositories>
<repository>
<id>gitea</id>
<url>https://gitea.seeseepuff.be/api/packages/seeseemelk/maven</url>
</repository>
</repositories>
<dependencies>
<dependency>
<groupId>org.projectlombok</groupId>
@@ -178,8 +185,13 @@
</dependencies>
<distributionManagement>
<snapshotRepository>
<id>gitea</id>
<url>https://gitea.seeseepuff.be/api/packages/seeseemelk/maven</url>
</snapshotRepository>
<repository>
<id>mvn-repo-id</id>
<id>gitea</id>
<url>https://gitea.seeseepuff.be/api/packages/seeseemelk/maven</url>
</repository>
</distributionManagement>
@@ -319,4 +331,4 @@
</profile>
</profiles>
</project>
</project>

View File

@@ -16,16 +16,10 @@ public class OllamaChatResult extends OllamaResult{
List<OllamaChatMessage> chatHistory) {
super(response, responseTime, httpStatusCode);
this.chatHistory = chatHistory;
appendAnswerToChatHistory(response);
}
public List<OllamaChatMessage> getChatHistory() {
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 String message = "";
public OllamaChatStreamObserver(OllamaStreamHandler streamHandler) {
this.streamHandler = streamHandler;
}
@@ -23,8 +21,7 @@ public class OllamaChatStreamObserver {
}
protected void handleCurrentResponsePart(OllamaChatResponseModel currentResponsePart) {
message = message + currentResponsePart.getMessage().getContent();
streamHandler.accept(message);
streamHandler.accept(currentResponsePart.getMessage().getContent());
}