Merge pull request #4420 from inception-project/feature/4399-Allow-Op…

…enNLP-Multi-Token-Sequence-Classifier-to-work-for-cross-sentence-layers #4399 - Allow OpenNLP Multi-Token Sequence Classifier to work for cross-sentence layers
inception-project · Jan 2, 2024 · 1ef2fee · 1ef2fee
2 parents 1379f3a + e2e1522
commit 1ef2fee
Show file tree

Hide file tree

Showing 24 changed files with 600 additions and 202 deletions.
diff --git a/...armstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java b/...armstadt/ukp/inception/annotation/feature/multistring/MultiValueStringFeatureSupport.java
@@ -242,7 +242,7 @@ public List<VLazyDetailGroup> lookupLazyDetails(AnnotationFeature aFeature, Obje
                     var value = (String) v;
                     var tag = schemaService.getTag(value, aFeature.getTagset());
 
-                    if (aFeature.getTagset() != null && !tag.isEmpty()) {
+                    if (isNotBlank(value) && aFeature.getTagset() != null && tag.isEmpty()) {
                         results.addDetail(new VLazyDetail(value, "Tag not in tagset"));
                     }
 

diff --git a/...ain/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java b/...ain/java/de/tudarmstadt/ukp/inception/annotation/feature/string/StringFeatureSupport.java
@@ -236,7 +236,7 @@ public List<VLazyDetailGroup> lookupLazyDetails(AnnotationFeature aFeature, Obje
         if (aValue instanceof String) {
             var value = (String) aValue;
             var tag = schemaService.getTag(value, aFeature.getTagset());
-            if (aFeature.getTagset() != null && !tag.isEmpty()) {
+            if (isNotBlank(value) && aFeature.getTagset() != null && tag.isEmpty()) {
                 return asList(new VLazyDetailGroup(new VLazyDetail(value, "Tag not in tagset")));
             }
 

diff --git a/...king/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java b/...king/src/test/java/de/tudarmstadt/ukp/inception/conceptlinking/NamedEntityLinkerTest.java
@@ -145,7 +145,7 @@ public void thatPredictionWorks() throws Exception
         casStorageSession.add("cas", EXCLUSIVE_WRITE_ACCESS, cas);
 
         sut.train(context, Collections.singletonList(cas));
-        RecommenderTestHelper.addScoreFeature(cas, NamedEntity.class, "value");
+        RecommenderTestHelper.addPredictionFeatures(cas, NamedEntity.class, "value");
 
         sut.predict(new PredictionContext(context), cas);
 

diff --git a/...mstadt/ukp/inception/recommendation/imls/datamajority/DataMajorityNerRecommenderTest.java b/...mstadt/ukp/inception/recommendation/imls/datamajority/DataMajorityNerRecommenderTest.java
@@ -18,7 +18,7 @@
 package de.tudarmstadt.ukp.inception.recommendation.imls.datamajority;
 
 import static de.tudarmstadt.ukp.clarin.webanno.api.casstorage.CasAccessMode.EXCLUSIVE_WRITE_ACCESS;
-import static de.tudarmstadt.ukp.inception.support.test.recommendation.RecommenderTestHelper.addScoreFeature;
+import static de.tudarmstadt.ukp.inception.support.test.recommendation.RecommenderTestHelper.addPredictionFeatures;
 import static de.tudarmstadt.ukp.inception.support.test.recommendation.RecommenderTestHelper.getPredictions;
 import static java.util.Arrays.asList;
 import static org.apache.uima.fit.factory.CollectionReaderFactory.createReader;
@@ -100,7 +100,7 @@ public void thatPredictionWorks() throws Exception
         CAS cas = casList.get(0);
         try (CasStorageSession session = CasStorageSession.open()) {
             session.add("testCas", EXCLUSIVE_WRITE_ACCESS, cas);
-            addScoreFeature(cas, NamedEntity.class.getName(), "value");
+            addPredictionFeatures(cas, NamedEntity.class.getName(), "value");
         }
 
         sut.train(context, asList(cas));

diff --git a/...adt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderIntegrationTest.java b/...adt/ukp/inception/recommendation/imls/external/v1/ExternalRecommenderIntegrationTest.java
@@ -133,7 +133,7 @@ public void thatPredictingWorks() throws Exception
         sut.train(context, casses);
 
         var cas = casses.get(0);
-        RecommenderTestHelper.addScoreFeature(cas, NamedEntity.class, "value");
+        RecommenderTestHelper.addPredictionFeatures(cas, NamedEntity.class, "value");
         sut.predict(new PredictionContext(context), cas);
 
         var predictions = getPredictions(cas, NamedEntity.class);
@@ -180,7 +180,7 @@ public void thatPredictingSendsCorrectRequest() throws Exception
         sut.train(context, casses);
 
         var cas = casses.get(0);
-        RecommenderTestHelper.addScoreFeature(cas, NamedEntity.class, "value");
+        RecommenderTestHelper.addPredictionFeatures(cas, NamedEntity.class, "value");
         sut.predict(new PredictionContext(context), cas);
 
         var request = fromJsonString(PredictionRequest.class, requestBodies.get(1));

diff --git a/...darmstadt/ukp/inception/recommendation/imls/lapps/LappsGridRecommenderConformityTest.java b/...darmstadt/ukp/inception/recommendation/imls/lapps/LappsGridRecommenderConformityTest.java
@@ -134,7 +134,7 @@ private CAS loadData() throws IOException, UIMAException
         CAS cas = loadData(path.toFile());
         casStorageSession.add("test", EXCLUSIVE_WRITE_ACCESS, cas);
 
-        RecommenderTestHelper.addScoreFeature(cas, NamedEntity.class, "value");
+        RecommenderTestHelper.addPredictionFeatures(cas, NamedEntity.class, "value");
 
         return cas;
     }

diff --git a/...n/java/de/tudarmstadt/ukp/inception/recommendation/imls/opennlp/ner/NameSampleStream.java b/...n/java/de/tudarmstadt/ukp/inception/recommendation/imls/opennlp/ner/NameSampleStream.java
@@ -23,7 +23,7 @@
 import opennlp.tools.namefind.NameSample;
 import opennlp.tools.util.ObjectStream;
 
-public class NameSampleStream
+class NameSampleStream
     implements ObjectStream<NameSample>, AutoCloseable
 {
     private List<NameSample> samples;
@@ -41,6 +41,7 @@ public NameSample read()
         if (iterator != null && iterator.hasNext()) {
             return iterator.next();
         }
+
         return null;
     }
 
@@ -56,5 +57,4 @@ public void close()
         samples = null;
         iterator = null;
     }
-
 }