Skip to content

Commit 5fe3a53

Browse files
committed
Try release of LC4j
1 parent 75cc724 commit 5fe3a53

File tree

2 files changed

+38
-2
lines changed

2 files changed

+38
-2
lines changed

langchain4j-astradb/src/test/java/dev/langchain4j/store/embedding/astradb/GettingStartedGuideTestIT.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,15 +139,15 @@ public void should_search_content_retriever() {
139139

140140
ContentRetriever contentRetriever = EmbeddingStoreContentRetriever.builder()
141141
.embeddingStore(storeJohnny)
142-
//.embeddingModel()
142+
.embeddingModel(AstraDBTestSupport.createopenAIEmbeddingModel(OpenAiEmbeddingModelName.TEXT_EMBEDDING_3_SMALL))
143143
.maxResults(2)
144144
.minScore(0.5)
145145
.build();
146146

147147
// configuring it to use the components we've created above.
148148
Assistant ai = AiServices.builder(Assistant.class)
149149
.contentRetriever(contentRetriever)
150-
//.chatLanguageModel(getChatLanguageModelChatBison())
150+
.chatLanguageModel(AstraDBTestSupport.createOpenAIChatLanguageModel(OpenAiChatModelName.GPT_4_O))
151151
//.chatMemory(MessageWindowChatMemory.withMaxMessages(10))
152152
.build();
153153

langchain4j-astradb/src/test/java/dev/langchain4j/store/embedding/astradb/GettingStartedGuideVectorizedTestIT.java

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
import com.datastax.astra.client.Database;
44
import com.datastax.astra.client.model.CollectionOptions;
55
import com.datastax.astra.client.model.SimilarityMetric;
6+
import com.datastax.astra.langchain4j.Assistant;
67
import com.datastax.astra.langchain4j.AstraDBTestSupport;
8+
import com.datastax.astra.langchain4j.rag.AstraVectorizeContentRetriever;
79
import com.datastax.astra.langchain4j.rag.AstraVectorizeIngestor;
810
import com.datastax.astra.langchain4j.store.embedding.AstraDbEmbeddingStore;
911
import com.datastax.astra.langchain4j.store.embedding.EmbeddingSearchRequestAstra;
@@ -12,6 +14,13 @@
1214
import dev.langchain4j.data.document.parser.TextDocumentParser;
1315
import dev.langchain4j.data.document.splitter.DocumentSplitters;
1416
import dev.langchain4j.data.segment.TextSegment;
17+
import dev.langchain4j.model.openai.OpenAiChatModelName;
18+
import dev.langchain4j.model.openai.OpenAiEmbeddingModelName;
19+
import dev.langchain4j.rag.DefaultRetrievalAugmentor;
20+
import dev.langchain4j.rag.RetrievalAugmentor;
21+
import dev.langchain4j.rag.content.retriever.ContentRetriever;
22+
import dev.langchain4j.rag.content.retriever.EmbeddingStoreContentRetriever;
23+
import dev.langchain4j.service.AiServices;
1524
import dev.langchain4j.store.embedding.EmbeddingMatch;
1625
import lombok.extern.slf4j.Slf4j;
1726
import org.junit.jupiter.api.BeforeAll;
@@ -81,6 +90,23 @@ public void should_ingest_documents() {
8190

8291
@Test
8392
@Order(2)
93+
public void should_search_with_content_retriever() {
94+
AstraVectorizeContentRetriever contentRetriever = AstraVectorizeContentRetriever.builder()
95+
.embeddingStore(embeddingStoreVectorizeNVidia)
96+
.maxResults(2)
97+
.minScore(0.5)
98+
.build();
99+
// configuring it to use the components we've created above.
100+
Assistant ai = AiServices.builder(Assistant.class)
101+
.contentRetriever(contentRetriever)
102+
.chatLanguageModel(AstraDBTestSupport.createOpenAIChatLanguageModel(OpenAiChatModelName.GPT_4_O))
103+
.build();
104+
String response = ai.answer("Who is Johnny?");
105+
System.out.println(response);
106+
}
107+
108+
@Test
109+
@Order(3)
84110
public void should_search_results() {
85111
String question = "Who is Johnny?";
86112

@@ -107,4 +133,14 @@ public void should_search_results() {
107133

108134
System.out.println(ragContext);
109135
}
136+
137+
@Test
138+
@Order(4)
139+
public void should_search_withResultAggregator() {
140+
String question = "Who is Johnny?";
141+
// Our guy for advanced RAG
142+
RetrievalAugmentor retrievalAugmentor = DefaultRetrievalAugmentor.builder()
143+
.contentRetriever(AstraVectorizeContentRetriever.from(embeddingStoreVectorizeNVidia))
144+
.build();
145+
}
110146
}

0 commit comments

Comments
 (0)