Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(deps): update dependency org.springframework.ai:spring-ai-bom to v1.0.0.m2 #86

Merged
merged 7 commits into from
Sep 20, 2024
Merged

fix(deps): update dependency org.springframework.ai:spring-ai-bom to v1.0.0.m2 #86

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
fc7c814
fix(deps): update dependency org.springframework.ai:spring-ai-bom to …
renovate[bot] Aug 23, 2024
b9b4565
fix : issue with build
rajadilipkolli Aug 24, 2024
90262e4
fix : compilation issue
rajadilipkolli Aug 24, 2024
ccb155a
Merge branch 'main' into renovate/spring-ai.version
rajadilipkolli Sep 20, 2024
049ff10
Merge branch 'main' into renovate/spring-ai.version
rajadilipkolli Sep 20, 2024
767a9ea
attempt to fix
rajadilipkolli Sep 20, 2024
e971e18
fix : build
rajadilipkolli Sep 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion chatbot/chatbot-ollama-springai/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions embeddingstores/pgvector-springai/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -99,7 +99,7 @@
<configuration>
<java>
<palantirJavaFormat>
<version>2.47.0</version>
<version>2.50.0</version>
</palantirJavaFormat>
<importOrder />
<removeUnusedImports />
Expand Down
4 changes: 2 additions & 2 deletions ...ing/ai/PgVectorEmbeddingStoreExample.java → .../PgVectorOpenAIEmbeddingStoreExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
5 changes: 3 additions & 2 deletions embeddingstores/pgvector-springai/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
6 changes: 3 additions & 3 deletions ...ai/TestPgVectorEmbeddingStoreExample.java → ...tPgVectorOpenAIEmbeddingStoreExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
4 changes: 2 additions & 2 deletions ...tores/pgvector-springai/src/test/java/com/learning/ai/controller/QueryControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -13,7 +13,7 @@

@SpringBootTest(
webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT,
classes = TestPgVectorEmbeddingStoreExample.class)
classes = TestPgVectorOpenAIEmbeddingStoreExample.class)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
class QueryControllerTest {

Expand Down
2 changes: 1 addition & 1 deletion rag/rag-springai-ollama-llm/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion rag/rag-springai-openai-llm/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
<configuration>
<java>
<palantirJavaFormat>
<version>2.47.0</version>
<version>2.50.0</version>
</palantirJavaFormat>
<importOrder/>
<removeUnusedImports/>
Expand Down
3 changes: 2 additions & 1 deletion rag/rag-springai-openai-llm/src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ spring.mvc.problemdetails.enabled=true

spring.ai.openai.api-key=demo
spring.ai.openai.base-url=http://langchain4j.dev/demo/openai
spring.ai.openai.chat.options.model=gpt-3.5-turbo
spring.ai.openai.chat.options.model=gpt-4o-mini
spring.ai.openai.chat.options.temperature=0.2
spring.ai.openai.chat.options.responseFormat=json_object
spring.ai.openai.embedding.options.model=text-embedding-3-small

#spring.ai.openai.image.model=dall-e-3
Loading