From cbbcfcd73eaa34eed4992d719e68795db2eac95c Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 1 Nov 2024 15:07:53 +0200 Subject: [PATCH 1/2] Fix Llama3 Java IT configuration --- .github/workflows/build-pull-request.yml | 8 ++------ integration-tests/llama3-java/pom.xml | 4 ++-- integration-tests/pom.xml | 9 +++++++++ 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build-pull-request.yml b/.github/workflows/build-pull-request.yml index df5d2cfda..853ef0bb8 100644 --- a/.github/workflows/build-pull-request.yml +++ b/.github/workflows/build-pull-request.yml @@ -124,19 +124,15 @@ jobs: run: | ./mvnw -B clean install -DskipTests -Dno-format -ntp -f model-providers/jlama/pom.xml - - name: Run tests of ${{ matrix.module }} with JDK ${{ matrix.java }} - run: | - cd ${{ matrix.module }} && ../mvnw -B verify -Dci=true -Dno-format -ntp - # Build Llama3.java if JDK >= 22. See https://x.com/tjake/status/1849141171475399083?t=EpgVJCPLC17fCXio0FvnhA&s=19 for the reason - name: Build Llama3-java extension if: ${{ matrix.java >= 22 }} run: | - ./mvnw -B clean install -DskipTests -Dno-format -ntp -f model-providers/llama3-java/pom.xml + ./mvnw -B clean install -DskipTests -Dno-format -ntp -f model-providers/llama3-java/pom.xml - name: Run tests of ${{ matrix.module }} with JDK ${{ matrix.java }} run: | - cd ${{ matrix.module }} && ../mvnw -B verify -Dci=true -Dno-format -ntp + cd ${{ matrix.module }} && ../mvnw -B verify -Dci=true -Dno-format -ntp native-tests: diff --git a/integration-tests/llama3-java/pom.xml b/integration-tests/llama3-java/pom.xml index 6b4de2716..26638bf41 100644 --- a/integration-tests/llama3-java/pom.xml +++ b/integration-tests/llama3-java/pom.xml @@ -6,8 +6,8 @@ quarkus-langchain4j-integration-tests-parent 999-SNAPSHOT - quarkus-langchain4j-integration-test-jlama - Quarkus LangChain4j - Integration Tests - Jlama + quarkus-langchain4j-integration-test-llama3-java + Quarkus LangChain4j - Integration Tests - Llama3 Java true 21 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 46e490512..4362e44c0 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -38,5 +38,14 @@ jlama + + jdk22-plus + + [22,) + + + llama3-java + + From 9969c6ca5631c24fe56fc0c30f04ce7bcea7d622 Mon Sep 17 00:00:00 2001 From: Georgios Andrianakis Date: Fri, 1 Nov 2024 15:09:18 +0200 Subject: [PATCH 2/2] Always disable downloading models during build time for ITs --- integration-tests/jlama/pom.xml | 12 ------------ .../jlama/src/main/resources/application.properties | 1 + .../src/main/resources/application.properties | 1 + 3 files changed, 2 insertions(+), 12 deletions(-) diff --git a/integration-tests/jlama/pom.xml b/integration-tests/jlama/pom.xml index 26348c1e9..112a7bd9d 100644 --- a/integration-tests/jlama/pom.xml +++ b/integration-tests/jlama/pom.xml @@ -134,17 +134,5 @@ native - - release - - - prepareRelease - - - - - false - - diff --git a/integration-tests/jlama/src/main/resources/application.properties b/integration-tests/jlama/src/main/resources/application.properties index e69de29bb..5ac6c80b2 100644 --- a/integration-tests/jlama/src/main/resources/application.properties +++ b/integration-tests/jlama/src/main/resources/application.properties @@ -0,0 +1 @@ +quarkus.langchain4j.jlama.include-models-in-artifact=false diff --git a/integration-tests/llama3-java/src/main/resources/application.properties b/integration-tests/llama3-java/src/main/resources/application.properties index e69de29bb..a969e3960 100644 --- a/integration-tests/llama3-java/src/main/resources/application.properties +++ b/integration-tests/llama3-java/src/main/resources/application.properties @@ -0,0 +1 @@ +quarkus.langchain4j.llama3.include-models-in-artifact=false