Merge remote-tracking branch 'origin/main' into prepare-multimodule-b…

…uild

src/main/java/org/jabref/cli/CliOptions.java

@@ -207,7 +207,7 @@ private static Options getOptions() {
                 .longOpt("importBibtex")
                 .desc("%s: '%s'".formatted(Localization.lang("Import BibTeX"), "-ib @article{entry}"))
                 .hasArg()
-                .argName("BIBTEXT_STRING")
+                .argName("BIBTEX_STRING")
                 .build());
 
         options.addOption(Option

src/main/java/org/jabref/gui/ai/components/privacynotice/PrivacyNoticeComponent.java

@@ -11,7 +11,6 @@
 import org.jabref.gui.DialogService;
 import org.jabref.gui.desktop.os.NativeDesktop;
 import org.jabref.gui.frame.ExternalApplicationsPreferences;
-import org.jabref.logic.ai.AiDefaultPreferences;
 import org.jabref.logic.ai.AiPreferences;
 import org.jabref.model.ai.AiProvider;
 
@@ -72,12 +71,11 @@ private void initPrivacyHyperlink(TextFlow textFlow, AiProvider aiProvider) {
         text.setText(replacedText);
         text.wrappingWidthProperty().bind(this.widthProperty());
 
-        String link = AiDefaultPreferences.PROVIDERS_PRIVACY_POLICIES.get(aiProvider);
-        Hyperlink hyperlink = new Hyperlink(link);
+        Hyperlink hyperlink = new Hyperlink(aiProvider.getApiUrl());
         hyperlink.setWrapText(true);
         hyperlink.setFont(text.getFont());
         hyperlink.setOnAction(event -> {
-            openBrowser(link);
+            openBrowser(aiProvider.getApiUrl());
         });
 
         textFlow.getChildren().add(hyperlink);

src/main/java/org/jabref/gui/externalfiletype/ExternalFileType.java

@@ -4,6 +4,9 @@
 import org.jabref.model.entry.field.Field;
 import org.jabref.model.entry.field.FieldFactory;
 
+/**
+ * "Twin" interface: {@link org.jabref.logic.util.FileType}
+ */
 public interface ExternalFileType {
     String getName();
 

src/main/java/org/jabref/gui/fieldeditors/LinkedFileViewModel.java

@@ -40,7 +40,7 @@
 import org.jabref.logic.importer.fileformat.PdfContentImporter;
 import org.jabref.logic.importer.fileformat.PdfEmbeddedBibFileImporter;
 import org.jabref.logic.importer.fileformat.PdfGrobidImporter;
-import org.jabref.logic.importer.fileformat.PdfVerbatimBibTextImporter;
+import org.jabref.logic.importer.fileformat.PdfVerbatimBibtexImporter;
 import org.jabref.logic.importer.fileformat.PdfXmpImporter;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.util.TaskExecutor;
@@ -460,7 +460,7 @@ public void parsePdfMetadataAndShowMergeDialog() {
             MultiMergeEntriesView dialog = new MultiMergeEntriesView(preferences, taskExecutor);
             dialog.setTitle(Localization.lang("Merge PDF metadata"));
             dialog.addSource(Localization.lang("Entry"), entry);
-            dialog.addSource(Localization.lang("Verbatim"), wrapImporterToSupplier(new PdfVerbatimBibTextImporter(preferences.getImportFormatPreferences()), filePath));
+            dialog.addSource(Localization.lang("Verbatim"), wrapImporterToSupplier(new PdfVerbatimBibtexImporter(preferences.getImportFormatPreferences()), filePath));
             dialog.addSource(Localization.lang("Embedded"), wrapImporterToSupplier(new PdfEmbeddedBibFileImporter(preferences.getImportFormatPreferences()), filePath));
             if (preferences.getGrobidPreferences().isGrobidEnabled()) {
                 dialog.addSource("Grobid", wrapImporterToSupplier(new PdfGrobidImporter(preferences.getImportFormatPreferences()), filePath));

src/main/java/org/jabref/gui/preferences/ai/AiTabViewModel.java

@@ -2,7 +2,6 @@
 
 import java.util.List;
 import java.util.Locale;
-import java.util.Map;
 import java.util.Objects;
 
 import javafx.beans.property.BooleanProperty;
@@ -119,7 +118,7 @@ public AiTabViewModel(CliPreferences preferences) {
         );
 
         this.selectedAiProvider.addListener((observable, oldValue, newValue) -> {
-            List<String> models = AiDefaultPreferences.AVAILABLE_CHAT_MODELS.get(newValue);
+            List<String> models = AiDefaultPreferences.getAvailableModels(newValue);
 
             // When we setAll on Hugging Face, models are empty, and currentChatModel become null.
             // It becomes null beause currentChatModel is binded to combobox, and this combobox becomes empty.
@@ -186,14 +185,7 @@ public AiTabViewModel(CliPreferences preferences) {
                 case HUGGING_FACE -> huggingFaceChatModel.set(newValue);
             }
 
-            Map<String, Integer> modelContextWindows = AiDefaultPreferences.CONTEXT_WINDOW_SIZES.get(selectedAiProvider.get());
-
-            if (modelContextWindows == null) {
-                contextWindowSize.set(AiDefaultPreferences.CONTEXT_WINDOW_SIZE);
-                return;
-            }
-
-            contextWindowSize.set(modelContextWindows.getOrDefault(newValue, AiDefaultPreferences.CONTEXT_WINDOW_SIZE));
+            contextWindowSize.set(AiDefaultPreferences.getContextWindowSize(selectedAiProvider.get(), newValue));
         });
 
         this.currentApiKey.addListener((observable, oldValue, newValue) -> {
@@ -356,13 +348,12 @@ public void storeSettings() {
     }
 
     public void resetExpertSettings() {
-        String resetApiBaseUrl = AiDefaultPreferences.PROVIDERS_API_URLS.get(selectedAiProvider.get());
+        String resetApiBaseUrl = selectedAiProvider.get().getApiUrl();
         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);
+        contextWindowSize.set(AiDefaultPreferences.getContextWindowSize(selectedAiProvider.get(), currentChatModel.get()));
 
         temperature.set(LocalizedNumbers.doubleToString(AiDefaultPreferences.TEMPERATURE));
         documentSplitterChunkSize.set(AiDefaultPreferences.DOCUMENT_SPLITTER_CHUNK_SIZE);

src/main/java/org/jabref/logic/ai/AiDefaultPreferences.java

@@ -1,67 +1,68 @@
 package org.jabref.logic.ai;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
 import org.jabref.model.ai.AiProvider;
 import org.jabref.model.ai.EmbeddingModel;
 
 public class AiDefaultPreferences {
-    public static final Map<AiProvider, List<String>> AVAILABLE_CHAT_MODELS = Map.of(
-            AiProvider.OPEN_AI, List.of("gpt-4o-mini", "gpt-4o", "gpt-4", "gpt-4-turbo", "gpt-3.5-turbo"),
-            // "mistral" and "mixtral" are not language mistakes.
-            AiProvider.MISTRAL_AI, List.of("open-mistral-nemo", "open-mistral-7b", "open-mixtral-8x7b", "open-mixtral-8x22b", "mistral-large-latest"),
-            AiProvider.GEMINI, List.of("gemini-1.5-flash", "gemini-1.5-pro", "gemini-1.0-pro"),
-            AiProvider.HUGGING_FACE, List.of()
-    );
+    public enum PredefinedChatModel {
+        GPT_4O_MINI(AiProvider.OPEN_AI, "gpt-4o-mini", 128000),
+        GPT_4O(AiProvider.OPEN_AI, "gpt-4o", 128000),
+        GPT_4(AiProvider.OPEN_AI, "gpt-4", 8192),
+        GPT_4_TURBO(AiProvider.OPEN_AI, "gpt-4-turbo", 128000),
+        GPT_3_5_TURBO(AiProvider.OPEN_AI, "gpt-3.5-turbo", 16385),
+        OPEN_MISTRAL_NEMO(AiProvider.MISTRAL_AI, "open-mistral-nemo", 128000),
+        OPEN_MISTRAL_7B(AiProvider.MISTRAL_AI, "open-mistral-7b", 32000),
+        // "mixtral" is not a typo.
+        OPEN_MIXTRAL_8X7B(AiProvider.MISTRAL_AI, "open-mixtral-8x7b", 32000),
+        OPEN_MIXTRAL_8X22B(AiProvider.MISTRAL_AI, "open-mixtral-8x22b", 64000),
+        GEMINI_1_5_FLASH(AiProvider.GEMINI, "gemini-1.5-flash", 1048576),
+        GEMINI_1_5_PRO(AiProvider.GEMINI, "gemini-1.5-pro", 2097152),
+        GEMINI_1_0_PRO(AiProvider.GEMINI, "gemini-1.0-pro", 32000),
+        // Dummy variant for Hugging Face models.
+        HUGGING_FACE(AiProvider.HUGGING_FACE, "", 0);
 
-    public static final Map<AiProvider, String> PROVIDERS_PRIVACY_POLICIES = Map.of(
-            AiProvider.OPEN_AI, "https://openai.com/policies/privacy-policy/",
-            AiProvider.MISTRAL_AI, "https://mistral.ai/terms/#privacy-policy",
-            AiProvider.GEMINI, "https://ai.google.dev/gemini-api/terms",
-            AiProvider.HUGGING_FACE, "https://huggingface.co/privacy"
-    );
+        private final AiProvider aiProvider;
+        private final String name;
+        private final int contextWindowSize;
 
-    public static final Map<AiProvider, String> PROVIDERS_API_URLS = Map.of(
-            AiProvider.OPEN_AI, "https://api.openai.com/v1",
-            AiProvider.MISTRAL_AI, "https://api.mistral.ai/v1",
-            AiProvider.GEMINI, "https://generativelanguage.googleapis.com/v1beta/",
-            AiProvider.HUGGING_FACE, "https://huggingface.co/api"
-    );
+        PredefinedChatModel(AiProvider aiProvider, String name, int contextWindowSize) {
+            this.aiProvider = aiProvider;
+            this.name = name;
+            this.contextWindowSize = contextWindowSize;
+        }
 
-    public static final Map<AiProvider, Map<String, Integer>> CONTEXT_WINDOW_SIZES = Map.of(
-            AiProvider.OPEN_AI, Map.of(
-                    "gpt-4o-mini", 128000,
-                    "gpt-4o", 128000,
-                    "gpt-4", 8192,
-                    "gpt-4-turbo", 128000,
-                    "gpt-3.5-turbo", 16385
-            ),
-            AiProvider.MISTRAL_AI, Map.of(
-                    "mistral-large-latest", 128000,
-                    "open-mistral-nemo", 128000,
-                    "open-mistral-7b", 32000,
-                    "open-mixtral-8x7b", 32000,
-                    "open-mixtral-8x22b", 64000
-            ),
-            AiProvider.GEMINI, Map.of(
-                    "gemini-1.5-flash", 1048576,
-                    "gemini-1.5-pro", 2097152,
-                    "gemini-1.0-pro", 32000
-            )
-    );
+        public AiProvider getAiProvider() {
+            return aiProvider;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public int getContextWindowSize() {
+            return contextWindowSize;
+        }
+
+        public String toString() {
+            return aiProvider.toString() + " " + name;
+        }
+    }
 
     public static final boolean ENABLE_CHAT = false;
     public static final boolean AUTO_GENERATE_EMBEDDINGS = false;
     public static final boolean AUTO_GENERATE_SUMMARIES = false;
 
     public static final AiProvider PROVIDER = AiProvider.OPEN_AI;
 
-    public static final Map<AiProvider, String> CHAT_MODELS = Map.of(
-            AiProvider.OPEN_AI, "gpt-4o-mini",
-            AiProvider.MISTRAL_AI, "open-mixtral-8x22b",
-            AiProvider.GEMINI, "gemini-1.5-flash",
-            AiProvider.HUGGING_FACE, ""
+    public static final Map<AiProvider, PredefinedChatModel> CHAT_MODELS = Map.of(
+            AiProvider.OPEN_AI, PredefinedChatModel.GPT_4O_MINI,
+            AiProvider.MISTRAL_AI, PredefinedChatModel.OPEN_MIXTRAL_8X22B,
+            AiProvider.GEMINI, PredefinedChatModel.GEMINI_1_5_FLASH,
+            AiProvider.HUGGING_FACE, PredefinedChatModel.HUGGING_FACE
     );
 
     public static final boolean CUSTOMIZE_SETTINGS = false;
@@ -74,9 +75,20 @@ public class AiDefaultPreferences {
     public static final int RAG_MAX_RESULTS_COUNT = 10;
     public static final double RAG_MIN_SCORE = 0.3;
 
-    public static final int CONTEXT_WINDOW_SIZE = 8196;
+    public static final int FALLBACK_CONTEXT_WINDOW_SIZE = 8196;
+
+    public static List<String> getAvailableModels(AiProvider aiProvider) {
+        return Arrays.stream(AiDefaultPreferences.PredefinedChatModel.values())
+                     .filter(model -> model.getAiProvider() == aiProvider)
+                     .map(AiDefaultPreferences.PredefinedChatModel::getName)
+                     .toList();
+    }
 
-    public static int getContextWindowSize(AiProvider aiProvider, String model) {
-        return CONTEXT_WINDOW_SIZES.getOrDefault(aiProvider, Map.of()).getOrDefault(model, 0);
+    public static int getContextWindowSize(AiProvider aiProvider, String modelName) {
+        return Arrays.stream(AiDefaultPreferences.PredefinedChatModel.values())
+                     .filter(model -> model.getAiProvider() == aiProvider && model.getName().equals(modelName))
+                     .map(AiDefaultPreferences.PredefinedChatModel::getContextWindowSize)
+                     .findFirst()
+                     .orElse(AiDefaultPreferences.FALLBACK_CONTEXT_WINDOW_SIZE);
     }
 }

src/main/java/org/jabref/logic/ai/AiPreferences.java

@@ -497,7 +497,7 @@ public String getSelectedApiBaseUrl() {
                         geminiApiBaseUrl.get();
             };
         } else {
-            return AiDefaultPreferences.PROVIDERS_API_URLS.get(aiProvider.get());
+            return aiProvider.get().getApiUrl();
         }
     }
 

src/main/java/org/jabref/logic/ai/chatting/AiChatLogic.java

@@ -8,7 +8,6 @@
 import javafx.collections.ListChangeListener;
 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.util.ErrorMessage;
@@ -160,7 +159,7 @@ public AiMessage execute(UserMessage message) {
         // Message will be automatically added to ChatMemory through ConversationalRetrievalChain.
 
         LOGGER.info("Sending message to AI provider ({}) for answering in {}: {}",
-                AiDefaultPreferences.PROVIDERS_API_URLS.get(aiPreferences.getAiProvider()),
+                aiPreferences.getAiProvider().getApiUrl(),
                 name.get(),
                 message.singleText());
 

src/main/java/org/jabref/logic/importer/ImportFormatReader.java

@@ -28,7 +28,7 @@
 import org.jabref.logic.importer.fileformat.PdfEmbeddedBibFileImporter;
 import org.jabref.logic.importer.fileformat.PdfGrobidImporter;
 import org.jabref.logic.importer.fileformat.PdfMergeMetadataImporter;
-import org.jabref.logic.importer.fileformat.PdfVerbatimBibTextImporter;
+import org.jabref.logic.importer.fileformat.PdfVerbatimBibtexImporter;
 import org.jabref.logic.importer.fileformat.PdfXmpImporter;
 import org.jabref.logic.importer.fileformat.RepecNepImporter;
 import org.jabref.logic.importer.fileformat.RisImporter;
@@ -75,7 +75,7 @@ public void reset() {
         formats.add(new MsBibImporter());
         formats.add(new OvidImporter());
         formats.add(new PdfMergeMetadataImporter(importFormatPreferences));
-        formats.add(new PdfVerbatimBibTextImporter(importFormatPreferences));
+        formats.add(new PdfVerbatimBibtexImporter(importFormatPreferences));
         formats.add(new PdfContentImporter());
         formats.add(new PdfEmbeddedBibFileImporter(importFormatPreferences));
         if (importFormatPreferences.grobidPreferences().isGrobidEnabled()) {

src/main/java/org/jabref/logic/importer/fileformat/PdfContentImporter.java

@@ -12,7 +12,6 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
 import org.jabref.logic.os.OS;
@@ -38,8 +37,10 @@
  * <p>
  * In case one wants to have a list of {@link BibEntry} matching the bibliography of a PDF,
  * please see {@link BibliographyFromPdfImporter}.
+ * <p>
+ * If several PDF importers should be tried, use {@link PdfMergeMetadataImporter}.
  */
-public class PdfContentImporter extends Importer {
+public class PdfContentImporter extends PdfImporter {
 
     private static final Pattern YEAR_EXTRACT_PATTERN = Pattern.compile("\\d{4}");
 

src/main/java/org/jabref/logic/importer/fileformat/PdfEmbeddedBibFileImporter.java

@@ -9,7 +9,6 @@
 import java.util.Objects;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParseException;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.l10n.Localization;
@@ -32,7 +31,7 @@
 /**
  * PdfEmbeddedBibFileImporter imports an embedded Bib-File from the PDF.
  */
-public class PdfEmbeddedBibFileImporter extends Importer {
+public class PdfEmbeddedBibFileImporter extends PdfImporter {
 
     private final BibtexParser bibtexParser;
 

src/main/java/org/jabref/logic/importer/fileformat/PdfGrobidImporter.java

@@ -8,7 +8,6 @@
 import java.util.Optional;
 
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.util.GrobidService;
 import org.jabref.logic.l10n.Localization;
@@ -20,7 +19,7 @@
 /**
  * Wraps the GrobidService function to be used as an Importer.
  */
-public class PdfGrobidImporter extends Importer {
+public class PdfGrobidImporter extends PdfImporter {
 
     private final GrobidService grobidService;
     private final ImportFormatPreferences importFormatPreferences;

src/main/java/org/jabref/logic/importer/fileformat/PdfImporter.java

@@ -0,0 +1,9 @@
+package org.jabref.logic.importer.fileformat;
+
+import org.jabref.logic.importer.Importer;
+
+/**
+ * Intermediate class to bundle all PdfImporters
+ */
+public abstract class PdfImporter extends Importer {
+}

src/main/java/org/jabref/logic/importer/fileformat/PdfMergeMetadataImporter.java

@@ -14,7 +14,6 @@
 import org.jabref.logic.importer.EntryBasedFetcher;
 import org.jabref.logic.importer.FetcherException;
 import org.jabref.logic.importer.ImportFormatPreferences;
-import org.jabref.logic.importer.Importer;
 import org.jabref.logic.importer.ParserResult;
 import org.jabref.logic.importer.fetcher.DoiFetcher;
 import org.jabref.logic.importer.fetcher.isbntobibtex.IsbnFetcher;
@@ -32,23 +31,23 @@
 import org.slf4j.LoggerFactory;
 
 /**
- * Tries to import BibTeX data trying multiple PDF content importers and merging the results.
+ * Tries to import BibTeX data trying multiple {@Link PdfImporter}s and merging the results.
  * See {@Link org.jabref.logic.importer.fileformat.PdfMergeMetadataImporter#metadataImporters} for the list of importers used.
  *
  * After all importers are applied, this importer tries to fetch additional metadata for the entry using the DOI and ISBN.
  */
-public class PdfMergeMetadataImporter extends Importer {
+public class PdfMergeMetadataImporter extends PdfImporter {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(PdfMergeMetadataImporter.class);
 
     private final ImportFormatPreferences importFormatPreferences;
-    private final List<Importer> metadataImporters;
+    private final List<PdfImporter> metadataImporters;
 
     public PdfMergeMetadataImporter(ImportFormatPreferences importFormatPreferences) {
         this.importFormatPreferences = importFormatPreferences;
 
         this.metadataImporters = new ArrayList<>(5);
-        this.metadataImporters.add(new PdfVerbatimBibTextImporter(importFormatPreferences));
+        this.metadataImporters.add(new PdfVerbatimBibtexImporter(importFormatPreferences));
         this.metadataImporters.add(new PdfEmbeddedBibFileImporter(importFormatPreferences));
         if (importFormatPreferences.grobidPreferences().isGrobidEnabled()) {
             this.metadataImporters.add(new PdfGrobidImporter(importFormatPreferences));
@@ -80,7 +79,7 @@ public ParserResult importDatabase(String data) throws IOException {
     public ParserResult importDatabase(Path filePath) throws IOException {
         List<BibEntry> candidates = new ArrayList<>();
 
-        for (Importer metadataImporter : metadataImporters) {
+        for (PdfImporter metadataImporter : metadataImporters) {
             List<BibEntry> extractedEntries = metadataImporter.importDatabase(filePath).getDatabase().getEntries();
             if (extractedEntries.isEmpty()) {
                 continue;