refactor: ignore FunctionCallingOptions

Signed-off-by: jiangsier-xyz <[email protected]>

Author: jiangsier-xyz

models/spring-ai-qwen/src/main/java/org/springframework/ai/qwen/QwenChatModel.java

@@ -13,7 +13,6 @@
 import org.springframework.ai.chat.prompt.ChatOptions;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.model.ModelOptionsUtils;
-import org.springframework.ai.model.function.FunctionCallingOptions;
 import org.springframework.ai.model.tool.DefaultToolExecutionEligibilityPredicate;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.model.tool.ToolCallingManager;
@@ -185,10 +184,6 @@ private Prompt buildRequestPrompt(Prompt prompt) {
 				runtimeOptions = ModelOptionsUtils.copyToTarget(toolCallingChatOptions, ToolCallingChatOptions.class,
 						QwenChatOptions.class);
 			}
-			else if (prompt.getOptions() instanceof FunctionCallingOptions functionCallingOptions) {
-				runtimeOptions = ModelOptionsUtils.copyToTarget(functionCallingOptions, FunctionCallingOptions.class,
-						QwenChatOptions.class);
-			}
 			else {
 				runtimeOptions = ModelOptionsUtils.copyToTarget(prompt.getOptions(), ChatOptions.class,
 						QwenChatOptions.class);

models/spring-ai-qwen/src/main/java/org/springframework/ai/qwen/QwenChatOptions.java

@@ -1,7 +1,6 @@
 package org.springframework.ai.qwen;
 
 import com.alibaba.dashscope.common.ResponseFormat;
-import org.springframework.ai.model.function.FunctionCallback;
 import org.springframework.ai.model.tool.ToolCallingChatOptions;
 import org.springframework.ai.tool.ToolCallback;
 import org.springframework.lang.Nullable;
@@ -101,7 +100,7 @@ public class QwenChatOptions implements ToolCallingChatOptions {
 	 * Collection of {@link ToolCallback}s to be used for tool calling in the chat
 	 * completion requests.
 	 */
-	private List<FunctionCallback> toolCallbacks;
+	private List<ToolCallback> toolCallbacks;
 
 	/**
 	 * Collection of tool names to be resolved at runtime and used for tool calling in the
@@ -155,7 +154,7 @@ public class QwenChatOptions implements ToolCallingChatOptions {
 	 * not specified, it will be judged based on the model name when called, but these
 	 * judgments may not keep up with the latest situation.
 	 */
-	private Boolean multimodalModel;
+	private Boolean isMultimodalModel;
 
 	/**
 	 * Whether the model supports incremental output in the streaming output mode. This
@@ -190,7 +189,7 @@ private QwenChatOptions(Builder builder) {
 		this.searchOptions = builder.searchOptions;
 		this.translationOptions = builder.translationOptions;
 		this.vlHighResolutionImages = builder.vlHighResolutionImages;
-		this.multimodalModel = builder.multimodalModel;
+		this.isMultimodalModel = builder.multimodalModel;
 		this.custom = builder.custom;
 	}
 
@@ -269,29 +268,17 @@ public Double getTopP() {
 	}
 
 	@Override
-	public List<FunctionCallback> getToolCallbacks() {
+	public List<ToolCallback> getToolCallbacks() {
 		return this.toolCallbacks;
 	}
 
 	@Override
-	public void setToolCallbacks(List<FunctionCallback> toolCallbacks) {
+	public void setToolCallbacks(List<ToolCallback> toolCallbacks) {
 		Assert.notNull(toolCallbacks, "toolCallbacks cannot be null");
 		Assert.noNullElements(toolCallbacks, "toolCallbacks cannot contain null elements");
 		this.toolCallbacks = toolCallbacks;
 	}
 
-	@Override
-	@Deprecated
-	public List<FunctionCallback> getFunctionCallbacks() {
-		return this.getToolCallbacks();
-	}
-
-	@Override
-	@Deprecated
-	public void setFunctionCallbacks(List<FunctionCallback> functionCallbacks) {
-		this.setToolCallbacks(functionCallbacks);
-	}
-
 	@Override
 	public Set<String> getToolNames() {
 		return this.toolNames;
@@ -305,21 +292,9 @@ public void setToolNames(Set<String> toolNames) {
 		this.toolNames = toolNames;
 	}
 
-	@Override
-	@Deprecated
-	public Set<String> getFunctions() {
-		return this.getToolNames();
-	}
-
-	@Override
-	@Deprecated
-	public void setFunctions(Set<String> functionNames) {
-		this.setToolNames(functionNames);
-	}
-
 	@Override
 	@Nullable
-	public Boolean isInternalToolExecutionEnabled() {
+	public Boolean getInternalToolExecutionEnabled() {
 		return internalToolExecutionEnabled;
 	}
 
@@ -391,12 +366,12 @@ public void setVlHighResolutionImages(Boolean vlHighResolutionImages) {
 		this.vlHighResolutionImages = vlHighResolutionImages;
 	}
 
-	public Boolean isMultimodalModel() {
-		return multimodalModel;
+	public Boolean getIsMultimodalModel() {
+		return isMultimodalModel;
 	}
 
-	public void setMultimodalModel(Boolean multimodalModel) {
-		this.multimodalModel = multimodalModel;
+	public void setIsMultimodalModel(Boolean isMultimodalModel) {
+		this.isMultimodalModel = isMultimodalModel;
 	}
 
 	public Boolean getSupportIncrementalOutput() {
@@ -454,7 +429,7 @@ public static class Builder {
 
 		private Integer topK;
 
-		private List<FunctionCallback> toolCallbacks = new ArrayList<>();
+		private List<ToolCallback> toolCallbacks = new ArrayList<>();
 
 		private Set<String> toolNames = new HashSet<>();
 
@@ -528,7 +503,7 @@ public Builder topK(Integer topK) {
 			return this;
 		}
 
-		public Builder toolCallbacks(List<FunctionCallback> toolCallbacks) {
+		public Builder toolCallbacks(List<ToolCallback> toolCallbacks) {
 			this.toolCallbacks = toolCallbacks;
 			return this;
 		}
@@ -614,7 +589,7 @@ public Builder overrideWith(QwenChatOptions fromOptions) {
 			this.translationOptions(getOrDefault(fromOptions.getTranslationOptions(), this.translationOptions));
 			this.vlHighResolutionImages(
 					getOrDefault(fromOptions.getVlHighResolutionImages(), this.vlHighResolutionImages));
-			this.isMultimodalModel(getOrDefault(fromOptions.isMultimodalModel(), this.multimodalModel));
+			this.isMultimodalModel(getOrDefault(fromOptions.getIsMultimodalModel(), this.multimodalModel));
 			this.supportIncrementalOutput(
 					getOrDefault(fromOptions.getSupportIncrementalOutput(), this.supportIncrementalOutput));
 			this.custom(copyIfNotNull(getOrDefault(fromOptions.getCustom(), this.custom)));

models/spring-ai-qwen/src/main/java/org/springframework/ai/qwen/api/QwenApi.java

@@ -266,7 +266,7 @@ boolean isMultimodalModel(Prompt prompt) {
 		}
 
 		String modelName = options.getModel();
-		Boolean isMultimodalModel = ((QwenChatOptions) options).isMultimodalModel();
+		Boolean isMultimodalModel = ((QwenChatOptions) options).getIsMultimodalModel();
 		isMultimodalModel = getOrDefault(isMultimodalModel, isMultimodalModelName(modelName));
 
 		return Boolean.TRUE.equals(isMultimodalModel);