From c2b8a296fee09dbdb7415675e28fd3c11f8a3fc2 Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Thu, 3 Oct 2024 17:07:27 +0300
Subject: [PATCH 1/7] Start to work

---
 build.gradle                                  |   2 +-
 src/main/java/module-info.java                |   1 +
 .../org/jabref/gui/preferences/ai/AiTab.fxml  |  30 ++++-
 .../org/jabref/gui/preferences/ai/AiTab.java  |  22 +++-
 .../gui/preferences/ai/AiTabViewModel.java    |  63 +++++++---
 .../jabref/logic/ai/AiDefaultPreferences.java |  42 ++++++-
 .../org/jabref/logic/ai/AiPreferences.java    |  18 ++-
 .../java/org/jabref/logic/ai/AiService.java   |  10 +-
 .../jabref/logic/ai/chatting/AiChatLogic.java | 119 ++++++++++++------
 .../logic/ai/chatting/AiChatService.java      |   9 +-
 .../ai/summarization/GenerateSummaryTask.java |  47 ++-----
 .../ai/summarization/SummariesService.java    |   5 +
 .../jabref/logic/ai/templates/AiTemplate.java |  28 +++++
 .../logic/ai/templates/PaperExcerpt.java      |   3 +
 .../logic/ai/templates/TemplatesService.java  |  62 +++++++++
 .../java/org/jabref/logic/help/HelpFile.java  |   3 +-
 .../preferences/JabRefCliPreferences.java     |  22 +++-
 17 files changed, 369 insertions(+), 117 deletions(-)
 create mode 100644 src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
 create mode 100644 src/main/java/org/jabref/logic/ai/templates/PaperExcerpt.java
 create mode 100644 src/main/java/org/jabref/logic/ai/templates/TemplatesService.java

diff --git a/build.gradle b/build.gradle
index ff57188b2c0..235b10012b6 100644
--- a/build.gradle
+++ b/build.gradle
@@ -351,7 +351,7 @@ dependencies {
         exclude group: 'org.jetbrains.kotlin'
     }
 
-
+    implementation 'org.apache.velocity:velocity-engine-core:2.3'
     implementation platform('ai.djl:bom:0.30.0')
     implementation 'ai.djl:api'
     implementation 'ai.djl.huggingface:tokenizers'
diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java
index cd22dd41ad4..fcb7072b981 100644
--- a/src/main/java/module-info.java
+++ b/src/main/java/module-info.java
@@ -189,5 +189,6 @@
     requires org.antlr.antlr4.runtime;
     requires org.libreoffice.uno;
     requires langchain4j.google.ai.gemini;
+    requires velocity.engine.core;
     // endregion
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
index c5dfc69e9de..aa1eb09927b 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
@@ -147,10 +147,6 @@
             </children>
         </HBox>
 
-        <ResizableTextArea
-                fx:id="instructionTextArea"
-                wrapText="true"/>
-
         <GridPane hgap="10" vgap="10">
             <columnConstraints>
                 <ColumnConstraints hgrow="ALWAYS" percentWidth="50" />
@@ -220,5 +216,31 @@
                         glyph="REFRESH"/>
             </graphic>
         </Button>
+
+        <HBox alignment="BASELINE_CENTER">
+            <Label styleClass="sectionHeader"
+                   text="%Templates"
+                   maxWidth="Infinity"
+                   HBox.hgrow="ALWAYS"/>
+            <Button fx:id="templatesHelp"
+                    prefWidth="20.0"/>
+        </HBox>
+
+        <ComboBox
+                fx:id="currentEditingTemplateComboBox"
+                maxWidth="1.7976931348623157E308"
+                HBox.hgrow="ALWAYS"/>
+
+        <ResizableTextArea
+                fx:id="currentEditingTemplateSourceTextArea"
+                wrapText="true"/>
+
+        <Button onAction="#onResetTemplatesButtonClick"
+                text="%Reset templates to default">
+            <graphic>
+                <JabRefIconView
+                        glyph="REFRESH"/>
+            </graphic>
+        </Button>
     </children>
 </fx:root>
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index 4cb67256603..c93884ee997 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -13,6 +13,7 @@
 import org.jabref.gui.preferences.AbstractPreferenceTabView;
 import org.jabref.gui.preferences.PreferencesTab;
 import org.jabref.gui.util.ViewModelListCellFactory;
+import org.jabref.logic.ai.templates.AiTemplate;
 import org.jabref.logic.help.HelpFile;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.model.ai.AiProvider;
@@ -38,7 +39,6 @@ public class AiTab extends AbstractPreferenceTabView<AiTabViewModel> implements
 
     @FXML private TextField apiBaseUrlTextField;
     @FXML private SearchableComboBox<EmbeddingModel> embeddingModelComboBox;
-    @FXML private ResizableTextArea instructionTextArea;
     @FXML private TextField temperatureTextField;
     @FXML private IntegerInputField contextWindowSizeTextField;
     @FXML private IntegerInputField documentSplitterChunkSizeTextField;
@@ -46,8 +46,12 @@ public class AiTab extends AbstractPreferenceTabView<AiTabViewModel> implements
     @FXML private IntegerInputField ragMaxResultsCountTextField;
     @FXML private TextField ragMinScoreTextField;
 
+    @FXML private ComboBox<AiTemplate> currentEditingTemplateComboBox;
+    @FXML private ResizableTextArea currentEditingTemplateSourceTextArea;
+
     @FXML private Button generalSettingsHelp;
     @FXML private Button expertSettingsHelp;
+    @FXML private Button templatesHelp;
 
     private final ControlsFxVisualizer visualizer = new ControlsFxVisualizer();
 
@@ -105,9 +109,6 @@ public void initialize() {
             apiBaseUrlTextField.setDisable(newValue || viewModel.disableExpertSettingsProperty().get())
         );
 
-        instructionTextArea.textProperty().bindBidirectional(viewModel.instructionProperty());
-        instructionTextArea.disableProperty().bind(viewModel.disableExpertSettingsProperty());
-
         // bindBidirectional doesn't work well with number input fields ({@link IntegerInputField}, {@link DoubleInputField}),
         // so they are expanded into `addListener` calls.
 
@@ -162,7 +163,6 @@ public void initialize() {
             visualizer.initVisualization(viewModel.getChatModelValidationStatus(), chatModelComboBox);
             visualizer.initVisualization(viewModel.getApiBaseUrlValidationStatus(), apiBaseUrlTextField);
             visualizer.initVisualization(viewModel.getEmbeddingModelValidationStatus(), embeddingModelComboBox);
-            visualizer.initVisualization(viewModel.getSystemMessageValidationStatus(), instructionTextArea);
             visualizer.initVisualization(viewModel.getTemperatureTypeValidationStatus(), temperatureTextField);
             visualizer.initVisualization(viewModel.getTemperatureRangeValidationStatus(), temperatureTextField);
             visualizer.initVisualization(viewModel.getMessageWindowSizeValidationStatus(), contextWindowSizeTextField);
@@ -173,9 +173,16 @@ public void initialize() {
             visualizer.initVisualization(viewModel.getRagMinScoreRangeValidationStatus(), ragMinScoreTextField);
         });
 
+        new ViewModelListCellFactory<AiTemplate>()
+                .withText(AiTemplate::getLocalizedName)
+                .install(currentEditingTemplateComboBox);
+        currentEditingTemplateComboBox.valueProperty().bindBidirectional(viewModel.currentEditingTemplate());
+        currentEditingTemplateSourceTextArea.textProperty().bindBidirectional(viewModel.currentEditingTemplateSource());
+
         ActionFactory actionFactory = new ActionFactory();
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AI_GENERAL_SETTINGS, dialogService, preferences.getExternalApplicationsPreferences()), generalSettingsHelp);
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AI_EXPERT_SETTINGS, dialogService, preferences.getExternalApplicationsPreferences()), expertSettingsHelp);
+        actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AI_TEMPLATES, dialogService, preferences.getExternalApplicationsPreferences()), templatesHelp);
     }
 
     @Override
@@ -187,4 +194,9 @@ public String getTabName() {
     private void onResetExpertSettingsButtonClick() {
         viewModel.resetExpertSettings();
     }
+
+    @FXML
+    private void onResetTemplatesButtonClick() {
+        viewModel.resetTemplates();
+    }
 }
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index 8ba7c3a66c0..5e452278e85 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -1,5 +1,6 @@
 package org.jabref.gui.preferences.ai;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -18,9 +19,11 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
+import org.jabref.gui.fieldeditors.SimpleEditor;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.ai.AiDefaultPreferences;
 import org.jabref.logic.ai.AiPreferences;
+import org.jabref.logic.ai.templates.AiTemplate;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.preferences.CliPreferences;
 import org.jabref.logic.util.LocalizedNumbers;
@@ -73,7 +76,18 @@ public class AiTabViewModel implements PreferenceTabViewModel {
     private final StringProperty geminiApiBaseUrl = new SimpleStringProperty();
     private final StringProperty huggingFaceApiBaseUrl = new SimpleStringProperty();
 
-    private final StringProperty instruction = new SimpleStringProperty();
+    private final ListProperty<AiTemplate> templatesList =
+            new SimpleListProperty<>(FXCollections.observableArrayList(AiTemplate.values()));
+    private final ObjectProperty<AiTemplate> currentEditingTemplate = new SimpleObjectProperty<>(AiTemplate.CHATTING_SYSTEM_MESSAGE);
+
+    private final Map<AiTemplate, StringProperty> templateSources = Map.of(
+            AiTemplate.CHATTING_SYSTEM_MESSAGE, new SimpleStringProperty(),
+            AiTemplate.CHATTING_USER_MESSAGE, new SimpleStringProperty(),
+            AiTemplate.SUMMARIZATION_CHUNK, new SimpleStringProperty(),
+            AiTemplate.SUMMARIZATION_COMBINE, new SimpleStringProperty()
+    );
+    private final StringProperty currentEditingTemplateSource = new SimpleStringProperty();
+
     private final StringProperty temperature = new SimpleStringProperty();
     private final IntegerProperty contextWindowSize = new SimpleIntegerProperty();
     private final IntegerProperty documentSplitterChunkSize = new SimpleIntegerProperty();
@@ -90,7 +104,6 @@ public class AiTabViewModel implements PreferenceTabViewModel {
     private final Validator chatModelValidator;
     private final Validator apiBaseUrlValidator;
     private final Validator embeddingModelValidator;
-    private final Validator instructionValidator;
     private final Validator temperatureTypeValidator;
     private final Validator temperatureRangeValidator;
     private final Validator contextWindowSizeValidator;
@@ -210,6 +223,14 @@ public AiTabViewModel(CliPreferences preferences) {
             }
         });
 
+        this.currentEditingTemplateSource.addListener((observable, oldValue, newValue) -> {
+            templateSources.get(currentEditingTemplate.get()).set(newValue);
+        });
+
+        this.currentEditingTemplate.addListener((observable, oldValue, newValue) -> {
+            currentEditingTemplateSource.set(templateSources.get(newValue).get());
+        });
+
         this.apiKeyValidator = new FunctionBasedValidator<>(
                 currentApiKey,
                 token -> !StringUtil.isBlank(token),
@@ -230,11 +251,6 @@ public AiTabViewModel(CliPreferences preferences) {
                 Objects::nonNull,
                 ValidationMessage.error(Localization.lang("Embedding model has to be provided")));
 
-        this.instructionValidator = new FunctionBasedValidator<>(
-                instruction,
-                message -> !StringUtil.isBlank(message),
-                ValidationMessage.error(Localization.lang("The instruction has to be provided")));
-
         this.temperatureTypeValidator = new FunctionBasedValidator<>(
                 temperature,
                 temp -> LocalizedNumbers.stringToDouble(temp).isPresent(),
@@ -301,7 +317,10 @@ public void setValues() {
         customizeExpertSettings.setValue(aiPreferences.getCustomizeExpertSettings());
 
         selectedEmbeddingModel.setValue(aiPreferences.getEmbeddingModel());
-        instruction.setValue(aiPreferences.getInstruction());
+
+        Arrays.stream(AiTemplate.values()).forEach(template ->
+                templateSources.get(template).set(aiPreferences.getTemplates().get(template)));
+
         temperature.setValue(LocalizedNumbers.doubleToString(aiPreferences.getTemperature()));
         contextWindowSize.setValue(aiPreferences.getContextWindowSize());
         documentSplitterChunkSize.setValue(aiPreferences.getDocumentSplitterChunkSize());
@@ -337,7 +356,9 @@ public void storeSettings() {
         aiPreferences.setGeminiApiBaseUrl(geminiApiBaseUrl.get() == null ? "" : geminiApiBaseUrl.get());
         aiPreferences.setHuggingFaceApiBaseUrl(huggingFaceApiBaseUrl.get() == null ? "" : huggingFaceApiBaseUrl.get());
 
-        aiPreferences.setInstruction(instruction.get());
+        Arrays.stream(AiTemplate.values()).forEach(template ->
+                aiPreferences.getTemplates().put(template, templateSources.get(template).get()));
+
         // We already check the correctness of temperature and RAG minimum score in validators, so we don't need to check it here.
         aiPreferences.setTemperature(LocalizedNumbers.stringToDouble(oldLocale, temperature.get()).get());
         aiPreferences.setContextWindowSize(contextWindowSize.get());
@@ -351,8 +372,6 @@ public void resetExpertSettings() {
         String resetApiBaseUrl = AiDefaultPreferences.PROVIDERS_API_URLS.get(selectedAiProvider.get());
         currentApiBaseUrl.set(resetApiBaseUrl);
 
-        instruction.set(AiDefaultPreferences.SYSTEM_MESSAGE);
-
         int resetContextWindowSize = AiDefaultPreferences.CONTEXT_WINDOW_SIZES.getOrDefault(selectedAiProvider.get(), Map.of()).getOrDefault(currentChatModel.get(), 0);
         contextWindowSize.set(resetContextWindowSize);
 
@@ -363,6 +382,11 @@ public void resetExpertSettings() {
         ragMinScore.set(LocalizedNumbers.doubleToString(AiDefaultPreferences.RAG_MIN_SCORE));
     }
 
+    public void resetTemplates() {
+        Arrays.stream(AiTemplate.values()).forEach(template ->
+                templateSources.get(template).set(AiDefaultPreferences.TEMPLATES.get(template)));
+    }
+
     @Override
     public boolean validateSettings() {
         if (enableAi.get()) {
@@ -389,7 +413,6 @@ public boolean validateExpertSettings() {
         List<Validator> validators = List.of(
                 apiBaseUrlValidator,
                 embeddingModelValidator,
-                instructionValidator,
                 temperatureTypeValidator,
                 temperatureRangeValidator,
                 contextWindowSizeValidator,
@@ -447,8 +470,16 @@ public BooleanProperty disableApiBaseUrlProperty() {
         return disableApiBaseUrl;
     }
 
-    public StringProperty instructionProperty() {
-        return instruction;
+    public ListProperty<AiTemplate> templatesProperty() {
+        return templatesList;
+    }
+
+    public ObjectProperty<AiTemplate> currentEditingTemplate() {
+        return currentEditingTemplate;
+    }
+
+    public StringProperty currentEditingTemplateSource() {
+        return currentEditingTemplateSource;
     }
 
     public StringProperty temperatureProperty() {
@@ -499,10 +530,6 @@ public ValidationStatus getEmbeddingModelValidationStatus() {
         return embeddingModelValidator.getValidationStatus();
     }
 
-    public ValidationStatus getSystemMessageValidationStatus() {
-        return instructionValidator.getValidationStatus();
-    }
-
     public ValidationStatus getTemperatureTypeValidationStatus() {
         return temperatureTypeValidator.getValidationStatus();
     }
diff --git a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
index b17fa670867..f3caf48d12c 100644
--- a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.jabref.logic.ai.templates.AiTemplate;
 import org.jabref.model.ai.AiProvider;
 import org.jabref.model.ai.EmbeddingModel;
 
@@ -65,7 +66,7 @@ public class AiDefaultPreferences {
     public static final boolean CUSTOMIZE_SETTINGS = false;
 
     public static final EmbeddingModel EMBEDDING_MODEL = EmbeddingModel.SENTENCE_TRANSFORMERS_ALL_MINILM_L12_V2;
-    public static final String SYSTEM_MESSAGE = "You are an AI assistant that analyses research papers. You answer questions about papers. You will be supplied with the necessary information. The supplied information will contain mentions of papers in form '@citationKey'. Whenever you refer to a paper, use its citation key in the same form with @ symbol. Whenever you find relevant information, always use the citation key. Here are the papers you are analyzing:\n";
+    public static final String SYSTEM_MESSAGE = "";
     public static final double TEMPERATURE = 0.7;
     public static final int DOCUMENT_SPLITTER_CHUNK_SIZE = 300;
     public static final int DOCUMENT_SPLITTER_OVERLAP = 100;
@@ -77,4 +78,43 @@ public class AiDefaultPreferences {
     public static int getContextWindowSize(AiProvider aiProvider, String model) {
         return CONTEXT_WINDOW_SIZES.getOrDefault(aiProvider, Map.of()).getOrDefault(model, 0);
     }
+
+    public static final Map<AiTemplate, String> TEMPLATES = Map.of(
+            AiTemplate.CHATTING_SYSTEM_MESSAGE,
+                    "You are an AI assistant that analyses research papers. You answer questions about papers.\n" +
+                            "You will be supplied with the necessary information. The supplied information will contain mentions of papers in form '@citationKey'.\n" +
+                            "Whenever you refer to a paper, use its citation key in the same form with @ symbol. Whenever you find relevant information, always use the citation key.\n\n" +
+                            "Here are the papers you are analyzing:\n" +
+                            "#foreach( $entry in $entries )\n" +
+                            "${CanonicalBibEntry.getCanonicalRepresentation($entry)}\n" +
+                            "#end",
+
+            AiTemplate.CHATTING_USER_MESSAGE, """
+                    $message
+
+                    Here is some relevant information for you:
+                    #foreach( $excerpt in $excerpts )
+                    ${excerpt.citationKey()}:
+                    ${excerpt.text()}
+                    #end""",
+
+            AiTemplate.SUMMARIZATION_CHUNK, """
+                Please provide an overview of the following text. It's a part of a scientific paper.
+                The summary should include the main objectives, methodologies used, key findings, and conclusions.
+                Mention any significant experiments, data, or discussions presented in the paper.
+
+                DOCUMENT:
+                $document
+
+                OVERVIEW:""",
+
+            AiTemplate.SUMMARIZATION_COMBINE, """
+                You have written an overview of a scientific paper. You have been collecting notes from various parts
+                of the paper. Now your task is to combine all of the notes in one structured message.
+
+                SUMMARIES:
+                $summaries
+
+                FINAL OVERVIEW:"""
+    );
 }
diff --git a/src/main/java/org/jabref/logic/ai/AiPreferences.java b/src/main/java/org/jabref/logic/ai/AiPreferences.java
index d3c8bb345ae..978db00a3f5 100644
--- a/src/main/java/org/jabref/logic/ai/AiPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiPreferences.java
@@ -1,6 +1,7 @@
 package org.jabref.logic.ai;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 
 import javafx.beans.property.BooleanProperty;
@@ -14,7 +15,10 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableMap;
 
+import org.jabref.logic.ai.templates.AiTemplate;
 import org.jabref.model.ai.AiProvider;
 import org.jabref.model.ai.EmbeddingModel;
 import org.jabref.model.strings.StringUtil;
@@ -55,6 +59,8 @@ public class AiPreferences {
     private final IntegerProperty ragMaxResultsCount;
     private final DoubleProperty ragMinScore;
 
+    private final ObservableMap<AiTemplate, String> templates;
+
     private Runnable apiKeyChangeListener;
 
     public AiPreferences(boolean enableAi,
@@ -75,14 +81,14 @@ public AiPreferences(boolean enableAi,
                          int documentSplitterChunkSize,
                          int documentSplitterOverlapSize,
                          int ragMaxResultsCount,
-                         double ragMinScore
+                         double ragMinScore,
+                         Map<AiTemplate, String> templates
     ) {
         this.enableAi = new SimpleBooleanProperty(enableAi);
 
         this.aiProvider = new SimpleObjectProperty<>(aiProvider);
 
-        this.openAiChatModel = new SimpleStringProperty(openAiChatModel);
-        this.mistralAiChatModel = new SimpleStringProperty(mistralAiChatModel);
+        this.openAiChatModel = new SimpleStringProperty(openAiChatModel); this.mistralAiChatModel = new SimpleStringProperty(mistralAiChatModel);
         this.geminiChatModel = new SimpleStringProperty(geminiChatModel);
         this.huggingFaceChatModel = new SimpleStringProperty(huggingFaceChatModel);
 
@@ -101,6 +107,8 @@ public AiPreferences(boolean enableAi,
         this.documentSplitterOverlapSize = new SimpleIntegerProperty(documentSplitterOverlapSize);
         this.ragMaxResultsCount = new SimpleIntegerProperty(ragMaxResultsCount);
         this.ragMinScore = new SimpleDoubleProperty(ragMinScore);
+
+        this.templates = FXCollections.observableMap(templates);
     }
 
     public String getApiKeyForAiProvider(AiProvider aiProvider) {
@@ -481,4 +489,8 @@ public void setApiKeyChangeListener(Runnable apiKeyChangeListener) {
     public void apiKeyUpdated() {
         apiKeyChangeListener.run();
     }
+
+    public ObservableMap<AiTemplate, String> getTemplates() {
+        return templates;
+    }
 }
diff --git a/src/main/java/org/jabref/logic/ai/AiService.java b/src/main/java/org/jabref/logic/ai/AiService.java
index 30655f1721c..1003a11d908 100644
--- a/src/main/java/org/jabref/logic/ai/AiService.java
+++ b/src/main/java/org/jabref/logic/ai/AiService.java
@@ -15,6 +15,7 @@
 import org.jabref.logic.ai.ingestion.storages.MVStoreFullyIngestedDocumentsTracker;
 import org.jabref.logic.ai.summarization.SummariesService;
 import org.jabref.logic.ai.summarization.storages.MVStoreSummariesStorage;
+import org.jabref.logic.ai.templates.TemplatesService;
 import org.jabref.logic.util.Directories;
 import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.util.TaskExecutor;
@@ -57,14 +58,14 @@ public AiService(AiPreferences aiPreferences,
                      NotificationService notificationService,
                      TaskExecutor taskExecutor
     ) {
+        TemplatesService templatesService = new TemplatesService(aiPreferences);
         this.jabRefChatLanguageModel = new JabRefChatLanguageModel(aiPreferences);
-
         this.mvStoreEmbeddingStore = new MVStoreEmbeddingStore(Directories.getAiFilesDirectory().resolve(EMBEDDINGS_FILE_NAME), notificationService);
         this.mvStoreFullyIngestedDocumentsTracker = new MVStoreFullyIngestedDocumentsTracker(Directories.getAiFilesDirectory().resolve(FULLY_INGESTED_FILE_NAME), notificationService);
         this.mvStoreSummariesStorage = new MVStoreSummariesStorage(Directories.getAiFilesDirectory().resolve(SUMMARIES_FILE_NAME), notificationService);
-
         this.jabRefEmbeddingModel = new JabRefEmbeddingModel(aiPreferences, notificationService, taskExecutor);
-        this.aiChatService = new AiChatService(aiPreferences, jabRefChatLanguageModel, jabRefEmbeddingModel, mvStoreEmbeddingStore, cachedThreadPool);
+        this.aiChatService = new AiChatService(aiPreferences, jabRefChatLanguageModel, jabRefEmbeddingModel, mvStoreEmbeddingStore, templatesService);
+
         this.ingestionService = new IngestionService(
                 aiPreferences,
                 shutdownSignal,
@@ -74,7 +75,8 @@ public AiService(AiPreferences aiPreferences,
                 filePreferences,
                 taskExecutor
         );
-        this.summariesService = new SummariesService(aiPreferences, mvStoreSummariesStorage, jabRefChatLanguageModel, shutdownSignal, filePreferences, taskExecutor);
+
+        this.summariesService = new SummariesService(aiPreferences, mvStoreSummariesStorage, jabRefChatLanguageModel, templatesService, shutdownSignal, filePreferences, taskExecutor);
     }
 
     public JabRefChatLanguageModel getChatLanguageModel() {
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
index 8a802847d5b..57bd7354cb7 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
@@ -1,16 +1,22 @@
 package org.jabref.logic.ai.chatting;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.Executor;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javafx.beans.property.StringProperty;
 import javafx.collections.ListChangeListener;
+import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
 
 import org.jabref.logic.ai.AiDefaultPreferences;
 import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.ingestion.FileEmbeddingsManager;
+import org.jabref.logic.ai.templates.AiTemplate;
+import org.jabref.logic.ai.templates.PaperExcerpt;
+import org.jabref.logic.ai.templates.TemplatesService;
 import org.jabref.logic.ai.util.ErrorMessage;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
@@ -18,6 +24,7 @@
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.ListUtil;
 
+import ai.djl.training.optimizer.Optimizer;
 import dev.langchain4j.chain.Chain;
 import dev.langchain4j.chain.ConversationalRetrievalChain;
 import dev.langchain4j.data.message.AiMessage;
@@ -34,6 +41,9 @@
 import dev.langchain4j.rag.RetrievalAugmentor;
 import dev.langchain4j.rag.content.retriever.ContentRetriever;
 import dev.langchain4j.rag.content.retriever.EmbeddingStoreContentRetriever;
+import dev.langchain4j.store.embedding.EmbeddingMatch;
+import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
+import dev.langchain4j.store.embedding.EmbeddingSearchResult;
 import dev.langchain4j.store.embedding.EmbeddingStore;
 import dev.langchain4j.store.embedding.filter.Filter;
 import dev.langchain4j.store.embedding.filter.MetadataFilterBuilder;
@@ -48,7 +58,7 @@ public class AiChatLogic {
     private final ChatLanguageModel chatLanguageModel;
     private final EmbeddingModel embeddingModel;
     private final EmbeddingStore<TextSegment> embeddingStore;
-    private final Executor cachedThreadPool;
+    private final TemplatesService templatesService;
 
     private final ObservableList<ChatMessage> chatHistory;
     private final ObservableList<BibEntry> entries;
@@ -56,13 +66,15 @@ public class AiChatLogic {
     private final BibDatabaseContext bibDatabaseContext;
 
     private ChatMemory chatMemory;
-    private Chain<String, String> chain;
+
+    // You must not pass an empty list to langchain4j {@link IsIn} filter. We forced to use null here, instead of Optional.
+    @Nullable Filter filter;
 
     public AiChatLogic(AiPreferences aiPreferences,
                        ChatLanguageModel chatLanguageModel,
                        EmbeddingModel embeddingModel,
                        EmbeddingStore<TextSegment> embeddingStore,
-                       Executor cachedThreadPool,
+                       TemplatesService templatesService,
                        StringProperty name,
                        ObservableList<ChatMessage> chatHistory,
                        ObservableList<BibEntry> entries,
@@ -72,26 +84,31 @@ public AiChatLogic(AiPreferences aiPreferences,
         this.chatLanguageModel = chatLanguageModel;
         this.embeddingModel = embeddingModel;
         this.embeddingStore = embeddingStore;
-        this.cachedThreadPool = cachedThreadPool;
+        this.templatesService = templatesService;
         this.chatHistory = chatHistory;
         this.entries = entries;
         this.name = name;
         this.bibDatabaseContext = bibDatabaseContext;
 
-        this.entries.addListener((ListChangeListener<BibEntry>) change -> rebuildChain());
+        this.entries.addListener((ListChangeListener<BibEntry>) change -> rebuildFilter());
 
         setupListeningToPreferencesChanges();
         rebuildFull(chatHistory);
     }
 
     private void setupListeningToPreferencesChanges() {
-        aiPreferences.instructionProperty().addListener(obs -> setSystemMessage(aiPreferences.getInstruction()));
+        aiPreferences.getTemplates().addListener((MapChangeListener<AiTemplate, String>) change -> {
+            if (change.getKey() == AiTemplate.CHATTING_SYSTEM_MESSAGE) {
+                setSystemMessage(templatesService.makeChattingSystemMessage(entries));
+            }
+        });
+
         aiPreferences.contextWindowSizeProperty().addListener(obs -> rebuildFull(chatMemory.messages()));
     }
 
     private void rebuildFull(List<ChatMessage> chatMessages) {
         rebuildChatMemory(chatMessages);
-        rebuildChain();
+        rebuildFilter();
     }
 
     private void rebuildChatMemory(List<ChatMessage> chatMessages) {
@@ -102,15 +119,13 @@ private void rebuildChatMemory(List<ChatMessage> chatMessages) {
 
         chatMessages.stream().filter(chatMessage -> !(chatMessage instanceof ErrorMessage)).forEach(chatMemory::add);
 
-        setSystemMessage(aiPreferences.getInstruction());
+        setSystemMessage(templatesService.makeChattingSystemMessage(entries));
     }
 
-    private void rebuildChain() {
+    private void rebuildFilter() {
         List<LinkedFile> linkedFiles = ListUtil.getLinkedFiles(entries).toList();
-        @Nullable Filter filter;
 
         if (linkedFiles.isEmpty()) {
-            // You must not pass an empty list to langchain4j {@link IsIn} filter.
             filter = null;
         } else {
             filter = MetadataFilterBuilder
@@ -121,29 +136,6 @@ private void rebuildChain() {
                             .toList()
                     );
         }
-
-        ContentRetriever contentRetriever = EmbeddingStoreContentRetriever
-                .builder()
-                .embeddingStore(embeddingStore)
-                .filter(filter)
-                .embeddingModel(embeddingModel)
-                .maxResults(aiPreferences.getRagMaxResultsCount())
-                .minScore(aiPreferences.getRagMinScore())
-                .build();
-
-        RetrievalAugmentor retrievalAugmentor = DefaultRetrievalAugmentor
-                .builder()
-                .contentRetriever(contentRetriever)
-                .contentInjector(new JabRefContentInjector(bibDatabaseContext))
-                .executor(cachedThreadPool)
-                .build();
-
-        this.chain = ConversationalRetrievalChain
-                .builder()
-                .chatLanguageModel(chatLanguageModel)
-                .retrievalAugmentor(retrievalAugmentor)
-                .chatMemory(chatMemory)
-                .build();
     }
 
     private void setSystemMessage(String systemMessage) {
@@ -159,18 +151,67 @@ private String augmentSystemMessage(String systemMessage) {
     public AiMessage execute(UserMessage message) {
         // Message will be automatically added to ChatMemory through ConversationalRetrievalChain.
 
+        chatHistory.add(message);
+
         LOGGER.info("Sending message to AI provider ({}) for answering in {}: {}",
                 AiDefaultPreferences.PROVIDERS_API_URLS.get(aiPreferences.getAiProvider()),
                 name.get(),
                 message.singleText());
 
-        chatHistory.add(message);
-        AiMessage result = new AiMessage(chain.execute(message.singleText()));
-        chatHistory.add(result);
+        EmbeddingSearchRequest embeddingSearchRequest = EmbeddingSearchRequest
+                .builder()
+                .maxResults(aiPreferences.getRagMaxResultsCount())
+                .minScore(aiPreferences.getRagMinScore())
+                .filter(filter)
+                .queryEmbedding(embeddingModel.embed(message.singleText()).content())
+                .build();
+
+        EmbeddingSearchResult<TextSegment> embeddingSearchResult = embeddingStore.search(embeddingSearchRequest);
+
+        List<PaperExcerpt> excerpts = embeddingSearchResult
+                .matches()
+                .stream()
+                .map(EmbeddingMatch::embedded)
+                .map(textSegment -> {
+                    String link = textSegment.metadata().getString(FileEmbeddingsManager.LINK_METADATA_KEY);
+
+                    if (link == null) {
+                        return new PaperExcerpt("", textSegment.text());
+                    } else {
+                        return new PaperExcerpt(findEntryByLink(link).flatMap(BibEntry::getCitationKey).orElse(""), textSegment.text());
+                    }
+                })
+                .toList();
+
+        LOGGER.debug("Found excerpts for the message: {}", excerpts);
+
+        // This is crazy, but langchain4j {@link ChatMemory} does not allow to remove single messages.
+        ChatMemory tempChatMemory = TokenWindowChatMemory
+                .builder()
+                .maxTokens(aiPreferences.getContextWindowSize(), new OpenAiTokenizer())
+                .build();
+
+        chatMemory.messages().forEach(tempChatMemory::add);
+
+        tempChatMemory.add(new UserMessage(templatesService.makeChattingUserMessage(message.singleText(), excerpts)));
+        chatMemory.add(message);
 
-        LOGGER.debug("Message was answered by the AI provider for {}: {}", name.get(), result.text());
+        AiMessage aiMessage = chatLanguageModel.generate(tempChatMemory.messages()).content();
+
+        chatMemory.add(aiMessage);
+        chatHistory.add(aiMessage);
+
+        LOGGER.debug("Message was answered by the AI provider for {}: {}", name.get(), aiMessage.text());
+
+        return aiMessage;
+    }
 
-        return result;
+    private Optional<BibEntry> findEntryByLink(String link) {
+        return bibDatabaseContext
+                .getEntries()
+                .stream()
+                .filter(entry -> entry.getFiles().stream().anyMatch(file -> file.getLink().equals(link)))
+                .findFirst();
     }
 
     public ObservableList<ChatMessage> getChatHistory() {
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
index d12b20ec502..1b49d1629aa 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
@@ -6,6 +6,7 @@
 import javafx.collections.ObservableList;
 
 import org.jabref.logic.ai.AiPreferences;
+import org.jabref.logic.ai.templates.TemplatesService;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
 
@@ -20,19 +21,19 @@ public class AiChatService {
     private final ChatLanguageModel chatLanguageModel;
     private final EmbeddingModel embeddingModel;
     private final EmbeddingStore<TextSegment> embeddingStore;
-    private final Executor cachedThreadPool;
+    private final TemplatesService templatesService;
 
     public AiChatService(AiPreferences aiPreferences,
                        ChatLanguageModel chatLanguageModel,
                        EmbeddingModel embeddingModel,
                        EmbeddingStore<TextSegment> embeddingStore,
-                       Executor cachedThreadPool
+                       TemplatesService templatesService
     ) {
         this.aiPreferences = aiPreferences;
         this.chatLanguageModel = chatLanguageModel;
         this.embeddingModel = embeddingModel;
         this.embeddingStore = embeddingStore;
-        this.cachedThreadPool = cachedThreadPool;
+        this.templatesService = templatesService;
     }
 
     public AiChatLogic makeChat(
@@ -46,7 +47,7 @@ public AiChatLogic makeChat(
                 chatLanguageModel,
                 embeddingModel,
                 embeddingStore,
-                cachedThreadPool,
+                templatesService,
                 name,
                 chatHistory,
                 entries,
diff --git a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
index 208de09f490..b8ca8780898 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
@@ -13,6 +13,8 @@
 import org.jabref.logic.FilePreferences;
 import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.ingestion.FileToDocument;
+import org.jabref.logic.ai.templates.AiTemplate;
+import org.jabref.logic.ai.templates.TemplatesService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.ProgressCounter;
@@ -39,32 +41,6 @@
 public class GenerateSummaryTask extends BackgroundTask<String> {
     private static final Logger LOGGER = LoggerFactory.getLogger(GenerateSummaryTask.class);
 
-    // Be careful when constructing prompt.
-    // 1. It should contain variables `bullets` and `chunk`.
-    // 2. Variables should be wrapped in `{{` and `}}` and only with them. No whitespace inside.
-    private static final PromptTemplate CHUNK_PROMPT_TEMPLATE = PromptTemplate.from(
-            """
-                Please provide an overview of the following text. It's a part of a scientific paper.
-                The summary should include the main objectives, methodologies used, key findings, and conclusions.
-                Mention any significant experiments, data, or discussions presented in the paper.
-
-                DOCUMENT:
-                {{document}}
-
-                OVERVIEW:"""
-    );
-
-    private static final PromptTemplate COMBINE_PROMPT_TEMPLATE = PromptTemplate.from(
-            """
-                You have written an overview of a scientific paper. You have been collecting notes from various parts
-                of the paper. Now your task is to combine all of the notes in one structured message.
-
-                SUMMARIES:
-                {{summaries}}
-
-                FINAL OVERVIEW:"""
-    );
-
     private static final int MAX_OVERLAP_SIZE_IN_CHARS = 100;
     private static final int CHAR_TOKEN_FACTOR = 4; // Means, every token is roughly 4 characters.
 
@@ -72,6 +48,7 @@ public class GenerateSummaryTask extends BackgroundTask<String> {
     private final String citationKey;
     private final List<LinkedFile> linkedFiles;
     private final ChatLanguageModel chatLanguageModel;
+    private final TemplatesService templatesService;
     private final BooleanProperty shutdownSignal;
     private final AiPreferences aiPreferences;
     private final FilePreferences filePreferences;
@@ -82,6 +59,7 @@ public GenerateSummaryTask(BibDatabaseContext bibDatabaseContext,
                                String citationKey,
                                List<LinkedFile> linkedFiles,
                                ChatLanguageModel chatLanguageModel,
+                               TemplatesService templatesService,
                                BooleanProperty shutdownSignal,
                                AiPreferences aiPreferences,
                                FilePreferences filePreferences
@@ -90,6 +68,7 @@ public GenerateSummaryTask(BibDatabaseContext bibDatabaseContext,
         this.citationKey = citationKey;
         this.linkedFiles = linkedFiles;
         this.chatLanguageModel = chatLanguageModel;
+        this.templatesService = templatesService;
         this.shutdownSignal = shutdownSignal;
         this.aiPreferences = aiPreferences;
         this.filePreferences = filePreferences;
@@ -187,7 +166,7 @@ private Optional<String> generateSummary(LinkedFile linkedFile) throws Interrupt
     public String summarizeOneDocument(String filePath, String document) throws InterruptedException {
         addMoreWork(1); // For the combination of summary chunks.
 
-        DocumentSplitter documentSplitter = DocumentSplitters.recursive(aiPreferences.getContextWindowSize() - MAX_OVERLAP_SIZE_IN_CHARS * 2 - estimateTokenCount(CHUNK_PROMPT_TEMPLATE), MAX_OVERLAP_SIZE_IN_CHARS);
+        DocumentSplitter documentSplitter = DocumentSplitters.recursive(aiPreferences.getContextWindowSize() - MAX_OVERLAP_SIZE_IN_CHARS * 2 - estimateTokenCount(aiPreferences.getTemplates().get(AiTemplate.SUMMARIZATION_CHUNK)), MAX_OVERLAP_SIZE_IN_CHARS);
 
         List<String> chunkSummaries = documentSplitter.split(new Document(document)).stream().map(TextSegment::text).toList();
 
@@ -208,10 +187,10 @@ public String summarizeOneDocument(String filePath, String document) throws Inte
                     throw new InterruptedException();
                 }
 
-                Prompt prompt = CHUNK_PROMPT_TEMPLATE.apply(Collections.singletonMap("document", chunkSummary));
+                String prompt = templatesService.makeSummarizationChunk(chunkSummary);
 
                 LOGGER.debug("Sending request to AI provider to summarize a chunk from file \"{}\" of entry {}", filePath, citationKey);
-                String chunk = chatLanguageModel.generate(prompt.toString());
+                String chunk = chatLanguageModel.generate(prompt);
                 LOGGER.debug("Chunk summary for file \"{}\" of entry {} was generated successfully", filePath, citationKey);
 
                 list.add(chunk);
@@ -219,7 +198,7 @@ public String summarizeOneDocument(String filePath, String document) throws Inte
             }
 
             chunkSummaries = list;
-        } while (estimateTokenCount(chunkSummaries) > aiPreferences.getContextWindowSize() - estimateTokenCount(COMBINE_PROMPT_TEMPLATE));
+        } while (estimateTokenCount(chunkSummaries) > aiPreferences.getContextWindowSize() - estimateTokenCount(aiPreferences.getTemplates().get(AiTemplate.SUMMARIZATION_COMBINE)));
 
         if (chunkSummaries.size() == 1) {
             doneOneWork(); // No need to call LLM for combination of summary chunks.
@@ -227,14 +206,14 @@ public String summarizeOneDocument(String filePath, String document) throws Inte
             return chunkSummaries.getFirst();
         }
 
-        Prompt prompt = COMBINE_PROMPT_TEMPLATE.apply(Collections.singletonMap("summaries", String.join("\n\n", chunkSummaries)));
+        String prompt = templatesService.makeSummarizationCombine(chunkSummaries);
 
         if (shutdownSignal.get()) {
             throw new InterruptedException();
         }
 
         LOGGER.debug("Sending request to AI provider to combine summary chunk(s) for file \"{}\" of entry {}", filePath, citationKey);
-        String result = chatLanguageModel.generate(prompt.toString());
+        String result = chatLanguageModel.generate(prompt);
         LOGGER.debug("Summary of the file \"{}\" of entry {} was generated successfully", filePath, citationKey);
 
         doneOneWork();
@@ -249,10 +228,6 @@ private static int estimateTokenCount(List<String> chunkSummaries) {
         return chunkSummaries.stream().mapToInt(GenerateSummaryTask::estimateTokenCount).sum();
     }
 
-    private static int estimateTokenCount(PromptTemplate promptTemplate) {
-        return estimateTokenCount(promptTemplate.template());
-    }
-
     private static int estimateTokenCount(String string) {
         return estimateTokenCount(string.length());
     }
diff --git a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
index c71db69cdf8..e7225adb0ec 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
@@ -11,6 +11,7 @@
 import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.processingstatus.ProcessingInfo;
 import org.jabref.logic.ai.processingstatus.ProcessingState;
+import org.jabref.logic.ai.templates.TemplatesService;
 import org.jabref.logic.ai.util.CitationKeyCheck;
 import org.jabref.logic.util.TaskExecutor;
 import org.jabref.model.database.BibDatabaseContext;
@@ -37,6 +38,7 @@ public class SummariesService {
     private final AiPreferences aiPreferences;
     private final SummariesStorage summariesStorage;
     private final ChatLanguageModel chatLanguageModel;
+    private final TemplatesService templatesService;
     private final BooleanProperty shutdownSignal;
     private final FilePreferences filePreferences;
     private final TaskExecutor taskExecutor;
@@ -44,6 +46,7 @@ public class SummariesService {
     public SummariesService(AiPreferences aiPreferences,
                             SummariesStorage summariesStorage,
                             ChatLanguageModel chatLanguageModel,
+                            TemplatesService templatesService,
                             BooleanProperty shutdownSignal,
                             FilePreferences filePreferences,
                             TaskExecutor taskExecutor
@@ -51,6 +54,7 @@ public SummariesService(AiPreferences aiPreferences,
         this.aiPreferences = aiPreferences;
         this.summariesStorage = summariesStorage;
         this.chatLanguageModel = chatLanguageModel;
+        this.templatesService = templatesService;
         this.shutdownSignal = shutdownSignal;
         this.filePreferences = filePreferences;
         this.taskExecutor = taskExecutor;
@@ -110,6 +114,7 @@ private void runGenerateSummaryTask(ProcessingInfo<BibEntry, Summary> processing
                 bibEntry.getCitationKey().orElse("<no citation key>"),
                 bibEntry.getFiles(),
                 chatLanguageModel,
+                templatesService,
                 shutdownSignal,
                 aiPreferences,
                 filePreferences)
diff --git a/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java b/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
new file mode 100644
index 00000000000..517da798a77
--- /dev/null
+++ b/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
@@ -0,0 +1,28 @@
+package org.jabref.logic.ai.templates;
+
+public enum AiTemplate {
+    // System message that is applied in the AI chat.
+    CHATTING_SYSTEM_MESSAGE,
+
+    // Template of a last user message in the AI chat with embeddings.
+    CHATTING_USER_MESSAGE,
+
+    // Template that is used to summarize the chunks of text.
+    SUMMARIZATION_CHUNK,
+
+    // Template that is used to combine the summarized chunks of text.
+    SUMMARIZATION_COMBINE;
+
+    public String getLocalizedName() {
+        return switch (this) {
+            case CHATTING_SYSTEM_MESSAGE ->
+                    "System message for chatting";
+            case CHATTING_USER_MESSAGE ->
+                    "User message for chatting";
+            case SUMMARIZATION_CHUNK ->
+                    "Summarization chunk";
+            case SUMMARIZATION_COMBINE ->
+                    "Summarization combine";
+        };
+    }
+}
diff --git a/src/main/java/org/jabref/logic/ai/templates/PaperExcerpt.java b/src/main/java/org/jabref/logic/ai/templates/PaperExcerpt.java
new file mode 100644
index 00000000000..b8fbf810650
--- /dev/null
+++ b/src/main/java/org/jabref/logic/ai/templates/PaperExcerpt.java
@@ -0,0 +1,3 @@
+package org.jabref.logic.ai.templates;
+
+public record PaperExcerpt(String citationKey, String text) { }
diff --git a/src/main/java/org/jabref/logic/ai/templates/TemplatesService.java b/src/main/java/org/jabref/logic/ai/templates/TemplatesService.java
new file mode 100644
index 00000000000..02155f52836
--- /dev/null
+++ b/src/main/java/org/jabref/logic/ai/templates/TemplatesService.java
@@ -0,0 +1,62 @@
+package org.jabref.logic.ai.templates;
+
+import java.io.StringWriter;
+import java.util.List;
+
+import org.jabref.logic.ai.AiPreferences;
+import org.jabref.model.entry.BibEntry;
+import org.jabref.model.entry.CanonicalBibEntry;
+
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+
+public class TemplatesService {
+    private final AiPreferences aiPreferences;
+    private final VelocityEngine velocityEngine = new VelocityEngine();
+    private final VelocityContext baseContext = new VelocityContext();
+
+    public TemplatesService(AiPreferences aiPreferences) {
+        this.aiPreferences = aiPreferences;
+
+        velocityEngine.init();
+
+        baseContext.put("CanonicalBibEntry", CanonicalBibEntry.class);
+    }
+
+    public String makeChattingSystemMessage(List<BibEntry> entries) {
+        VelocityContext context = new VelocityContext(baseContext);
+        context.put("entries", entries);
+
+        return makeTemplate(AiTemplate.CHATTING_SYSTEM_MESSAGE, context);
+    }
+
+    public String makeChattingUserMessage(String message, List<PaperExcerpt> excerpts) {
+        VelocityContext context = new VelocityContext(baseContext);
+        context.put("message", message);
+        context.put("excerpts", excerpts);
+
+        return makeTemplate(AiTemplate.CHATTING_USER_MESSAGE, context);
+    }
+
+    public String makeSummarizationChunk(String text) {
+        VelocityContext context = new VelocityContext(baseContext);
+        context.put("text", text);
+
+        return makeTemplate(AiTemplate.SUMMARIZATION_CHUNK, context);
+    }
+
+    public String makeSummarizationCombine(List<String> chunks) {
+        VelocityContext context = new VelocityContext(baseContext);
+        context.put("chunks", chunks);
+
+        return makeTemplate(AiTemplate.SUMMARIZATION_COMBINE, context);
+    }
+
+    private String makeTemplate(AiTemplate template, VelocityContext context) {
+        StringWriter writer = new StringWriter();
+
+        velocityEngine.evaluate(context, writer, template.name(), aiPreferences.getTemplates().get(template));
+
+        return writer.toString();
+    }
+}
diff --git a/src/main/java/org/jabref/logic/help/HelpFile.java b/src/main/java/org/jabref/logic/help/HelpFile.java
index c4f91c54153..7ead357ec38 100644
--- a/src/main/java/org/jabref/logic/help/HelpFile.java
+++ b/src/main/java/org/jabref/logic/help/HelpFile.java
@@ -48,7 +48,8 @@ public enum HelpFile {
     SQL_DATABASE_MIGRATION("collaborative-work/sqldatabase/sqldatabasemigration"),
     PUSH_TO_APPLICATION("cite/pushtoapplications"),
     AI_GENERAL_SETTINGS("ai/preferences"),
-    AI_EXPERT_SETTINGS("ai/preferences#ai-expert-settings");
+    AI_EXPERT_SETTINGS("ai/preferences#ai-expert-settings"),
+    AI_TEMPLATES("ai/preferences#templates");
 
     private final String pageName;
 
diff --git a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index 3423df38a8d..e1859aca9ab 100644
--- a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -37,6 +37,7 @@
 import org.jabref.logic.LibraryPreferences;
 import org.jabref.logic.ai.AiDefaultPreferences;
 import org.jabref.logic.ai.AiPreferences;
+import org.jabref.logic.ai.templates.AiTemplate;
 import org.jabref.logic.bibtex.FieldPreferences;
 import org.jabref.logic.citationkeypattern.CitationKeyPattern;
 import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
@@ -359,6 +360,11 @@ public class JabRefCliPreferences implements CliPreferences {
     private static final String AI_RAG_MAX_RESULTS_COUNT = "aiRagMaxResultsCount";
     private static final String AI_RAG_MIN_SCORE = "aiRagMinScore";
 
+    private static final String AI_CHATTING_SYSTEM_MESSAGE_TEMPLATE = "aiChattingSystemMessageTemplate";
+    private static final String AI_CHATTING_USER_MESSAGE_TEMPLATE = "aiChattingUserMessageTemplate";
+    private static final String AI_SUMMARIZATION_CHUNK_TEMPLATE = "aiSummarizationChunkTemplate";
+    private static final String AI_SUMMARIZATION_COMBINE_TEMPLATE = "aiSummarizationCombineTemplate";
+
     private static final Logger LOGGER = LoggerFactory.getLogger(JabRefCliPreferences.class);
     private static final Preferences PREFS_NODE = Preferences.userRoot().node("/org/jabref");
 
@@ -638,6 +644,14 @@ protected JabRefCliPreferences() {
         defaults.put(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE, AiDefaultPreferences.DOCUMENT_SPLITTER_OVERLAP);
         defaults.put(AI_RAG_MAX_RESULTS_COUNT, AiDefaultPreferences.RAG_MAX_RESULTS_COUNT);
         defaults.put(AI_RAG_MIN_SCORE, AiDefaultPreferences.RAG_MIN_SCORE);
+
+        // region:AI templates
+        defaults.put(AI_CHATTING_SYSTEM_MESSAGE_TEMPLATE, AiDefaultPreferences.TEMPLATES.get(AiTemplate.CHATTING_SYSTEM_MESSAGE));
+        defaults.put(AI_CHATTING_USER_MESSAGE_TEMPLATE, AiDefaultPreferences.TEMPLATES.get(AiTemplate.CHATTING_USER_MESSAGE));
+        defaults.put(AI_SUMMARIZATION_CHUNK_TEMPLATE, AiDefaultPreferences.TEMPLATES.get(AiTemplate.SUMMARIZATION_CHUNK));
+        defaults.put(AI_SUMMARIZATION_COMBINE_TEMPLATE, AiDefaultPreferences.TEMPLATES.get(AiTemplate.SUMMARIZATION_COMBINE));
+        // endregion
+
         // endregion
     }
 
@@ -1828,7 +1842,13 @@ public AiPreferences getAiPreferences() {
                 getInt(AI_DOCUMENT_SPLITTER_CHUNK_SIZE),
                 getInt(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE),
                 getInt(AI_RAG_MAX_RESULTS_COUNT),
-                getDouble(AI_RAG_MIN_SCORE));
+                getDouble(AI_RAG_MIN_SCORE),
+                Map.of(
+                        AiTemplate.CHATTING_SYSTEM_MESSAGE, get(AI_CHATTING_SYSTEM_MESSAGE_TEMPLATE),
+                        AiTemplate.CHATTING_USER_MESSAGE, get(AI_CHATTING_USER_MESSAGE_TEMPLATE),
+                        AiTemplate.SUMMARIZATION_CHUNK, get(AI_SUMMARIZATION_CHUNK_TEMPLATE),
+                        AiTemplate.SUMMARIZATION_COMBINE, get(AI_SUMMARIZATION_COMBINE_TEMPLATE)
+                ));
 
         EasyBind.listen(aiPreferences.enableAiProperty(), (obs, oldValue, newValue) -> putBoolean(AI_ENABLED, newValue));
 

From 1ef2958518275aec8b027613dce1e4ca7fb7b7d1 Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Sun, 6 Oct 2024 15:03:49 +0300
Subject: [PATCH 2/7] Fix runtime problems and checkers

---
 .../org/jabref/gui/preferences/ai/AiTab.java  |  6 ++--
 .../gui/preferences/ai/AiTabViewModel.java    |  9 ++++--
 .../jabref/logic/ai/AiDefaultPreferences.java |  8 ++---
 .../org/jabref/logic/ai/AiPreferences.java    | 26 +++++++++++-----
 .../jabref/logic/ai/chatting/AiChatLogic.java | 31 ++++---------------
 .../logic/ai/chatting/AiChatService.java      |  2 --
 .../ai/summarization/GenerateSummaryTask.java |  7 ++---
 .../jabref/logic/ai/templates/AiTemplate.java | 10 +++---
 .../logic/ai/templates/TemplatesService.java  |  2 +-
 .../preferences/JabRefCliPreferences.java     |  9 ++++--
 src/main/resources/l10n/JabRef_en.properties  |  7 ++++-
 11 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index c93884ee997..8771b0dab7a 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -69,14 +69,14 @@ public void initialize() {
         new ViewModelListCellFactory<AiProvider>()
                 .withText(AiProvider::toString)
                 .install(aiProviderComboBox);
-        aiProviderComboBox.setItems(viewModel.aiProvidersProperty());
+        aiProviderComboBox.itemsProperty().bind(viewModel.aiProvidersProperty());
         aiProviderComboBox.valueProperty().bindBidirectional(viewModel.selectedAiProviderProperty());
         aiProviderComboBox.disableProperty().bind(viewModel.disableBasicSettingsProperty());
 
         new ViewModelListCellFactory<String>()
                 .withText(text -> text)
                 .install(chatModelComboBox);
-        chatModelComboBox.setItems(viewModel.chatModelsProperty());
+        chatModelComboBox.itemsProperty().bind(viewModel.chatModelsProperty());
         chatModelComboBox.valueProperty().bindBidirectional(viewModel.selectedChatModelProperty());
         chatModelComboBox.disableProperty().bind(viewModel.disableBasicSettingsProperty());
 
@@ -176,7 +176,9 @@ public void initialize() {
         new ViewModelListCellFactory<AiTemplate>()
                 .withText(AiTemplate::getLocalizedName)
                 .install(currentEditingTemplateComboBox);
+        currentEditingTemplateComboBox.itemsProperty().bind(viewModel.templatesProperty());
         currentEditingTemplateComboBox.valueProperty().bindBidirectional(viewModel.currentEditingTemplate());
+
         currentEditingTemplateSourceTextArea.textProperty().bindBidirectional(viewModel.currentEditingTemplateSource());
 
         ActionFactory actionFactory = new ActionFactory();
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index 5e452278e85..c6b0fc6953a 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -19,7 +19,6 @@
 import javafx.beans.property.StringProperty;
 import javafx.collections.FXCollections;
 
-import org.jabref.gui.fieldeditors.SimpleEditor;
 import org.jabref.gui.preferences.PreferenceTabViewModel;
 import org.jabref.logic.ai.AiDefaultPreferences;
 import org.jabref.logic.ai.AiPreferences;
@@ -319,7 +318,9 @@ public void setValues() {
         selectedEmbeddingModel.setValue(aiPreferences.getEmbeddingModel());
 
         Arrays.stream(AiTemplate.values()).forEach(template ->
-                templateSources.get(template).set(aiPreferences.getTemplates().get(template)));
+                templateSources.get(template).set(aiPreferences.getTemplate(template)));
+
+        currentEditingTemplateSource.set(templateSources.get(currentEditingTemplate.get()).get());
 
         temperature.setValue(LocalizedNumbers.doubleToString(aiPreferences.getTemperature()));
         contextWindowSize.setValue(aiPreferences.getContextWindowSize());
@@ -357,7 +358,7 @@ public void storeSettings() {
         aiPreferences.setHuggingFaceApiBaseUrl(huggingFaceApiBaseUrl.get() == null ? "" : huggingFaceApiBaseUrl.get());
 
         Arrays.stream(AiTemplate.values()).forEach(template ->
-                aiPreferences.getTemplates().put(template, templateSources.get(template).get()));
+                aiPreferences.setTemplate(template, templateSources.get(template).get()));
 
         // We already check the correctness of temperature and RAG minimum score in validators, so we don't need to check it here.
         aiPreferences.setTemperature(LocalizedNumbers.stringToDouble(oldLocale, temperature.get()).get());
@@ -385,6 +386,8 @@ public void resetExpertSettings() {
     public void resetTemplates() {
         Arrays.stream(AiTemplate.values()).forEach(template ->
                 templateSources.get(template).set(AiDefaultPreferences.TEMPLATES.get(template)));
+
+        currentEditingTemplateSource.set(templateSources.get(currentEditingTemplate.get()).get());
     }
 
     @Override
diff --git a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
index f3caf48d12c..b9446edf513 100644
--- a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
@@ -75,10 +75,6 @@ public class AiDefaultPreferences {
 
     public static final int CONTEXT_WINDOW_SIZE = 8196;
 
-    public static int getContextWindowSize(AiProvider aiProvider, String model) {
-        return CONTEXT_WINDOW_SIZES.getOrDefault(aiProvider, Map.of()).getOrDefault(model, 0);
-    }
-
     public static final Map<AiTemplate, String> TEMPLATES = Map.of(
             AiTemplate.CHATTING_SYSTEM_MESSAGE,
                     "You are an AI assistant that analyses research papers. You answer questions about papers.\n" +
@@ -117,4 +113,8 @@ public static int getContextWindowSize(AiProvider aiProvider, String model) {
 
                 FINAL OVERVIEW:"""
     );
+
+    public static int getContextWindowSize(AiProvider aiProvider, String model) {
+        return CONTEXT_WINDOW_SIZES.getOrDefault(aiProvider, Map.of()).getOrDefault(model, 0);
+    }
 }
diff --git a/src/main/java/org/jabref/logic/ai/AiPreferences.java b/src/main/java/org/jabref/logic/ai/AiPreferences.java
index 978db00a3f5..6dc03b55cb9 100644
--- a/src/main/java/org/jabref/logic/ai/AiPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiPreferences.java
@@ -15,8 +15,6 @@
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import javafx.beans.property.StringProperty;
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableMap;
 
 import org.jabref.logic.ai.templates.AiTemplate;
 import org.jabref.model.ai.AiProvider;
@@ -59,7 +57,7 @@ public class AiPreferences {
     private final IntegerProperty ragMaxResultsCount;
     private final DoubleProperty ragMinScore;
 
-    private final ObservableMap<AiTemplate, String> templates;
+    private final Map<AiTemplate, StringProperty> templates;
 
     private Runnable apiKeyChangeListener;
 
@@ -88,7 +86,8 @@ public AiPreferences(boolean enableAi,
 
         this.aiProvider = new SimpleObjectProperty<>(aiProvider);
 
-        this.openAiChatModel = new SimpleStringProperty(openAiChatModel); this.mistralAiChatModel = new SimpleStringProperty(mistralAiChatModel);
+        this.openAiChatModel = new SimpleStringProperty(openAiChatModel);
+        this.mistralAiChatModel = new SimpleStringProperty(mistralAiChatModel);
         this.geminiChatModel = new SimpleStringProperty(geminiChatModel);
         this.huggingFaceChatModel = new SimpleStringProperty(huggingFaceChatModel);
 
@@ -108,7 +107,12 @@ public AiPreferences(boolean enableAi,
         this.ragMaxResultsCount = new SimpleIntegerProperty(ragMaxResultsCount);
         this.ragMinScore = new SimpleDoubleProperty(ragMinScore);
 
-        this.templates = FXCollections.observableMap(templates);
+        this.templates = Map.of(
+                AiTemplate.CHATTING_SYSTEM_MESSAGE, new SimpleStringProperty(templates.get(AiTemplate.CHATTING_SYSTEM_MESSAGE)),
+                AiTemplate.CHATTING_USER_MESSAGE, new SimpleStringProperty(templates.get(AiTemplate.CHATTING_USER_MESSAGE)),
+                AiTemplate.SUMMARIZATION_CHUNK, new SimpleStringProperty(templates.get(AiTemplate.SUMMARIZATION_CHUNK)),
+                AiTemplate.SUMMARIZATION_COMBINE, new SimpleStringProperty(templates.get(AiTemplate.SUMMARIZATION_COMBINE))
+        );
     }
 
     public String getApiKeyForAiProvider(AiProvider aiProvider) {
@@ -490,7 +494,15 @@ public void apiKeyUpdated() {
         apiKeyChangeListener.run();
     }
 
-    public ObservableMap<AiTemplate, String> getTemplates() {
-        return templates;
+    public void setTemplate(AiTemplate aiTemplate, String template) {
+        templates.get(aiTemplate).set(template);
+    }
+
+    public String getTemplate(AiTemplate aiTemplate) {
+        return templates.get(aiTemplate).get();
+    }
+
+    public StringProperty templateProperty(AiTemplate aiTemplate) {
+        return templates.get(aiTemplate);
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
index 57bd7354cb7..01dfad430f8 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
@@ -2,13 +2,9 @@
 
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.Executor;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import javafx.beans.property.StringProperty;
 import javafx.collections.ListChangeListener;
-import javafx.collections.MapChangeListener;
 import javafx.collections.ObservableList;
 
 import org.jabref.logic.ai.AiDefaultPreferences;
@@ -20,13 +16,9 @@
 import org.jabref.logic.ai.util.ErrorMessage;
 import org.jabref.model.database.BibDatabaseContext;
 import org.jabref.model.entry.BibEntry;
-import org.jabref.model.entry.CanonicalBibEntry;
 import org.jabref.model.entry.LinkedFile;
 import org.jabref.model.util.ListUtil;
 
-import ai.djl.training.optimizer.Optimizer;
-import dev.langchain4j.chain.Chain;
-import dev.langchain4j.chain.ConversationalRetrievalChain;
 import dev.langchain4j.data.message.AiMessage;
 import dev.langchain4j.data.message.ChatMessage;
 import dev.langchain4j.data.message.SystemMessage;
@@ -37,10 +29,6 @@
 import dev.langchain4j.model.chat.ChatLanguageModel;
 import dev.langchain4j.model.embedding.EmbeddingModel;
 import dev.langchain4j.model.openai.OpenAiTokenizer;
-import dev.langchain4j.rag.DefaultRetrievalAugmentor;
-import dev.langchain4j.rag.RetrievalAugmentor;
-import dev.langchain4j.rag.content.retriever.ContentRetriever;
-import dev.langchain4j.rag.content.retriever.EmbeddingStoreContentRetriever;
 import dev.langchain4j.store.embedding.EmbeddingMatch;
 import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
 import dev.langchain4j.store.embedding.EmbeddingSearchResult;
@@ -68,7 +56,7 @@ public class AiChatLogic {
     private ChatMemory chatMemory;
 
     // You must not pass an empty list to langchain4j {@link IsIn} filter. We forced to use null here, instead of Optional.
-    @Nullable Filter filter;
+    private @Nullable Filter filter;
 
     public AiChatLogic(AiPreferences aiPreferences,
                        ChatLanguageModel chatLanguageModel,
@@ -97,11 +85,10 @@ public AiChatLogic(AiPreferences aiPreferences,
     }
 
     private void setupListeningToPreferencesChanges() {
-        aiPreferences.getTemplates().addListener((MapChangeListener<AiTemplate, String>) change -> {
-            if (change.getKey() == AiTemplate.CHATTING_SYSTEM_MESSAGE) {
-                setSystemMessage(templatesService.makeChattingSystemMessage(entries));
-            }
-        });
+        aiPreferences
+                .templateProperty(AiTemplate.CHATTING_SYSTEM_MESSAGE)
+                .addListener(obs ->
+                        setSystemMessage(templatesService.makeChattingSystemMessage(entries)));
 
         aiPreferences.contextWindowSizeProperty().addListener(obs -> rebuildFull(chatMemory.messages()));
     }
@@ -139,13 +126,7 @@ private void rebuildFilter() {
     }
 
     private void setSystemMessage(String systemMessage) {
-        chatMemory.add(new SystemMessage(augmentSystemMessage(systemMessage)));
-    }
-
-    private String augmentSystemMessage(String systemMessage) {
-        String entriesInfo = entries.stream().map(CanonicalBibEntry::getCanonicalRepresentation).collect(Collectors.joining("\n"));
-
-        return systemMessage + "\n" + entriesInfo;
+        chatMemory.add(new SystemMessage(systemMessage));
     }
 
     public AiMessage execute(UserMessage message) {
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
index 1b49d1629aa..d0d1698c497 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatService.java
@@ -1,7 +1,5 @@
 package org.jabref.logic.ai.chatting;
 
-import java.util.concurrent.Executor;
-
 import javafx.beans.property.StringProperty;
 import javafx.collections.ObservableList;
 
diff --git a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
index b8ca8780898..9b598c4feaf 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryTask.java
@@ -2,7 +2,6 @@
 
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -26,8 +25,6 @@
 import dev.langchain4j.data.document.splitter.DocumentSplitters;
 import dev.langchain4j.data.segment.TextSegment;
 import dev.langchain4j.model.chat.ChatLanguageModel;
-import dev.langchain4j.model.input.Prompt;
-import dev.langchain4j.model.input.PromptTemplate;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -166,7 +163,7 @@ private Optional<String> generateSummary(LinkedFile linkedFile) throws Interrupt
     public String summarizeOneDocument(String filePath, String document) throws InterruptedException {
         addMoreWork(1); // For the combination of summary chunks.
 
-        DocumentSplitter documentSplitter = DocumentSplitters.recursive(aiPreferences.getContextWindowSize() - MAX_OVERLAP_SIZE_IN_CHARS * 2 - estimateTokenCount(aiPreferences.getTemplates().get(AiTemplate.SUMMARIZATION_CHUNK)), MAX_OVERLAP_SIZE_IN_CHARS);
+        DocumentSplitter documentSplitter = DocumentSplitters.recursive(aiPreferences.getContextWindowSize() - MAX_OVERLAP_SIZE_IN_CHARS * 2 - estimateTokenCount(aiPreferences.getTemplate(AiTemplate.SUMMARIZATION_CHUNK)), MAX_OVERLAP_SIZE_IN_CHARS);
 
         List<String> chunkSummaries = documentSplitter.split(new Document(document)).stream().map(TextSegment::text).toList();
 
@@ -198,7 +195,7 @@ public String summarizeOneDocument(String filePath, String document) throws Inte
             }
 
             chunkSummaries = list;
-        } while (estimateTokenCount(chunkSummaries) > aiPreferences.getContextWindowSize() - estimateTokenCount(aiPreferences.getTemplates().get(AiTemplate.SUMMARIZATION_COMBINE)));
+        } while (estimateTokenCount(chunkSummaries) > aiPreferences.getContextWindowSize() - estimateTokenCount(aiPreferences.getTemplate(AiTemplate.SUMMARIZATION_COMBINE)));
 
         if (chunkSummaries.size() == 1) {
             doneOneWork(); // No need to call LLM for combination of summary chunks.
diff --git a/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java b/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
index 517da798a77..1957c2f48e7 100644
--- a/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
+++ b/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
@@ -1,5 +1,7 @@
 package org.jabref.logic.ai.templates;
 
+import org.jabref.logic.l10n.Localization;
+
 public enum AiTemplate {
     // System message that is applied in the AI chat.
     CHATTING_SYSTEM_MESSAGE,
@@ -16,13 +18,13 @@ public enum AiTemplate {
     public String getLocalizedName() {
         return switch (this) {
             case CHATTING_SYSTEM_MESSAGE ->
-                    "System message for chatting";
+                    Localization.lang("System message for chatting");
             case CHATTING_USER_MESSAGE ->
-                    "User message for chatting";
+                    Localization.lang("User message for chatting");
             case SUMMARIZATION_CHUNK ->
-                    "Summarization chunk";
+                    Localization.lang("Summarization chunk");
             case SUMMARIZATION_COMBINE ->
-                    "Summarization combine";
+                    Localization.lang("Summarization combine");
         };
     }
 }
diff --git a/src/main/java/org/jabref/logic/ai/templates/TemplatesService.java b/src/main/java/org/jabref/logic/ai/templates/TemplatesService.java
index 02155f52836..79e1634491d 100644
--- a/src/main/java/org/jabref/logic/ai/templates/TemplatesService.java
+++ b/src/main/java/org/jabref/logic/ai/templates/TemplatesService.java
@@ -55,7 +55,7 @@ public String makeSummarizationCombine(List<String> chunks) {
     private String makeTemplate(AiTemplate template, VelocityContext context) {
         StringWriter writer = new StringWriter();
 
-        velocityEngine.evaluate(context, writer, template.name(), aiPreferences.getTemplates().get(template));
+        velocityEngine.evaluate(context, writer, template.name(), aiPreferences.getTemplate(template));
 
         return writer.toString();
     }
diff --git a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index e1859aca9ab..d494a2f8b6c 100644
--- a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -1843,12 +1843,12 @@ public AiPreferences getAiPreferences() {
                 getInt(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE),
                 getInt(AI_RAG_MAX_RESULTS_COUNT),
                 getDouble(AI_RAG_MIN_SCORE),
-                Map.of(
+                new HashMap<>(Map.of(
                         AiTemplate.CHATTING_SYSTEM_MESSAGE, get(AI_CHATTING_SYSTEM_MESSAGE_TEMPLATE),
                         AiTemplate.CHATTING_USER_MESSAGE, get(AI_CHATTING_USER_MESSAGE_TEMPLATE),
                         AiTemplate.SUMMARIZATION_CHUNK, get(AI_SUMMARIZATION_CHUNK_TEMPLATE),
                         AiTemplate.SUMMARIZATION_COMBINE, get(AI_SUMMARIZATION_COMBINE_TEMPLATE)
-                ));
+                )));
 
         EasyBind.listen(aiPreferences.enableAiProperty(), (obs, oldValue, newValue) -> putBoolean(AI_ENABLED, newValue));
 
@@ -1875,6 +1875,11 @@ AiTemplate.SUMMARIZATION_COMBINE, get(AI_SUMMARIZATION_COMBINE_TEMPLATE)
         EasyBind.listen(aiPreferences.ragMaxResultsCountProperty(), (obs, oldValue, newValue) -> putInt(AI_RAG_MAX_RESULTS_COUNT, newValue));
         EasyBind.listen(aiPreferences.ragMinScoreProperty(), (obs, oldValue, newValue) -> putDouble(AI_RAG_MIN_SCORE, newValue.doubleValue()));
 
+        EasyBind.listen(aiPreferences.templateProperty(AiTemplate.CHATTING_SYSTEM_MESSAGE), (obs, oldValue, newValue) -> put(AI_CHATTING_SYSTEM_MESSAGE_TEMPLATE, newValue));
+        EasyBind.listen(aiPreferences.templateProperty(AiTemplate.CHATTING_USER_MESSAGE), (obs, oldValue, newValue) -> put(AI_CHATTING_USER_MESSAGE_TEMPLATE, newValue));
+        EasyBind.listen(aiPreferences.templateProperty(AiTemplate.SUMMARIZATION_CHUNK), (obs, oldValue, newValue) -> put(AI_SUMMARIZATION_CHUNK_TEMPLATE, newValue));
+        EasyBind.listen(aiPreferences.templateProperty(AiTemplate.SUMMARIZATION_COMBINE), (obs, oldValue, newValue) -> put(AI_SUMMARIZATION_COMBINE_TEMPLATE, newValue));
+
         return aiPreferences;
     }
 
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 454a38cf4a6..0f0d8063f08 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2558,7 +2558,6 @@ Are\ you\ sure\ you\ want\ to\ clear\ the\ chat\ history\ of\ this\ entry?=Are y
 Context\ window\ size=Context window size
 Context\ window\ size\ must\ be\ greater\ than\ 0=Context window size must be greater than 0
 Instruction\ for\ AI\ (also\ known\ as\ prompt\ or\ system\ message)=Instruction for AI (also known as prompt or system message)
-The\ instruction\ has\ to\ be\ provided=The instruction has to be provided
 An\ I/O\ error\ occurred\ while\ opening\ the\ embedding\ model\ by\ URL\ %0=An I/O error occurred while opening the embedding model by URL %0
 Got\ error\ while\ processing\ the\ file\:=Got error while processing the file:
 The\ model\ by\ URL\ %0\ is\ malformed=The model by URL %0 is malformed
@@ -2637,6 +2636,12 @@ RAG\ minimum\ score\ must\ be\ a\ number=RAG minimum score must be a number
 RAG\ minimum\ score\ must\ be\ greater\ than\ 0\ and\ less\ than\ 1=RAG minimum score must be greater than 0 and less than 1
 Temperature\ must\ be\ a\ number=Temperature must be a number
 If\ you\ have\ chosen\ %0\ as\ an\ AI\ provider,\ the\ privacy\ policy\ of\ %0\ applies.\ You\ find\ it\ at\ %1.=If you have chosen %0 as an AI provider, the privacy policy of %0 applies. You find it at %1.
+Reset\ templates\ to\ default=Reset templates to default
+Summarization\ chunk=Summarization chunk
+Summarization\ combine=Summarization combine
+System\ message\ for\ chatting=System message for chatting
+Templates=Templates
+User\ message\ for\ chatting=User message for chatting
 
 Link=Link
 Source\ URL=Source URL

From d9c32b5da5113c08d126c6c816612cb51c14319b Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Sun, 6 Oct 2024 15:47:10 +0300
Subject: [PATCH 3/7] Merge with main

---
 src/main/java/org/jabref/logic/ai/AiService.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/org/jabref/logic/ai/AiService.java b/src/main/java/org/jabref/logic/ai/AiService.java
index 1e24190093c..2e1b76b67b0 100644
--- a/src/main/java/org/jabref/logic/ai/AiService.java
+++ b/src/main/java/org/jabref/logic/ai/AiService.java
@@ -17,8 +17,8 @@
 import org.jabref.logic.ai.ingestion.storages.MVStoreFullyIngestedDocumentsTracker;
 import org.jabref.logic.ai.summarization.SummariesService;
 import org.jabref.logic.ai.summarization.storages.MVStoreSummariesStorage;
-import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.ai.templates.TemplatesService;
+import org.jabref.logic.citationkeypattern.CitationKeyPatternPreferences;
 import org.jabref.logic.util.Directories;
 import org.jabref.logic.util.NotificationService;
 import org.jabref.logic.util.TaskExecutor;
@@ -93,6 +93,7 @@ public AiService(AiPreferences aiPreferences,
                 aiPreferences,
                 mvStoreSummariesStorage,
                 jabRefChatLanguageModel,
+                templatesService,
                 shutdownSignal,
                 filePreferences,
                 taskExecutor

From d8312429628bef9b8430446702cfc844651cde82 Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Wed, 9 Oct 2024 09:33:30 +0300
Subject: [PATCH 4/7] Fix from code review

---
 .../jabref/logic/ai/AiDefaultPreferences.java | 19 ++++++++++---------
 .../jabref/logic/ai/chatting/AiChatLogic.java | 12 +++++-------
 .../preferences/JabRefCliPreferences.java     |  4 ++--
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
index bc540d4b71b..c6275a7fe08 100644
--- a/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
+++ b/src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java
@@ -78,14 +78,15 @@ public class AiDefaultPreferences {
     public static final int CONTEXT_WINDOW_SIZE = 8196;
 
     public static final Map<AiTemplate, String> TEMPLATES = Map.of(
-            AiTemplate.CHATTING_SYSTEM_MESSAGE,
-                    "You are an AI assistant that analyses research papers. You answer questions about papers.\n" +
-                            "You will be supplied with the necessary information. The supplied information will contain mentions of papers in form '@citationKey'.\n" +
-                            "Whenever you refer to a paper, use its citation key in the same form with @ symbol. Whenever you find relevant information, always use the citation key.\n\n" +
-                            "Here are the papers you are analyzing:\n" +
-                            "#foreach( $entry in $entries )\n" +
-                            "${CanonicalBibEntry.getCanonicalRepresentation($entry)}\n" +
-                            "#end",
+            AiTemplate.CHATTING_SYSTEM_MESSAGE, """
+                    You are an AI assistant that analyses research papers. You answer questions about papers.
+                    You will be supplied with the necessary information. The supplied information will contain mentions of papers in form '@citationKey'.
+                    Whenever you refer to a paper, use its citation key in the same form with @ symbol. Whenever you find relevant information, always use the citation key.
+
+                    Here are the papers you are analyzing:
+                    #foreach( $entry in $entries )
+                    ${CanonicalBibEntry.getCanonicalRepresentation($entry)}
+                    #end""",
 
             AiTemplate.CHATTING_USER_MESSAGE, """
                     $message
@@ -97,7 +98,7 @@ public class AiDefaultPreferences {
                     #end""",
 
             AiTemplate.SUMMARIZATION_CHUNK, """
-                Please provide an overview of the following text. It's a part of a scientific paper.
+                Please provide an overview of the following text. It is a part of a scientific paper.
                 The summary should include the main objectives, methodologies used, key findings, and conclusions.
                 Mention any significant experiments, data, or discussions presented in the paper.
 
diff --git a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
index 01dfad430f8..fe0270ba443 100644
--- a/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
+++ b/src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java
@@ -35,7 +35,6 @@
 import dev.langchain4j.store.embedding.EmbeddingStore;
 import dev.langchain4j.store.embedding.filter.Filter;
 import dev.langchain4j.store.embedding.filter.MetadataFilterBuilder;
-import jakarta.annotation.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -55,8 +54,7 @@ public class AiChatLogic {
 
     private ChatMemory chatMemory;
 
-    // You must not pass an empty list to langchain4j {@link IsIn} filter. We forced to use null here, instead of Optional.
-    private @Nullable Filter filter;
+    private Optional<Filter> filter = Optional.empty();
 
     public AiChatLogic(AiPreferences aiPreferences,
                        ChatLanguageModel chatLanguageModel,
@@ -113,15 +111,15 @@ private void rebuildFilter() {
         List<LinkedFile> linkedFiles = ListUtil.getLinkedFiles(entries).toList();
 
         if (linkedFiles.isEmpty()) {
-            filter = null;
+            filter = Optional.empty();
         } else {
-            filter = MetadataFilterBuilder
+            filter = Optional.of(MetadataFilterBuilder
                     .metadataKey(FileEmbeddingsManager.LINK_METADATA_KEY)
                     .isIn(linkedFiles
                             .stream()
                             .map(LinkedFile::getLink)
                             .toList()
-                    );
+                    ));
         }
     }
 
@@ -143,7 +141,7 @@ public AiMessage execute(UserMessage message) {
                 .builder()
                 .maxResults(aiPreferences.getRagMaxResultsCount())
                 .minScore(aiPreferences.getRagMinScore())
-                .filter(filter)
+                .filter(filter.orElse(null))
                 .queryEmbedding(embeddingModel.embed(message.singleText()).content())
                 .build();
 
diff --git a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
index 1e624e69a7d..18ebe151427 100644
--- a/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
+++ b/src/main/java/org/jabref/logic/preferences/JabRefCliPreferences.java
@@ -1852,12 +1852,12 @@ public AiPreferences getAiPreferences() {
                 getInt(AI_DOCUMENT_SPLITTER_OVERLAP_SIZE),
                 getInt(AI_RAG_MAX_RESULTS_COUNT),
                 getDouble(AI_RAG_MIN_SCORE),
-                new HashMap<>(Map.of(
+                Map.of(
                         AiTemplate.CHATTING_SYSTEM_MESSAGE, get(AI_CHATTING_SYSTEM_MESSAGE_TEMPLATE),
                         AiTemplate.CHATTING_USER_MESSAGE, get(AI_CHATTING_USER_MESSAGE_TEMPLATE),
                         AiTemplate.SUMMARIZATION_CHUNK, get(AI_SUMMARIZATION_CHUNK_TEMPLATE),
                         AiTemplate.SUMMARIZATION_COMBINE, get(AI_SUMMARIZATION_COMBINE_TEMPLATE)
-                )));
+                ));
 
         EasyBind.listen(aiPreferences.enableAiProperty(), (obs, oldValue, newValue) -> putBoolean(AI_ENABLED, newValue));
         EasyBind.listen(aiPreferences.autoGenerateEmbeddingsProperty(), (obs, oldValue, newValue) -> putBoolean(AI_AUTO_GENERATE_EMBEDDINGS, newValue));

From eadec6a9e1848925eb197df567ce970aee996839 Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Sat, 12 Oct 2024 14:21:16 +0300
Subject: [PATCH 5/7] Update from merge

---
 .../ai/summarization/GenerateSummaryForSeveralTask.java      | 5 +++++
 .../org/jabref/logic/ai/summarization/SummariesService.java  | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryForSeveralTask.java b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryForSeveralTask.java
index 4940fba8b21..849040d4de0 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryForSeveralTask.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/GenerateSummaryForSeveralTask.java
@@ -12,6 +12,7 @@
 import org.jabref.logic.ai.AiPreferences;
 import org.jabref.logic.ai.processingstatus.ProcessingInfo;
 import org.jabref.logic.ai.processingstatus.ProcessingState;
+import org.jabref.logic.ai.templates.TemplatesService;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.BackgroundTask;
 import org.jabref.logic.util.ProgressCounter;
@@ -36,6 +37,7 @@ public class GenerateSummaryForSeveralTask extends BackgroundTask<Void> {
     private final BibDatabaseContext bibDatabaseContext;
     private final SummariesStorage summariesStorage;
     private final ChatLanguageModel chatLanguageModel;
+    private final TemplatesService templatesService;
     private final ReadOnlyBooleanProperty shutdownSignal;
     private final AiPreferences aiPreferences;
     private final FilePreferences filePreferences;
@@ -51,6 +53,7 @@ public GenerateSummaryForSeveralTask(
             BibDatabaseContext bibDatabaseContext,
             SummariesStorage summariesStorage,
             ChatLanguageModel chatLanguageModel,
+            TemplatesService templatesService,
             ReadOnlyBooleanProperty shutdownSignal,
             AiPreferences aiPreferences,
             FilePreferences filePreferences,
@@ -61,6 +64,7 @@ public GenerateSummaryForSeveralTask(
         this.bibDatabaseContext = bibDatabaseContext;
         this.summariesStorage = summariesStorage;
         this.chatLanguageModel = chatLanguageModel;
+        this.templatesService = templatesService;
         this.shutdownSignal = shutdownSignal;
         this.aiPreferences = aiPreferences;
         this.filePreferences = filePreferences;
@@ -95,6 +99,7 @@ public Void call() throws Exception {
                                     bibDatabaseContext,
                                     summariesStorage,
                                     chatLanguageModel,
+                                    templatesService,
                                     shutdownSignal,
                                     aiPreferences,
                                     filePreferences
diff --git a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
index 95d547bfd27..faf8a4dece4 100644
--- a/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
+++ b/src/main/java/org/jabref/logic/ai/summarization/SummariesService.java
@@ -138,7 +138,7 @@ public List<ProcessingInfo<BibEntry, Summary>> summarize(StringProperty groupNam
     private void startSummarizationTask(BibEntry entry, BibDatabaseContext bibDatabaseContext, ProcessingInfo<BibEntry, Summary> processingInfo) {
         processingInfo.setState(ProcessingState.PROCESSING);
 
-        new GenerateSummaryTask(entry, bibDatabaseContext, summariesStorage, chatLanguageModel, shutdownSignal, aiPreferences, filePreferences)
+        new GenerateSummaryTask(entry, bibDatabaseContext, summariesStorage, chatLanguageModel, templatesService, shutdownSignal, aiPreferences, filePreferences)
                 .onSuccess(processingInfo::setSuccess)
                 .onFailure(processingInfo::setException)
                 .executeWith(taskExecutor);
@@ -147,7 +147,7 @@ private void startSummarizationTask(BibEntry entry, BibDatabaseContext bibDataba
     private void startSummarizationTask(StringProperty groupName, List<ProcessingInfo<BibEntry, Summary>> entries, BibDatabaseContext bibDatabaseContext) {
         entries.forEach(processingInfo -> processingInfo.setState(ProcessingState.PROCESSING));
 
-        new GenerateSummaryForSeveralTask(groupName, entries, bibDatabaseContext, summariesStorage, chatLanguageModel, shutdownSignal, aiPreferences, filePreferences, taskExecutor)
+        new GenerateSummaryForSeveralTask(groupName, entries, bibDatabaseContext, summariesStorage, chatLanguageModel, templatesService, shutdownSignal, aiPreferences, filePreferences, taskExecutor)
                 .executeWith(taskExecutor);
     }
 

From f96037dc7c323645343456be8be6dad48b27a3d3 Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Mon, 28 Oct 2024 19:38:14 +0200
Subject: [PATCH 6/7] Fix compiler errors

---
 .../java/org/jabref/gui/preferences/ai/AiTabViewModel.java     | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index cf5f012272c..15fe2b564b7 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -3,6 +3,7 @@
 import java.util.Arrays;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 
 import javafx.beans.property.BooleanProperty;
@@ -395,8 +396,6 @@ public void resetExpertSettings() {
         String resetApiBaseUrl = selectedAiProvider.get().getApiUrl();
         currentApiBaseUrl.set(resetApiBaseUrl);
 
-        instruction.set(AiDefaultPreferences.SYSTEM_MESSAGE);
-
         contextWindowSize.set(AiDefaultPreferences.getContextWindowSize(selectedAiProvider.get(), currentChatModel.get()));
 
         temperature.set(LocalizedNumbers.doubleToString(AiDefaultPreferences.TEMPERATURE));

From 1f00416f3d0007c2391be052b4c1bdd785f573ae Mon Sep 17 00:00:00 2001
From: InAnYan <ruslanpopov1512@gmail.com>
Date: Wed, 30 Oct 2024 08:47:21 +0200
Subject: [PATCH 7/7] Fix from code review

---
 .../org/jabref/gui/preferences/ai/AiTab.fxml  | 25 +++++++++++-----
 .../org/jabref/gui/preferences/ai/AiTab.java  | 19 ++++++------
 .../gui/preferences/ai/AiTabViewModel.java    | 29 ++-----------------
 .../jabref/logic/ai/templates/AiTemplate.java |  4 +--
 src/main/resources/l10n/JabRef_en.properties  |  6 ++--
 5 files changed, 33 insertions(+), 50 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
index cd692f3d616..64e737747f5 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.fxml
@@ -16,6 +16,9 @@
 <?import com.dlsc.unitfx.IntegerInputField?>
 <?import org.controlsfx.control.SearchableComboBox?>
 <?import org.controlsfx.control.textfield.CustomPasswordField?>
+<?import javafx.scene.control.TabPane?>
+<?import javafx.scene.control.Tab?>
+<?import javafx.scene.control.TextArea?>
 <fx:root
         spacing="10.0"
         type="VBox"
@@ -241,14 +244,20 @@
                     prefWidth="20.0"/>
         </HBox>
 
-        <ComboBox
-                fx:id="currentEditingTemplateComboBox"
-                maxWidth="1.7976931348623157E308"
-                HBox.hgrow="ALWAYS"/>
-
-        <ResizableTextArea
-                fx:id="currentEditingTemplateSourceTextArea"
-                wrapText="true"/>
+        <TabPane>
+            <Tab text="%System message for chatting" closable="false">
+                <TextArea fx:id="systemMessageTextArea"/>
+            </Tab>
+            <Tab text="User message for chatting" closable="false">
+                <TextArea fx:id="userMessageTextArea"/>
+            </Tab>
+            <Tab text="Completion text for summarization of a chunk" closable="false">
+                <TextArea fx:id="summarizationChunkTextArea"/>
+            </Tab>
+            <Tab text="Completion text for summarization of several chunks" closable="false">
+                <TextArea fx:id="summarizationCombineTextArea"/>
+            </Tab>
+        </TabPane>
 
         <Button onAction="#onResetTemplatesButtonClick"
                 text="%Reset templates to default">
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
index 83632827947..1646e57420e 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTab.java
@@ -7,6 +7,7 @@
 import javafx.scene.control.Button;
 import javafx.scene.control.CheckBox;
 import javafx.scene.control.ComboBox;
+import javafx.scene.control.TextArea;
 import javafx.scene.control.TextField;
 
 import org.jabref.gui.actions.ActionFactory;
@@ -22,7 +23,6 @@
 import org.jabref.model.ai.EmbeddingModel;
 
 import com.airhacks.afterburner.views.ViewLoader;
-import com.dlsc.gemsfx.ResizableTextArea;
 import com.dlsc.unitfx.IntegerInputField;
 import de.saxsys.mvvmfx.utils.validation.visualization.ControlsFxVisualizer;
 import org.controlsfx.control.SearchableComboBox;
@@ -51,8 +51,10 @@ public class AiTab extends AbstractPreferenceTabView<AiTabViewModel> implements
     @FXML private IntegerInputField ragMaxResultsCountTextField;
     @FXML private TextField ragMinScoreTextField;
 
-    @FXML private ComboBox<AiTemplate> currentEditingTemplateComboBox;
-    @FXML private ResizableTextArea currentEditingTemplateSourceTextArea;
+    @FXML private TextArea systemMessageTextArea;
+    @FXML private TextArea userMessageTextArea;
+    @FXML private TextArea summarizationChunkTextArea;
+    @FXML private TextArea summarizationCombineTextArea;
 
     @FXML private Button generalSettingsHelp;
     @FXML private Button expertSettingsHelp;
@@ -191,13 +193,10 @@ public void initialize() {
             visualizer.initVisualization(viewModel.getRagMinScoreRangeValidationStatus(), ragMinScoreTextField);
         });
 
-        new ViewModelListCellFactory<AiTemplate>()
-                .withText(AiTemplate::getLocalizedName)
-                .install(currentEditingTemplateComboBox);
-        currentEditingTemplateComboBox.itemsProperty().bind(viewModel.templatesProperty());
-        currentEditingTemplateComboBox.valueProperty().bindBidirectional(viewModel.currentEditingTemplate());
-
-        currentEditingTemplateSourceTextArea.textProperty().bindBidirectional(viewModel.currentEditingTemplateSource());
+        systemMessageTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.CHATTING_SYSTEM_MESSAGE));
+        userMessageTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.CHATTING_USER_MESSAGE));
+        summarizationChunkTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.SUMMARIZATION_CHUNK));
+        summarizationCombineTextArea.textProperty().bindBidirectional(viewModel.getTemplateSources().get(AiTemplate.SUMMARIZATION_COMBINE));
 
         ActionFactory actionFactory = new ActionFactory();
         actionFactory.configureIconButton(StandardActions.HELP, new HelpAction(HelpFile.AI_GENERAL_SETTINGS, dialogService, preferences.getExternalApplicationsPreferences()), generalSettingsHelp);
diff --git a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
index 15fe2b564b7..2cb019cf968 100644
--- a/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
+++ b/src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java
@@ -82,17 +82,12 @@ public class AiTabViewModel implements PreferenceTabViewModel {
     private final StringProperty huggingFaceApiBaseUrl = new SimpleStringProperty();
     private final StringProperty gpt4AllApiBaseUrl = new SimpleStringProperty();
 
-    private final ListProperty<AiTemplate> templatesList =
-            new SimpleListProperty<>(FXCollections.observableArrayList(AiTemplate.values()));
-    private final ObjectProperty<AiTemplate> currentEditingTemplate = new SimpleObjectProperty<>(AiTemplate.CHATTING_SYSTEM_MESSAGE);
-
     private final Map<AiTemplate, StringProperty> templateSources = Map.of(
             AiTemplate.CHATTING_SYSTEM_MESSAGE, new SimpleStringProperty(),
             AiTemplate.CHATTING_USER_MESSAGE, new SimpleStringProperty(),
             AiTemplate.SUMMARIZATION_CHUNK, new SimpleStringProperty(),
             AiTemplate.SUMMARIZATION_COMBINE, new SimpleStringProperty()
     );
-    private final StringProperty currentEditingTemplateSource = new SimpleStringProperty();
 
     private final StringProperty temperature = new SimpleStringProperty();
     private final IntegerProperty contextWindowSize = new SimpleIntegerProperty();
@@ -235,14 +230,6 @@ public AiTabViewModel(CliPreferences preferences) {
             }
         });
 
-        this.currentEditingTemplateSource.addListener((observable, oldValue, newValue) -> {
-            templateSources.get(currentEditingTemplate.get()).set(newValue);
-        });
-
-        this.currentEditingTemplate.addListener((observable, oldValue, newValue) -> {
-            currentEditingTemplateSource.set(templateSources.get(newValue).get());
-        });
-
         this.apiKeyValidator = new FunctionBasedValidator<>(
                 currentApiKey,
                 token -> !StringUtil.isBlank(token),
@@ -338,8 +325,6 @@ public void setValues() {
         Arrays.stream(AiTemplate.values()).forEach(template ->
                 templateSources.get(template).set(aiPreferences.getTemplate(template)));
 
-        currentEditingTemplateSource.set(templateSources.get(currentEditingTemplate.get()).get());
-
         temperature.setValue(LocalizedNumbers.doubleToString(aiPreferences.getTemperature()));
         contextWindowSize.setValue(aiPreferences.getContextWindowSize());
         documentSplitterChunkSize.setValue(aiPreferences.getDocumentSplitterChunkSize());
@@ -408,8 +393,6 @@ public void resetExpertSettings() {
     public void resetTemplates() {
         Arrays.stream(AiTemplate.values()).forEach(template ->
                 templateSources.get(template).set(AiDefaultPreferences.TEMPLATES.get(template)));
-
-        currentEditingTemplateSource.set(templateSources.get(currentEditingTemplate.get()).get());
     }
 
     @Override
@@ -511,16 +494,8 @@ public BooleanProperty disableApiBaseUrlProperty() {
         return disableApiBaseUrl;
     }
 
-    public ListProperty<AiTemplate> templatesProperty() {
-        return templatesList;
-    }
-
-    public ObjectProperty<AiTemplate> currentEditingTemplate() {
-        return currentEditingTemplate;
-    }
-
-    public StringProperty currentEditingTemplateSource() {
-        return currentEditingTemplateSource;
+    public Map<AiTemplate, StringProperty> getTemplateSources() {
+        return templateSources;
     }
 
     public StringProperty temperatureProperty() {
diff --git a/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java b/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
index 1957c2f48e7..50feff648d3 100644
--- a/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
+++ b/src/main/java/org/jabref/logic/ai/templates/AiTemplate.java
@@ -22,9 +22,9 @@ public String getLocalizedName() {
             case CHATTING_USER_MESSAGE ->
                     Localization.lang("User message for chatting");
             case SUMMARIZATION_CHUNK ->
-                    Localization.lang("Summarization chunk");
+                    Localization.lang("Completion text for summarization of a chunk");
             case SUMMARIZATION_COMBINE ->
-                    Localization.lang("Summarization combine");
+                    Localization.lang("Completion text for summarization of several chunks");
         };
     }
 }
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 6ae92bbd35a..fb3ed0d759b 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -2648,11 +2648,11 @@ Generating\ summaries\ for\ %0=Generating summaries for %0
 Ingestion\ started\ for\ group\ "%0".=Ingestion started for group "%0".
 Summarization\ started\ for\ group\ "%0".=Summarization started for group "%0".
 Reset\ templates\ to\ default=Reset templates to default
-Summarization\ chunk=Summarization chunk
-Summarization\ combine=Summarization combine
-System\ message\ for\ chatting=System message for chatting
 Templates=Templates
+System\ message\ for\ chatting=System message for chatting
 User\ message\ for\ chatting=User message for chatting
+Completion\ text\ for\ summarization\ of\ a\ chunk=Completion text for summarization of a chunk
+Completion\ text\ for\ summarization\ of\ several\ chunks=Completion text for summarization of several chunks
 
 Link=Link
 Source\ URL=Source URL