From e2a8be42e032aff21cfbcd33768be49175a1053e Mon Sep 17 00:00:00 2001 From: Richard Eckart de Castilho Date: Sun, 12 Nov 2023 19:36:27 +0100 Subject: [PATCH] Issue #4: evalCount in response from ollama cannot be parsed - Change `eval_count` identify in Java code to more appropriate `evalCount` - Change `evalCount` to `eval_count` in the JSON mapping - Configure JSON mapping to ignore unknown fields to avoid errors in case ollama expands its response --- .../core/models/OllamaResponseModel.java | 35 +++++++------------ 1 file changed, 13 insertions(+), 22 deletions(-) diff --git a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResponseModel.java b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResponseModel.java index a0ab481..5320e3a 100644 --- a/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResponseModel.java +++ b/src/main/java/io/github/amithkoujalgi/ollama4j/core/models/OllamaResponseModel.java @@ -1,32 +1,23 @@ package io.github.amithkoujalgi.ollama4j.core.models; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; +@JsonIgnoreProperties(ignoreUnknown = true) public class OllamaResponseModel { private String model; - @JsonProperty("created_at") - private String createdAt; + private @JsonProperty("created_at") String createdAt; private String response; private Boolean done; private List context; - @JsonProperty("total_duration") - private Long totalDuration; - - @JsonProperty("load_duration") - private Long loadDuration; - @JsonProperty("prompt_eval_duration") - private Long promptEvalDuration; - @JsonProperty("eval_duration") - - private Long evalDuration; - @JsonProperty("prompt_eval_count") - - private Integer promptEvalCount; - @JsonProperty("evalCount") - - private Integer eval_count; + private @JsonProperty("total_duration") Long totalDuration; + private @JsonProperty("load_duration") Long loadDuration; + private @JsonProperty("prompt_eval_duration") Long promptEvalDuration; + private @JsonProperty("eval_duration") Long evalDuration; + private @JsonProperty("prompt_eval_count") Integer promptEvalCount; + private @JsonProperty("eval_count") Integer evalCount; public String getModel() { return model; @@ -108,11 +99,11 @@ public class OllamaResponseModel { this.promptEvalCount = promptEvalCount; } - public Integer getEval_count() { - return eval_count; + public Integer getEvalCount() { + return evalCount; } - public void setEval_count(Integer eval_count) { - this.eval_count = eval_count; + public void setEvalCount(Integer eval_count) { + this.evalCount = eval_count; } }