From 36d5245b3a50ffe58c742f30479dfd7d6fec9b9d Mon Sep 17 00:00:00 2001 From: Thomas Vitale Date: Tue, 15 Oct 2024 06:53:26 +0200 Subject: [PATCH] Ollama integration tests fix * Disable tests by default * Improve Testcontainers configuration --- .../java/org/springframework/ai/ollama/BaseOllamaIT.java | 6 +++--- .../ai/autoconfigure/ollama/BaseOllamaIT.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java index e78e970d040..9618f07e67b 100644 --- a/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java +++ b/models/spring-ai-ollama/src/test/java/org/springframework/ai/ollama/BaseOllamaIT.java @@ -10,7 +10,7 @@ public class BaseOllamaIT { private static final Logger logger = LoggerFactory.getLogger(BaseOllamaIT.class); // Toggle for running tests locally on native Ollama for a faster feedback loop. - private static final boolean useTestcontainers = false; + private static final boolean useTestcontainers = true; public static final OllamaContainer ollamaContainer; @@ -30,13 +30,13 @@ public class BaseOllamaIT { * to the file ".testcontainers.properties" located in your home directory */ public static boolean isDisabled() { - return false; + return true; } public static OllamaApi buildOllamaApiWithModel(String model) { var baseUrl = "http://localhost:11434"; if (useTestcontainers) { - baseUrl = "http://" + ollamaContainer.getHost() + ":" + ollamaContainer.getMappedPort(11434); + baseUrl = ollamaContainer.getEndpoint(); } var ollamaApi = new OllamaApi(baseUrl); diff --git a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java index 145d046d33e..b216badcf84 100644 --- a/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java +++ b/spring-ai-spring-boot-autoconfigure/src/test/java/org/springframework/ai/autoconfigure/ollama/BaseOllamaIT.java @@ -37,7 +37,7 @@ public static boolean isDisabled() { public static String buildConnectionWithModel(String model) throws IOException, InterruptedException { var baseUrl = "http://localhost:11434"; if (useTestcontainers) { - baseUrl = "http://" + ollamaContainer.getHost() + ":" + ollamaContainer.getMappedPort(11434); + baseUrl = ollamaContainer.getEndpoint(); logger.info("Start pulling the '{}' model. The operation can take several minutes...", model); ollamaContainer.execInContainer("ollama", "pull", model);