Merge branch 'main' into renovate/spring-boot

rajadilipkolli · Sep 20, 2024 · e997d5b · e997d5b
2 parents 0d23fed + 68dce13
commit e997d5b
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 14 deletions.
diff --git a/chatbot/chatbot-ollama-springai/src/main/resources/application.properties b/chatbot/chatbot-ollama-springai/src/main/resources/application.properties
@@ -6,4 +6,4 @@ spring.mvc.problemdetails.enabled=true
 spring.ai.ollama.chat.options.model=llama3
 spring.ai.ollama.embedding.options.model=llama3
 
-spring.testcontainers.beans.startup=parallel
+spring.testcontainers.beans.startup=parallel
diff --git a/embeddingstores/pgvector-springai/pom.xml b/embeddingstores/pgvector-springai/pom.xml
@@ -18,7 +18,7 @@
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <java.version>21</java.version>
-        <spring-ai.version>1.0.0-M1</spring-ai.version>
+        <spring-ai.version>1.0.0-M2</spring-ai.version>
 
         <spotless.version>2.43.0</spotless.version>
     </properties>
@@ -99,7 +99,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.47.0</version>
+                            <version>2.50.0</version>
                         </palantirJavaFormat>
                         <importOrder />
                         <removeUnusedImports />

diff --git a/...ing/ai/PgVectorEmbeddingStoreExample.java → .../PgVectorOpenAIEmbeddingStoreExample.java b/...ing/ai/PgVectorEmbeddingStoreExample.java → .../PgVectorOpenAIEmbeddingStoreExample.java
@@ -4,9 +4,9 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class PgVectorEmbeddingStoreExample {
+public class PgVectorOpenAIEmbeddingStoreExample {
 
     public static void main(String[] args) {
-        SpringApplication.run(PgVectorEmbeddingStoreExample.class, args);
+        SpringApplication.run(PgVectorOpenAIEmbeddingStoreExample.class, args);
     }
 }
diff --git a/embeddingstores/pgvector-springai/src/main/resources/application.properties b/embeddingstores/pgvector-springai/src/main/resources/application.properties
@@ -5,7 +5,7 @@ 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-4o-mini
-spring.ai.openai.chat.options.responseFormat=json_object
+spring.ai.openai.chat.options.responseFormat.type=json_schema
 spring.ai.openai.embedding.options.model=text-embedding-3-small
 
 spring.threads.virtual.enabled=true
@@ -14,4 +14,5 @@ spring.threads.virtual.enabled=true
 #PgVector
 spring.ai.vectorstore.pgvector.dimensions=1536
 ## only for development
-spring.ai.vectorstore.pgvector.removeExistingVectorStoreTable=true
+spring.ai.vectorstore.pgvector.removeExistingVectorStoreTable=true
+spring.ai.vectorstore.pgvector.initialize-schema=true
diff --git a/...ai/TestPgVectorEmbeddingStoreExample.java → ...tPgVectorOpenAIEmbeddingStoreExample.java b/...ai/TestPgVectorEmbeddingStoreExample.java → ...tPgVectorOpenAIEmbeddingStoreExample.java
@@ -7,11 +7,11 @@
 
 @TestConfiguration(proxyBeanMethods = false)
 @ImportTestcontainers(ContainersConfig.class)
-public class TestPgVectorEmbeddingStoreExample {
+public class TestPgVectorOpenAIEmbeddingStoreExample {
 
     public static void main(String[] args) {
-        SpringApplication.from(PgVectorEmbeddingStoreExample::main)
-                .with(TestPgVectorEmbeddingStoreExample.class)
+        SpringApplication.from(PgVectorOpenAIEmbeddingStoreExample::main)
+                .with(TestPgVectorOpenAIEmbeddingStoreExample.class)
                 .run(args);
     }
 }
diff --git a/...tores/pgvector-springai/src/test/java/com/learning/ai/controller/QueryControllerTest.java b/...tores/pgvector-springai/src/test/java/com/learning/ai/controller/QueryControllerTest.java
@@ -3,7 +3,7 @@
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.equalTo;
 
-import com.learning.ai.TestPgVectorEmbeddingStoreExample;
+import com.learning.ai.TestPgVectorOpenAIEmbeddingStoreExample;
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
@@ -13,7 +13,7 @@
 
 @SpringBootTest(
         webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
-        classes = TestPgVectorEmbeddingStoreExample.class)
+        classes = TestPgVectorOpenAIEmbeddingStoreExample.class)
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 class QueryControllerTest {
 

diff --git a/rag/rag-springai-ollama-llm/src/main/resources/application.properties b/rag/rag-springai-ollama-llm/src/main/resources/application.properties
@@ -12,7 +12,7 @@ spring.ai.ollama.embedding.options.model=nomic-embed-text
 
 spring.ai.vectorstore.redis.index=vector_store
 spring.ai.vectorstore.redis.prefix=ai
-spring.ai.vectorstore.redis.initializeSchema=true
+spring.ai.vectorstore.redis.initialize-schema=true
 
 spring.ai.ollama.baseUrl=http://localhost:11434
 

diff --git a/rag/rag-springai-openai-llm/pom.xml b/rag/rag-springai-openai-llm/pom.xml
@@ -120,7 +120,7 @@
                 <configuration>
                     <java>
                         <palantirJavaFormat>
-                            <version>2.47.0</version>
+                            <version>2.50.0</version>
                         </palantirJavaFormat>
                         <importOrder/>
                         <removeUnusedImports/>