Skip to content

Commit 6b12ff5

Browse files
ilayaperumalgmarkpollack
ilayaperumalg
authored and
markpollack
committed
Refactor autoconfigurations for models
 - Conditionally enable invidividual models within the provider - Introduce top level properties to support conditional logic - The properties will have the format like "spring.ai.model.<chat/embedding/image etc.,>=<provider>" to enable specific chat/embedding/image/audio/moderation models by the provider. By default, these will be enabled when no specific properties are set. To disable, set any value other than the provider name for example, "none" - For the auto configurations where the provider has multiple models, split the autoconfiguration into per model auto-configuration classes. This will enable the isolated auto-configurations for each provider and its model. - This PR addresses this for OpenAI and others will follow in subsequent PRs Signed-off-by: Ilayaperumal Gopinathan <ilayaperumal.gopinathan@broadcom.com>
1 parent 31bc8c4 commit 6b12ff5

File tree

132 files changed

+3695
-736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+3695
-736
lines changed

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0-SNAPSHOT</version>
1010
<relativePath>../../../pom.xml</relativePath>
1111
</parent>
12-
<artifactId>spring-ai-mcp-client-spring-boot-autoconfigure</artifactId>
12+
<artifactId>spring-ai-autoconfigure-mcp-client</artifactId>
1313
<packaging>jar</packaging>
1414
<name>Spring AI MCP Client Auto Configuration</name>
1515
<description>Spring AI MCP Client Auto Configuration</description>

‎auto-configurations/mcp/spring-ai-autoconfigure-mcp-server/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<version>1.0.0-SNAPSHOT</version>
1010
<relativePath>../../../pom.xml</relativePath>
1111
</parent>
12-
<artifactId>spring-ai-mcp-server-spring-boot-autoconfigure</artifactId>
12+
<artifactId>spring-ai-autoconfigure-mcp-server</artifactId>
1313
<packaging>jar</packaging>
1414
<name>Spring AI MCP Server Auto Configuration</name>
1515
<description>Spring AI MCP Server Auto Configuration</description>

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-client/pom.xml renamed to ‎auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>org.springframework.ai</groupId>
88
<artifactId>spring-ai</artifactId>
99
<version>1.0.0-SNAPSHOT</version>
10-
<relativePath>../../../pom.xml</relativePath>
10+
<relativePath>../../../../../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>spring-ai-autoconfigure-model-chat-client</artifactId>
1313
<packaging>jar</packaging>

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-client/src/main/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientAutoConfiguration.java renamed to ‎auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/main/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientAutoConfiguration.java

File renamed without changes.

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-client/src/main/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientBuilderConfigurer.java renamed to ‎auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/main/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientBuilderConfigurer.java

File renamed without changes.

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-client/src/main/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientBuilderProperties.java renamed to ‎auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/main/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientBuilderProperties.java

File renamed without changes.

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports renamed to ‎auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

File renamed without changes.

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-client/src/test/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientObservationAutoConfigurationTests.java renamed to ‎auto-configurations/models/chat/client/spring-ai-autoconfigure-model-chat-client/src/test/java/org/springframework/ai/model/chat/client/autoconfigure/ChatClientObservationAutoConfigurationTests.java

File renamed without changes.

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-memory/pom.xml renamed to ‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<groupId>org.springframework.ai</groupId>
88
<artifactId>spring-ai</artifactId>
99
<version>1.0.0-SNAPSHOT</version>
10-
<relativePath>../../../pom.xml</relativePath>
10+
<relativePath>../../../../../pom.xml</relativePath>
1111
</parent>
1212
<artifactId>spring-ai-autoconfigure-model-chat-memory</artifactId>
1313
<packaging>jar</packaging>

‎auto-configurations/chat/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/autoconfigure/CommonChatMemoryProperties.java renamed to ‎auto-configurations/models/chat/memory/spring-ai-autoconfigure-model-chat-memory/src/main/java/org/springframework/ai/model/chat/memory/autoconfigure/CommonChatMemoryProperties.java

File renamed without changes.

0 commit comments

Comments
 (0)