Skip to content

Initial Support for the Anthropic Java SDK #5366

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
sobychacko wants to merge 1 commit into from
+5,799 −13,517
Closed

Initial Support for the Anthropic Java SDK #5366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions auto-configurations/models/spring-ai-autoconfigure-model-anthropic/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-anthropic</artifactId>
<version>${project.parent.version}</version>
<optional>true</optional>
</dependency>

<!-- Spring AI auto configurations -->
Expand All @@ -41,12 +40,6 @@
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-autoconfigure-retry</artifactId>
<version>${project.parent.version}</version>
</dependency>

<dependency>
<groupId>org.springframework.ai</groupId>
<artifactId>spring-ai-autoconfigure-model-chat-observation</artifactId>
Expand All @@ -60,17 +53,6 @@
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-webclient</artifactId>
<optional>true</optional>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-restclient</artifactId>
<optional>true</optional>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-configuration-processor</artifactId>
Expand Down
77 changes: 31 additions & 46 deletions .../org/springframework/ai/model/anthropic/autoconfigure/AnthropicChatAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,88 +16,73 @@

package org.springframework.ai.model.anthropic.autoconfigure;

import com.anthropic.client.AnthropicClient;
import io.micrometer.observation.ObservationRegistry;

import org.springframework.ai.anthropic.AnthropicChatModel;
import org.springframework.ai.anthropic.api.AnthropicApi;
import org.springframework.ai.anthropic.AnthropicChatOptions;
import org.springframework.ai.chat.observation.ChatModelObservationConvention;
import org.springframework.ai.model.SpringAIModelProperties;
import org.springframework.ai.model.SpringAIModels;
import org.springframework.ai.model.tool.DefaultToolExecutionEligibilityPredicate;
import org.springframework.ai.model.tool.ToolCallingManager;
import org.springframework.ai.model.tool.ToolExecutionEligibilityPredicate;
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import org.springframework.ai.retry.RetryUtils;
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
import org.springframework.boot.restclient.autoconfigure.RestClientAutoConfiguration;
import org.springframework.boot.webclient.autoconfigure.WebClientAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Import;
import org.springframework.core.retry.RetryTemplate;
import org.springframework.web.client.ResponseErrorHandler;
import org.springframework.web.client.RestClient;
import org.springframework.web.reactive.function.client.WebClient;

/**
* {@link AutoConfiguration Auto-configuration} for Anthropic Chat Model.
*
* @author Christian Tzolov
* @author Thomas Vitale
* @author Ilayaperumal Gopinathan
* @author Hyoseop Song
* @author Yanming Zhou
* @since 1.0.0
* @author Soby Chacko
* @since 2.0.0
*/
@AutoConfiguration(after = { RestClientAutoConfiguration.class, WebClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, SpringAiRetryAutoConfiguration.class })
@EnableConfigurationProperties({ AnthropicChatProperties.class, AnthropicConnectionProperties.class })
@ConditionalOnClass(AnthropicApi.class)
@AutoConfiguration(after = { ToolCallingAutoConfiguration.class })
Copy link
Member

@ericbottard ericbottard Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

See my comment above about after

Copy link
Contributor Author

@sobychacko sobychacko Mar 12, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The anthropicChatModel bean directly injects ToolCallingManager, which is provided by ToolCallingAutoConfiguration. Removing the after attribute breaks various auto-config tests since SpringAiTestAutoConfigurations.of() rely on it to include dependency configs in the test context. OpenAiSdkChatAutoConfiguration also follows the same pattern. Therefore I am keeping the after as is, unless you see further issues with that.

Copy link
Member

@ericbottard ericbottard Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not correct. SpringAiTestAutoConfigurations is wrong too (it adding any config that is in after to the list of configs to load is wrong and does not reflect what happens at runtime). Please remove the afters from this PR and I'll also create a PR to get rid of SpringAiTestAutoConfigurations for M3

Copy link
Contributor Author

@sobychacko sobychacko Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ericbottard Based on our discussion on this matter, we are good here, right?

Copy link
Member

@ericbottard ericbottard Mar 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, let's postpone

@EnableConfigurationProperties({ AnthropicConnectionProperties.class, AnthropicChatProperties.class })
@ConditionalOnClass(AnthropicClient.class)
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.ANTHROPIC,
matchIfMissing = true)
@Import(StringToToolChoiceConverter.class)
public class AnthropicChatAutoConfiguration {

@Bean
@ConditionalOnMissingBean
public AnthropicApi anthropicApi(AnthropicConnectionProperties connectionProperties,
ObjectProvider<RestClient.Builder> restClientBuilderProvider,
ObjectProvider<WebClient.Builder> webClientBuilderProvider,
ObjectProvider<ResponseErrorHandler> responseErrorHandler) {

return AnthropicApi.builder()
.baseUrl(connectionProperties.getBaseUrl())
.completionsPath(connectionProperties.getCompletionsPath())
.apiKey(connectionProperties.getApiKey())
.anthropicVersion(connectionProperties.getVersion())
.restClientBuilder(restClientBuilderProvider.getIfAvailable(RestClient::builder))
.webClientBuilder(webClientBuilderProvider.getIfAvailable(WebClient::builder))
.responseErrorHandler(responseErrorHandler.getIfAvailable(() -> RetryUtils.DEFAULT_RESPONSE_ERROR_HANDLER))
.anthropicBetaFeatures(connectionProperties.getBetaVersion())
.build();
}

@Bean
@ConditionalOnMissingBean
public AnthropicChatModel anthropicChatModel(AnthropicApi anthropicApi, AnthropicChatProperties chatProperties,
ObjectProvider<RetryTemplate> retryTemplate, ToolCallingManager toolCallingManager,
public AnthropicChatModel anthropicChatModel(AnthropicConnectionProperties connectionProperties,
AnthropicChatProperties chatProperties, ToolCallingManager toolCallingManager,
ObjectProvider<ObservationRegistry> observationRegistry,
ObjectProvider<ChatModelObservationConvention> observationConvention,
ObjectProvider<ToolExecutionEligibilityPredicate> anthropicToolExecutionEligibilityPredicate) {

AnthropicChatOptions options = chatProperties.getOptions();
if (connectionProperties.getApiKey() != null) {
options.setApiKey(connectionProperties.getApiKey());
}
if (connectionProperties.getBaseUrl() != null) {
options.setBaseUrl(connectionProperties.getBaseUrl());
}
if (connectionProperties.getTimeout() != null) {
options.setTimeout(connectionProperties.getTimeout());
}
if (connectionProperties.getMaxRetries() != null) {
options.setMaxRetries(connectionProperties.getMaxRetries());
}
if (connectionProperties.getProxy() != null) {
options.setProxy(connectionProperties.getProxy());
}
if (!connectionProperties.getCustomHeaders().isEmpty()) {
options.setCustomHeaders(connectionProperties.getCustomHeaders());
}

var chatModel = AnthropicChatModel.builder()
.anthropicApi(anthropicApi)
.defaultOptions(chatProperties.getOptions())
.options(options)
.toolCallingManager(toolCallingManager)
.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
.toolExecutionEligibilityPredicate(anthropicToolExecutionEligibilityPredicate
.getIfUnique(DefaultToolExecutionEligibilityPredicate::new))
.retryTemplate(retryTemplate.getIfUnique(() -> RetryUtils.DEFAULT_RETRY_TEMPLATE))
.observationRegistry(observationRegistry.getIfUnique(() -> ObservationRegistry.NOOP))
.build();

observationConvention.ifAvailable(chatModel::setObservationConvention);
Expand Down
20 changes: 8 additions & 12 deletions ...in/java/org/springframework/ai/model/anthropic/autoconfigure/AnthropicChatProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,32 +16,28 @@

package org.springframework.ai.model.anthropic.autoconfigure;

import org.springframework.ai.anthropic.AnthropicChatModel;
import org.springframework.ai.anthropic.AbstractAnthropicOptions;
import org.springframework.ai.anthropic.AnthropicChatOptions;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;

/**
* Anthropic Chat autoconfiguration properties.
*
* @author Christian Tzolov
* @author Alexandros Pappas
* @since 1.0.0
* @author Soby Chacko
* @since 2.0.0
*/
@ConfigurationProperties(AnthropicChatProperties.CONFIG_PREFIX)
public class AnthropicChatProperties {
public class AnthropicChatProperties extends AbstractAnthropicOptions {

public static final String CONFIG_PREFIX = "spring.ai.anthropic.chat";

/**
* Client lever Ollama options. Use this property to configure generative temperature,
* topK and topP and alike parameters. The null values are ignored defaulting to the
* generative's defaults.
*/
public static final String DEFAULT_CHAT_MODEL = AnthropicChatOptions.DEFAULT_MODEL;

@NestedConfigurationProperty
private final AnthropicChatOptions options = AnthropicChatOptions.builder()
.model(AnthropicChatModel.DEFAULT_MODEL_NAME)
.maxTokens(AnthropicChatModel.DEFAULT_MAX_TOKENS)
.model(DEFAULT_CHAT_MODEL)
.maxTokens(AnthropicChatOptions.DEFAULT_MAX_TOKENS)
.build();

public AnthropicChatOptions getOptions() {
Expand Down
76 changes: 5 additions & 71 deletions ...a/org/springframework/ai/model/anthropic/autoconfigure/AnthropicConnectionProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,84 +16,18 @@

package org.springframework.ai.model.anthropic.autoconfigure;

import org.springframework.ai.anthropic.api.AnthropicApi;
import org.springframework.ai.anthropic.AbstractAnthropicOptions;
import org.springframework.boot.context.properties.ConfigurationProperties;

/**
* Anthropic API connection properties.
* Anthropic connection properties.
*
* @author Christian Tzolov
* @since 1.0.0
* @author Soby Chacko
* @since 2.0.0
*/
@ConfigurationProperties(AnthropicConnectionProperties.CONFIG_PREFIX)
public class AnthropicConnectionProperties {
public class AnthropicConnectionProperties extends AbstractAnthropicOptions {

public static final String CONFIG_PREFIX = "spring.ai.anthropic";

/**
* Anthropic API access key.
*/
private String apiKey;

/**
* Anthropic API base URL.
*/
private String baseUrl = AnthropicApi.DEFAULT_BASE_URL;

/**
* Path to append to the base URL
*/
private String completionsPath = AnthropicApi.DEFAULT_MESSAGE_COMPLETIONS_PATH;

/**
* Anthropic API version.
*/
private String version = AnthropicApi.DEFAULT_ANTHROPIC_VERSION;

/**
* Beta features version. Such as tools-2024-04-04 or
* max-tokens-3-5-sonnet-2024-07-15.
*/
private String betaVersion = AnthropicApi.DEFAULT_ANTHROPIC_BETA_VERSION;

public String getApiKey() {
return this.apiKey;
}

public void setApiKey(String apiKey) {
this.apiKey = apiKey;
}

public String getBaseUrl() {
return this.baseUrl;
}

public void setBaseUrl(String baseUrl) {
this.baseUrl = baseUrl;
}

public String getCompletionsPath() {
return this.completionsPath;
}

public void setCompletionsPath(String completionsPath) {
this.completionsPath = completionsPath;
}

public String getVersion() {
return this.version;
}

public void setVersion(String version) {
this.version = version;
}

public String getBetaVersion() {
return this.betaVersion;
}

public void setBetaVersion(String betaVersion) {
this.betaVersion = betaVersion;
}

}
42 changes: 0 additions & 42 deletions ...ava/org/springframework/ai/model/anthropic/autoconfigure/StringToToolChoiceConverter.java
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...k/ai/anthropic/metadata/package-info.java → ...anthropic/autoconfigure/package-info.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
*/

@NullMarked
package org.springframework.ai.anthropic.metadata;
package org.springframework.ai.model.anthropic.autoconfigure;

import org.jspecify.annotations.NullMarked;
Loading
Loading