Merge pull request #448 from quarkiverse/#446

Introduce the use of quarkus-wiremock
quarkiverse · Apr 5, 2024 · 82a13c1 · 82a13c1
2 parents 99e36cd + 21aeed1
commit 82a13c1
Show file tree

Hide file tree

Showing 15 changed files with 131 additions and 108 deletions.
diff --git a/cohere/deployment/pom.xml b/cohere/deployment/pom.xml
@@ -34,12 +34,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/docs/modules/ROOT/pages/includes/attributes.adoc b/docs/modules/ROOT/pages/includes/attributes.adoc
@@ -1,3 +1,3 @@
 :project-version: 0.10.3
 :langchain4j-version: 0.29.1
-:examples-dir: ./../examples/
+:examples-dir: ./../examples/
diff --git a/easy-rag/deployment/pom.xml b/easy-rag/deployment/pom.xml
@@ -33,12 +33,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-embeddings-all-minilm-l6-v2-q</artifactId>

diff --git a/hugging-face/deployment/pom.xml b/hugging-face/deployment/pom.xml
@@ -39,9 +39,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
+            <groupId>io.quarkiverse.langchain4j</groupId>
+            <artifactId>quarkus-langchain4j-testing-internal</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/.../java/io/quarkiverse/langchain4j/huggingface/deployment/QuarkusHuggingFaceClientTest.java b/.../java/io/quarkiverse/langchain4j/huggingface/deployment/QuarkusHuggingFaceClientTest.java
@@ -4,22 +4,18 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.assertj.core.api.Assertions.assertThat;
 
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.List;
 
+import org.eclipse.microprofile.rest.client.RestClientBuilder;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-
 import dev.langchain4j.model.huggingface.HuggingFaceModelName;
 import dev.langchain4j.model.huggingface.client.EmbeddingRequest;
 import dev.langchain4j.model.huggingface.client.Options;
@@ -28,35 +24,22 @@
 import dev.langchain4j.model.huggingface.client.TextGenerationResponse;
 import io.quarkiverse.langchain4j.huggingface.HuggingFaceRestApi;
 import io.quarkiverse.langchain4j.huggingface.QuarkusHuggingFaceClientFactory;
+import io.quarkiverse.langchain4j.testing.internal.WiremockAware;
 import io.quarkus.rest.client.reactive.QuarkusRestClientBuilder;
 import io.quarkus.test.QuarkusUnitTest;
 
-public class QuarkusHuggingFaceClientTest {
+public class QuarkusHuggingFaceClientTest extends WiremockAware {
 
     @RegisterExtension
     static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class));
-    private static final int WIREMOCK_PORT = 8089;
     private static final String CHAT_MODEL_ID = HuggingFaceModelName.TII_UAE_FALCON_7B_INSTRUCT;
     private static final String EMBED_MODEL_ID = HuggingFaceModelName.SENTENCE_TRANSFORMERS_ALL_MINI_LM_L6_V2;
     private static final String API_KEY = "key";
 
-    static WireMockServer wireMockServer;
-
-    @BeforeAll
-    static void beforeAll() {
-        wireMockServer = new WireMockServer(options().port(WIREMOCK_PORT));
-        wireMockServer.start();
-    }
-
-    @AfterAll
-    static void afterAll() {
-        wireMockServer.stop();
-    }
-
     @Test
     void chat() {
-        wireMockServer.stubFor(
+        wiremock().register(
                 post(urlEqualTo("/models/" + sanitizeModelForUrl(CHAT_MODEL_ID)))
                         .withHeader("Authorization", equalTo("Bearer " + API_KEY))
                         .willReturn(aResponse()
@@ -87,7 +70,7 @@ void chat() {
 
     @Test
     void embed() {
-        wireMockServer.stubFor(
+        wiremock().register(
                 post(urlEqualTo("/models/" + sanitizeModelForUrl(EMBED_MODEL_ID)))
                         .withHeader("Authorization", equalTo("Bearer " + API_KEY))
                         .willReturn(aResponse()
@@ -108,21 +91,21 @@ private String sanitizeModelForUrl(String modelId) {
     private QuarkusHuggingFaceClientFactory.QuarkusHuggingFaceClient createClient() {
         try {
             HuggingFaceRestApi restApi = QuarkusRestClientBuilder.newBuilder()
-                    .baseUri(new URI("http://localhost:" + WIREMOCK_PORT + "/models/" + sanitizeModelForUrl(EMBED_MODEL_ID)))
+                    .baseUrl(new URL(resolvedWiremockUrl("/models/" + sanitizeModelForUrl(EMBED_MODEL_ID))))
                     .build(HuggingFaceRestApi.class);
             return new QuarkusHuggingFaceClientFactory.QuarkusHuggingFaceClient(restApi, API_KEY);
-        } catch (URISyntaxException e) {
+        } catch (MalformedURLException e) {
             throw new RuntimeException(e);
         }
     }
 
     private QuarkusHuggingFaceClientFactory.QuarkusHuggingFaceClient createClientForChat() {
         try {
-            HuggingFaceRestApi restApi = QuarkusRestClientBuilder.newBuilder()
-                    .baseUri(new URI("http://localhost:" + WIREMOCK_PORT + "/models/" + sanitizeModelForUrl(CHAT_MODEL_ID)))
+            HuggingFaceRestApi restApi = RestClientBuilder.newBuilder()
+                    .baseUrl(new URL(resolvedWiremockUrl("/models/" + sanitizeModelForUrl(CHAT_MODEL_ID))))
                     .build(HuggingFaceRestApi.class);
             return new QuarkusHuggingFaceClientFactory.QuarkusHuggingFaceClient(restApi, API_KEY);
-        } catch (URISyntaxException e) {
+        } catch (MalformedURLException e) {
             throw new RuntimeException(e);
         }
     }

diff --git a/infinispan/deployment/pom.xml b/infinispan/deployment/pom.xml
@@ -46,12 +46,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-embeddings-all-minilm-l6-v2-q</artifactId>

diff --git a/mistral/deployment/pom.xml b/mistral/deployment/pom.xml
@@ -35,9 +35,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
+            <groupId>io.quarkiverse.langchain4j</groupId>
+            <artifactId>quarkus-langchain4j-testing-internal</artifactId>
+            <version>${project.version}</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

diff --git a/.../io/quarkiverse/langchain4j/mistralai/deployment/MistralAiChatLanguageModelSmokeTest.java b/.../io/quarkiverse/langchain4j/mistralai/deployment/MistralAiChatLanguageModelSmokeTest.java
@@ -4,57 +4,36 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.equalTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.post;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo;
-import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.assertj.core.api.Assertions.assertThat;
 
 import jakarta.inject.Inject;
 
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.JavaArchive;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
 import com.github.tomakehurst.wiremock.verification.LoggedRequest;
 
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.mistralai.MistralAiChatModel;
+import io.quarkiverse.langchain4j.testing.internal.WiremockAware;
 import io.quarkus.arc.ClientProxy;
 import io.quarkus.test.QuarkusUnitTest;
 
-class MistralAiChatLanguageModelSmokeTest {
-    private static final int WIREMOCK_PORT = 8089;
-    private static final String CHAT_MODEL_ID = "mistral-tiny";
+class MistralAiChatLanguageModelSmokeTest extends WiremockAware {
+
     private static final String API_KEY = "somekey";
+    private static final String CHAT_MODEL_ID = "mistral-tiny";
 
     @RegisterExtension
     static final QuarkusUnitTest unitTest = new QuarkusUnitTest()
             .setArchiveProducer(() -> ShrinkWrap.create(JavaArchive.class))
             .overrideRuntimeConfigKey("quarkus.langchain4j.mistralai.api-key", API_KEY)
             .overrideRuntimeConfigKey("quarkus.langchain4j.mistralai.log-requests", "true")
-            .overrideRuntimeConfigKey("quarkus.langchain4j.mistralai.base-url", "http://localhost:" + WIREMOCK_PORT + "/v1");
-
-    static WireMockServer wireMockServer;
-
-    @BeforeAll
-    static void beforeAll() {
-        wireMockServer = new WireMockServer(options().port(WIREMOCK_PORT));
-        wireMockServer.start();
-    }
-
-    @AfterAll
-    static void afterAll() {
-        wireMockServer.stop();
-    }
-
-    @BeforeEach
-    void setup() {
-        wireMockServer.resetAll();
-    }
+            .overrideRuntimeConfigKey("quarkus.langchain4j.mistralai.base-url",
+                    WiremockAware.wiremockUrlForConfig("/v1"));
 
     @Inject
     ChatLanguageModel chatLanguageModel;
@@ -63,7 +42,7 @@ void setup() {
     void test() {
         assertThat(ClientProxy.unwrap(chatLanguageModel)).isInstanceOf(MistralAiChatModel.class);
 
-        wireMockServer.stubFor(
+        wiremock().register(
                 post(urlEqualTo("/v1/chat/completions"))
                         .withHeader("Authorization", equalTo("Bearer " + API_KEY))
                         .willReturn(aResponse()
@@ -95,8 +74,8 @@ void test() {
         String response = chatLanguageModel.generate("hello");
         assertThat(response).isEqualTo("Nice to meet you");
 
-        assertThat(wireMockServer.getAllServeEvents()).hasSize(1);
-        ServeEvent serveEvent = wireMockServer.getAllServeEvents().get(0); // this works because we reset requests for Wiremock before each test
+        assertThat(wiremock().getServeEvents()).hasSize(1);
+        ServeEvent serveEvent = wiremock().getServeEvents().get(0); // this works because we reset requests for Wiremock before each test
         LoggedRequest loggedRequest = serveEvent.getRequest();
         assertThat(loggedRequest.getHeader("User-Agent")).isEqualTo("Resteasy Reactive Client");
         String requestBody = new String(loggedRequest.getBody());

diff --git a/ollama/deployment/pom.xml b/ollama/deployment/pom.xml
@@ -42,12 +42,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
     <build>
         <plugins>

diff --git a/pgvector/deployment/pom.xml b/pgvector/deployment/pom.xml
@@ -54,12 +54,6 @@
         <version>${assertj.version}</version>
         <scope>test</scope>
     </dependency>
-    <dependency>
-        <groupId>org.wiremock</groupId>
-        <artifactId>wiremock-standalone</artifactId>
-        <version>${wiremock.version}</version>
-        <scope>test</scope>
-    </dependency>
     <dependency>
         <groupId>dev.langchain4j</groupId>
         <artifactId>langchain4j-embeddings-all-minilm-l6-v2-q</artifactId>

diff --git a/pinecone/deployment/pom.xml b/pinecone/deployment/pom.xml
@@ -46,12 +46,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-embeddings-all-minilm-l6-v2-q</artifactId>

diff --git a/pom.xml b/pom.xml
@@ -17,6 +17,7 @@
     <module>cohere</module>
     <module>core</module>
     <module>docs</module>
+    <module>testing-internal</module>
     <module>easy-rag</module>
     <module>hugging-face</module>
     <module>infinispan</module>
@@ -48,6 +49,7 @@
     <wiremock.version>3.5.2</wiremock.version>
     <pgvector-java.version>0.1.4</pgvector-java.version>
     <sundrio.version>0.103.1</sundrio.version>
+    <quarkus-wiremock.version>1.3.0</quarkus-wiremock.version>
   </properties>
   <dependencyManagement>
     <dependencies>

diff --git a/redis/deployment/pom.xml b/redis/deployment/pom.xml
@@ -50,12 +50,6 @@
             <version>${assertj.version}</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.wiremock</groupId>
-            <artifactId>wiremock-standalone</artifactId>
-            <version>${wiremock.version}</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>dev.langchain4j</groupId>
             <artifactId>langchain4j-embeddings-all-minilm-l6-v2-q</artifactId>

diff --git a/testing-internal/pom.xml b/testing-internal/pom.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>io.quarkiverse.langchain4j</groupId>
+        <artifactId>quarkus-langchain4j-parent</artifactId>
+        <version>999-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>quarkus-langchain4j-testing-internal</artifactId>
+    <name>Quarkus LangChain4j - Internal Testing</name>
+    <description>A module that provides testing utilities used by other modules</description>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.quarkiverse.wiremock</groupId>
+            <artifactId>quarkus-wiremock-test</artifactId>
+            <version>${quarkus-wiremock.version}</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+
+</project>