From e381806ba0a461db7dda429e09e3875fbef75023 Mon Sep 17 00:00:00 2001 From: 007gzs <007gzs@gmail.com> Date: Sun, 27 Apr 2025 14:31:02 +0800 Subject: [PATCH] fix: ai_data_masking add compatibility handling for non-compliant API response structures (#2130) --- plugins/wasm-rust/extensions/ai-data-masking/src/lib.rs | 4 ++++ .../wasm-rust/extensions/ai-data-masking/src/msg_window.rs | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/plugins/wasm-rust/extensions/ai-data-masking/src/lib.rs b/plugins/wasm-rust/extensions/ai-data-masking/src/lib.rs index dc10bc371..9938c50cd 100644 --- a/plugins/wasm-rust/extensions/ai-data-masking/src/lib.rs +++ b/plugins/wasm-rust/extensions/ai-data-masking/src/lib.rs @@ -202,6 +202,7 @@ pub struct AiDataMaskingConfig { #[derive(Debug, Deserialize, Clone)] struct Message { + #[serde(default)] content: String, } #[derive(Debug, Deserialize, Clone)] @@ -221,8 +222,11 @@ struct ResMessage { #[derive(Default, Debug, Deserialize, Serialize, Clone)] struct Usage { + #[serde(default)] completion_tokens: i32, + #[serde(default)] prompt_tokens: i32, + #[serde(default)] total_tokens: i32, } diff --git a/plugins/wasm-rust/extensions/ai-data-masking/src/msg_window.rs b/plugins/wasm-rust/extensions/ai-data-masking/src/msg_window.rs index b8b33aacb..59d6f5e4b 100644 --- a/plugins/wasm-rust/extensions/ai-data-masking/src/msg_window.rs +++ b/plugins/wasm-rust/extensions/ai-data-masking/src/msg_window.rs @@ -299,7 +299,9 @@ data: {"id":"chatcmpl-936","object":"chat.completion.chunk","created":1739872012 data: {"id":"chatcmpl-936","object":"chat.completion.chunk","created":1739872012,"model":"qwen2.5-coder:32b","system_fingerprint":"fp_ollama","choices":[{"index":0,"delta":{"role":"assistant","content":"。"},"finish_reason":null}]} -data: {"id":"chatcmpl-936","object":"chat.completion.chunk","created":1739872012,"model":"qwen2.5-coder:32b","system_fingerprint":"fp_ollama","choices":[{"index":0,"delta":{"role":"assistant","content":""},"finish_reason":"stop"}]} +data: {"id":"chatcmpl-936","object":"chat.completion.chunk","created":1739872012,"model":"qwen2.5-coder:32b","system_fingerprint":"fp_ollama","choices":[{"index":0,"delta":{},"finish_reason":"stop"}],"usage":{}} + +data: {"id":"chatcmpl-936","object":"chat.completion.chunk","created":1739872012,"model":"qwen2.5-coder:32b","system_fingerprint":"fp_ollama","choices":[{"index":0,"delta":{}}],"usage":{"prompt_tokens":372,"completion_tokens":9,"total_tokens":381}} data: [DONE]