This is an automated email from the ASF dual-hosted git repository.
mawiesne pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opennlp.git
The following commit(s) were added to refs/heads/main by this push:
new f2810592 OPENNLP-1753: Switch to Models v1.3 (#815)
f2810592 is described below
commit f28105929b2de3f30153e3088d8730bc114a4cd2
Author: Martin Wiesner <mawie...@users.noreply.github.com>
AuthorDate: Wed Jul 9 08:28:11 2025 +0200
OPENNLP-1753: Switch to Models v1.3 (#815)
- adds missing newly supported lang codes to DownloadUtil's internal map
- adds missing newly supported lang codes to AbstractModelLoaderTest classes
---
.../src/test/java/opennlp/tools/AbstractModelLoaderTest.java | 8 ++++----
.../src/main/java/opennlp/tools/util/DownloadUtil.java | 8 ++++++++
.../src/test/java/opennlp/tools/AbstractModelLoaderTest.java | 10 +++++-----
.../src/test/java/opennlp/tools/util/DownloadParserTest.java | 2 +-
4 files changed, 18 insertions(+), 10 deletions(-)
diff --git
a/opennlp-core/opennlp-cli/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
b/opennlp-core/opennlp-cli/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
index 53ec0298..059a07d3 100644
---
a/opennlp-core/opennlp-cli/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
+++
b/opennlp-core/opennlp-cli/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
@@ -41,10 +41,10 @@ public abstract class AbstractModelLoaderTest {
protected static final String VER = "1.3-2.5.4";
protected static final String BIN = ".bin";
protected static List<String> SUPPORTED_LANG_CODES = List.of(
- "en", "fr", "de", "it", "nl", "bg", "ca", "cs", "da", "el",
- "es", "et", "eu", "fi", "hr", "hy", "is", "ka", "kk", "ko",
- "lv", "no", "pl", "pt", "ro", "ru", "sk", "sl", "sr", "sv",
- "tr", "uk");
+ "af", "en", "fr", "de", "it", "nl", "bg", "ca", "cs", "da", "el",
+ "es", "et", "eu", "fa", "fi", "ga", "hr", "hy", "id", "is", "ka",
+ "kk", "ko", "lv", "no", "pl", "pt", "ro", "ru", "sk", "sl", "sr",
+ "sv", "tr", "uk");
protected static void downloadVersion15Model(String modelName) throws
IOException {
downloadModel(new URL(BASE_URL_MODELS_V15 + modelName));
diff --git
a/opennlp-core/opennlp-runtime/src/main/java/opennlp/tools/util/DownloadUtil.java
b/opennlp-core/opennlp-runtime/src/main/java/opennlp/tools/util/DownloadUtil.java
index 4fb4e783..03f6f064 100644
---
a/opennlp-core/opennlp-runtime/src/main/java/opennlp/tools/util/DownloadUtil.java
+++
b/opennlp-core/opennlp-runtime/src/main/java/opennlp/tools/util/DownloadUtil.java
@@ -273,6 +273,8 @@ public class DownloadUtil {
addModel("nl", link, result);
} else if (link.contains("fr-ud")) { // French
addModel("fr", link, result);
+ } else if (link.contains("af-ud")) { // Afrikaans
+ addModel("af", link, result);
} else if (link.contains("bg-ud")) { // Bulgarian
addModel("bg", link, result);
} else if (link.contains("ca-ud")) { // Catalan
@@ -291,10 +293,16 @@ public class DownloadUtil {
addModel("et", link, result);
} else if (link.contains("eu-ud")) { // Basque
addModel("eu", link, result);
+ } else if (link.contains("fa-ud")) { // Persian
+ addModel("fa", link, result);
} else if (link.contains("fi-ud")) { // Finnish
addModel("fi", link, result);
+ } else if (link.contains("ga-ud")) { // Irish
+ addModel("ga", link, result);
} else if (link.contains("hy-ud")) { // Armenian
addModel("hy", link, result);
+ } else if (link.contains("id-ud")) { // Indonesian
+ addModel("id", link, result);
} else if (link.contains("is-ud")) { // Icelandic
addModel("is", link, result);
} else if (link.contains("ka-ud")) { // Georgian
diff --git
a/opennlp-core/opennlp-runtime/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
b/opennlp-core/opennlp-runtime/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
index b8c57656..059a07d3 100644
---
a/opennlp-core/opennlp-runtime/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
+++
b/opennlp-core/opennlp-runtime/src/test/java/opennlp/tools/AbstractModelLoaderTest.java
@@ -38,13 +38,13 @@ public abstract class AbstractModelLoaderTest {
private static final String BASE_URL_MODELS_V183 =
System.getProperty("opennlp.model.v183.base.url",
"https://dlcdn.apache.org/opennlp/models/langdetect/1.8.3/";);
protected static final Path OPENNLP_DIR =
Paths.get(System.getProperty("OPENNLP_DOWNLOAD_HOME",
System.getProperty("user.home"))).resolve(".opennlp");
- protected static final String VER = "1.2-2.5.0";
+ protected static final String VER = "1.3-2.5.4";
protected static final String BIN = ".bin";
protected static List<String> SUPPORTED_LANG_CODES = List.of(
- "en", "fr", "de", "it", "nl", "bg", "ca", "cs", "da", "el",
- "es", "et", "eu", "fi", "hr", "hy", "is", "ka", "kk", "ko",
- "lv", "no", "pl", "pt", "ro", "ru", "sk", "sl", "sr", "sv",
- "tr", "uk");
+ "af", "en", "fr", "de", "it", "nl", "bg", "ca", "cs", "da", "el",
+ "es", "et", "eu", "fa", "fi", "ga", "hr", "hy", "id", "is", "ka",
+ "kk", "ko", "lv", "no", "pl", "pt", "ro", "ru", "sk", "sl", "sr",
+ "sv", "tr", "uk");
protected static void downloadVersion15Model(String modelName) throws
IOException {
downloadModel(new URL(BASE_URL_MODELS_V15 + modelName));
diff --git
a/opennlp-tools/src/test/java/opennlp/tools/util/DownloadParserTest.java
b/opennlp-tools/src/test/java/opennlp/tools/util/DownloadParserTest.java
index bc74ca6e..b2d360bd 100644
--- a/opennlp-tools/src/test/java/opennlp/tools/util/DownloadParserTest.java
+++ b/opennlp-tools/src/test/java/opennlp/tools/util/DownloadParserTest.java
@@ -47,7 +47,7 @@ public class DownloadParserTest {
Map<String, Map<ModelType, String>> result =
downloadParser.getAvailableModels();
assertNotNull(result);
- assertEquals(32, result.size());
+ assertEquals(36, result.size());
final Map<ModelType, String> availableModels = result.get(language);
assertNotNull(availableModels);
