From ca5e2e64b33a47f1168e2928a36810c1c116028e Mon Sep 17 00:00:00 2001 From: Clement Escoffier Date: Wed, 2 Oct 2024 15:33:47 +0200 Subject: [PATCH] Update the CI builds to run the in-process embedding models native integration tests - Refactor the in-process embedding models integration tests to run in the native executable - Update the PR and _main_ CI builds to run with more Java versions - Do not skip the in-process embedding models integration tests in the PR build --- .github/workflows/build-pull-request.yml | 35 ++++++------------- .github/workflows/build-push.yml | 6 +--- .../embed-all-minilm-l6-v2-q/pom.xml | 13 +------ .../acme/test/InProcessEmbeddingResource.java | 0 .../src/main/resources/application.properties | 0 .../test/InProcessEmbeddingResourceIT.java | 0 .../test/InProcessEmbeddingResourceTest.java | 0 .../embed-all-minilm-l6-v2/pom.xml | 2 +- .../acme/test/InProcessEmbeddingResource.java | 0 .../src/main/resources/application.properties | 0 .../test/InProcessEmbeddingResourceIT.java | 0 .../test/InProcessEmbeddingResourceTest.java | 0 .../embed-bge-small-en-q/pom.xml | 20 ++++------- .../acme/test/InProcessEmbeddingResource.java | 0 .../src/main/resources/application.properties | 0 .../test/InProcessEmbeddingResourceIT.java | 0 .../test/InProcessEmbeddingResourceTest.java | 0 .../embed-bge-small-en/pom.xml | 20 ++++------- .../acme/test/InProcessEmbeddingResource.java | 0 .../src/main/resources/application.properties | 0 .../test/InProcessEmbeddingResourceIT.java | 0 .../test/InProcessEmbeddingResourceTest.java | 0 .../embed-e5-small-v2-q/pom.xml | 20 ++++------- .../acme/test/InProcessEmbeddingResource.java | 0 .../src/main/resources/application.properties | 0 .../test/InProcessEmbeddingResourceIT.java | 0 .../test/InProcessEmbeddingResourceTest.java | 0 .../embed-e5-small-v2/pom.xml | 20 ++++------- .../acme/test/InProcessEmbeddingResource.java | 0 .../src/main/resources/application.properties | 0 .../test/InProcessEmbeddingResourceIT.java | 0 .../test/InProcessEmbeddingResourceTest.java | 0 .../in-process-embedding-models/pom.xml | 22 ++++++++++++ integration-tests/pom.xml | 7 +--- 34 files changed, 64 insertions(+), 101 deletions(-) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2-q/pom.xml (88%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2-q/src/main/resources/application.properties (100%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2/pom.xml (97%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2/src/main/resources/application.properties (100%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en-q/pom.xml (91%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en-q/src/main/resources/application.properties (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en/pom.xml (91%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en/src/main/java/org/acme/test/InProcessEmbeddingResource.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en/src/main/resources/application.properties (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2-q/pom.xml (92%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2-q/src/main/resources/application.properties (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2/pom.xml (92%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2/src/main/resources/application.properties (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java (100%) rename integration-tests/{ => in-process-embedding-models}/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java (100%) create mode 100644 integration-tests/in-process-embedding-models/pom.xml diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index 8b59658d7..7d817cfe0 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -20,29 +20,21 @@ defaults: shell: bash jobs: + # Build the project, no native tests. build-and-test-jvm: - name: Build on ${{ matrix.os }} - ${{ matrix.java }} - strategy: - fail-fast: false - matrix: - os: [ubuntu-latest] - java: [17] - runs-on: ${{ matrix.os }} + name: Main Build + runs-on: ubuntu-latest outputs: matrix: ${{ steps.set-matrix.outputs.matrix }} steps: - - name: Prepare git - run: git config --global core.autocrlf false - if: startsWith(matrix.os, 'windows') - - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - - name: Set up JDK ${{ matrix.java }} + - name: Set up JDK 17 uses: actions/setup-java@v4 with: distribution: temurin - java-version: ${{ matrix.java }} + java-version: 17 cache: 'maven' - name: Build with Maven @@ -65,33 +57,27 @@ jobs: run: | cd integration-tests # skip RAG module as it doesn't have any native-compatible tests now - # skip 'embed' modules (with in-process embeddings) and others that don't work in native - # FIXME: reenable embedding modules, see https://github.com/quarkiverse/quarkus-langchain4j/issues/394 MATRIX='{"testModule":'$( \ find . -mindepth 2 -maxdepth 2 -type f -name 'pom.xml' -exec dirname {} \; \ | sed 's|^\./||' \ | sort -u \ | grep -v rag \ - | grep -v embed \ | grep -v jlama \ | jq -R -s -c 'split("\n")[:-1]' \ )'}' echo "matrix=$MATRIX" >> $GITHUB_OUTPUT + # Test the project with different JDKs. test-jvm-alt: - name: Test on ${{ matrix.os }} - ${{ matrix.java }} strategy: fail-fast: false matrix: os: [ubuntu-latest] - java: [21] + java: [21, 22, 23] + name: Test on ${{ matrix.os }} - ${{ matrix.java }} runs-on: ${{ matrix.os }} steps: - - name: Prepare git - run: git config --global core.autocrlf false - if: startsWith(matrix.os, 'windows') - - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v4 @@ -116,7 +102,6 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - name: Set up JDK 17 diff --git a/.github/workflows/build-push.yml b/.github/workflows/build-push.yml index 0a7421652..ef0098df8 100644 --- a/.github/workflows/build-push.yml +++ b/.github/workflows/build-push.yml @@ -28,13 +28,9 @@ jobs: fail-fast: false matrix: os: [ubuntu-latest] - java: [17, 21] + java: [17, 21, 22, 23] runs-on: ${{ matrix.os }} steps: - - name: Prepare git - run: git config --global core.autocrlf false - if: startsWith(matrix.os, 'windows') - - uses: actions/checkout@v3 - name: Set up JDK ${{ matrix.java }} uses: actions/setup-java@v3 diff --git a/integration-tests/embed-all-minilm-l6-v2-q/pom.xml b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/pom.xml similarity index 88% rename from integration-tests/embed-all-minilm-l6-v2-q/pom.xml rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/pom.xml index 616d2da9e..10e116b01 100644 --- a/integration-tests/embed-all-minilm-l6-v2-q/pom.xml +++ b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.langchain4j - quarkus-langchain4j-integration-tests-parent + quarkus-langchain4j-integration-tests-in-process-embedding-models 999-SNAPSHOT @@ -12,11 +12,6 @@ Quarkus LangChain4j - Integration Tests - embeddings-all-minilm-l6-v2-q - - io.quarkiverse.langchain4j - quarkus-langchain4j-parsers-base - ${project.version} - io.quarkiverse.langchain4j quarkus-langchain4j-core @@ -27,12 +22,6 @@ dev.langchain4j langchain4j-embeddings-all-minilm-l6-v2-q ${langchain4j-embeddings.version} - - - dev.langchain4j - langchain4j-core - - diff --git a/integration-tests/embed-all-minilm-l6-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java diff --git a/integration-tests/embed-all-minilm-l6-v2-q/src/main/resources/application.properties b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/main/resources/application.properties similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2-q/src/main/resources/application.properties rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/main/resources/application.properties diff --git a/integration-tests/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java diff --git a/integration-tests/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java diff --git a/integration-tests/embed-all-minilm-l6-v2/pom.xml b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/pom.xml similarity index 97% rename from integration-tests/embed-all-minilm-l6-v2/pom.xml rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/pom.xml index 85d6435c6..e15f28b93 100644 --- a/integration-tests/embed-all-minilm-l6-v2/pom.xml +++ b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.langchain4j - quarkus-langchain4j-integration-tests-parent + quarkus-langchain4j-integration-tests-in-process-embedding-models 999-SNAPSHOT diff --git a/integration-tests/embed-all-minilm-l6-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java diff --git a/integration-tests/embed-all-minilm-l6-v2/src/main/resources/application.properties b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/main/resources/application.properties similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2/src/main/resources/application.properties rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/main/resources/application.properties diff --git a/integration-tests/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java diff --git a/integration-tests/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java b/integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java similarity index 100% rename from integration-tests/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java rename to integration-tests/in-process-embedding-models/embed-all-minilm-l6-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java diff --git a/integration-tests/embed-bge-small-en-q/pom.xml b/integration-tests/in-process-embedding-models/embed-bge-small-en-q/pom.xml similarity index 91% rename from integration-tests/embed-bge-small-en-q/pom.xml rename to integration-tests/in-process-embedding-models/embed-bge-small-en-q/pom.xml index 284cbc2c2..1291ab680 100644 --- a/integration-tests/embed-bge-small-en-q/pom.xml +++ b/integration-tests/in-process-embedding-models/embed-bge-small-en-q/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.langchain4j - quarkus-langchain4j-integration-tests-parent + quarkus-langchain4j-integration-tests-in-process-embedding-models 999-SNAPSHOT @@ -12,22 +12,16 @@ Quarkus LangChain4j - Integration Tests - embeddings-bge-small-en-q - - io.quarkiverse.langchain4j - quarkus-langchain4j-parsers-base - ${project.version} - - dev.langchain4j langchain4j-embeddings-bge-small-en-q ${langchain4j-embeddings.version} - - - dev.langchain4j - langchain4j-core - - + + + + io.quarkiverse.langchain4j + quarkus-langchain4j-core + ${project.version} diff --git a/integration-tests/embed-bge-small-en-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java b/integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java similarity index 100% rename from integration-tests/embed-bge-small-en-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java rename to integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java diff --git a/integration-tests/embed-bge-small-en-q/src/main/resources/application.properties b/integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/main/resources/application.properties similarity index 100% rename from integration-tests/embed-bge-small-en-q/src/main/resources/application.properties rename to integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/main/resources/application.properties diff --git a/integration-tests/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java b/integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java similarity index 100% rename from integration-tests/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java rename to integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java diff --git a/integration-tests/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java b/integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java similarity index 100% rename from integration-tests/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java rename to integration-tests/in-process-embedding-models/embed-bge-small-en-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java diff --git a/integration-tests/embed-bge-small-en/pom.xml b/integration-tests/in-process-embedding-models/embed-bge-small-en/pom.xml similarity index 91% rename from integration-tests/embed-bge-small-en/pom.xml rename to integration-tests/in-process-embedding-models/embed-bge-small-en/pom.xml index 98072c1fd..b60da273b 100644 --- a/integration-tests/embed-bge-small-en/pom.xml +++ b/integration-tests/in-process-embedding-models/embed-bge-small-en/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.langchain4j - quarkus-langchain4j-integration-tests-parent + quarkus-langchain4j-integration-tests-in-process-embedding-models 999-SNAPSHOT @@ -12,22 +12,16 @@ Quarkus LangChain4j - Integration Tests - embeddings-bge-small-en - - io.quarkiverse.langchain4j - quarkus-langchain4j-parsers-base - ${project.version} - - dev.langchain4j langchain4j-embeddings-bge-small-en ${langchain4j-embeddings.version} - - - dev.langchain4j - langchain4j-core - - + + + + io.quarkiverse.langchain4j + quarkus-langchain4j-core + ${project.version} diff --git a/integration-tests/embed-bge-small-en/src/main/java/org/acme/test/InProcessEmbeddingResource.java b/integration-tests/in-process-embedding-models/embed-bge-small-en/src/main/java/org/acme/test/InProcessEmbeddingResource.java similarity index 100% rename from integration-tests/embed-bge-small-en/src/main/java/org/acme/test/InProcessEmbeddingResource.java rename to integration-tests/in-process-embedding-models/embed-bge-small-en/src/main/java/org/acme/test/InProcessEmbeddingResource.java diff --git a/integration-tests/embed-bge-small-en/src/main/resources/application.properties b/integration-tests/in-process-embedding-models/embed-bge-small-en/src/main/resources/application.properties similarity index 100% rename from integration-tests/embed-bge-small-en/src/main/resources/application.properties rename to integration-tests/in-process-embedding-models/embed-bge-small-en/src/main/resources/application.properties diff --git a/integration-tests/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java b/integration-tests/in-process-embedding-models/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java similarity index 100% rename from integration-tests/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java rename to integration-tests/in-process-embedding-models/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java diff --git a/integration-tests/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java b/integration-tests/in-process-embedding-models/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java similarity index 100% rename from integration-tests/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java rename to integration-tests/in-process-embedding-models/embed-bge-small-en/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java diff --git a/integration-tests/embed-e5-small-v2-q/pom.xml b/integration-tests/in-process-embedding-models/embed-e5-small-v2-q/pom.xml similarity index 92% rename from integration-tests/embed-e5-small-v2-q/pom.xml rename to integration-tests/in-process-embedding-models/embed-e5-small-v2-q/pom.xml index 0b032608d..7a908ab8f 100644 --- a/integration-tests/embed-e5-small-v2-q/pom.xml +++ b/integration-tests/in-process-embedding-models/embed-e5-small-v2-q/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.langchain4j - quarkus-langchain4j-integration-tests-parent + quarkus-langchain4j-integration-tests-in-process-embedding-models 999-SNAPSHOT @@ -12,22 +12,16 @@ Quarkus LangChain4j - Integration Tests - embeddings-e5-small-v2-q - - io.quarkiverse.langchain4j - quarkus-langchain4j-parsers-base - ${project.version} - - dev.langchain4j langchain4j-embeddings-e5-small-v2-q ${langchain4j-embeddings.version} - - - dev.langchain4j - langchain4j-core - - + + + + io.quarkiverse.langchain4j + quarkus-langchain4j-core + ${project.version} diff --git a/integration-tests/embed-e5-small-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java b/integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java similarity index 100% rename from integration-tests/embed-e5-small-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java rename to integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/main/java/org/acme/test/InProcessEmbeddingResource.java diff --git a/integration-tests/embed-e5-small-v2-q/src/main/resources/application.properties b/integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/main/resources/application.properties similarity index 100% rename from integration-tests/embed-e5-small-v2-q/src/main/resources/application.properties rename to integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/main/resources/application.properties diff --git a/integration-tests/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java b/integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java similarity index 100% rename from integration-tests/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java rename to integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java diff --git a/integration-tests/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java b/integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java similarity index 100% rename from integration-tests/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java rename to integration-tests/in-process-embedding-models/embed-e5-small-v2-q/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java diff --git a/integration-tests/embed-e5-small-v2/pom.xml b/integration-tests/in-process-embedding-models/embed-e5-small-v2/pom.xml similarity index 92% rename from integration-tests/embed-e5-small-v2/pom.xml rename to integration-tests/in-process-embedding-models/embed-e5-small-v2/pom.xml index 3b951cb9e..e2195e9a5 100644 --- a/integration-tests/embed-e5-small-v2/pom.xml +++ b/integration-tests/in-process-embedding-models/embed-e5-small-v2/pom.xml @@ -4,7 +4,7 @@ io.quarkiverse.langchain4j - quarkus-langchain4j-integration-tests-parent + quarkus-langchain4j-integration-tests-in-process-embedding-models 999-SNAPSHOT @@ -12,22 +12,16 @@ Quarkus LangChain4j - Integration Tests - embeddings-e5-small-v2 - - io.quarkiverse.langchain4j - quarkus-langchain4j-parsers-base - ${project.version} - - dev.langchain4j langchain4j-embeddings-e5-small-v2 ${langchain4j-embeddings.version} - - - dev.langchain4j - langchain4j-core - - + + + + io.quarkiverse.langchain4j + quarkus-langchain4j-core + ${project.version} diff --git a/integration-tests/embed-e5-small-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java b/integration-tests/in-process-embedding-models/embed-e5-small-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java similarity index 100% rename from integration-tests/embed-e5-small-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java rename to integration-tests/in-process-embedding-models/embed-e5-small-v2/src/main/java/org/acme/test/InProcessEmbeddingResource.java diff --git a/integration-tests/embed-e5-small-v2/src/main/resources/application.properties b/integration-tests/in-process-embedding-models/embed-e5-small-v2/src/main/resources/application.properties similarity index 100% rename from integration-tests/embed-e5-small-v2/src/main/resources/application.properties rename to integration-tests/in-process-embedding-models/embed-e5-small-v2/src/main/resources/application.properties diff --git a/integration-tests/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java b/integration-tests/in-process-embedding-models/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java similarity index 100% rename from integration-tests/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java rename to integration-tests/in-process-embedding-models/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceIT.java diff --git a/integration-tests/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java b/integration-tests/in-process-embedding-models/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java similarity index 100% rename from integration-tests/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java rename to integration-tests/in-process-embedding-models/embed-e5-small-v2/src/test/java/org/acme/test/InProcessEmbeddingResourceTest.java diff --git a/integration-tests/in-process-embedding-models/pom.xml b/integration-tests/in-process-embedding-models/pom.xml new file mode 100644 index 000000000..483f1d004 --- /dev/null +++ b/integration-tests/in-process-embedding-models/pom.xml @@ -0,0 +1,22 @@ + + + 4.0.0 + + io.quarkiverse.langchain4j + quarkus-langchain4j-integration-tests-parent + 999-SNAPSHOT + + quarkus-langchain4j-integration-tests-in-process-embedding-models + Quarkus LangChain4j - Integration Tests - In Process Embedding Models + pom + + + embed-all-minilm-l6-v2-q + embed-all-minilm-l6-v2 + embed-bge-small-en-q + embed-bge-small-en + embed-e5-small-v2-q + embed-e5-small-v2 + + + diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 15f49d92f..b4f09900a 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -22,12 +22,7 @@ mistralai devui devui-multiple-embedding-models - embed-all-minilm-l6-v2-q - embed-all-minilm-l6-v2 - embed-bge-small-en-q - embed-bge-small-en - embed-e5-small-v2-q - embed-e5-small-v2 + in-process-embedding-models rag rag-pgvector rag-pgvector-flyway