From 3a92d1400f8768b86be6f837930db0012d8877b4 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 24 Sep 2025 01:20:46 +0500 Subject: [PATCH] timeout increased --- .../service/OllamaAnalyticsService.java | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/java/kz/konturai/parser/service/OllamaAnalyticsService.java b/src/main/java/kz/konturai/parser/service/OllamaAnalyticsService.java index 398066d..c4b8275 100644 --- a/src/main/java/kz/konturai/parser/service/OllamaAnalyticsService.java +++ b/src/main/java/kz/konturai/parser/service/OllamaAnalyticsService.java @@ -12,9 +12,13 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.core.type.TypeReference; import org.springframework.core.ParameterizedTypeReference; +import java.time.Duration; import java.util.HashMap; import java.util.Map; +import reactor.netty.http.client.HttpClient; +import org.springframework.http.client.reactive.ReactorClientHttpConnector; + @Service public class OllamaAnalyticsService { @@ -25,9 +29,23 @@ public class OllamaAnalyticsService { @Value("${ollama.model:gemma3:1b}") private String modelName; + @Value("${ollama.timeoutMs:60000}") + private long timeoutMs; + + @Value("${ollama.connectTimeoutMs:10000}") + private int connectTimeoutMs; + + @Value("${ollama.responseTimeoutMs:60000}") + private long responseTimeoutMs; + public OllamaAnalyticsService(@Value("${ollama.host:http://185.35.223.45:11434}") String ollamaHost) { + HttpClient httpClient = HttpClient.create() + .compress(true) + .responseTimeout(Duration.ofMillis(responseTimeoutMs)); + this.webClient = WebClient.builder() .baseUrl(ollamaHost) + .clientConnector(new ReactorClientHttpConnector(httpClient)) .build(); } @@ -103,7 +121,7 @@ public class OllamaAnalyticsService { logger.warn("Ollama request failed: {}", err.getMessage()); return Mono.empty(); }) - .block(); + .block(Duration.ofMillis(timeoutMs)); if (response == null) { return null; @@ -137,7 +155,7 @@ public class OllamaAnalyticsService { logger.warn("Ollama request failed: {}", err.getMessage()); return Mono.empty(); }) - .block(); + .block(Duration.ofMillis(timeoutMs)); if (response == null) { return null;