Remove deprecations from 1.0.0-M6

- Remove deprecations from models, vector stores and usage
- Deprecations from FunctionCallback and ObservationContext/Convention will be in a separate PR

Models updates
  - Remove AbstractToolCallSupport from the models which use ToolCallingManager
  - Remove deprecated constructors and their usage
  - Remove FunctionCallbackResolver and FunctionCallbacks usage in the models

- Add back deprecations for VectorStoreChatMemoryAdvisor until builder is fixed

- Update OpenAiPaymentTransactionIT to use ToolCallbackResolver in config

Signed-off-by: Ilayaperumal Gopinathan <[email protected]>

Author: ilayaperumalg

models/spring-ai-anthropic/src/main/java/org/springframework/ai/anthropic/AnthropicChatModel.java

@@ -30,13 +30,6 @@
 import io.micrometer.observation.contextpropagation.ObservationThreadLocalAccessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.ai.model.tool.LegacyToolCallingManager;
-import org.springframework.ai.model.tool.ToolCallingChatOptions;
-import org.springframework.ai.model.tool.ToolCallingManager;
-import org.springframework.ai.model.tool.ToolExecutionResult;
-import org.springframework.ai.tool.definition.ToolDefinition;
-import org.springframework.ai.util.json.JsonParser;
-import org.springframework.lang.Nullable;
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
 import reactor.core.scheduler.Schedulers;
@@ -59,7 +52,6 @@
 import org.springframework.ai.chat.metadata.EmptyUsage;
 import org.springframework.ai.chat.metadata.Usage;
 import org.springframework.ai.chat.metadata.UsageUtils;
-import org.springframework.ai.chat.model.AbstractToolCallSupport;
 import org.springframework.ai.chat.model.ChatModel;
 import org.springframework.ai.chat.model.ChatResponse;
 import org.springframework.ai.chat.model.Generation;
@@ -72,10 +64,12 @@
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.model.Media;
 import org.springframework.ai.model.ModelOptionsUtils;
-import org.springframework.ai.model.function.FunctionCallback;
-import org.springframework.ai.model.function.FunctionCallbackResolver;
-import org.springframework.ai.model.function.FunctionCallingOptions;
+import org.springframework.ai.model.tool.ToolCallingChatOptions;
+import org.springframework.ai.model.tool.ToolCallingManager;
+import org.springframework.ai.model.tool.ToolExecutionResult;
 import org.springframework.ai.retry.RetryUtils;
+import org.springframework.ai.tool.definition.ToolDefinition;
+import org.springframework.ai.util.json.JsonParser;
 import org.springframework.http.ResponseEntity;
 import org.springframework.retry.support.RetryTemplate;
 import org.springframework.util.Assert;
@@ -94,7 +88,7 @@
  * @author Alexandros Pappas
  * @since 1.0.0
  */
-public class AnthropicChatModel extends AbstractToolCallSupport implements ChatModel {
+public class AnthropicChatModel implements ChatModel {
 
 	public static final String DEFAULT_MODEL_NAME = AnthropicApi.ChatModel.CLAUDE_3_7_SONNET.getValue();
 
@@ -135,111 +129,9 @@ public class AnthropicChatModel extends AbstractToolCallSupport implements ChatM
 	 */
 	private ChatModelObservationConvention observationConvention = DEFAULT_OBSERVATION_CONVENTION;
 
-	/**
-	 * Construct a new {@link AnthropicChatModel} instance.
-	 * @param anthropicApi the lower-level API for the Anthropic service.
-	 * @deprecated Use {@link AnthropicChatModel.Builder}.
-	 */
-	@Deprecated
-	public AnthropicChatModel(AnthropicApi anthropicApi) {
-		this(anthropicApi,
-				AnthropicChatOptions.builder()
-					.model(DEFAULT_MODEL_NAME)
-					.maxTokens(DEFAULT_MAX_TOKENS)
-					.temperature(DEFAULT_TEMPERATURE)
-					.build());
-	}
-
-	/**
-	 * Construct a new {@link AnthropicChatModel} instance.
-	 * @param anthropicApi the lower-level API for the Anthropic service.
-	 * @param defaultOptions the default options used for the chat completion requests.
-	 * @deprecated Use {@link AnthropicChatModel.Builder}.
-	 */
-	@Deprecated
-	public AnthropicChatModel(AnthropicApi anthropicApi, AnthropicChatOptions defaultOptions) {
-		this(anthropicApi, defaultOptions, RetryUtils.DEFAULT_RETRY_TEMPLATE);
-	}
-
-	/**
-	 * Construct a new {@link AnthropicChatModel} instance.
-	 * @param anthropicApi the lower-level API for the Anthropic service.
-	 * @param defaultOptions the default options used for the chat completion requests.
-	 * @param retryTemplate the retry template used to retry the Anthropic API calls.
-	 * @deprecated Use {@link AnthropicChatModel.Builder}.
-	 */
-	@Deprecated
-	public AnthropicChatModel(AnthropicApi anthropicApi, AnthropicChatOptions defaultOptions,
-			RetryTemplate retryTemplate) {
-		this(anthropicApi, defaultOptions, retryTemplate, null);
-	}
-
-	/**
-	 * Construct a new {@link AnthropicChatModel} instance.
-	 * @param anthropicApi the lower-level API for the Anthropic service.
-	 * @param defaultOptions the default options used for the chat completion requests.
-	 * @param retryTemplate the retry template used to retry the Anthropic API calls.
-	 * @param functionCallbackResolver the function callback resolver used to resolve the
-	 * function by its name.
-	 * @deprecated Use {@link AnthropicChatModel.Builder}.
-	 */
-	@Deprecated
-	public AnthropicChatModel(AnthropicApi anthropicApi, AnthropicChatOptions defaultOptions,
-			RetryTemplate retryTemplate, FunctionCallbackResolver functionCallbackResolver) {
-		this(anthropicApi, defaultOptions, retryTemplate, functionCallbackResolver, List.of());
-	}
-
-	/**
-	 * Construct a new {@link AnthropicChatModel} instance.
-	 * @param anthropicApi the lower-level API for the Anthropic service.
-	 * @param defaultOptions the default options used for the chat completion requests.
-	 * @param retryTemplate the retry template used to retry the Anthropic API calls.
-	 * @param functionCallbackResolver the function callback resolver used to resolve the
-	 * function by its name.
-	 * @param toolFunctionCallbacks the tool function callbacks used to handle the tool
-	 * calls.
-	 * @deprecated Use {@link AnthropicChatModel.Builder}.
-	 */
-	@Deprecated
-	public AnthropicChatModel(AnthropicApi anthropicApi, AnthropicChatOptions defaultOptions,
-			RetryTemplate retryTemplate, FunctionCallbackResolver functionCallbackResolver,
-			List<FunctionCallback> toolFunctionCallbacks) {
-		this(anthropicApi, defaultOptions, retryTemplate, functionCallbackResolver, toolFunctionCallbacks,
-				ObservationRegistry.NOOP);
-	}
-
-	/**
-	 * Construct a new {@link AnthropicChatModel} instance.
-	 * @param anthropicApi the lower-level API for the Anthropic service.
-	 * @param defaultOptions the default options used for the chat completion requests.
-	 * @param retryTemplate the retry template used to retry the Anthropic API calls.
-	 * @param functionCallbackResolver the function callback resolver used to resolve the
-	 * function by its name.
-	 * @param toolFunctionCallbacks the tool function callbacks used to handle the tool
-	 * calls.
-	 * @deprecated Use {@link AnthropicChatModel.Builder}.
-	 */
-	@Deprecated
-	public AnthropicChatModel(AnthropicApi anthropicApi, AnthropicChatOptions defaultOptions,
-			RetryTemplate retryTemplate, @Nullable FunctionCallbackResolver functionCallbackResolver,
-			@Nullable List<FunctionCallback> toolFunctionCallbacks, ObservationRegistry observationRegistry) {
-		this(anthropicApi, defaultOptions,
-				LegacyToolCallingManager.builder()
-					.functionCallbackResolver(functionCallbackResolver)
-					.functionCallbacks(toolFunctionCallbacks)
-					.build(),
-				retryTemplate, observationRegistry);
-		logger.warn("This constructor is deprecated and will be removed in the next milestone. "
-				+ "Please use the MistralAiChatModel.Builder or the new constructor accepting ToolCallingManager instead.");
-	}
-
 	public AnthropicChatModel(AnthropicApi anthropicApi, AnthropicChatOptions defaultOptions,
 			ToolCallingManager toolCallingManager, RetryTemplate retryTemplate,
 			ObservationRegistry observationRegistry) {
-		// We do not pass the 'defaultOptions' to the AbstractToolSupport,
-		// because it modifies them. We are using ToolCallingManager instead,
-		// so we just pass empty options here.
-		super(null, AnthropicChatOptions.builder().build(), List.of());
 
 		Assert.notNull(anthropicApi, "anthropicApi cannot be null");
 		Assert.notNull(defaultOptions, "defaultOptions cannot be null");
@@ -488,10 +380,6 @@ Prompt buildRequestPrompt(Prompt prompt) {
 				runtimeOptions = ModelOptionsUtils.copyToTarget(toolCallingChatOptions, ToolCallingChatOptions.class,
 						AnthropicChatOptions.class);
 			}
-			else if (prompt.getOptions() instanceof FunctionCallingOptions functionCallingOptions) {
-				runtimeOptions = ModelOptionsUtils.copyToTarget(functionCallingOptions, FunctionCallingOptions.class,
-						AnthropicChatOptions.class);
-			}
 			else {
 				runtimeOptions = ModelOptionsUtils.copyToTarget(prompt.getOptions(), ChatOptions.class,
 						AnthropicChatOptions.class);
@@ -648,10 +536,6 @@ public static final class Builder {
 
 		private RetryTemplate retryTemplate = RetryUtils.DEFAULT_RETRY_TEMPLATE;
 
-		private FunctionCallbackResolver functionCallbackResolver;
-
-		private List<FunctionCallback> toolCallbacks;
-
 		private ToolCallingManager toolCallingManager;
 
 		private ObservationRegistry observationRegistry = ObservationRegistry.NOOP;
@@ -679,41 +563,16 @@ public Builder toolCallingManager(ToolCallingManager toolCallingManager) {
 			return this;
 		}
 
-		@Deprecated
-		public Builder functionCallbackResolver(FunctionCallbackResolver functionCallbackResolver) {
-			this.functionCallbackResolver = functionCallbackResolver;
-			return this;
-		}
-
-		@Deprecated
-		public Builder toolCallbacks(List<FunctionCallback> toolCallbacks) {
-			this.toolCallbacks = toolCallbacks;
-			return this;
-		}
-
 		public Builder observationRegistry(ObservationRegistry observationRegistry) {
 			this.observationRegistry = observationRegistry;
 			return this;
 		}
 
 		public AnthropicChatModel build() {
 			if (toolCallingManager != null) {
-				Assert.isNull(functionCallbackResolver,
-						"functionCallbackResolver cannot be set when toolCallingManager is set");
-				Assert.isNull(toolCallbacks, "toolCallbacks cannot be set when toolCallingManager is set");
-
 				return new AnthropicChatModel(anthropicApi, defaultOptions, toolCallingManager, retryTemplate,
 						observationRegistry);
 			}
-			if (functionCallbackResolver != null) {
-				Assert.isNull(toolCallingManager,
-						"toolCallingManager cannot be set when functionCallbackResolver is set");
-				List<FunctionCallback> toolCallbacks = this.toolCallbacks != null ? this.toolCallbacks : List.of();
-
-				return new AnthropicChatModel(anthropicApi, defaultOptions, retryTemplate, functionCallbackResolver,
-						toolCallbacks, observationRegistry);
-			}
-
 			return new AnthropicChatModel(anthropicApi, defaultOptions, DEFAULT_TOOL_CALLING_MANAGER, retryTemplate,
 					observationRegistry);
 		}

models/spring-ai-anthropic/src/test/java/org/springframework/ai/anthropic/AnthropicChatModelObservationIT.java

@@ -34,6 +34,8 @@
 import org.springframework.ai.chat.observation.DefaultChatModelObservationConvention;
 import org.springframework.ai.chat.prompt.Prompt;
 import org.springframework.ai.model.function.DefaultFunctionCallbackResolver;
+import org.springframework.ai.model.tool.DefaultToolCallingManager;
+import org.springframework.ai.model.tool.ToolCallingManager;
 import org.springframework.ai.observation.conventions.AiOperationType;
 import org.springframework.ai.observation.conventions.AiProvider;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -171,8 +173,7 @@ public AnthropicApi anthropicApi() {
 		public AnthropicChatModel anthropicChatModel(AnthropicApi anthropicApi,
 				TestObservationRegistry observationRegistry) {
 			return new AnthropicChatModel(anthropicApi, AnthropicChatOptions.builder().build(),
-					RetryTemplate.defaultInstance(), new DefaultFunctionCallbackResolver(), List.of(),
-					observationRegistry);
+					ToolCallingManager.builder().build(), RetryTemplate.defaultInstance(), observationRegistry);
 		}
 
 	}