Skip to content

Fix VertexAI auto-configuration #4535

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
wants to merge 1 commit into from
Closed

Fix VertexAI auto-configuration #4535

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
5 changes: 1 addition & 4 deletions .../model/vertexai/autoconfigure/embedding/VertexAiMultiModalEmbeddingAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.springframework.ai.vertexai.embedding.VertexAiEmbeddingConnectionDetails;
import org.springframework.ai.vertexai.embedding.multimodal.VertexAiMultimodalEmbeddingModel;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand All @@ -41,13 +40,11 @@
* @author Ilayaperumal Gopinathan
* @since 1.0.0
*/
@AutoConfiguration(after = { SpringAiRetryAutoConfiguration.class })
@AutoConfiguration(after = { SpringAiRetryAutoConfiguration.class, VertexAiEmbeddingConnectionAutoConfiguration.class })
@ConditionalOnClass({ VertexAI.class, VertexAiMultimodalEmbeddingModel.class })
@ConditionalOnProperty(name = SpringAIModelProperties.MULTI_MODAL_EMBEDDING_MODEL,
havingValue = SpringAIModels.VERTEX_AI, matchIfMissing = true)
@EnableConfigurationProperties(VertexAiMultimodalEmbeddingProperties.class)
@ImportAutoConfiguration(
classes = { SpringAiRetryAutoConfiguration.class, VertexAiEmbeddingConnectionAutoConfiguration.class })
public class VertexAiMultiModalEmbeddingAutoConfiguration {

@Bean
Expand Down
5 changes: 1 addition & 4 deletions ...ork/ai/model/vertexai/autoconfigure/embedding/VertexAiTextEmbeddingAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
import org.springframework.ai.vertexai.embedding.text.VertexAiTextEmbeddingModel;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand All @@ -42,13 +41,11 @@
* @author Ilayaperumal Gopinathan
* @since 1.0.0
*/
@AutoConfiguration(after = { SpringAiRetryAutoConfiguration.class })
@AutoConfiguration(after = { SpringAiRetryAutoConfiguration.class, VertexAiEmbeddingConnectionAutoConfiguration.class })
@ConditionalOnClass(VertexAiTextEmbeddingModel.class)
@ConditionalOnProperty(name = SpringAIModelProperties.TEXT_EMBEDDING_MODEL, havingValue = SpringAIModels.VERTEX_AI,
matchIfMissing = true)
@EnableConfigurationProperties(VertexAiTextEmbeddingProperties.class)
@ImportAutoConfiguration(
classes = { SpringAiRetryAutoConfiguration.class, VertexAiEmbeddingConnectionAutoConfiguration.class })
public class VertexAiTextEmbeddingAutoConfiguration {

@Bean
Expand Down
2 changes: 0 additions & 2 deletions ...framework/ai/model/vertexai/autoconfigure/gemini/VertexAiGeminiChatAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.boot.autoconfigure.AutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand All @@ -59,7 +58,6 @@
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.VERTEX_AI,
matchIfMissing = true)
@EnableConfigurationProperties({ VertexAiGeminiChatProperties.class, VertexAiGeminiConnectionProperties.class })
@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, ToolCallingAutoConfiguration.class })
public class VertexAiGeminiChatAutoConfiguration {

@Bean
Expand Down
30 changes: 22 additions & 8 deletions ...model/vertexai/autoconfigure/embedding/VertexAiTextEmbeddingModelAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.springframework.ai.embedding.EmbeddingOptionsBuilder;
import org.springframework.ai.embedding.EmbeddingResponse;
import org.springframework.ai.embedding.EmbeddingResultMetadata;
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
import org.springframework.ai.vertexai.embedding.multimodal.VertexAiMultimodalEmbeddingModel;
import org.springframework.ai.vertexai.embedding.text.VertexAiTextEmbeddingModel;
import org.springframework.boot.autoconfigure.AutoConfigurations;
Expand All @@ -52,12 +53,13 @@ public class VertexAiTextEmbeddingModelAutoConfigurationIT {

@Test
public void textEmbedding() {
this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiTextEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
.run(context -> {
var connectionProperties = context.getBean(VertexAiEmbeddingConnectionProperties.class);
var textEmbeddingProperties = context.getBean(VertexAiTextEmbeddingProperties.class);

assertThat(connectionProperties).isNotNull();
assertThat(textEmbeddingProperties).isNotNull();

VertexAiTextEmbeddingModel embeddingModel = context.getBean(VertexAiTextEmbeddingModel.class);
assertThat(embeddingModel).isInstanceOf(VertexAiTextEmbeddingModel.class);
Expand All @@ -71,21 +73,21 @@ public void textEmbedding() {

@Test
void textEmbeddingActivation() {
this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiTextEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
.withPropertyValues("spring.ai.model.embedding.text=none")
.run(context -> {
assertThat(context.getBeansOfType(VertexAiTextEmbeddingProperties.class)).isEmpty();
assertThat(context.getBeansOfType(VertexAiTextEmbeddingModel.class)).isEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiTextEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
.withPropertyValues("spring.ai.model.embedding.text=vertexai")
.run(context -> {
assertThat(context.getBeansOfType(VertexAiTextEmbeddingProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(VertexAiTextEmbeddingModel.class)).isNotEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiTextEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiTextEmbeddingAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(VertexAiTextEmbeddingProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(VertexAiTextEmbeddingModel.class)).isNotEmpty();
Expand All @@ -95,12 +97,13 @@ void textEmbeddingActivation() {

@Test
public void multimodalEmbedding() {
this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiMultiModalEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
.run(context -> {
var connectionProperties = context.getBean(VertexAiEmbeddingConnectionProperties.class);
var multimodalEmbeddingProperties = context.getBean(VertexAiMultimodalEmbeddingProperties.class);

assertThat(connectionProperties).isNotNull();
assertThat(multimodalEmbeddingProperties).isNotNull();

VertexAiMultimodalEmbeddingModel multiModelEmbeddingModel = context
.getBean(VertexAiMultimodalEmbeddingModel.class);
Expand Down Expand Up @@ -129,26 +132,37 @@ public void multimodalEmbedding() {

@Test
void multimodalEmbeddingActivation() {
this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiMultiModalEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
.withPropertyValues("spring.ai.model.embedding.multimodal=none")
.run(context -> {
assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingProperties.class)).isEmpty();
assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingModel.class)).isEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiMultiModalEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
.withPropertyValues("spring.ai.model.embedding.multimodal=vertexai")
.run(context -> {
assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingModel.class)).isNotEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(VertexAiMultiModalEmbeddingAutoConfiguration.class))
this.contextRunner.withConfiguration(vertexAiAutoConfig(VertexAiMultiModalEmbeddingAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(VertexAiMultimodalEmbeddingModel.class)).isNotEmpty();
});

}

private static AutoConfigurations vertexAiAutoConfig(Class<?>... additionalAutoConfigurations) {
Class<?>[] dependencies = new Class[] { SpringAiRetryAutoConfiguration.class,
VertexAiEmbeddingConnectionAutoConfiguration.class };
Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
additionalAutoConfigurations.length);

return AutoConfigurations.of(allAutoConfigurations);
}

}
21 changes: 16 additions & 5 deletions ...amework/ai/model/vertexai/autoconfigure/gemini/VertexAiGeminiChatAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@

package org.springframework.ai.model.vertexai.autoconfigure.gemini;

import java.util.stream.Collectors;

import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import reactor.core.publisher.Flux;

import org.springframework.ai.chat.messages.UserMessage;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.ai.chat.prompt.Prompt;
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
import org.springframework.ai.vertexai.gemini.VertexAiGeminiChatModel;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
import reactor.core.publisher.Flux;

import java.util.stream.Collectors;

import static org.assertj.core.api.Assertions.assertThat;

Expand All @@ -42,7 +43,7 @@ public class VertexAiGeminiChatAutoConfigurationIT {
private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withPropertyValues("spring.ai.vertex.ai.gemini.project-id=" + System.getenv("VERTEX_AI_GEMINI_PROJECT_ID"),
"spring.ai.vertex.ai.gemini.location=" + System.getenv("VERTEX_AI_GEMINI_LOCATION"))
.withConfiguration(AutoConfigurations.of(VertexAiGeminiChatAutoConfiguration.class));
.withConfiguration(vertexAiAutoConfig(VertexAiGeminiChatAutoConfiguration.class));

@Test
void generate() {
Expand Down Expand Up @@ -70,4 +71,14 @@ void generateStreaming() {
});
}

private static AutoConfigurations vertexAiAutoConfig(Class<?>... additionalAutoConfigurations) {
Class<?>[] dependencies = new Class[] { SpringAiRetryAutoConfiguration.class, ToolCallingAutoConfiguration.class};
Class<?>[] allAutoConfigurations = new Class[dependencies.length + additionalAutoConfigurations.length];
System.arraycopy(dependencies, 0, allAutoConfigurations, 0, dependencies.length);
System.arraycopy(additionalAutoConfigurations, 0, allAutoConfigurations, dependencies.length,
additionalAutoConfigurations.length);

return AutoConfigurations.of(allAutoConfigurations);
}

}
Loading