Skip to content

Commit a0c55ae

Browse files
fix incorrect ollama autoconfiguration changes
Signed-off-by: jonghoonpark <dev@jonghoonpark.com>
1 parent 28f86bf commit a0c55ae

File tree

2 files changed

+5
-154
lines changed

2 files changed

+5
-154
lines changed

auto-configurations/models/spring-ai-autoconfigure-model-ollama/src/main/java/org/springframework/ai/model/ollama/autoconfigure/OllamaChatAutoConfiguration.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import org.springframework.boot.autoconfigure.web.reactive.function.client.WebClientAutoConfiguration;
4040
import org.springframework.boot.context.properties.EnableConfigurationProperties;
4141
import org.springframework.context.annotation.Bean;
42+
import org.springframework.retry.support.RetryTemplate;
4243

4344
/**
4445
* {@link AutoConfiguration Auto-configuration} for Ollama Chat model.
@@ -47,6 +48,7 @@
4748
* @author Eddú Meléndez
4849
* @author Thomas Vitale
4950
* @author Ilayaperumal Gopinathan
51+
* @author Jonghoon Park
5052
* @since 0.8.0
5153
*/
5254
@AutoConfiguration(after = { RestClientAutoConfiguration.class, ToolCallingAutoConfiguration.class })
@@ -64,7 +66,8 @@ public OllamaChatModel ollamaChatModel(OllamaApi ollamaApi, OllamaChatProperties
6466
OllamaInitializationProperties initProperties, ToolCallingManager toolCallingManager,
6567
ObjectProvider<ObservationRegistry> observationRegistry,
6668
ObjectProvider<ChatModelObservationConvention> observationConvention,
67-
ObjectProvider<ToolExecutionEligibilityPredicate> ollamaToolExecutionEligibilityPredicate) {
69+
ObjectProvider<ToolExecutionEligibilityPredicate> ollamaToolExecutionEligibilityPredicate,
70+
RetryTemplate retryTemplate) {
6871
var chatModelPullStrategy = initProperties.getChat().isInclude() ? initProperties.getPullModelStrategy()
6972
: PullModelStrategy.NEVER;
7073

@@ -78,6 +81,7 @@ public OllamaChatModel ollamaChatModel(OllamaApi ollamaApi, OllamaChatProperties
7881
.modelManagementOptions(
7982
new ModelManagementOptions(chatModelPullStrategy, initProperties.getChat().getAdditionalModels(),
8083
initProperties.getTimeout(), initProperties.getMaxRetries()))
84+
.retryTemplate(retryTemplate)
8185
.build();
8286

8387
observationConvention.ifAvailable(chatModel::setObservationConvention);

spring-ai-spring-boot-autoconfigure/src/main/java/org/springframework/ai/autoconfigure/ollama/OllamaAutoConfiguration.java

Lines changed: 0 additions & 153 deletions
This file was deleted.

0 commit comments

Comments
 (0)