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

Jump to bottom

Updated to LangChain4j 0.29.0 #6

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Updated to LangChain4j 0.29.0 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 4 additions & 22 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<properties>
<java.version>17</java.version>
<hilla.version>2.5.6</hilla.version>
<langchain.version>0.28.0</langchain.version>
<langchain.version>0.29.0</langchain.version>
<spring-ai.version>0.8.1</spring-ai.version>
</properties>

Expand Down Expand Up @@ -111,41 +111,23 @@
<optional>true</optional>
</dependency>

<!-- LangChain4j dependencies -->
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j</artifactId>
<artifactId>langchain4j-spring-boot-starter</artifactId>
<version>${langchain.version}</version>
</dependency>

<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-open-ai</artifactId>
<artifactId>langchain4j-open-ai-spring-boot-starter</artifactId>
<version>${langchain.version}</version>
</dependency>
<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-ollama</artifactId>
<version>${langchain.version}</version>
</dependency>

<dependency>
<groupId>dev.langchain4j</groupId>
<artifactId>langchain4j-embeddings-all-minilm-l6-v2</artifactId>
<version>${langchain.version}</version>
</dependency>

<dependency>
<groupId>org.mapdb</groupId>
<artifactId>mapdb</artifactId>
<version>3.0.9</version>
<exclusions>
<exclusion>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/org/vaadin/marcus/langchain4j/LangChain4jAssistant.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
import dev.langchain4j.service.SystemMessage;
import dev.langchain4j.service.TokenStream;
import dev.langchain4j.service.UserMessage;
import dev.langchain4j.service.spring.AiService;

@AiService
public interface LangChain4jAssistant {

@SystemMessage("""
Expand Down
67 changes: 11 additions & 56 deletions src/main/java/org/vaadin/marcus/langchain4j/LangChain4jConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,39 +1,28 @@
package org.vaadin.marcus.langchain4j;

import dev.langchain4j.data.document.DocumentSplitter;
import dev.langchain4j.data.document.parser.TextDocumentParser;
import dev.langchain4j.data.document.splitter.DocumentSplitters;
import dev.langchain4j.data.segment.TextSegment;
import dev.langchain4j.memory.chat.ChatMemoryProvider;
import dev.langchain4j.memory.chat.TokenWindowChatMemory;
import dev.langchain4j.model.Tokenizer;
import dev.langchain4j.model.chat.StreamingChatLanguageModel;
import dev.langchain4j.model.embedding.AllMiniLmL6V2EmbeddingModel;
import dev.langchain4j.model.embedding.EmbeddingModel;
import dev.langchain4j.model.openai.OpenAiChatModelName;
import dev.langchain4j.model.openai.OpenAiStreamingChatModel;
import dev.langchain4j.model.openai.OpenAiTokenizer;
import dev.langchain4j.rag.content.retriever.ContentRetriever;
import dev.langchain4j.rag.content.retriever.EmbeddingStoreContentRetriever;
import dev.langchain4j.service.AiServices;
import dev.langchain4j.store.embedding.EmbeddingStore;
import dev.langchain4j.store.embedding.EmbeddingStoreIngestor;
import dev.langchain4j.store.embedding.inmemory.InMemoryEmbeddingStore;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.CommandLineRunner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;

import java.io.IOException;

import static dev.langchain4j.data.document.loader.FileSystemDocumentLoader.loadDocument;
import static dev.langchain4j.data.document.splitter.DocumentSplitters.recursive;

@Configuration
public class LangChain4jConfig {

private static final String MODEL_NAME = OpenAiChatModelName.GPT_4_TURBO_PREVIEW.toString();

@Bean
EmbeddingModel embeddingModel() {
return new AllMiniLmL6V2EmbeddingModel();
Expand All @@ -44,30 +33,19 @@ EmbeddingStore<TextSegment> embeddingStore() {
return new InMemoryEmbeddingStore<>();
}

@Bean
Tokenizer tokenizer() {
return new OpenAiTokenizer(MODEL_NAME);
}


// In the real world, ingesting documents would often happen separately, on a CI server or similar
@Bean
CommandLineRunner ingestDocsForLangChain(
EmbeddingModel embeddingModel,
EmbeddingStore<TextSegment> embeddingStore,
Tokenizer tokenizer,
Tokenizer tokenizer, // Tokenizer is provided by langchain4j-open-ai-spring-boot-starter
ResourceLoader resourceLoader
) throws IOException {
) {
return args -> {
Resource resource =
resourceLoader.getResource("classpath:terms-of-service.txt");
var resource = resourceLoader.getResource("classpath:terms-of-service.txt");
var termsOfUse = loadDocument(resource.getFile().toPath(), new TextDocumentParser());

DocumentSplitter documentSplitter = DocumentSplitters.recursive(200, 0,
tokenizer);

EmbeddingStoreIngestor ingestor = EmbeddingStoreIngestor.builder()
.documentSplitter(documentSplitter)
var ingestor = EmbeddingStoreIngestor.builder()
.documentSplitter(recursive(50, 0, tokenizer))
.embeddingModel(embeddingModel)
.embeddingStore(embeddingStore)
.build();
Expand All @@ -76,16 +54,7 @@ CommandLineRunner ingestDocsForLangChain(
}

@Bean
StreamingChatLanguageModel chatLanguageModel(@Value("${openai.api.key}") String apiKey) {
return OpenAiStreamingChatModel.builder()
.apiKey(apiKey)
.modelName(MODEL_NAME)
.build();
}


@Bean
ContentRetriever retriever(
ContentRetriever contentRetriever(
EmbeddingStore<TextSegment> embeddingStore,
EmbeddingModel embeddingModel
) {
Expand All @@ -97,23 +66,9 @@ ContentRetriever retriever(
.build();
}


@Bean
LangChain4jAssistant customerSupportAgent(
StreamingChatLanguageModel chatLanguageModel,
Tokenizer tokenizer,
ContentRetriever retriever,
Lang4jTools tools
) {

return AiServices.builder(LangChain4jAssistant.class)
.streamingChatLanguageModel(chatLanguageModel)
.chatMemoryProvider(chatId -> TokenWindowChatMemory.builder()
.id(chatId)
.maxTokens(1000, tokenizer)
.build())
.contentRetriever(retriever)
.tools(tools)
.build();
ChatMemoryProvider chatMemoryProvider(Tokenizer tokenizer) {
// Tokenizer is provided by langchain4j-open-ai-spring-boot-starter
return chatId -> TokenWindowChatMemory.withMaxTokens(1000, tokenizer);
}
}
9 changes: 9 additions & 0 deletions src/main/resources/application.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,12 @@ spring.ai.openai.api-key=${OPENAI_API_KEY}
spring.ai.openai.chat.options.model=gpt-4-turbo-preview
spring.ai.openai.chat.options.functions=getBookingDetails,changeBooking,cancelBooking
spring.ai.embedding.transformer.enabled=false

# LangChain4j properties
langchain4j.open-ai.streaming-chat-model.api-key=${OPENAI_API_KEY}
langchain4j.open-ai.streaming-chat-model.model-name=gpt-4-turbo-preview
langchain4j.open-ai.streaming-chat-model.log-requests=true
langchain4j.open-ai.streaming-chat-model.log-responses=false
logging.level.dev.langchain4j=DEBUG
logging.level.dev.ai4j.openai4j=DEBUG
logging.level.ai.djl=OFF