Skip to content

Commit ed75b80

Browse files
author
CHANDRAKANT Kumar
committed
Added few more changes to accommodate review comments.
1 parent 03c9dce commit ed75b80

6 files changed

Lines changed: 31 additions & 67 deletions

File tree

‎libraries-llms/src/test/java/com/baeldung/langchain/ChainWithDocumentLiveTest.java‎

Lines changed: 7 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,10 @@
22

33
import static dev.langchain4j.data.document.FileSystemDocumentLoader.loadDocument;
44
import static java.time.Duration.ofSeconds;
5+
import static org.junit.Assert.assertNotNull;
56

6-
import java.io.File;
7-
import java.net.MalformedURLException;
8-
import java.net.URISyntaxException;
9-
import java.net.URL;
10-
import java.nio.file.Path;
117
import java.nio.file.Paths;
128

13-
import org.junit.Assert;
149
import org.junit.Test;
1510
import org.slf4j.Logger;
1611
import org.slf4j.LoggerFactory;
@@ -31,11 +26,11 @@
3126
import dev.langchain4j.store.embedding.inmemory.InMemoryEmbeddingStore;
3227

3328
public class ChainWithDocumentLiveTest {
34-
35-
Logger logger = LoggerFactory.getLogger(ChainWithDocumentLiveTest.class);
29+
30+
private static final Logger logger = LoggerFactory.getLogger(ChainWithDocumentLiveTest.class);
3631

3732
@Test
38-
public void givenDocument_whenPrompted_thenValidResponse() {
33+
public void givenChainWithDocument_whenPrompted_thenValidResponse() {
3934

4035
EmbeddingModel embeddingModel = new AllMiniLmL6V2EmbeddingModel();
4136

@@ -47,7 +42,7 @@ public void givenDocument_whenPrompted_thenValidResponse() {
4742
.embeddingStore(embeddingStore)
4843
.build();
4944

50-
Document document = loadDocument(toPath("src/test/resources/example-files/simpson's_adventures.txt"));
45+
Document document = loadDocument(Paths.get("src/test/resources/example-files/simpson's_adventures.txt"));
5146
ingestor.ingest(document);
5247

5348
ChatLanguageModel chatModel = OpenAiChatModel.builder()
@@ -59,27 +54,14 @@ public void givenDocument_whenPrompted_thenValidResponse() {
5954
.chatLanguageModel(chatModel)
6055
.retriever(EmbeddingStoreRetriever.from(embeddingStore, embeddingModel))
6156
.chatMemory(MessageWindowChatMemory.withMaxMessages(10))
62-
.promptTemplate(PromptTemplate
63-
.from("Answer the following question to the best of your ability: {{question}}\n\nBase your answer on the following information:\n{{information}}"))
57+
.promptTemplate(PromptTemplate.from("Answer the following question to the best of your ability: {{question}}\n\nBase your answer on the following information:\n{{information}}"))
6458
.build();
6559

6660
String answer = chain.execute("Who is Simpson?");
6761

6862
logger.info(answer);
69-
Assert.assertNotNull(answer);
70-
71-
}
63+
assertNotNull(answer);
7264

73-
private static Path toPath(String fileName) {
74-
try {
75-
URL fileUrl = new File(fileName).toURI()
76-
.toURL();
77-
System.out.println(new File(fileName).toURI()
78-
.toURL());
79-
return Paths.get(fileUrl.toURI());
80-
} catch (URISyntaxException | MalformedURLException e) {
81-
throw new RuntimeException(e);
82-
}
8365
}
8466

8567
}

‎libraries-llms/src/test/java/com/baeldung/langchain/ChatWithDocumentLiveTest.java‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,13 @@
44
import static dev.langchain4j.model.openai.OpenAiModelName.GPT_3_5_TURBO;
55
import static java.time.Duration.ofSeconds;
66
import static java.util.stream.Collectors.joining;
7+
import static org.junit.Assert.assertNotNull;
78

8-
import java.io.File;
9-
import java.net.MalformedURLException;
10-
import java.net.URISyntaxException;
11-
import java.net.URL;
12-
import java.nio.file.Path;
139
import java.nio.file.Paths;
1410
import java.util.HashMap;
1511
import java.util.List;
1612
import java.util.Map;
1713

18-
import org.junit.Assert;
1914
import org.junit.Test;
2015
import org.slf4j.Logger;
2116
import org.slf4j.LoggerFactory;
@@ -38,13 +33,13 @@
3833
import dev.langchain4j.store.embedding.inmemory.InMemoryEmbeddingStore;
3934

4035
public class ChatWithDocumentLiveTest {
41-
42-
Logger logger = LoggerFactory.getLogger(ChatWithDocumentLiveTest.class);
36+
37+
private static final Logger logger = LoggerFactory.getLogger(ChatWithDocumentLiveTest.class);
4338

4439
@Test
45-
public void givenChainWithDocument_whenPrompted_thenValidResponse() {
40+
public void givenDocument_whenPrompted_thenValidResponse() {
4641

47-
Document document = loadDocument(toPath("src/test/resources/example-files/simpson's_adventures.txt"));
42+
Document document = loadDocument(Paths.get("src/test/resources/example-files/simpson's_adventures.txt"));
4843
DocumentSplitter splitter = DocumentSplitters.recursive(100, 0, new OpenAiTokenizer(GPT_3_5_TURBO));
4944
List<TextSegment> segments = splitter.split(document);
5045

@@ -81,20 +76,8 @@ public void givenChainWithDocument_whenPrompted_thenValidResponse() {
8176
.content();
8277

8378
logger.info(aiMessage.text());
84-
Assert.assertNotNull(aiMessage.text());
85-
86-
}
79+
assertNotNull(aiMessage.text());
8780

88-
private static Path toPath(String fileName) {
89-
try {
90-
URL fileUrl = new File(fileName).toURI()
91-
.toURL();
92-
System.out.println(new File(fileName).toURI()
93-
.toURL());
94-
return Paths.get(fileUrl.toURI());
95-
} catch (URISyntaxException | MalformedURLException e) {
96-
throw new RuntimeException(e);
97-
}
9881
}
9982

10083
}

‎libraries-llms/src/test/java/com/baeldung/langchain/ChatWithMemoryLiveTest.java‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
package com.baeldung.langchain;
22

3-
import dev.langchain4j.data.message.AiMessage;
4-
import dev.langchain4j.memory.ChatMemory;
5-
import dev.langchain4j.memory.chat.TokenWindowChatMemory;
6-
import dev.langchain4j.model.chat.ChatLanguageModel;
7-
import dev.langchain4j.model.openai.OpenAiChatModel;
8-
import dev.langchain4j.model.openai.OpenAiTokenizer;
9-
103
import static dev.langchain4j.data.message.UserMessage.userMessage;
114
import static dev.langchain4j.model.openai.OpenAiModelName.GPT_3_5_TURBO;
125
import static org.assertj.core.api.Assertions.assertThat;
6+
import static org.junit.Assert.assertNotNull;
137

14-
import org.junit.Assert;
158
import org.junit.Test;
169
import org.slf4j.Logger;
1710
import org.slf4j.LoggerFactory;
1811

12+
import dev.langchain4j.data.message.AiMessage;
13+
import dev.langchain4j.memory.ChatMemory;
14+
import dev.langchain4j.memory.chat.TokenWindowChatMemory;
15+
import dev.langchain4j.model.chat.ChatLanguageModel;
16+
import dev.langchain4j.model.openai.OpenAiChatModel;
17+
import dev.langchain4j.model.openai.OpenAiTokenizer;
18+
1919
public class ChatWithMemoryLiveTest {
20-
21-
Logger logger = LoggerFactory.getLogger(ChatWithMemoryLiveTest.class);
20+
21+
private static final Logger logger = LoggerFactory.getLogger(ChatWithMemoryLiveTest.class);
2222

2323
@Test
2424
public void givenMemory_whenPrompted_thenValidResponse() {
@@ -30,15 +30,16 @@ public void givenMemory_whenPrompted_thenValidResponse() {
3030
AiMessage answer = model.generate(chatMemory.messages())
3131
.content();
3232
logger.info(answer.text());
33-
Assert.assertNotNull(answer.text());
3433
chatMemory.add(answer);
34+
assertNotNull(answer.text());
3535

3636
chatMemory.add(userMessage("What is my name?"));
3737
AiMessage answerWithName = model.generate(chatMemory.messages())
3838
.content();
3939
logger.info(answerWithName.text());
40-
assertThat(answerWithName.text().contains("Kumar"));
4140
chatMemory.add(answerWithName);
41+
assertThat(answerWithName.text()
42+
.contains("Kumar"));
4243

4344
}
4445

‎libraries-llms/src/test/java/com/baeldung/langchain/Constants.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ public class Constants {
77
* registering for free at (https://platform.openai.com/signup) and then by navigating
88
* to "Create new secret key" page at (https://platform.openai.com/account/api-keys).
99
*/
10-
public static String OPEN_AI_KEY = "<OPEN_AI_KEY>";
10+
public static String OPEN_AI_KEY = "demo"; //"<OPEN_AI_KEY>";
1111

1212
}

‎libraries-llms/src/test/java/com/baeldung/langchain/PromptTemplatesLiveTest.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.baeldung.langchain;
22

33
import static dev.langchain4j.model.openai.OpenAiModelName.GPT_3_5_TURBO;
4+
import static org.junit.Assert.assertNotNull;
45

56
import java.util.HashMap;
67
import java.util.Map;
@@ -14,11 +15,9 @@
1415
import dev.langchain4j.model.input.PromptTemplate;
1516
import dev.langchain4j.model.openai.OpenAiChatModel;
1617

17-
import org.junit.Assert;
18-
1918
public class PromptTemplatesLiveTest {
2019

21-
Logger logger = LoggerFactory.getLogger(PromptTemplatesLiveTest.class);
20+
private static final Logger logger = LoggerFactory.getLogger(PromptTemplatesLiveTest.class);
2221

2322
@Test
2423
public void givenPromptTemplate_whenSuppliedInput_thenValidResponse() {
@@ -37,7 +36,7 @@ public void givenPromptTemplate_whenSuppliedInput_thenValidResponse() {
3736

3837
String response = model.generate(prompt.text());
3938
logger.info(response);
40-
Assert.assertNotNull(response);
39+
assertNotNull(response);
4140

4241
}
4342

‎libraries-llms/src/test/java/com/baeldung/langchain/ServiceWithToolsLiveTest.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import static org.assertj.core.api.Assertions.assertThat;
44

5-
import org.junit.Assert;
65
import org.junit.Test;
76
import org.slf4j.Logger;
87
import org.slf4j.LoggerFactory;
@@ -14,7 +13,7 @@
1413

1514
public class ServiceWithToolsLiveTest {
1615

17-
Logger logger = LoggerFactory.getLogger(ServiceWithToolsLiveTest.class);
16+
private static final Logger logger = LoggerFactory.getLogger(ServiceWithToolsLiveTest.class);
1817

1918
static class Calculator {
2019

0 commit comments

Comments
 (0)