Support extraBody parameter for OpenAiEmbeddingModel

Signed-off-by: guanxu <1510424541@qq.com>

Author: guanxuc

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiChatModel.java

@@ -903,11 +903,10 @@ else if (json.equals("required")) {
 		// Add extraBody parameters as additional body properties for OpenAI-compatible
 		// providers
 		if (requestOptions.getExtraBody() != null && !requestOptions.getExtraBody().isEmpty()) {
-			Map<String, com.openai.core.JsonValue> extraParams = requestOptions.getExtraBody()
+			Map<String, JsonValue> extraParams = requestOptions.getExtraBody()
 				.entrySet()
 				.stream()
-				.collect(java.util.stream.Collectors.toMap(Map.Entry::getKey,
-						entry -> com.openai.core.JsonValue.from(entry.getValue())));
+				.collect(Collectors.toMap(Map.Entry::getKey, entry -> JsonValue.from(entry.getValue())));
 			builder.additionalBodyProperties(extraParams);
 		}
 

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/OpenAiEmbeddingOptions.java

@@ -22,8 +22,10 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import com.openai.azure.AzureOpenAIServiceVersion;
+import com.openai.core.JsonValue;
 import com.openai.credential.Credential;
 import com.openai.models.embeddings.EmbeddingCreateParams;
 import com.openai.models.embeddings.EmbeddingModel;
@@ -39,6 +41,7 @@
  * @author Christian Tzolov
  * @author Ilayaperumal Gopinathan
  * @author Sebastien Deleuze
+ * @author guan xu
  */
 public class OpenAiEmbeddingOptions extends AbstractOpenAiOptions implements EmbeddingOptions {
 
@@ -61,18 +64,28 @@ public class OpenAiEmbeddingOptions extends AbstractOpenAiOptions implements Emb
 	 */
 	private final @Nullable Integer dimensions;
 
+	/**
+	 * Extra parameters that are not part of the standard OpenAI API. These parameters are
+	 * passed as additional body properties to support OpenAI-compatible providers like
+	 * vLLM, Ollama, Groq, etc. that support custom parameters such as top_k,
+	 * repetition_penalty, etc.
+	 */
+	private final @Nullable Map<String, Object> extraBody;
+
 	protected OpenAiEmbeddingOptions(@Nullable String baseUrl, @Nullable String apiKey, @Nullable Credential credential,
 			@Nullable String model, @Nullable String microsoftDeploymentName,
 			@Nullable AzureOpenAIServiceVersion microsoftFoundryServiceVersion, @Nullable String organizationId,
 			@Nullable Boolean isMicrosoftFoundry, @Nullable Boolean isGitHubModels, @Nullable Duration timeout,
 			@Nullable Integer maxRetries, @Nullable Proxy proxy, @Nullable Map<String, String> customHeaders,
-			@Nullable String user, @Nullable EncodingFormat encodingFormat, @Nullable Integer dimensions) {
+			@Nullable String user, @Nullable EncodingFormat encodingFormat, @Nullable Integer dimensions,
+			@Nullable Map<String, Object> extraBody) {
 		super(baseUrl, apiKey, credential, model != null ? model : DEFAULT_EMBEDDING_MODEL, microsoftDeploymentName,
 				microsoftFoundryServiceVersion, organizationId, isMicrosoftFoundry, isGitHubModels, timeout, maxRetries,
 				proxy, customHeaders);
 		this.user = user;
 		this.encodingFormat = encodingFormat;
 		this.dimensions = dimensions;
+		this.extraBody = (extraBody != null ? Map.copyOf(extraBody) : null);
 	}
 
 	public static Builder builder() {
@@ -92,6 +105,10 @@ public static Builder builder() {
 		return this.dimensions;
 	}
 
+	public @Nullable Map<String, Object> getExtraBody() {
+		return this.extraBody;
+	}
+
 	public EmbeddingCreateParams toOpenAiCreateParams(List<String> instructions) {
 
 		EmbeddingCreateParams.Builder builder = EmbeddingCreateParams.builder();
@@ -117,6 +134,17 @@ else if (this.getModel() != null) {
 		if (this.getDimensions() != null) {
 			builder.dimensions(this.getDimensions());
 		}
+
+		// Add extraBody parameters as additional body properties for OpenAI-compatible
+		// providers
+		if (this.getExtraBody() != null && !this.getExtraBody().isEmpty()) {
+			Map<String, JsonValue> extraParams = this.getExtraBody()
+				.entrySet()
+				.stream()
+				.collect(Collectors.toMap(Map.Entry::getKey, entry -> JsonValue.from(entry.getValue())));
+			builder.additionalBodyProperties(extraParams);
+		}
+
 		return builder.build();
 	}
 
@@ -147,6 +175,8 @@ public static final class Builder extends AbstractBuilder<OpenAiEmbeddingOptions
 
 		private @Nullable Integer dimensions;
 
+		private @Nullable Map<String, Object> extraBody;
+
 		public Builder from(OpenAiEmbeddingOptions fromOptions) {
 			// Parent class fields
 			this.baseUrl = fromOptions.getBaseUrl();
@@ -166,6 +196,7 @@ public Builder from(OpenAiEmbeddingOptions fromOptions) {
 			this.user = fromOptions.getUser();
 			this.encodingFormat = fromOptions.getEncodingFormat();
 			this.dimensions = fromOptions.getDimensions();
+			this.extraBody = fromOptions.getExtraBody();
 			return this;
 		}
 
@@ -223,6 +254,16 @@ public Builder merge(@Nullable EmbeddingOptions from) {
 				if (castFrom.getEncodingFormat() != null) {
 					this.encodingFormat = castFrom.getEncodingFormat();
 				}
+				if (castFrom.getExtraBody() != null) {
+					if (this.extraBody == null) {
+						this.extraBody = new HashMap<>(castFrom.getExtraBody());
+					}
+					else {
+						Map<String, Object> merged = new HashMap<>(this.extraBody);
+						merged.putAll(castFrom.getExtraBody());
+						this.extraBody = merged;
+					}
+				}
 			}
 			return this;
 		}
@@ -257,12 +298,17 @@ public Builder dimensions(@Nullable Integer dimensions) {
 			return this;
 		}
 
+		public Builder extraBody(@Nullable Map<String, Object> extraBody) {
+			this.extraBody = extraBody;
+			return this;
+		}
+
 		@Override
 		public OpenAiEmbeddingOptions build() {
 			return new OpenAiEmbeddingOptions(this.baseUrl, this.apiKey, this.credential, this.model,
 					this.microsoftDeploymentName, this.microsoftFoundryServiceVersion, this.organizationId,
 					this.isMicrosoftFoundry, this.isGitHubModels, this.timeout, this.maxRetries, this.proxy,
-					this.customHeaders, this.user, this.encodingFormat, this.dimensions);
+					this.customHeaders, this.user, this.encodingFormat, this.dimensions, this.extraBody);
 		}
 
 	}

models/spring-ai-openai/src/test/java/org/springframework/ai/openai/embedding/OpenAiEmbeddingOptionsTests.java

@@ -99,4 +99,46 @@ void testOptionsBuilderMergeCustomHeaders() {
 			.containsEntry("merged-header2", "merged-value2");
 	}
 
+	@Test
+	void extraBodyIsPassedAsAdditionalBodyProperties() {
+		OpenAiEmbeddingOptions options = OpenAiEmbeddingOptions.builder()
+			.model("test-model")
+			.extraBody(Map.of("top_k", 40, "repetition_penalty", 1.2))
+			.build();
+
+		EmbeddingCreateParams createParams = options.toOpenAiCreateParams(List.of("test input"));
+
+		assertThat(options.getExtraBody()).containsEntry("top_k", 40).containsEntry("repetition_penalty", 1.2);
+		assertThat(createParams._additionalBodyProperties()).containsKeys("top_k", "repetition_penalty");
+		assertThat(createParams._additionalBodyProperties().get("top_k").asNumber().get()).isEqualTo(40);
+		assertThat(createParams._additionalBodyProperties().get("repetition_penalty").asNumber().get()).isEqualTo(1.2);
+	}
+
+	@Test
+	void extraBodyIsCopiedAndMerged() {
+		OpenAiEmbeddingOptions source = OpenAiEmbeddingOptions.builder()
+			.model("test-model")
+			.extraBody(Map.of("top_k", 40))
+			.build();
+
+		OpenAiEmbeddingOptions copied = OpenAiEmbeddingOptions.builder().from(source).build();
+		OpenAiEmbeddingOptions merged = OpenAiEmbeddingOptions.builder()
+			.extraBody(Map.of("repetition_penalty", 1.2))
+			.merge(source)
+			.build();
+
+		assertThat(copied.getExtraBody()).containsEntry("top_k", 40);
+		assertThat(merged.getExtraBody()).containsEntry("top_k", 40).containsEntry("repetition_penalty", 1.2);
+	}
+
+	@Test
+	void emptyExtraBodyIsNotAddedToCreateParams() {
+		OpenAiEmbeddingOptions options = OpenAiEmbeddingOptions.builder().model("test-model").build();
+
+		EmbeddingCreateParams createParams = options.toOpenAiCreateParams(List.of("test input"));
+
+		assertThat(options.getExtraBody()).isNull();
+		assertThat(createParams._additionalBodyProperties()).isEmpty();
+	}
+
 }