Skip to content

Fix MiniMax model auto-configuration #4566

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 MiniMax model auto-configuration #4566

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
4 changes: 1 addition & 3 deletions ...java/org/springframework/ai/model/minimax/autoconfigure/MiniMaxChatAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
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 @@ -48,15 +47,14 @@
*
* @author Geng Rong
* @author Ilayaperumal Gopinathan
* @author Issam El-atif
*/
@AutoConfiguration(after = { RestClientAutoConfiguration.class, SpringAiRetryAutoConfiguration.class,
ToolCallingAutoConfiguration.class })
@ConditionalOnClass(MiniMaxApi.class)
@EnableConfigurationProperties({ MiniMaxConnectionProperties.class, MiniMaxChatProperties.class })
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.MINIMAX,
matchIfMissing = true)
@ImportAutoConfiguration(classes = { SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class })
public class MiniMaxChatAutoConfiguration {

@Bean
Expand Down
7 changes: 5 additions & 2 deletions ...t/java/org/springframework/ai/model/minimax/autoconfigure/FunctionCallbackInPromptIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import reactor.core.publisher.Flux;

import org.springframework.ai.chat.messages.AssistantMessage;
Expand All @@ -42,6 +43,7 @@

/**
* @author Geng Rong
* @author Issam El-atif
*/
@EnabledIfEnvironmentVariable(named = "MINIMAX_API_KEY", matches = ".*")
public class FunctionCallbackInPromptIT {
Expand All @@ -50,8 +52,9 @@ public class FunctionCallbackInPromptIT {

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withPropertyValues("spring.ai.minimax.apiKey=" + System.getenv("MINIMAX_API_KEY"))
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class));
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class));

@Test
void functionCallTest() {
Expand Down
7 changes: 5 additions & 2 deletions ...ringframework/ai/model/minimax/autoconfigure/FunctionCallbackWithPlainFunctionBeanIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import reactor.core.publisher.Flux;

import org.springframework.ai.chat.messages.AssistantMessage;
Expand All @@ -46,6 +47,7 @@

/**
* @author Geng Rong
* @author Issam El-atif
*/
@EnabledIfEnvironmentVariable(named = "MINIMAX_API_KEY", matches = ".*")
class FunctionCallbackWithPlainFunctionBeanIT {
Expand All @@ -54,8 +56,9 @@ class FunctionCallbackWithPlainFunctionBeanIT {

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withPropertyValues("spring.ai.minimax.apiKey=" + System.getenv("MINIMAX_API_KEY"))
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withUserConfiguration(Config.class);

// FIXME: multiple function calls may stop prematurely due to model performance
Expand Down
19 changes: 11 additions & 8 deletions ...t/java/org/springframework/ai/model/minimax/autoconfigure/MiniMaxAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.apache.commons.logging.LogFactory;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.condition.EnabledIfEnvironmentVariable;
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import reactor.core.publisher.Flux;

import org.springframework.ai.chat.messages.UserMessage;
Expand All @@ -40,6 +41,7 @@

/**
* @author Geng Rong
* @author Issam El-atif
*/
@EnabledIfEnvironmentVariable(named = "MINIMAX_API_KEY", matches = ".*")
public class MiniMaxAutoConfigurationIT {
Expand All @@ -51,9 +53,9 @@ public class MiniMaxAutoConfigurationIT {

@Test
void generate() {
this.contextRunner
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
this.contextRunner.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
MiniMaxChatModel chatModel = context.getBean(MiniMaxChatModel.class);
String response = chatModel.call("Hello");
Expand All @@ -64,9 +66,9 @@ void generate() {

@Test
void generateStreaming() {
this.contextRunner
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
this.contextRunner.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
MiniMaxChatModel chatModel = context.getBean(MiniMaxChatModel.class);
Flux<ChatResponse> responseFlux = chatModel.stream(new Prompt(new UserMessage("Hello")));
Expand All @@ -84,8 +86,9 @@ void generateStreaming() {
@Test
void embedding() {
this.contextRunner
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxEmbeddingAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxEmbeddingAutoConfiguration.class))
.run(context -> {
MiniMaxEmbeddingModel embeddingModel = context.getBean(MiniMaxEmbeddingModel.class);

Expand Down
32 changes: 20 additions & 12 deletions .../test/java/org/springframework/ai/model/minimax/autoconfigure/MiniMaxPropertiesTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import org.springframework.ai.minimax.MiniMaxEmbeddingModel;
import org.springframework.ai.minimax.api.MiniMaxApi;
import org.springframework.ai.model.ModelOptionsUtils;
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
Expand All @@ -36,6 +37,7 @@
* {@link MiniMaxEmbeddingProperties}.
*
* @author Geng Rong
* @author Issam El-atif
*/
public class MiniMaxPropertiesTests {

Expand All @@ -49,8 +51,9 @@ public void chatProperties() {
"spring.ai.minimax.chat.options.model=MODEL_XYZ",
"spring.ai.minimax.chat.options.temperature=0.55")
// @formatter:on
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
var chatProperties = context.getBean(MiniMaxChatProperties.class);
var connectionProperties = context.getBean(MiniMaxConnectionProperties.class);
Expand Down Expand Up @@ -78,8 +81,9 @@ public void chatOverrideConnectionProperties() {
"spring.ai.minimax.chat.options.model=MODEL_XYZ",
"spring.ai.minimax.chat.options.temperature=0.55")
// @formatter:on
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
var chatProperties = context.getBean(MiniMaxChatProperties.class);
var connectionProperties = context.getBean(MiniMaxConnectionProperties.class);
Expand Down Expand Up @@ -198,8 +202,9 @@ public void chatOptionsTest() {
"""
)
// @formatter:on
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
var chatProperties = context.getBean(MiniMaxChatProperties.class);
var connectionProperties = context.getBean(MiniMaxConnectionProperties.class);
Expand Down Expand Up @@ -295,17 +300,19 @@ void chatActivation() {
new ApplicationContextRunner()
.withPropertyValues("spring.ai.minimax.api-key=API_KEY", "spring.ai.minimax.base-url=TEST_BASE_URL",
"spring.ai.model.chat=none")
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxChatProperties.class)).isEmpty();
assertThat(context.getBeansOfType(MiniMaxChatModel.class)).isEmpty();
});

new ApplicationContextRunner()
.withPropertyValues("spring.ai.minimax.api-key=API_KEY", "spring.ai.minimax.base-url=TEST_BASE_URL")
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxChatProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxChatModel.class)).isNotEmpty();
Expand All @@ -314,8 +321,9 @@ void chatActivation() {
new ApplicationContextRunner()
.withPropertyValues("spring.ai.minimax.api-key=API_KEY", "spring.ai.minimax.base-url=TEST_BASE_URL",
"spring.ai.model.chat=minimax")
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxChatProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxChatModel.class)).isNotEmpty();
Expand Down
51 changes: 27 additions & 24 deletions ...va/org/springframework/ai/model/minimax/autoconfigure/MinimaxModelConfigurationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,10 @@

import org.springframework.ai.minimax.MiniMaxChatModel;
import org.springframework.ai.minimax.MiniMaxEmbeddingModel;
import org.springframework.ai.model.tool.autoconfigure.ToolCallingAutoConfiguration;
import org.springframework.ai.retry.autoconfigure.SpringAiRetryAutoConfiguration;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.web.client.RestClientAutoConfiguration;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;

import static org.assertj.core.api.Assertions.assertThat;
Expand All @@ -30,29 +32,35 @@
* Unit Tests for MiniMax auto-configurations' conditional enabling of models.
*
* @author Ilayaperumal Gopinathan
* @author Issam El-atif
*/
public class MinimaxModelConfigurationTests {

private final ApplicationContextRunner contextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class))
private final ApplicationContextRunner chatContextRunner = new ApplicationContextRunner()
.withConfiguration(
AutoConfigurations.of(SpringAiRetryAutoConfiguration.class, RestClientAutoConfiguration.class,
ToolCallingAutoConfiguration.class, MiniMaxChatAutoConfiguration.class))
.withPropertyValues("spring.ai.minimax.api-key=API_KEY", "spring.ai.minimax.base-url=TEST_BASE_URL");

private final ApplicationContextRunner embeddingContextRunner = new ApplicationContextRunner()
.withConfiguration(AutoConfigurations.of(SpringAiRetryAutoConfiguration.class,
RestClientAutoConfiguration.class, MiniMaxEmbeddingAutoConfiguration.class))
.withPropertyValues("spring.ai.minimax.api-key=API_KEY", "spring.ai.minimax.base-url=TEST_BASE_URL");

@Test
void chatModelActivation() {
this.contextRunner.withConfiguration(AutoConfigurations.of(MiniMaxChatAutoConfiguration.class)).run(context -> {
this.chatContextRunner.run(context -> {
assertThat(context.getBeansOfType(MiniMaxChatProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxChatModel.class)).isNotEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(MiniMaxChatAutoConfiguration.class))
.withPropertyValues("spring.ai.model.chat=none", "spring.ai.model.embedding=none")
this.chatContextRunner.withPropertyValues("spring.ai.model.chat=none", "spring.ai.model.embedding=none")
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxChatProperties.class)).isEmpty();
assertThat(context.getBeansOfType(MiniMaxChatModel.class)).isEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(MiniMaxChatAutoConfiguration.class))
.withPropertyValues("spring.ai.model.chat=minimax", "spring.ai.model.embedding=none")
this.chatContextRunner.withPropertyValues("spring.ai.model.chat=minimax", "spring.ai.model.embedding=none")
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxChatProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxChatModel.class)).isNotEmpty();
Expand All @@ -61,25 +69,20 @@ void chatModelActivation() {

@Test
void embeddingModelActivation() {
this.contextRunner.withConfiguration(AutoConfigurations.of(MiniMaxEmbeddingAutoConfiguration.class))
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxEmbeddingModel.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxEmbeddingProperties.class)).isNotEmpty();
});
this.embeddingContextRunner.run(context -> {
assertThat(context.getBeansOfType(MiniMaxEmbeddingModel.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxEmbeddingProperties.class)).isNotEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(MiniMaxEmbeddingAutoConfiguration.class))
.withPropertyValues("spring.ai.model.embedding=none")
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxEmbeddingProperties.class)).isEmpty();
assertThat(context.getBeansOfType(MiniMaxEmbeddingModel.class)).isEmpty();
});
this.embeddingContextRunner.withPropertyValues("spring.ai.model.embedding=none").run(context -> {
assertThat(context.getBeansOfType(MiniMaxEmbeddingProperties.class)).isEmpty();
assertThat(context.getBeansOfType(MiniMaxEmbeddingModel.class)).isEmpty();
});

this.contextRunner.withConfiguration(AutoConfigurations.of(MiniMaxEmbeddingAutoConfiguration.class))
.withPropertyValues("spring.ai.model.embedding=minimax")
.run(context -> {
assertThat(context.getBeansOfType(MiniMaxEmbeddingProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxEmbeddingModel.class)).isNotEmpty();
});
this.embeddingContextRunner.withPropertyValues("spring.ai.model.embedding=minimax").run(context -> {
assertThat(context.getBeansOfType(MiniMaxEmbeddingProperties.class)).isNotEmpty();
assertThat(context.getBeansOfType(MiniMaxEmbeddingModel.class)).isNotEmpty();
});
}

}
Loading