Skip to content

Commit c1730ab

Browse files
committed
Uses official ollama testcontainers
1 parent c6c183b commit c1730ab

File tree

2 files changed

+11
-4
lines changed

2 files changed

+11
-4
lines changed

langchain4j-ollama-spring-boot-starter/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@
5959

6060
<dependency>
6161
<groupId>org.testcontainers</groupId>
62-
<artifactId>testcontainers</artifactId>
62+
<artifactId>ollama</artifactId>
6363
<scope>test</scope>
6464
</dependency>
6565

langchain4j-ollama-spring-boot-starter/src/test/java/dev/langchain4j/ollama/spring/AutoConfigIT.java

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
import dev.langchain4j.model.language.StreamingLanguageModel;
1010
import dev.langchain4j.model.ollama.*;
1111
import dev.langchain4j.model.output.Response;
12+
import org.junit.jupiter.api.BeforeAll;
1213
import org.junit.jupiter.api.Test;
1314
import org.springframework.boot.autoconfigure.AutoConfigurations;
1415
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
15-
import org.testcontainers.containers.GenericContainer;
1616
import org.testcontainers.junit.jupiter.Container;
1717
import org.testcontainers.junit.jupiter.Testcontainers;
18+
import org.testcontainers.ollama.OllamaContainer;
19+
import org.testcontainers.utility.DockerImageName;
1820

1921
import java.util.concurrent.CompletableFuture;
2022

@@ -28,14 +30,19 @@ class AutoConfigIT {
2830
private static final String MODEL_NAME = "phi";
2931

3032
@Container
31-
static GenericContainer<?> ollama = new GenericContainer<>("langchain4j/ollama-" + MODEL_NAME)
33+
static OllamaContainer ollama = new OllamaContainer(DockerImageName.parse("ollama/ollama:latest"))
3234
.withExposedPorts(11434);
3335

36+
@BeforeAll
37+
static void beforeAll() throws Exception {
38+
ollama.execInContainer("ollama", "pull", MODEL_NAME);
39+
}
40+
3441
ApplicationContextRunner contextRunner = new ApplicationContextRunner()
3542
.withConfiguration(AutoConfigurations.of(AutoConfig.class));
3643

3744
private static String baseUrl() {
38-
return format("http://%s:%s", ollama.getHost(), ollama.getFirstMappedPort());
45+
return ollama.getEndpoint();
3946
}
4047

4148
@Test

0 commit comments

Comments
 (0)