From d0312ba42654be15f7153f6ef4c673bf0eb1df60 Mon Sep 17 00:00:00 2001 From: Christian Tzolov Date: Tue, 5 Nov 2024 12:56:23 +0100 Subject: [PATCH] Add @JsonIgnore annotation to jsonSchema field in AI provider APIs Add @JsonIgnore annotation to the jsonSchema field in Function classes across multiple AI provider APIs (MiniMax, MistralAI, OpenAI, ZhiPuAI) to exclude it from JSON serialization. --- .../java/org/springframework/ai/minimax/api/MiniMaxApi.java | 2 ++ .../java/org/springframework/ai/mistralai/api/MistralAiApi.java | 2 ++ .../main/java/org/springframework/ai/openai/api/OpenAiApi.java | 2 ++ .../java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java | 2 ++ 4 files changed, 8 insertions(+) diff --git a/models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/api/MiniMaxApi.java b/models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/api/MiniMaxApi.java index 036a6aa1a..954803fde 100644 --- a/models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/api/MiniMaxApi.java +++ b/models/spring-ai-minimax/src/main/java/org/springframework/ai/minimax/api/MiniMaxApi.java @@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Predicate; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; @@ -420,6 +421,7 @@ public class MiniMaxApi { @JsonProperty("parameters") private Map parameters; + @JsonIgnore private String jsonSchema; private Function() { diff --git a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java index 33ce9cad6..f3d3e0b0f 100644 --- a/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java +++ b/models/spring-ai-mistral-ai/src/main/java/org/springframework/ai/mistralai/api/MistralAiApi.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Predicate; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; @@ -390,6 +391,7 @@ public class MistralAiApi { @JsonProperty("parameters") private Map parameters; + @JsonIgnore private String jsonSchema; private Function() { diff --git a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java index 173fbf866..20c0eeab6 100644 --- a/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java +++ b/models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java @@ -22,6 +22,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Predicate; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; @@ -613,6 +614,7 @@ public class OpenAiApi { @JsonProperty("parameters") private Map parameters; + @JsonIgnore private String jsonSchema; private Function() { diff --git a/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java b/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java index c5f9abe28..90ab02c49 100644 --- a/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java +++ b/models/spring-ai-zhipuai/src/main/java/org/springframework/ai/zhipuai/api/ZhiPuAiApi.java @@ -24,6 +24,7 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.function.Consumer; import java.util.function.Predicate; +import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; @@ -404,6 +405,7 @@ public class ZhiPuAiApi { @JsonProperty("parameters") private Map parameters; + @JsonIgnore private String jsonSchema; private Function() {