Skip to content

Commit 44507e1

Browse files
robinji0robinji0
committed
ai deserialization update
1 parent 67ae084 commit 44507e1

11 files changed

Lines changed: 24 additions & 0 deletions

File tree

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/azure/client/AzureOpenAiStreamClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatCompletionsOptions;
1010
import ai.chat2db.server.web.api.controller.ai.azure.model.AzureChatMessage;
1111
import cn.hutool.http.ContentType;
12+
import com.fasterxml.jackson.databind.DeserializationFeature;
1213
import com.fasterxml.jackson.databind.ObjectMapper;
1314
import lombok.Getter;
1415
import lombok.extern.slf4j.Slf4j;
@@ -166,6 +167,7 @@ public void streamCompletions(List<AzureChatMessage> chatMessages, EventSourceLi
166167

167168
EventSource.Factory factory = EventSources.createFactory(this.okHttpClient);
168169
ObjectMapper mapper = new ObjectMapper();
170+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
169171
String requestBody = mapper.writeValueAsString(chatCompletionsOptions);
170172
if (!endpoint.endsWith("/")) {
171173
endpoint = endpoint + "/";

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/baichuan/client/BaichuanAIStreamClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import ai.chat2db.server.web.api.controller.ai.baichuan.model.BaichuanChatCompletionsOptions;
66
import ai.chat2db.server.web.api.controller.ai.fastchat.model.FastChatMessage;
77
import cn.hutool.http.ContentType;
8+
import com.fasterxml.jackson.databind.DeserializationFeature;
89
import com.fasterxml.jackson.databind.ObjectMapper;
910
import lombok.Getter;
1011
import lombok.extern.slf4j.Slf4j;
@@ -191,6 +192,7 @@ public void streamCompletions(List<FastChatMessage> chatMessages, EventSourceLis
191192
chatCompletionsOptions.setMessages(chatMessages);
192193

193194
ObjectMapper mapper = new ObjectMapper();
195+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
194196
String requestBody = mapper.writeValueAsString(chatCompletionsOptions);
195197
Request request = new Request.Builder()
196198
.url(apiHost)

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/chat2db/client/Chat2DBAIStreamClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import ai.chat2db.server.web.api.controller.ai.fastchat.embeddings.FastChatEmbeddingResponse;
1212
import ai.chat2db.server.web.api.util.ApplicationContextUtil;
1313
import cn.hutool.http.ContentType;
14+
import com.fasterxml.jackson.databind.DeserializationFeature;
1415
import com.fasterxml.jackson.databind.ObjectMapper;
1516
import com.unfbx.chatgpt.entity.chat.ChatCompletion;
1617
import com.unfbx.chatgpt.entity.chat.Message;
@@ -204,6 +205,7 @@ public void streamCompletions(List<Message> chatMessages, EventSourceListener ev
204205

205206
EventSource.Factory factory = EventSources.createFactory(this.okHttpClient);
206207
ObjectMapper mapper = new ObjectMapper();
208+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
207209
String requestBody = mapper.writeValueAsString(chatCompletion);
208210
Request request = new Request.Builder()
209211
.url(this.apiHost + "v1/chat/completions")
@@ -242,6 +244,7 @@ public FastChatEmbeddingResponse embeddings(String input) {
242244
public FastChatEmbeddingResponse embeddings(FastChatEmbedding embedding) {
243245
try {
244246
ObjectMapper mapper = new ObjectMapper();
247+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
245248
String requestBody = mapper.writeValueAsString(embedding);
246249
Request request = new Request.Builder()
247250
.url(this.apiHost + "v1/embeddings")

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/claude/client/ClaudeAiStreamClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import ai.chat2db.server.web.api.controller.ai.claude.interceptor.ClaudeHeaderAuthorizationInterceptor;
55
import ai.chat2db.server.web.api.controller.ai.claude.model.ClaudeChatMessage;
66
import cn.hutool.http.ContentType;
7+
import com.fasterxml.jackson.databind.DeserializationFeature;
78
import com.fasterxml.jackson.databind.ObjectMapper;
89
import lombok.Getter;
910
import lombok.extern.slf4j.Slf4j;
@@ -167,6 +168,7 @@ public void streamCompletions(ClaudeChatMessage claudeChatMessage, EventSourceLi
167168
claudeChatMessage.setConversation_uuid(this.userId);
168169
EventSource.Factory factory = EventSources.createFactory(this.okHttpClient);
169170
ObjectMapper mapper = new ObjectMapper();
171+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
170172
String requestBody = mapper.writeValueAsString(claudeChatMessage);
171173

172174
Request request = new Request.Builder()

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/fastchat/client/FastChatAIStreamClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import ai.chat2db.server.web.api.controller.ai.fastchat.model.FastChatCompletionsOptions;
88
import ai.chat2db.server.web.api.controller.ai.fastchat.model.FastChatMessage;
99
import cn.hutool.http.ContentType;
10+
import com.fasterxml.jackson.databind.DeserializationFeature;
1011
import com.fasterxml.jackson.databind.ObjectMapper;
1112
import io.reactivex.Single;
1213
import lombok.Getter;
@@ -199,6 +200,7 @@ public void streamCompletions(List<FastChatMessage> chatMessages, EventSourceLis
199200

200201
EventSource.Factory factory = EventSources.createFactory(this.okHttpClient);
201202
ObjectMapper mapper = new ObjectMapper();
203+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
202204
String requestBody = mapper.writeValueAsString(chatCompletionsOptions);
203205
Request request = new Request.Builder()
204206
.url(apiHost)

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/openai/listener/OpenAIEventSourceListener.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55
import ai.chat2db.server.web.api.controller.ai.response.ChatCompletionResponse;
66

7+
import com.fasterxml.jackson.databind.DeserializationFeature;
78
import com.fasterxml.jackson.databind.ObjectMapper;
89
import com.unfbx.chatgpt.entity.chat.Message;
910
import lombok.SneakyThrows;
@@ -54,6 +55,7 @@ public void onEvent(EventSource eventSource, String id, String type, String data
5455
return;
5556
}
5657
ObjectMapper mapper = new ObjectMapper();
58+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
5759
// 读取Json
5860
ChatCompletionResponse completionResponse = mapper.readValue(data, ChatCompletionResponse.class);
5961
String text = completionResponse.getChoices().get(0).getDelta() == null

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/rest/client/RestAiStreamClient.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import ai.chat2db.server.tools.common.exception.ParamBusinessException;
88
import ai.chat2db.server.web.api.controller.ai.rest.model.RestAiCompletion;
99
import cn.hutool.http.ContentType;
10+
import com.fasterxml.jackson.databind.DeserializationFeature;
1011
import com.fasterxml.jackson.databind.ObjectMapper;
1112
import com.unfbx.chatgpt.sse.ConsoleEventSourceListener;
1213
import lombok.Getter;
@@ -102,6 +103,7 @@ public void streamCompletions(RestAiCompletion completion, EventSourceListener e
102103
try {
103104
EventSource.Factory factory = EventSources.createFactory(this.okHttpClient);
104105
ObjectMapper mapper = new ObjectMapper();
106+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
105107
String requestBody = mapper.writeValueAsString(completion);
106108
Request request = new Request.Builder()
107109
.url(this.apiUrl)
@@ -128,6 +130,7 @@ public void nonStreamCompletions(RestAiCompletion completion, EventSourceListene
128130
}
129131
try {
130132
ObjectMapper mapper = new ObjectMapper();
133+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
131134
String requestBody = mapper.writeValueAsString(completion);
132135
Request request = new Request.Builder()
133136
.url(this.apiUrl)

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/tongyi/client/TongyiChatAIStreamClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import ai.chat2db.server.web.api.controller.ai.tongyi.model.TongyiChatCompletionsOptions;
77
import ai.chat2db.server.web.api.controller.ai.tongyi.model.TongyiChatMessage;
88
import cn.hutool.http.ContentType;
9+
import com.fasterxml.jackson.databind.DeserializationFeature;
910
import com.fasterxml.jackson.databind.ObjectMapper;
1011
import lombok.Getter;
1112
import lombok.extern.slf4j.Slf4j;
@@ -192,6 +193,7 @@ public void streamCompletions(List<FastChatMessage> chatMessages, EventSourceLis
192193

193194
EventSource.Factory factory = EventSources.createFactory(this.okHttpClient);
194195
ObjectMapper mapper = new ObjectMapper();
196+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
195197
String requestBody = mapper.writeValueAsString(chatCompletionsOptions);
196198
Request request = new Request.Builder()
197199
.url(apiHost)

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/wenxin/client/WenxinAIStreamClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import ai.chat2db.server.web.api.controller.ai.fastchat.model.FastChatMessage;
66
import ai.chat2db.server.web.api.controller.ai.wenxin.interceptor.AccessTokenInterceptor;
77
import cn.hutool.http.ContentType;
8+
import com.fasterxml.jackson.databind.DeserializationFeature;
89
import com.fasterxml.jackson.databind.ObjectMapper;
910
import lombok.Getter;
1011
import lombok.extern.slf4j.Slf4j;
@@ -179,6 +180,7 @@ public void streamCompletions(List<FastChatMessage> chatMessages, EventSourceLis
179180

180181
EventSource.Factory factory = EventSources.createFactory(this.okHttpClient);
181182
ObjectMapper mapper = new ObjectMapper();
183+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
182184
String requestBody = mapper.writeValueAsString(chatCompletionsOptions);
183185
Request request = new Request.Builder()
184186
.url(apiHost)

‎chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/ai/zhipu/client/ZhipuChatAIStreamClient.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import ai.chat2db.server.web.api.controller.ai.zhipu.interceptor.ZhipuChatHeaderAuthorizationInterceptor;
66
import ai.chat2db.server.web.api.controller.ai.zhipu.model.ZhipuChatCompletionsOptions;
77
import cn.hutool.http.ContentType;
8+
import com.fasterxml.jackson.databind.DeserializationFeature;
89
import com.fasterxml.jackson.databind.ObjectMapper;
910
import lombok.Getter;
1011
import lombok.extern.slf4j.Slf4j;
@@ -201,6 +202,7 @@ public void streamCompletions(List<FastChatMessage> chatMessages, EventSourceLis
201202
String requestId = String.valueOf(System.currentTimeMillis());
202203
completionsOptions.setRequestId(requestId);
203204
ObjectMapper mapper = new ObjectMapper();
205+
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
204206
String requestBody = mapper.writeValueAsString(completionsOptions);
205207

206208
String url = this.apiHost + "/" + this.model + "/" + "sse-invoke";

0 commit comments

Comments
 (0)