Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
*/
@AutoConfiguration
@ConditionalOnClass(RetryUtils.class)
@EnableConfigurationProperties({ SpringAiRetryProperties.class })
@EnableConfigurationProperties(SpringAiRetryProperties.class)
public class SpringAiRetryAutoConfiguration {

private static final Logger logger = LoggerFactory.getLogger(SpringAiRetryAutoConfiguration.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
"org.springframework.ai.mcp.client.httpclient.autoconfigure.StreamableHttpHttpClientTransportAutoConfiguration",
"org.springframework.ai.mcp.client.webflux.autoconfigure.SseWebFluxTransportAutoConfiguration",
"org.springframework.ai.mcp.client.webflux.autoconfigure.StreamableHttpWebFluxTransportAutoConfiguration" })
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties(McpClientCommonProperties.class)
@ConditionalOnProperty(prefix = McpClientCommonProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
matchIfMissing = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
* ToolCallbacksProviders. These providers are used by Spring AI to discover and execute
* tools.
*/
@AutoConfiguration(after = { McpClientAutoConfiguration.class },
beforeName = { "org.springframework.ai.model.chat.client.autoconfigure.ChatClientAutoConfiguration" })
@AutoConfiguration(after = McpClientAutoConfiguration.class,
beforeName = "org.springframework.ai.model.chat.client.autoconfigure.ChatClientAutoConfiguration")
@EnableConfigurationProperties(McpClientCommonProperties.class)
@Conditional(McpToolCallbackAutoConfiguration.McpToolCallbackAutoConfigurationCondition.class)
public class McpToolCallbackAutoConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@
* @see McpStdioClientProperties
*/
@AutoConfiguration
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties({ McpStdioClientProperties.class, McpClientCommonProperties.class })
@ConditionalOnProperty(prefix = McpClientCommonProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
matchIfMissing = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"org.springframework.ai.mcp.server.autoconfigure.McpServerSseWebMvcAutoConfiguration",
"org.springframework.ai.mcp.server.autoconfigure.McpServerStreamableHttpWebMvcAutoConfiguration",
"org.springframework.ai.mcp.server.autoconfigure.McpServerStreamableHttpWebFluxAutoConfiguration" })
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties({ McpServerProperties.class, McpServerChangeNotificationProperties.class })
@ConditionalOnProperty(prefix = McpServerProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
matchIfMissing = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"org.springframework.ai.mcp.server.common.autoconfigure.StatelessToolCallbackConverterAutoConfiguration",
"org.springframework.ai.mcp.server.autoconfigure.McpServerStatelessWebFluxAutoConfiguration",
"org.springframework.ai.mcp.server.autoconfigure.McpServerStatelessWebMvcAutoConfiguration" })
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties(McpServerProperties.class)
@Conditional({ McpServerStdioDisabledCondition.class,
McpServerStatelessAutoConfiguration.EnabledStatelessServerCondition.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
* @see WebFluxSseServerTransportProvider
*/
@AutoConfiguration(before = McpServerAutoConfiguration.class)
@EnableConfigurationProperties({ McpServerSseProperties.class })
@ConditionalOnClass({ WebFluxSseServerTransportProvider.class })
@EnableConfigurationProperties(McpServerSseProperties.class)
@ConditionalOnClass(WebFluxSseServerTransportProvider.class)
@ConditionalOnMissingBean(McpServerTransportProvider.class)
@Conditional({ McpServerStdioDisabledCondition.class, McpServerAutoConfiguration.EnabledSseServerCondition.class })
public class McpServerSseWebFluxAutoConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* @author Yanming Zhou
*/
@AutoConfiguration(before = McpServerStatelessAutoConfiguration.class)
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties(McpServerStreamableHttpProperties.class)
@Conditional({ McpServerStdioDisabledCondition.class,
McpServerStatelessAutoConfiguration.EnabledStatelessServerCondition.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* @author Yanming Zhou
*/
@AutoConfiguration(before = McpServerAutoConfiguration.class)
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties({ McpServerProperties.class, McpServerStreamableHttpProperties.class })
@Conditional({ McpServerStdioDisabledCondition.class,
McpServerAutoConfiguration.EnabledStreamableServerCondition.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,8 @@
* @see WebMvcSseServerTransportProvider
*/
@AutoConfiguration(before = McpServerAutoConfiguration.class)
@EnableConfigurationProperties({ McpServerSseProperties.class })
@ConditionalOnClass({ WebMvcSseServerTransportProvider.class })
@EnableConfigurationProperties(McpServerSseProperties.class)
@ConditionalOnClass(WebMvcSseServerTransportProvider.class)
@ConditionalOnMissingBean(McpServerTransportProvider.class)
@Conditional({ McpServerStdioDisabledCondition.class, McpServerAutoConfiguration.EnabledSseServerCondition.class })
public class McpServerSseWebMvcAutoConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
* @author Yanming Zhou
*/
@AutoConfiguration(before = McpServerStatelessAutoConfiguration.class)
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties(McpServerStreamableHttpProperties.class)
@Conditional({ McpServerStdioDisabledCondition.class,
McpServerStatelessAutoConfiguration.EnabledStatelessServerCondition.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* @author Yanming Zhou
*/
@AutoConfiguration(before = McpServerAutoConfiguration.class)
@ConditionalOnClass({ McpSchema.class })
@ConditionalOnClass(McpSchema.class)
@EnableConfigurationProperties({ McpServerProperties.class, McpServerStreamableHttpProperties.class })
@Conditional({ McpServerStdioDisabledCondition.class,
McpServerAutoConfiguration.EnabledStreamableServerCondition.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
* @since 1.0.0
*/
@AutoConfiguration(
afterName = { "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration" })
afterName = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
@ConditionalOnClass(ChatClient.class)
@EnableConfigurationProperties(ChatClientBuilderProperties.class)
@ConditionalOnProperty(prefix = ChatClientBuilderProperties.CONFIG_PREFIX, name = "enabled", havingValue = "true",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@
* @since 1.0.0
*/
@AutoConfiguration(
afterName = { "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration" })
afterName = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
@ConditionalOnClass(ChatModel.class)
@EnableConfigurationProperties({ ChatObservationProperties.class })
@EnableConfigurationProperties(ChatObservationProperties.class)
public class ChatObservationAutoConfiguration {

private static final Logger logger = LoggerFactory.getLogger(ChatObservationAutoConfiguration.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
@AutoConfiguration(
afterName = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration.class")
@ConditionalOnClass(ImageModel.class)
@EnableConfigurationProperties({ ImageObservationProperties.class })
@EnableConfigurationProperties(ImageObservationProperties.class)
public class ImageObservationAutoConfiguration {

private static final Logger logger = LoggerFactory.getLogger(ImageObservationAutoConfiguration.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* @author Ilayaperumal Gopinathan
*/
@AutoConfiguration
@ConditionalOnClass({ AzureOpenAiAudioTranscriptionModel.class })
@ConditionalOnClass(AzureOpenAiAudioTranscriptionModel.class)
@EnableConfigurationProperties(AzureOpenAiAudioTranscriptionProperties.class)
@ConditionalOnProperty(name = SpringAIModelProperties.AUDIO_TRANSCRIPTION_MODEL,
havingValue = SpringAIModels.AZURE_OPENAI, matchIfMissing = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@
* @author Manuel Andreo Garcia
* @author Ilayaperumal Gopinathan
*/
@AutoConfiguration(after = { ToolCallingAutoConfiguration.class })
@ConditionalOnClass({ AzureOpenAiChatModel.class })
@EnableConfigurationProperties({ AzureOpenAiChatProperties.class })
@AutoConfiguration(after = ToolCallingAutoConfiguration.class)
@ConditionalOnClass(AzureOpenAiChatModel.class)
@EnableConfigurationProperties(AzureOpenAiChatProperties.class)
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.AZURE_OPENAI,
matchIfMissing = true)
@Import(AzureOpenAiClientBuilderConfiguration.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
* @author Manuel Andreo Garcia
* @author Ilayaperumal Gopinathan
*/
@ConditionalOnClass({ OpenAIClientBuilder.class })
@ConditionalOnClass(OpenAIClientBuilder.class)
@EnableConfigurationProperties(AzureOpenAiConnectionProperties.class)
public class AzureOpenAiClientBuilderConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
* @author Ilayaperumal Gopinathan
*/
@AutoConfiguration
@ConditionalOnClass({ AzureOpenAiEmbeddingModel.class })
@EnableConfigurationProperties({ AzureOpenAiEmbeddingProperties.class })
@ConditionalOnClass(AzureOpenAiEmbeddingModel.class)
@EnableConfigurationProperties(AzureOpenAiEmbeddingProperties.class)
@ConditionalOnProperty(name = SpringAIModelProperties.EMBEDDING_MODEL, havingValue = SpringAIModels.AZURE_OPENAI,
matchIfMissing = true)
@Import(AzureOpenAiClientBuilderConfiguration.class)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* @author Wei Jiang
*/
@Configuration
@EnableConfigurationProperties({ BedrockAwsConnectionProperties.class })
@EnableConfigurationProperties(BedrockAwsConnectionProperties.class)
public class BedrockAwsConnectionConfiguration {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
* @author Wei Jiang
* @author Pawel Potaczala
*/
@AutoConfiguration(after = { ToolCallingAutoConfiguration.class })
@AutoConfiguration(after = ToolCallingAutoConfiguration.class)
@EnableConfigurationProperties({ BedrockConverseProxyChatProperties.class, BedrockAwsConnectionConfiguration.class })
@ConditionalOnClass({ BedrockProxyChatModel.class, BedrockRuntimeClient.class, BedrockRuntimeAsyncClient.class })
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.BEDROCK_CONVERSE,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public void autoConfigureWithCustomAWSCredentialAndRegionProvider() {
});
}

@EnableConfigurationProperties({ BedrockAwsConnectionProperties.class })
@EnableConfigurationProperties(BedrockAwsConnectionProperties.class)
@Import(BedrockAwsConnectionConfiguration.class)
static class TestAutoConfiguration {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
* @author Ilayaperumal Gopinathan
* @since 0.8.0
*/
@AutoConfiguration(after = { RestClientAutoConfiguration.class })
@AutoConfiguration(after = RestClientAutoConfiguration.class)
@ConditionalOnClass(StabilityAiApi.class)
@ConditionalOnProperty(name = SpringAIModelProperties.IMAGE_MODEL, havingValue = SpringAIModels.STABILITY_AI,
matchIfMissing = true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
* @author Christian Tzolov
*/
@AutoConfiguration
@EnableConfigurationProperties({ TransformersEmbeddingModelProperties.class })
@EnableConfigurationProperties(TransformersEmbeddingModelProperties.class)
@ConditionalOnProperty(name = SpringAIModelProperties.EMBEDDING_MODEL, havingValue = SpringAIModels.TRANSFORMERS,
matchIfMissing = true)
@ConditionalOnClass({ OrtSession.class, HuggingFaceTokenizer.class, TransformersEmbeddingModel.class })
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
*/
@AutoConfiguration
@ConditionalOnClass({ EmbeddingModel.class, SearchIndexClient.class, AzureVectorStore.class })
@EnableConfigurationProperties({ AzureVectorStoreProperties.class })
@EnableConfigurationProperties(AzureVectorStoreProperties.class)
@ConditionalOnProperty(name = SpringAIVectorStoreTypes.TYPE, havingValue = SpringAIVectorStoreTypes.AZURE,
matchIfMissing = true)
public class AzureVectorStoreAutoConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
*/
@AutoConfiguration(after = Neo4jAutoConfiguration.class)
@ConditionalOnClass({ Neo4jVectorStore.class, EmbeddingModel.class, Driver.class })
@EnableConfigurationProperties({ Neo4jVectorStoreProperties.class })
@EnableConfigurationProperties(Neo4jVectorStoreProperties.class)
@ConditionalOnProperty(name = SpringAIVectorStoreTypes.TYPE, havingValue = SpringAIVectorStoreTypes.NEO4J,
matchIfMissing = true)
public class Neo4jVectorStoreAutoConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@
* @since 1.0.0
*/
@AutoConfiguration(
afterName = { "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration" })
afterName = "org.springframework.boot.actuate.autoconfigure.observation.ObservationAutoConfiguration")
@ConditionalOnClass(VectorStore.class)
@EnableConfigurationProperties({ VectorStoreObservationProperties.class })
@EnableConfigurationProperties(VectorStoreObservationProperties.class)
public class VectorStoreObservationAutoConfiguration {

private static final Logger logger = LoggerFactory.getLogger(VectorStoreObservationAutoConfiguration.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
*/
@AutoConfiguration
@ConditionalOnClass({ EmbeddingModel.class, WeaviateVectorStore.class })
@EnableConfigurationProperties({ WeaviateVectorStoreProperties.class })
@EnableConfigurationProperties(WeaviateVectorStoreProperties.class)
@ConditionalOnProperty(name = SpringAIVectorStoreTypes.TYPE, havingValue = SpringAIVectorStoreTypes.WEAVIATE,
matchIfMissing = true)
public class WeaviateVectorStoreAutoConfiguration {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ void clear_shouldDeleteMessages() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
* @author Yanming Zhou
*/
@SpringBootTest
@TestPropertySource(properties = { "spring.datasource.url=jdbc:tc:mariadb:10.3.39:///" })
@TestPropertySource(properties = "spring.datasource.url=jdbc:tc:mariadb:10.3.39:///")
@Sql(scripts = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-mariadb.sql")
class JdbcChatMemoryRepositoryMariaDbIT extends AbstractJdbcChatMemoryRepositoryIT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
* @author Henning Pöttker
*/
@SpringBootTest
@TestPropertySource(properties = { "spring.datasource.url=jdbc:tc:mysql:8.0.42:///" })
@TestPropertySource(properties = "spring.datasource.url=jdbc:tc:mysql:8.0.42:///")
@Sql(scripts = "classpath:org/springframework/ai/chat/memory/repository/jdbc/schema-mysql.sql")
class JdbcChatMemoryRepositoryMysqlIT extends AbstractJdbcChatMemoryRepositoryIT {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public final class SimpleVectorStoreContent implements Content {
* @param embedding the embedding vector, must not be null
*/
@JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
public SimpleVectorStoreContent(@JsonProperty("text") @JsonAlias({ "content" }) String text,
public SimpleVectorStoreContent(@JsonProperty("text") @JsonAlias("content") String text,
@JsonProperty("embedding") float[] embedding) {
this(text, new HashMap<>(), embedding);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -609,7 +609,7 @@ private void executeCqlFile(ApplicationContext context, String filename) throws
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ void throwsExceptionOnInvalidIndexNameWithSchemaValidation() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ void search() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ void getNativeClientTest() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,7 @@ public void getNativeClientTest() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Bean("vectorStore_cosine")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ void observationVectorStoreAddAndQueryOperations() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class Config {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ public void shouldFailOnSQLInjectionAttemptInSchemaName() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Value("${test.spring.ai.vectorstore.mariadb.vectorTableName:}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -410,7 +410,7 @@ void getNativeClientTest() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
public static class TestApplication {

@Value("${test.spring.ai.vectorstore.mariadb.distanceType}")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ void observationVectorStoreAddAndQueryOperations() {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
static class Config {

@Bean
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ void searchWithAutoIdEnabled(String metricType) {
}

@SpringBootConfiguration
@EnableAutoConfiguration(exclude = { DataSourceAutoConfiguration.class })
@EnableAutoConfiguration(exclude = DataSourceAutoConfiguration.class)
static class TestApplication {

@Value("${test.spring.ai.vectorstore.milvus.metricType}")
Expand Down
Loading
Loading