- split ai4j into multiple modules: ai4j-core, ai4j, ai4j-pinecone

- some minor bugfixes and improvements

Author: deep-learning-dynamo

pom.xml

@@ -50,12 +50,19 @@
 
     <dependencies>
 
+        <dependency>
+            <groupId>dev.ai4j</groupId>
+            <artifactId>ai4j-core</artifactId>
+            <version>0.3.0</version>
+        </dependency>
+
         <dependency>
             <groupId>dev.ai4j</groupId>
             <artifactId>openai4j</artifactId>
             <version>0.2.0</version>
         </dependency>
 
+        <!-- TODO remove -->
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
@@ -69,34 +76,6 @@
             <version>2.0.28</version>
         </dependency>
 
-        <!-- TODO move to separate module -->
-        <dependency>
-            <groupId>io.pinecone</groupId>
-            <artifactId>pinecone-client</artifactId>
-            <version>0.2.3</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-params</artifactId>
-            <version>${junit.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.assertj</groupId>
-            <artifactId>assertj-core</artifactId>
-            <version>3.24.2</version>
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
@@ -121,6 +100,27 @@
             <version>0.4.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.24.2</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <distributionManagement>

src/main/java/dev/ai4j/agent/tool/Tool.java

@@ -1,6 +1,6 @@
 package dev.ai4j.agent.tool.webpage;
 
-import dev.ai4j.agent.tool.Tool;
+import dev.ai4j.agent.Tool;
 import lombok.val;
 import org.jsoup.Jsoup;
 

src/main/java/dev/ai4j/agent/tool/webpage/WebPageScrapperTool.java

@@ -1,6 +1,7 @@
 package dev.ai4j.document.loader;
 
 import dev.ai4j.document.Document;
+import dev.ai4j.document.DocumentLoader;
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.val;

src/main/java/dev/ai4j/document/Document.java

@@ -1,13 +1,14 @@
 package dev.ai4j.document.loader;
 
-import com.google.common.io.Files;
 import dev.ai4j.document.Document;
+import dev.ai4j.document.DocumentLoader;
 import lombok.Builder;
 import lombok.SneakyThrows;
 import lombok.val;
 
-import java.io.File;
 import java.nio.charset.Charset;
+import java.nio.file.Files;
+import java.nio.file.Paths;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -25,7 +26,7 @@ public TextFileLoader(String absolutePathToTextFile, Charset charset) {
     @Override
     @SneakyThrows
     public Document load() {
-        val fileContents = Files.asCharSource(new File(absolutePathToTextFile), charset).read();
+        val fileContents = new String(Files.readAllBytes(Paths.get(absolutePathToTextFile)), charset);
         return Document.from(fileContents);
     }
 }

src/main/java/dev/ai4j/document/loader/DocumentLoader.java

@@ -1,6 +1,7 @@
 package dev.ai4j.document.splitter;
 
 import dev.ai4j.document.Document;
+import dev.ai4j.document.DocumentSplitter;
 import lombok.Builder;
 import lombok.val;
 import lombok.var;
@@ -21,11 +22,11 @@ public OverlappingDocumentSplitter(int chunkSize, int chunkOverlap) {
 
     @Override
     public List<Document> split(Document document) {
-        if (document.getContents() == null || document.getContents().isEmpty()) {
+        if (document.contents() == null || document.contents().isEmpty()) {
             throw new IllegalArgumentException("Document content should not be null or empty");
         }
 
-        val contents = document.getContents();
+        val contents = document.contents();
         val contentLength = contents.length();
 
         if (chunkSize <= 0 || chunkOverlap < 0 || chunkSize <= chunkOverlap) {

src/main/java/dev/ai4j/document/loader/PdfFileLoader.java

@@ -1,11 +1,14 @@
 package dev.ai4j.flows;
 
-import dev.ai4j.model.chat.ChatHistory;
-import dev.ai4j.model.chat.ChatModel;
+import dev.ai4j.chat.AiMessage;
+import dev.ai4j.chat.ChatHistory;
+import dev.ai4j.chat.ChatMessage;
+import dev.ai4j.chat.ChatModel;
 import lombok.Builder;
-import lombok.val;
 
-import static dev.ai4j.model.chat.MessageFromHuman.messageFromHuman;
+import java.util.List;
+
+import static dev.ai4j.chat.UserMessage.userMessage;
 
 public class ChatFlow {
 
@@ -19,13 +22,13 @@ private ChatFlow(ChatModel chatModel, ChatHistory chatHistory) {
         this.chatHistory = chatHistory;
     }
 
-    public String humanSaid(String humanMessage) {
-        chatHistory.add(messageFromHuman(humanMessage));
-        val history = chatHistory.getHistory();
+    public String chat(String userMessage) {
+        chatHistory.add(userMessage(userMessage));
+        List<ChatMessage> history = chatHistory.history();
 
-        val messageFromAi = chatModel.chat(history);
+        AiMessage aiMessage = chatModel.chat(history);
 
-        chatHistory.add(messageFromAi);
-        return messageFromAi.getContents();
+        chatHistory.add(aiMessage);
+        return aiMessage.contents();
     }
 }