From f4c49f68b0d91c2dffc7a3295809391ec808093b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 5 Sep 2024 14:52:26 +0000 Subject: [PATCH 1/9] fix(deps): update langchain4j.version to v0.34.0 --- embeddingstores/opensearch-langchain4j/pom.xml | 2 +- embeddingstores/pgvector-langchain4j/pom.xml | 2 +- playground-langchain4j/pom.xml | 2 +- rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/embeddingstores/opensearch-langchain4j/pom.xml b/embeddingstores/opensearch-langchain4j/pom.xml index 25fcaa2..3b5e4d7 100644 --- a/embeddingstores/opensearch-langchain4j/pom.xml +++ b/embeddingstores/opensearch-langchain4j/pom.xml @@ -20,7 +20,7 @@ 21 UTF-8 - 0.33.0 + 0.34.0 2.7.0 diff --git a/embeddingstores/pgvector-langchain4j/pom.xml b/embeddingstores/pgvector-langchain4j/pom.xml index ec05e67..069e809 100644 --- a/embeddingstores/pgvector-langchain4j/pom.xml +++ b/embeddingstores/pgvector-langchain4j/pom.xml @@ -16,7 +16,7 @@ 21 UTF-8 - 0.33.0 + 0.34.0 diff --git a/playground-langchain4j/pom.xml b/playground-langchain4j/pom.xml index 1c8c3cb..53a02f5 100644 --- a/playground-langchain4j/pom.xml +++ b/playground-langchain4j/pom.xml @@ -12,7 +12,7 @@ 21 21 UTF-8 - 0.33.0 + 0.34.0 2.7.0 diff --git a/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml b/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml index 5df4498..92a08da 100644 --- a/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml +++ b/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml @@ -16,7 +16,7 @@ 21 - 0.33.0 + 0.34.0 0.33.0 2.43.0 From 2aff1a12841f79ececbe327eb835f814854433e7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 6 Sep 2024 18:20:40 +0530 Subject: [PATCH 2/9] fix(deps): update langchain4j.springboot.version to v0.34.0 (#87) * fix(deps): update langchain4j.springboot.version to v0.34.0 * fix : bean name --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Raja Kolli --- rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml | 2 +- .../src/main/java/com/learning/ai/config/AIConfig.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml b/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml index 92a08da..9e550ef 100644 --- a/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml +++ b/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml @@ -17,7 +17,7 @@ 21 0.34.0 - 0.33.0 + 0.34.0 2.43.0 diff --git a/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/java/com/learning/ai/config/AIConfig.java b/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/java/com/learning/ai/config/AIConfig.java index c0d2a98..9085038 100644 --- a/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/java/com/learning/ai/config/AIConfig.java +++ b/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/java/com/learning/ai/config/AIConfig.java @@ -32,7 +32,7 @@ class AIConfig { @Bean - AICustomerSupportAgent customerSupportAgent( + AICustomerSupportAgent aiCustomerSupportAgent( ChatLanguageModel chatLanguageModel, ChatTools chatAssistantTools, ContentRetriever contentRetriever, From 779dceee86d9b2b38122741a4c3c5677f9e79cbf Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 9 Sep 2024 15:14:18 +0000 Subject: [PATCH 3/9] chore(deps): update actions/setup-java action to v4.3.0 --- .github/workflows/chatbot-ollama-springai.yml | 2 +- .github/workflows/chatmodel-springai.yml | 2 +- .github/workflows/embeddingstore-neo4j-springai.yml | 2 +- .github/workflows/pgvector-langchain4j.yml | 2 +- .github/workflows/pgvector-springai.yml | 2 +- .github/workflows/rag-langchain4j-AllMiniLmL6V2-llm.yml | 2 +- .github/workflows/rag-springai-ollama-llm.yml | 2 +- .github/workflows/rag-springai-openai-llm.yml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/chatbot-ollama-springai.yml b/.github/workflows/chatbot-ollama-springai.yml index dc08f87..fdc0650 100644 --- a/.github/workflows/chatbot-ollama-springai.yml +++ b/.github/workflows/chatbot-ollama-springai.yml @@ -29,7 +29,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: temurin diff --git a/.github/workflows/chatmodel-springai.yml b/.github/workflows/chatmodel-springai.yml index 7836e7b..2763b3c 100644 --- a/.github/workflows/chatmodel-springai.yml +++ b/.github/workflows/chatmodel-springai.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} diff --git a/.github/workflows/embeddingstore-neo4j-springai.yml b/.github/workflows/embeddingstore-neo4j-springai.yml index 0ddc3a0..5095340 100644 --- a/.github/workflows/embeddingstore-neo4j-springai.yml +++ b/.github/workflows/embeddingstore-neo4j-springai.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} diff --git a/.github/workflows/pgvector-langchain4j.yml b/.github/workflows/pgvector-langchain4j.yml index 3fc5060..c4f4118 100644 --- a/.github/workflows/pgvector-langchain4j.yml +++ b/.github/workflows/pgvector-langchain4j.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} diff --git a/.github/workflows/pgvector-springai.yml b/.github/workflows/pgvector-springai.yml index a2900a4..113e93a 100644 --- a/.github/workflows/pgvector-springai.yml +++ b/.github/workflows/pgvector-springai.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} diff --git a/.github/workflows/rag-langchain4j-AllMiniLmL6V2-llm.yml b/.github/workflows/rag-langchain4j-AllMiniLmL6V2-llm.yml index 395f105..01ca415 100644 --- a/.github/workflows/rag-langchain4j-AllMiniLmL6V2-llm.yml +++ b/.github/workflows/rag-langchain4j-AllMiniLmL6V2-llm.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} diff --git a/.github/workflows/rag-springai-ollama-llm.yml b/.github/workflows/rag-springai-ollama-llm.yml index 1bb6031..2c5b742 100644 --- a/.github/workflows/rag-springai-ollama-llm.yml +++ b/.github/workflows/rag-springai-ollama-llm.yml @@ -32,7 +32,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} diff --git a/.github/workflows/rag-springai-openai-llm.yml b/.github/workflows/rag-springai-openai-llm.yml index 81f2d00..859d78a 100644 --- a/.github/workflows/rag-springai-openai-llm.yml +++ b/.github/workflows/rag-springai-openai-llm.yml @@ -30,7 +30,7 @@ jobs: fetch-depth: 0 # Shallow clones should be disabled for a better relevancy of analysis - name: Set up JDK ${{ matrix.java }} - uses: actions/setup-java@v4.2.2 + uses: actions/setup-java@v4.3.0 with: java-version: ${{ matrix.java }} distribution: ${{ matrix.distribution }} From 563e36ebe3ffc97dea1e6048b1f14aa526ff9d19 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Sep 2024 13:48:02 +0000 Subject: [PATCH 4/9] chore(deps): update grafana/otel-lgtm docker tag to v0.7.2 --- rag/rag-springai-ollama-llm/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rag/rag-springai-ollama-llm/docker/docker-compose.yml b/rag/rag-springai-ollama-llm/docker/docker-compose.yml index 1ed7954..6ef7b3c 100644 --- a/rag/rag-springai-ollama-llm/docker/docker-compose.yml +++ b/rag/rag-springai-ollama-llm/docker/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - '6379:6379' lgtm-stack: - image: grafana/otel-lgtm:0.7.1 + image: grafana/otel-lgtm:0.7.2 extra_hosts: ['host.docker.internal:host-gateway'] container_name: lgtm-stack environment: From f62e1c50dd84d8d67e25642640c764b9fb82b128 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 13 Sep 2024 12:42:45 +0000 Subject: [PATCH 5/9] chore(deps): update grafana/otel-lgtm docker tag to v0.7.3 --- rag/rag-springai-ollama-llm/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rag/rag-springai-ollama-llm/docker/docker-compose.yml b/rag/rag-springai-ollama-llm/docker/docker-compose.yml index 6ef7b3c..6b3b82f 100644 --- a/rag/rag-springai-ollama-llm/docker/docker-compose.yml +++ b/rag/rag-springai-ollama-llm/docker/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - '6379:6379' lgtm-stack: - image: grafana/otel-lgtm:0.7.2 + image: grafana/otel-lgtm:0.7.3 extra_hosts: ['host.docker.internal:host-gateway'] container_name: lgtm-stack environment: From 1fdee3e6523724552b93616134795c7bfee34ae8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 17 Sep 2024 22:24:52 +0000 Subject: [PATCH 6/9] chore(deps): update opensearchproject/opensearch docker tag to v2.17.0 --- .../opensearch-langchain4j/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml b/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml index 1c4e41e..2b7d3b3 100644 --- a/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml +++ b/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml @@ -1,7 +1,7 @@ services: opensearch: - image: opensearchproject/opensearch:2.16.0 + image: opensearchproject/opensearch:2.17.0 container_name: opensearch hostname: opensearch ports: From 2d40b605180160f5785f3f369365cc6de2d089be Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 02:06:41 +0000 Subject: [PATCH 7/9] chore(deps): update opensearchproject/opensearch-dashboards docker tag to v2.17.0 --- .../opensearch-langchain4j/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml b/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml index 2b7d3b3..9d236c3 100644 --- a/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml +++ b/embeddingstores/opensearch-langchain4j/docker/docker-compose.yml @@ -14,7 +14,7 @@ services: - "OPENSEARCH_JAVA_OPTS=-Xms512m -Xmx512m" opensearch-dashboards: - image: opensearchproject/opensearch-dashboards:2.16.0 + image: opensearchproject/opensearch-dashboards:2.17.0 container_name: opensearch_dashboards ports: - "5601:5601" From 9623c0ae74719becaecc46915705bce83a4f8d8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 18 Sep 2024 10:00:51 +0000 Subject: [PATCH 8/9] chore(deps): update grafana/otel-lgtm docker tag to v0.7.4 --- rag/rag-springai-ollama-llm/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rag/rag-springai-ollama-llm/docker/docker-compose.yml b/rag/rag-springai-ollama-llm/docker/docker-compose.yml index 6b3b82f..2427e21 100644 --- a/rag/rag-springai-ollama-llm/docker/docker-compose.yml +++ b/rag/rag-springai-ollama-llm/docker/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - '6379:6379' lgtm-stack: - image: grafana/otel-lgtm:0.7.3 + image: grafana/otel-lgtm:0.7.4 extra_hosts: ['host.docker.internal:host-gateway'] container_name: lgtm-stack environment: From 2438a2a8b35a3b9892ae8257516bbc5c2afd273f Mon Sep 17 00:00:00 2001 From: Raja Kolli Date: Fri, 20 Sep 2024 03:32:54 +0000 Subject: [PATCH 9/9] chore(deps) : update to latest SB and supported model --- embeddingstores/neo4j-springai/pom.xml | 2 +- .../neo4j-springai/src/main/resources/application.properties | 3 ++- embeddingstores/opensearch-langchain4j/pom.xml | 2 +- embeddingstores/pgvector-langchain4j/pom.xml | 2 +- embeddingstores/pgvector-springai/pom.xml | 2 +- .../src/main/resources/application.properties | 3 ++- java-openai/src/main/java/com/example/learning/Main.java | 2 +- rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml | 2 +- .../src/main/resources/application.properties | 2 +- rag/rag-springai-ollama-llm/pom.xml | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/embeddingstores/neo4j-springai/pom.xml b/embeddingstores/neo4j-springai/pom.xml index fc99ba9..badd291 100644 --- a/embeddingstores/neo4j-springai/pom.xml +++ b/embeddingstores/neo4j-springai/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 diff --git a/embeddingstores/neo4j-springai/src/main/resources/application.properties b/embeddingstores/neo4j-springai/src/main/resources/application.properties index 9b8f646..f101a2d 100644 --- a/embeddingstores/neo4j-springai/src/main/resources/application.properties +++ b/embeddingstores/neo4j-springai/src/main/resources/application.properties @@ -4,8 +4,9 @@ spring.ai.openai.api-key=demo spring.ai.openai.base-url=http://langchain4j.dev/demo/openai spring.ai.openai.image.enabled=false spring.ai.openai.chat.options.temperature=0.2 -spring.ai.openai.chat.options.model=gpt-3.5-turbo +spring.ai.openai.chat.options.model=gpt-4o-mini spring.ai.openai.chat.options.responseFormat=json_object +spring.ai.openai.embedding.options.model=text-embedding-3-small spring.threads.virtual.enabled=true diff --git a/embeddingstores/opensearch-langchain4j/pom.xml b/embeddingstores/opensearch-langchain4j/pom.xml index 3b5e4d7..93099ec 100644 --- a/embeddingstores/opensearch-langchain4j/pom.xml +++ b/embeddingstores/opensearch-langchain4j/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 diff --git a/embeddingstores/pgvector-langchain4j/pom.xml b/embeddingstores/pgvector-langchain4j/pom.xml index 069e809..a517214 100644 --- a/embeddingstores/pgvector-langchain4j/pom.xml +++ b/embeddingstores/pgvector-langchain4j/pom.xml @@ -6,7 +6,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 org.example.ai diff --git a/embeddingstores/pgvector-springai/pom.xml b/embeddingstores/pgvector-springai/pom.xml index 99e34f5..d5c842b 100644 --- a/embeddingstores/pgvector-springai/pom.xml +++ b/embeddingstores/pgvector-springai/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 diff --git a/embeddingstores/pgvector-springai/src/main/resources/application.properties b/embeddingstores/pgvector-springai/src/main/resources/application.properties index 5aca066..54b18ca 100644 --- a/embeddingstores/pgvector-springai/src/main/resources/application.properties +++ b/embeddingstores/pgvector-springai/src/main/resources/application.properties @@ -4,8 +4,9 @@ spring.ai.openai.api-key=demo spring.ai.openai.base-url=http://langchain4j.dev/demo/openai spring.ai.openai.image.enabled=false spring.ai.openai.chat.options.temperature=0.7 -spring.ai.openai.chat.options.model=gpt-3.5-turbo +spring.ai.openai.chat.options.model=gpt-4o-mini spring.ai.openai.chat.options.responseFormat=json_object +spring.ai.openai.embedding.options.model=text-embedding-3-small spring.threads.virtual.enabled=true diff --git a/java-openai/src/main/java/com/example/learning/Main.java b/java-openai/src/main/java/com/example/learning/Main.java index 50ab1b2..8a5a2f2 100644 --- a/java-openai/src/main/java/com/example/learning/Main.java +++ b/java-openai/src/main/java/com/example/learning/Main.java @@ -19,7 +19,7 @@ public class Main { // "https://api.openai.com/v1/chat/completions"; public static final String OPENAI_API_KEY = "demo"; public static final String CHAT_URL = "http://langchain4j.dev/demo/openai/v1/chat/completions"; - public final static String MODEL = "gpt-3.5-turbo"; + public final static String MODEL = "gpt-4o-mini"; public final static double TEMPERATURE = 0.7; static HttpClient client = HttpClient.newHttpClient(); diff --git a/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml b/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml index 9e550ef..22d7562 100644 --- a/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml +++ b/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 org.example.ai diff --git a/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/resources/application.properties b/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/resources/application.properties index 5b5987e..fa32530 100644 --- a/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/resources/application.properties +++ b/rag/rag-langchain4j-AllMiniLmL6V2-llm/src/main/resources/application.properties @@ -1,7 +1,7 @@ spring.application.name=rag-langchain4j-AllMiniLmL6V2-llm langchain4j.open-ai.chat-model.api-key=demo -langchain4j.open-ai.chat-model.model-name=gpt-3.5-turbo +langchain4j.open-ai.chat-model.model-name=gpt-4o-mini langchain4j.open-ai.chat-model.temperature=0.7 langchain4j.open-ai.chat-model.timeout=PT60S langchain4j.open-ai.chat-model.log-requests=true diff --git a/rag/rag-springai-ollama-llm/pom.xml b/rag/rag-springai-ollama-llm/pom.xml index 637c174..b3545ce 100644 --- a/rag/rag-springai-ollama-llm/pom.xml +++ b/rag/rag-springai-ollama-llm/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.3.3 + 3.3.4 com.learning.ai