Skip to content

Fix OCI GenAI auto-configuration #4562

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 OCI GenAI auto-configuration #4562

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: 2 additions & 3 deletions ...a/org/springframework/ai/model/oci/genai/autoconfigure/OCIGenAiChatAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import org.springframework.ai.oci.cohere.OCICohereChatModel;
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 @@ -38,13 +37,13 @@
*
* @author Anders Swanson
* @author Ilayaperumal Gopinathan
* @author Issam El-atif
*/
@AutoConfiguration
@AutoConfiguration(after = OCIGenAiInferenceClientAutoConfiguration.class)
@ConditionalOnClass(OCICohereChatModel.class)
@EnableConfigurationProperties(OCICohereChatModelProperties.class)
@ConditionalOnProperty(name = SpringAIModelProperties.CHAT_MODEL, havingValue = SpringAIModels.OCI_GENAI,
matchIfMissing = true)
@ImportAutoConfiguration(OCIGenAiInferenceClientAutoConfiguration.class)
public class OCIGenAiChatAutoConfiguration {

@Bean
Expand Down
5 changes: 2 additions & 3 deletions .../springframework/ai/model/oci/genai/autoconfigure/OCIGenAiEmbeddingAutoConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.springframework.ai.model.SpringAIModels;
import org.springframework.ai.oci.OCIEmbeddingModel;
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 @@ -35,13 +34,13 @@
*
* @author Anders Swanson
* @author Ilayaperumal Gopinathan
* @author Issam El-atif
*/
@AutoConfiguration
@AutoConfiguration(after = OCIGenAiInferenceClientAutoConfiguration.class)
@ConditionalOnClass(OCIEmbeddingModel.class)
@EnableConfigurationProperties(OCIEmbeddingModelProperties.class)
@ConditionalOnProperty(name = SpringAIModelProperties.EMBEDDING_MODEL, havingValue = SpringAIModels.OCI_GENAI,
matchIfMissing = true)
@ImportAutoConfiguration(OCIGenAiInferenceClientAutoConfiguration.class)
public class OCIGenAiEmbeddingAutoConfiguration {

@Bean
Expand Down
4 changes: 3 additions & 1 deletion ...a/org/springframework/ai/model/oci/genai/autoconfigure/OCIGenAIAutoConfigurationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,9 @@ void setProperties(@TempDir Path tempDir) throws Exception {
"spring.ai.oci.genai.cohere.chat.options.frequencyPenalty=0.1",
"spring.ai.oci.genai.cohere.chat.options.presencePenalty=0.2"
// @formatter:on
).withConfiguration(AutoConfigurations.of(OCIGenAiChatAutoConfiguration.class));
)
.withConfiguration(AutoConfigurations.of(OCIGenAiInferenceClientAutoConfiguration.class,
OCIGenAiChatAutoConfiguration.class));

contextRunner.run(context -> {
OCICohereChatModel chatModel = context.getBean(OCICohereChatModel.class);
Expand Down
8 changes: 6 additions & 2 deletions ...ava/org/springframework/ai/model/oci/genai/autoconfigure/OCIGenAiAutoConfigurationIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ public class OCIGenAiAutoConfigurationIT {
"spring.ai.oci.genai.embedding.servingMode=on-demand",
"spring.ai.oci.genai.embedding.model=cohere.embed-english-light-v2.0"
// @formatter:on
).withConfiguration(AutoConfigurations.of(OCIGenAiEmbeddingAutoConfiguration.class));
)
.withConfiguration(AutoConfigurations.of(OCIGenAiInferenceClientAutoConfiguration.class,
OCIGenAiEmbeddingAutoConfiguration.class));

private final ApplicationContextRunner cohereChatContextRunner = new ApplicationContextRunner().withPropertyValues(
// @formatter:off
Expand All @@ -62,7 +64,9 @@ public class OCIGenAiAutoConfigurationIT {
"spring.ai.oci.genai.cohere.chat.options.servingMode=on-demand",
"spring.ai.oci.genai.cohere.chat.options.model=" + this.CHAT_MODEL_ID
// @formatter:on
).withConfiguration(AutoConfigurations.of(OCIGenAiChatAutoConfiguration.class));
)
.withConfiguration(AutoConfigurations.of(OCIGenAiInferenceClientAutoConfiguration.class,
OCIGenAiChatAutoConfiguration.class));

@Test
void embeddings() {
Expand Down