From 3bd346ea77d293f271cabaf818d00703d6b51942 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E5=AD=90=E9=BB=98?= <925456043@qq.com>
Date: Sun, 14 Jun 2026 16:09:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=A2=9E=E5=8A=A0=20F?=
 =?UTF-8?q?AQ=20=E6=8A=A5=E9=94=99=E7=9A=84=20bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../easy-agents-embedding-openai/pom.xml      |  5 ++
 .../openai/OpenAIEmbeddingModel.java          | 70 ++++++++++++------
 .../openai/OpenAIEmbeddingModelTest.java      | 71 +++++++++++++++++++
 3 files changed, 126 insertions(+), 20 deletions(-)
 create mode 100644 easy-agents-embedding/easy-agents-embedding-openai/src/test/java/com/easyagents/embedding/openai/OpenAIEmbeddingModelTest.java

diff --git a/easy-agents-embedding/easy-agents-embedding-openai/pom.xml b/easy-agents-embedding/easy-agents-embedding-openai/pom.xml
index 78d5db0..9f79b2d 100644
--- a/easy-agents-embedding/easy-agents-embedding-openai/pom.xml
+++ b/easy-agents-embedding/easy-agents-embedding-openai/pom.xml
@@ -21,6 +21,11 @@
             <groupId>com.easyagents</groupId>
             <artifactId>easy-agents-core</artifactId>
         </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>
diff --git a/easy-agents-embedding/easy-agents-embedding-openai/src/main/java/com/easyagents/embedding/openai/OpenAIEmbeddingModel.java b/easy-agents-embedding/easy-agents-embedding-openai/src/main/java/com/easyagents/embedding/openai/OpenAIEmbeddingModel.java
index 8e0f044..afbc8c2 100644
--- a/easy-agents-embedding/easy-agents-embedding-openai/src/main/java/com/easyagents/embedding/openai/OpenAIEmbeddingModel.java
+++ b/easy-agents-embedding/easy-agents-embedding-openai/src/main/java/com/easyagents/embedding/openai/OpenAIEmbeddingModel.java
@@ -1,20 +1,7 @@
-/*
- *  Copyright (c) 2023-2026, Easy-Agents (fuhai999@gmail.com).
- *  <p>
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *  <p>
- *  http://www.apache.org/licenses/LICENSE-2.0
- *  <p>
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
 package com.easyagents.embedding.openai;
 
+import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONObject;
 import com.easyagents.core.document.Document;
 import com.easyagents.core.model.client.HttpClient;
 import com.easyagents.core.model.embedding.BaseEmbeddingModel;
@@ -24,10 +11,9 @@ import com.easyagents.core.store.VectorData;
 import com.easyagents.core.util.JSONUtil;
 import com.easyagents.core.util.Maps;
 import com.easyagents.core.util.StringUtil;
-import com.alibaba.fastjson2.JSON;
-import com.alibaba.fastjson2.JSONObject;
 
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 public class OpenAIEmbeddingModel extends BaseEmbeddingModel<OpenAIEmbeddingConfig> {
@@ -69,19 +55,63 @@ public class OpenAIEmbeddingModel extends BaseEmbeddingModel<OpenAIEmbeddingConf
 
         VectorData vectorData = new VectorData();
         double[] embedding = JSONUtil.readDoubleArray(jsonObject, "$.data[0].embedding");
+        if (embedding == null || embedding.length == 0) {
+            throw new ModelException(buildMissingEmbeddingMessage());
+        }
         vectorData.setVector(embedding);
 
         return vectorData;
     }
 
 
+    /**
+     * Builds the embeddings request payload for OpenAI-compatible providers.
+     *
+     * @param text document to embed
+     * @param options embedding request options
+     * @param config model configuration
+     * @return JSON payload for the embeddings endpoint
+     */
     public static String promptToEmbeddingsPayload(Document text, EmbeddingOptions options, OpenAIEmbeddingConfig config) {
-        // https://platform.openai.com/docs/api-reference/making-requests
-        return Maps.of("model", options.getModelOrDefault(config.getModel()))
+        String model = options.getModelOrDefault(config.getModel());
+        return Maps.of("model", model)
             .set("encoding_format", options.getEncodingFormatOrDefault("float"))
             .set("input", text.getContent())
             .setIfNotEmpty("user", options.getUser())
-            .setIfNotEmpty("dimensions", options.getDimensions())
+            .setIf(
+                supportsDimensionsParameter(model) && options.getDimensions() != null,
+                "dimensions",
+                options.getDimensions()
+            )
             .toJSON();
     }
+
+    /**
+     * Determines whether the upstream embeddings endpoint supports dynamic dimensions.
+     *
+     * @param model model name sent to the provider
+     * @return true when dimensions should be sent
+     */
+    static boolean supportsDimensionsParameter(String model) {
+        if (StringUtil.noText(model)) {
+            return false;
+        }
+        String normalizedModel = model.toLowerCase(Locale.ROOT);
+        return normalizedModel.contains("qwen3-embedding")
+            || normalizedModel.contains("qwen");
+    }
+
+    /**
+     * Builds a safe diagnostic message for malformed embeddings responses.
+     *
+     * @return diagnostic message without secrets or raw response content
+     */
+    private String buildMissingEmbeddingMessage() {
+        return "Embedding response does not contain data[0].embedding."
+            + " Please check provider, model, request path, dimensions, or response format."
+            + " provider=" + config.getProvider()
+            + ", model=" + config.getModel()
+            + ", endpoint=" + config.getEndpoint()
+            + ", requestPath=" + config.getRequestPath();
+    }
 }
diff --git a/easy-agents-embedding/easy-agents-embedding-openai/src/test/java/com/easyagents/embedding/openai/OpenAIEmbeddingModelTest.java b/easy-agents-embedding/easy-agents-embedding-openai/src/test/java/com/easyagents/embedding/openai/OpenAIEmbeddingModelTest.java
new file mode 100644
index 0000000..1017c08
--- /dev/null
+++ b/easy-agents-embedding/easy-agents-embedding-openai/src/test/java/com/easyagents/embedding/openai/OpenAIEmbeddingModelTest.java
@@ -0,0 +1,71 @@
+package com.easyagents.embedding.openai;
+
+import com.easyagents.core.document.Document;
+import com.easyagents.core.model.client.HttpClient;
+import com.easyagents.core.model.embedding.EmbeddingOptions;
+import com.easyagents.core.model.exception.ModelException;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.util.Map;
+
+/**
+ * Tests for OpenAI-compatible embeddings request payload generation.
+ */
+public class OpenAIEmbeddingModelTest {
+
+    /**
+     * Verifies that fixed-dimension embeddings models do not receive dimensions.
+     */
+    @Test
+    public void shouldNotSendDimensionsForBgeModel() {
+        OpenAIEmbeddingConfig config = new OpenAIEmbeddingConfig();
+        config.setModel("BAAI/bge-m3");
+        EmbeddingOptions options = new EmbeddingOptions();
+        options.setDimensions(1024);
+
+        String payload = OpenAIEmbeddingModel.promptToEmbeddingsPayload(Document.of("hello"), options, config);
+
+        Assert.assertFalse(payload.contains("\"dimensions\""));
+    }
+
+    /**
+     * Verifies that Qwen3 embedding models keep the dynamic dimensions parameter.
+     */
+    @Test
+    public void shouldSendDimensionsForQwen3EmbeddingModel() {
+        OpenAIEmbeddingConfig config = new OpenAIEmbeddingConfig();
+        config.setModel("Qwen/Qwen3-Embedding-8B");
+        EmbeddingOptions options = new EmbeddingOptions();
+        options.setDimensions(1024);
+
+        String payload = OpenAIEmbeddingModel.promptToEmbeddingsPayload(Document.of("hello"), options, config);
+
+        Assert.assertTrue(payload.contains("\"dimensions\":1024"));
+    }
+
+    /**
+     * Verifies that malformed embeddings responses fail with a clear model exception.
+     */
+    @Test
+    public void shouldThrowModelExceptionWhenEmbeddingMissing() {
+        OpenAIEmbeddingConfig config = new OpenAIEmbeddingConfig();
+        config.setProvider("test-provider");
+        config.setModel("BAAI/bge-m3");
+        config.setApiKey("test-key");
+        OpenAIEmbeddingModel model = new OpenAIEmbeddingModel(config);
+        model.setHttpClient(new HttpClient() {
+            @Override
+            public String post(String url, Map<String, String> headers, String payload) {
+                return "{\"data\":[{}]}";
+            }
+        });
+
+        ModelException exception = Assert.assertThrows(
+            ModelException.class,
+            () -> model.embed(Document.of("hello"))
+        );
+
+        Assert.assertTrue(exception.getMessage().contains("data[0].embedding"));
+    }
+}
-- 
2.49.1