Merge branch 'main' into renovate/spring-ai.version

rajadilipkolli · Sep 20, 2024 · ccb155a · ccb155a
2 parents 90262e4 + 2438a2a
commit ccb155a
Show file tree

Hide file tree

Showing 22 changed files with 31 additions and 29 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/embeddingstores/neo4j-springai/pom.xml b/embeddingstores/neo4j-springai/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

diff --git 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.responseFormat.type=json_object
+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/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:
@@ -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"

diff --git a/embeddingstores/opensearch-langchain4j/pom.xml b/embeddingstores/opensearch-langchain4j/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -20,7 +20,7 @@
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 
-        <langchain4j.version>0.33.0</langchain4j.version>
+        <langchain4j.version>0.34.0</langchain4j.version>
         <tinylog.version>2.7.0</tinylog.version>
     </properties>
 

diff --git a/embeddingstores/pgvector-langchain4j/pom.xml b/embeddingstores/pgvector-langchain4j/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.example.ai</groupId>
@@ -16,7 +16,7 @@
     <properties>
         <java.version>21</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <langchain4j.version>0.33.0</langchain4j.version>
+        <langchain4j.version>0.34.0</langchain4j.version>
     </properties>
 
     <dependencies>

diff --git a/embeddingstores/pgvector-springai/pom.xml b/embeddingstores/pgvector-springai/pom.xml
@@ -7,7 +7,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 

diff --git 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.responseFormat.type=json_object
+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
@@ -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/playground-langchain4j/pom.xml b/playground-langchain4j/pom.xml
@@ -12,7 +12,7 @@
         <maven.compiler.source>21</maven.compiler.source>
         <maven.compiler.target>21</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <langchain4j.version>0.33.0</langchain4j.version>
+        <langchain4j.version>0.34.0</langchain4j.version>
         <tinylog.version>2.7.0</tinylog.version>
     </properties>
 

diff --git a/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml b/rag/rag-langchain4j-AllMiniLmL6V2-llm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>org.example.ai</groupId>
@@ -16,8 +16,8 @@
 
     <properties>
         <java.version>21</java.version>
-        <langchain4j.version>0.33.0</langchain4j.version>
-        <langchain4j.springboot.version>0.33.0</langchain4j.springboot.version>
+        <langchain4j.version>0.34.0</langchain4j.version>
+        <langchain4j.springboot.version>0.34.0</langchain4j.springboot.version>
         <spotless.version>2.43.0</spotless.version>
     </properties>
 

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
@@ -32,7 +32,7 @@
 class AIConfig {
 
     @Bean
-    AICustomerSupportAgent customerSupportAgent(
+    AICustomerSupportAgent aiCustomerSupportAgent(
             ChatLanguageModel chatLanguageModel,
             ChatTools chatAssistantTools,
             ContentRetriever contentRetriever,

diff --git 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/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.4
         extra_hosts: ['host.docker.internal:host-gateway']
         container_name: lgtm-stack
         environment:

diff --git a/rag/rag-springai-ollama-llm/pom.xml b/rag/rag-springai-ollama-llm/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.3.3</version>
+        <version>3.3.4</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.learning.ai</groupId>