From ecb04d6d82ccffecc1146394469dc39b039e3baa Mon Sep 17 00:00:00 2001 From: Amith Koujalgi Date: Thu, 31 Oct 2024 21:22:17 +0530 Subject: [PATCH] Cleanup --- Makefile | 4 ++-- .../ollama4j/models/chat/OllamaChatMessage.java | 17 +++++++++-------- .../models/chat/OllamaChatMessageRole.java | 10 +++++----- 3 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index 7c5f2df..8202309 100644 --- a/Makefile +++ b/Makefile @@ -11,9 +11,9 @@ doxygen: doxygen Doxyfile list-releases: - curl 'https://central.sonatype.com/api/internal/browse/component/versions?sortField=normalizedVersion&sortDirection=asc&page=0&size=12&filter=namespace%3Aio.github.amithkoujalgi%2Cname%3Aollama4j' \ + curl 'https://central.sonatype.com/api/internal/browse/component/versions?sortField=normalizedVersion&sortDirection=desc&page=0&size=20&filter=namespace%3Aio.github.ollama4j%2Cname%3Aollama4j' \ --compressed \ - --silent | jq '.components[].version' + --silent | jq -r '.components[].version' build-docs: npm i --prefix docs && npm run build --prefix docs diff --git a/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessage.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessage.java index d4fe195..0d6d938 100644 --- a/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessage.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessage.java @@ -8,6 +8,7 @@ import com.fasterxml.jackson.databind.annotation.JsonSerialize; import io.github.ollama4j.utils.FileToBase64Serializer; import java.util.List; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -33,13 +34,13 @@ public class OllamaChatMessage { @JsonSerialize(using = FileToBase64Serializer.class) private List images; - - @Override - public String toString() { - try { - return getObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(this); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); + + @Override + public String toString() { + try { + return getObjectMapper().writerWithDefaultPrettyPrinter().writeValueAsString(this); + } catch (JsonProcessingException e) { + throw new RuntimeException(e); + } } - } } diff --git a/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessageRole.java b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessageRole.java index 5432cf1..4d00bc5 100644 --- a/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessageRole.java +++ b/src/main/java/io/github/ollama4j/models/chat/OllamaChatMessageRole.java @@ -12,7 +12,7 @@ import java.util.List; */ @Getter public class OllamaChatMessageRole { - private static final List ROLES = new ArrayList<>(); + private static final List roles = new ArrayList<>(); public static final OllamaChatMessageRole SYSTEM = new OllamaChatMessageRole("system"); public static final OllamaChatMessageRole USER = new OllamaChatMessageRole("user"); @@ -24,21 +24,21 @@ public class OllamaChatMessageRole { private OllamaChatMessageRole(String roleName) { this.roleName = roleName; - ROLES.add(this); + roles.add(this); } public static OllamaChatMessageRole newCustomRole(String roleName) { OllamaChatMessageRole customRole = new OllamaChatMessageRole(roleName); - ROLES.add(customRole); + roles.add(customRole); return customRole; } public static List getRoles() { - return new ArrayList<>(ROLES); + return new ArrayList<>(roles); } public static OllamaChatMessageRole getRole(String roleName) throws RoleNotFoundException { - for (OllamaChatMessageRole role : ROLES) { + for (OllamaChatMessageRole role : roles) { if (role.roleName.equals(roleName)) { return role; }