From 3ed3187ba972fab5e8a930007a9b5865fbd29f77 Mon Sep 17 00:00:00 2001 From: AgentSchmecker Date: Thu, 16 May 2024 22:00:11 +0000 Subject: [PATCH] Updates Model.java to be up to date with current OllamaAPI Also adds Jackson-JSR310 for java.time JSON Mapping --- pom.xml | 7 ++++++- .../amithkoujalgi/ollama4j/core/models/Model.java | 6 +++++- .../amithkoujalgi/ollama4j/core/utils/Utils.java | 10 +++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index c340387..f88fe1d 100644 --- a/pom.xml +++ b/pom.xml @@ -149,7 +149,12 @@ com.fasterxml.jackson.core jackson-databind - 2.15.3 + 2.17.1 + + + com.fasterxml.jackson.datatype + jackson-datatype-jsr310 + 2.17.1 ch.qos.logback diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java index 27fd3e5..79c2458 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/Model.java @@ -1,5 +1,7 @@ package io.github.amithkoujalgi.ollama4j.core.models; +import java.time.LocalDateTime; + import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonProcessingException; import io.github.amithkoujalgi.ollama4j.core.utils.Utils; @@ -11,7 +13,9 @@ public class Model { private String name; private String model; @JsonProperty("modified_at") - private String modifiedAt; + private LocalDateTime modifiedAt; + @JsonProperty("expires_at") + private LocalDateTime expiresAt; private String digest; private long size; @JsonProperty("details") diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java index 1504c1d..96b07ae 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/utils/Utils.java @@ -8,10 +8,18 @@ import java.net.URISyntaxException; import java.net.URL; import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; public class Utils { + + private static ObjectMapper objectMapper; + public static ObjectMapper getObjectMapper() { - return new ObjectMapper(); + if(objectMapper == null) { + objectMapper = new ObjectMapper(); + objectMapper.registerModule(new JavaTimeModule()); + } + return objectMapper; } public static byte[] loadImageBytesFromUrl(String imageUrl)