Release v1.1.2

pom.xml

@@ -42,7 +42,7 @@
         <dependency>
             <groupId>me.piitex.engine</groupId>
             <artifactId>ren-engine</artifactId>
-            <version>1.0.4-SNAPSHOT</version>
+            <version>1.0.6-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.junit.jupiter</groupId>

src/main/java/me/piitex/app/App.java

@@ -62,7 +62,7 @@
     private volatile boolean error = false;
 
     // Used for testing with the IDE!
     static void main() {
         new App();
         Application.launch(App.class);
     }
@@ -74,12 +74,13 @@
         setupDirectories();
 
         settings = new ServerSettings();
+        appSettings = new AppSettings();
 
         long currentPid = ProcessHandle.current().pid();
         if (settings.getInfoFile().hasKey("main-pid")) {
             String pid = settings.getInfoFile().get("main-pid");
             if (ProcessUtil.isProcessRunning(Long.parseLong(pid))) {
-                logger.error("Process already running!");
+                logger.error("Process already running! '{}'", pid);
                 error = true;
                 Platform.runLater(() -> {
                     buildErrorWindow("Process is already running!").render();
@@ -101,7 +102,6 @@
             App.logger.info("Finished pre-initialization.");
             loading = false;
         });
-        appSettings = new AppSettings();
     }
 
     @Override
@@ -160,7 +160,7 @@
         // This is because the pathing for the image doesn't change but the image gets replaced by the new image.
         ImageLoader.useCache = false;
 
-        window = new WindowBuilder("Chat App").setIcon(new ImageLoader(new File(App.getAppDirectory(), "logo.png"))).setScale(false).setDimensions(setWidth, setHeight).build();
+        window = new WindowBuilder("Chat App").setIcon(new ImageLoader(new File(App.getAppDirectory(), "logo.png"))).setScale((appSettings.isWindowScaling()) && !mobile).setAntiAliasing(false).setDimensions(setWidth, setHeight).build();
 
         // Initialize global positions. Needed for the rendering process.
         Positions.initialize();
@@ -326,12 +326,22 @@
                 downloader.startDownload(dataFileUrl, currentData);
             }
 
-            logger.info("Model list updated...");
+            logger.info("Model list updated.");
             downloader.shutdown();
         } catch (IOException e) {
             App.logger.error("Failed to fetch download size.");
         }
 
+//        TODO: Automatically update llamacpp
+//        try {
+//            GitHubUtil gitHubUtil = new GitHubUtil("https://api.github.com/repos/ggerganov/llama.cpp/");
+//            FileDownloader llamaDownloader = gitHubUtil.downloadAsset(gitHubUtil.getReleaseAsset(gitHubUtil.getLatestReleaseID(), "llama-[a-zA-Z0-9]+-bin-win-cuda-12\\.4-x64\\.zip").getInt("id"), new File("output/download.zip"));
+//
+//        } catch (IOException e) {
+//            throw new RuntimeException(e);
+//        }
+
+
     }
 
     public AppSettings getAppSettings() {
@@ -373,7 +383,7 @@
 
     public Window buildErrorWindow(String message) {
         if (window != null) {
-            window.close();
+            window.close(true);
         }
 
         Application.setUserAgentStylesheet(new PrimerDark().getUserAgentStylesheet());
@@ -400,6 +410,8 @@
                 App.logger.info("Forcefully killing old process.");
                 ProcessUtil.terminateProcess(Long.parseLong(settings.getInfoFile().get("main-pid")));
             }
+
+            appSettings.getInfoFile().set("main-pid", "");
         });
 
         window.getStage().setOnCloseRequest(event -> {

src/main/java/me/piitex/app/backend/Character.java

@@ -4,7 +4,7 @@
 import me.piitex.app.App;
 import me.piitex.app.configuration.ModelSettings;
 import me.piitex.app.views.chats.ChatView;
-import me.piitex.engine.LimitedHashMap;
+import me.piitex.engine.maps.LimitedHashMap;
 import me.piitex.os.configurations.InfoFile;
 
 import java.io.File;
@@ -122,7 +122,7 @@
 
     private void loadChats() {
         if (getChatDirectory() == null || !getChatDirectory().exists()) return;
         for (File file : getChatDirectory().listFiles()) {
             if (file.isDirectory()) continue;
             Chat chat = new Chat(file);
             chats.add(chat);
@@ -288,7 +288,7 @@
         return infoFile;
     }
 
     public Map<Chat, ChatView> getChatViewCachedNodes() {
         return chatViewCachedNodes;
     }
 

src/main/java/me/piitex/app/backend/Chat.java

@@ -1,7 +1,6 @@
 package me.piitex.app.backend;
 
 import me.piitex.app.App;
-import me.piitex.app.views.chats.ChatView;
 import me.piitex.os.configurations.FileCrypter;
 
 import javax.crypto.IllegalBlockSizeException;
@@ -17,7 +16,6 @@ public class Chat {
     private Response response;
     private final LinkedList<ChatMessage> messages = new LinkedList<>();
     private final boolean dev = false;
-    private ChatView cachedView;
 
 
     public Chat(File file) {
@@ -240,12 +238,4 @@ public Response getResponse() {
     public void setResponse(Response response) {
         this.response = response;
     }
-
-    public ChatView getCachedView() {
-        return cachedView;
-    }
-
-    public void setCachedView(ChatView cachedView) {
-        this.cachedView = cachedView;
-    }
 }

src/main/java/me/piitex/app/backend/server/DeviceProcess.java

@@ -7,6 +7,7 @@
 import java.io.IOException;
 import java.nio.file.Files;
 import java.util.LinkedList;
+import java.util.List;
 
 public class DeviceProcess {
     private final Process process;
@@ -37,12 +38,11 @@ public DeviceProcess(String backend) throws IOException {
     }
 
     public void handleOutput() {
-        App.logger.info("Handling input...");
         try {
             LinkedList<String> lines = new LinkedList<>(Files.readAllLines(new File(App.getDataDirectory(), "devices.txt").toPath()));
             lines.removeFirst();
             App.getInstance().getSettings().setDevices(lines);
-
+            App.logger.info("Devices: {}", List.of(lines));
         } catch (IOException e) {
             throw new RuntimeException(e);
         }

src/main/java/me/piitex/app/configuration/AppSettings.java

@@ -16,6 +16,7 @@ public class AppSettings {
     private String textColor;
     private String quoteColor;
     private String astrixColor;
+    private boolean windowScaling = false;
 
     private final InfoFile infoFile;
 
@@ -55,6 +56,9 @@ public AppSettings() {
         } else {
             this.astrixColor = Color.DODGERBLUE.toString();
         }
+        if (infoFile.hasKey("window-scaling")) {
+            this.windowScaling = infoFile.getBoolean("window-scaling");
+        }
     }
 
     public int getWidth() {
@@ -142,10 +146,19 @@ public void setAstrixColor(String astrixColor) {
         infoFile.set("astrix-color", astrixColor);
     }
 
+    public boolean isWindowScaling() {
+        return windowScaling;
+    }
+
+    public void setWindowScaling(boolean windowScaling) {
+        this.windowScaling = windowScaling;
+        infoFile.set("window-scaling", windowScaling);
+    }
+
     /*
-        Utility functions for getting theme coloring.
-        Needed for RichTextFX components and BBCode
-     */
+      Utility functions for getting theme coloring.
+      Needed for RichTextFX components and BBCode
+    */
     public Theme getStyleTheme(String name) {
         if (name.equalsIgnoreCase("primer light")) {
             return new PrimerLight();

src/main/java/me/piitex/app/utils/CharacterCardImporter.java

@@ -201,6 +201,22 @@ public static String getChatScenario(JSONObject metaData) throws JSONException {
         return "";
     }
 
+    public static String getUserDisplay(JSONObject metaData) {
+        JSONObject characterJson = getCharacterJson(metaData);
+        if (characterJson.has("userDisplay")) {
+            return characterJson.getString("userDisplay");
+        }
+        return null;
+    }
+
+    public static String getUserPersona(JSONObject metaData) {
+        JSONObject characterJson = getCharacterJson(metaData);
+        if (characterJson.has("userPersona")) {
+            return characterJson.getString("userPersona");
+        }
+        return null;
+    }
+
     public static Map<String, String> getLoreItems(JSONObject metaData) throws JSONException {
         JSONObject characterJson = getCharacterJson(metaData);
         Map<String, String> map = new HashMap<>();

src/main/java/me/piitex/app/utils/ImageCardExporter.java

@@ -0,0 +1,183 @@
+package me.piitex.app.utils;
+
+import me.piitex.app.App;
+import me.piitex.app.backend.Character;
+import me.piitex.app.backend.User;
+import org.json.JSONArray;
+import org.json.JSONObject;
+
+import javax.imageio.*;
+import javax.imageio.metadata.IIOMetadata;
+import javax.imageio.metadata.IIOMetadataNode;
+import javax.imageio.stream.ImageOutputStream;
+import java.awt.image.BufferedImage;
+import java.io.File;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.Base64;
+import java.util.Iterator;
+
+public class ImageCardExporter {
+
+   public static void exportCharacter(Character character, File output) throws IOException {
+
+       Files.copy(new File(character.getIconPath()).toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING);
+
+       BufferedImage image = ImageIO.read(output);
+
+       Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("png");
+       if (!writers.hasNext()) {
+           App.logger.error("Could not find png writer for exporter.", new RuntimeException());
+           return;
+       }
+       ImageWriter writer = writers.next();
+
+       // Prepare ImageWriteParam and IIOMetadata
+       ImageWriteParam writeParam = writer.getDefaultWriteParam();
+       ImageTypeSpecifier typeSpecifier = ImageTypeSpecifier.createFromRenderedImage(image);
+       IIOMetadata metadata = writer.getDefaultImageMetadata(typeSpecifier, writeParam);
+       String nativeFormat = metadata.getNativeMetadataFormatName();
+
+       // Create the native metadata tree
+       IIOMetadataNode root = (IIOMetadataNode) metadata.getAsTree(nativeFormat);
+       IIOMetadataNode textNode = null;
+
+
+       // Check if a tEXt node already exists
+       for (int i = 0; i < root.getChildNodes().getLength(); i++) {
+           if (root.getChildNodes().item(i).getNodeName().equals("tEXt")) {
+               textNode = (IIOMetadataNode) root.getChildNodes().item(i);
+               break;
+           }
+       }
+
+       // If not, create a new one and append it to the root
+       if (textNode == null) {
+           textNode = new IIOMetadataNode("tEXt");
+           root.appendChild(textNode);
+       }
+
+       IIOMetadataNode textEntry = new IIOMetadataNode("tEXtEntry");
+       textEntry.setAttribute("keyword", "chara");
+       textEntry.setAttribute("value", Base64.getEncoder().encodeToString(toJson(character).toString().getBytes(StandardCharsets.UTF_8)));
+       textNode.appendChild(textEntry);
+
+
+       metadata.setFromTree(nativeFormat, root);
+
+       try (ImageOutputStream stream = ImageIO.createImageOutputStream(output)) {
+           writer.setOutput(stream);
+           writer.write(new IIOImage(image, null, metadata));
+       } finally {
+           writer.dispose();
+       }
+   }
+
+    public static void exportUser(User user, File output) throws IOException {
+
+        Files.copy(new File(user.getIconPath()).toPath(), output.toPath(), StandardCopyOption.REPLACE_EXISTING);
+
+        BufferedImage image = ImageIO.read(output);
+
+        Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("png");
+        if (!writers.hasNext()) {
+            App.logger.error("Could not find png writer for exporter.", new RuntimeException());
+            return;
+        }
+        ImageWriter writer = writers.next();
+
+        // Prepare ImageWriteParam and IIOMetadata
+        ImageWriteParam writeParam = writer.getDefaultWriteParam();
+        ImageTypeSpecifier typeSpecifier = ImageTypeSpecifier.createFromRenderedImage(image);
+        IIOMetadata metadata = writer.getDefaultImageMetadata(typeSpecifier, writeParam);
+        String nativeFormat = metadata.getNativeMetadataFormatName();
+
+        // Create the native metadata tree
+        IIOMetadataNode root = (IIOMetadataNode) metadata.getAsTree(nativeFormat);
+        IIOMetadataNode textNode = null;
+
+
+        // Check if a tEXt node already exists
+        for (int i = 0; i < root.getChildNodes().getLength(); i++) {
+            if (root.getChildNodes().item(i).getNodeName().equals("tEXt")) {
+                textNode = (IIOMetadataNode) root.getChildNodes().item(i);
+                break;
+            }
+        }
+
+        // If not, create a new one and append it to the root
+        if (textNode == null) {
+            textNode = new IIOMetadataNode("tEXt");
+            root.appendChild(textNode);
+        }
+
+        IIOMetadataNode textEntry = new IIOMetadataNode("tEXtEntry");
+        textEntry.setAttribute("keyword", "user");
+        textEntry.setAttribute("value", Base64.getEncoder().encodeToString(toJson(user).toString().getBytes(StandardCharsets.UTF_8)));
+        textNode.appendChild(textEntry);
+
+
+        metadata.setFromTree(nativeFormat, root);
+
+        try (ImageOutputStream stream = ImageIO.createImageOutputStream(output)) {
+            writer.setOutput(stream);
+            writer.write(new IIOImage(image, null, metadata));
+        } finally {
+            writer.dispose();
+        }
+    }
+
+    public static JSONObject toJson(Character character) {
+        JSONObject root = new JSONObject();
+
+        JSONObject characterRoot = new JSONObject();
+        characterRoot.put("basePrompt", App.getInstance().getSettings().getGlobalModel().getSettings().getModelInstructions());
+        characterRoot.put("customDialogue", "");
+        characterRoot.put("firstMessage", character.getFirstMessage());
+        characterRoot.put("scenario", character.getChatScenario());
+        characterRoot.put("aiDisplayName", character.getDisplayName());
+        characterRoot.put("aiName", character.getId());
+        characterRoot.put("aiPersona", character.getPersona());
+
+        JSONArray loreRoot = new JSONArray();
+
+        for (String loreId : character.getLorebook().keySet()) {
+            String loreValue = character.getLorebook().get(loreId);
+            JSONObject loreEntry = new JSONObject();
+            loreEntry.put("id", loreId);
+            loreEntry.put("key", loreId);
+            loreEntry.put("value", loreValue);
+            loreRoot.put(loreEntry);
+        }
+        characterRoot.put("loreItems", loreRoot);
+        root.put("character", characterRoot);
+
+        return root;
+    }
+
+    public static JSONObject toJson(User user) {
+        JSONObject root = new JSONObject();
+
+        JSONObject characterRoot = new JSONObject();
+        characterRoot.put("userDisplay", user.getDisplayName());
+        characterRoot.put("userPersona", user.getPersona());
+
+        JSONArray loreRoot = new JSONArray();
+
+        for (String loreId : user.getLorebook().keySet()) {
+            String loreValue = user.getLorebook().get(loreId);
+            JSONObject loreEntry = new JSONObject();
+            loreEntry.put("id", loreId);
+            loreEntry.put("key", loreId);
+            loreEntry.put("value", loreValue);
+            loreRoot.put(loreEntry);
+        }
+        characterRoot.put("loreItems", loreRoot);
+        root.put("user", characterRoot);
+
+        return root;
+    }
+
+}