Merge pull request #1564 from inception-project/feature/1563-Allow-co…

…nfiguring-concept-feature-for-properties #1563 - Allow configuring concept feature for properties
inception-project · Dec 16, 2019 · fcaeada · fcaeada
2 parents e339912 + a0375f9
commit fcaeada
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 8 deletions.
diff --git a/...n/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImpl.java b/...n/java/de/tudarmstadt/ukp/inception/conceptlinking/service/ConceptLinkingServiceImpl.java
@@ -139,6 +139,8 @@ private SPARQLQueryPrimaryConditions newQueryBuilder(ConceptFeatureValueType aVa
             return SPARQLQueryBuilder.forClasses(aKB);
         case INSTANCE:
             return SPARQLQueryBuilder.forInstances(aKB);
+        case PROPERTY:
+            return SPARQLQueryBuilder.forProperties(aKB);
         default:
             throw new IllegalArgumentException("Unknown item type: [" + aValueType + "]");
         }

diff --git a/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/ConceptFeatureValueType.java b/inception-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/ConceptFeatureValueType.java
@@ -19,9 +19,10 @@
 
 public enum ConceptFeatureValueType
 {
-    ANY_OBJECT("<Any Concept/Instance>"), 
-    CONCEPT("Only Concepts"), 
-    INSTANCE("Only Instances");
+    ANY_OBJECT("<any concept/instance>"), 
+    CONCEPT("concepts only"), 
+    INSTANCE("instances only"),
+    PROPERTY("properties only");
 
     private final String uiLabel;
 

diff --git a/...ion-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilder.java b/...ion-kb/src/main/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilder.java
@@ -499,6 +499,12 @@ private SPARQLQueryBuilder(KnowledgeBase aKB, Mode aMode)
     {
         kb = aKB;
         mode = aMode;
+
+        // The Wikidata search service we are using does not return properties, so we have to do 
+        // this the old-fashioned way...
+        if (Mode.PROPERTY.equals(mode) && FTS_WIKIDATA.equals(aKB.getFullTextSearchIri())) {
+            forceDisableFTS = true;
+        }
     }
 
     private void addPattern(Priority aPriority, GraphPattern aPattern)
@@ -675,6 +681,8 @@ else if (FTS_WIKIDATA.equals(ftsMode)) {
             addPattern(PRIMARY, withLabelMatchingExactlyAnyOf_Wikidata_FTS(aValues));
         }
         else if (FTS_NONE.equals(ftsMode) || ftsMode == null) {
+            // For exact matching, we do not make use of regexes, so we keep this as a primary
+            // condition - unlike in withLabelContainingAnyOf or withLabelStartingWith
             addPattern(PRIMARY, withLabelMatchingExactlyAnyOf_No_FTS(aValues));
         }
         else {
@@ -831,7 +839,10 @@ else if (FTS_WIKIDATA.equals(ftsMode)) {
             addPattern(PRIMARY, withLabelContainingAnyOf_Wikidata_FTS(aValues));
         }
         else if (FTS_NONE.equals(ftsMode) || ftsMode == null) {
-            addPattern(PRIMARY, withLabelContainingAnyOf_No_FTS(aValues));
+            // Label matching without FTS is slow, so we add this with low prio and hope that some
+            // other higher-prio condition exists which limites the number of candidates to a
+            // manageable level
+            addPattern(SECONDARY, withLabelContainingAnyOf_No_FTS(aValues));
         }
         else {
             throw new IllegalStateException(
@@ -968,7 +979,6 @@ public SPARQLQueryBuilder withLabelStartingWith(String aPrefixQuery)
             return this;
         }
 
-
         IRI ftsMode = forceDisableFTS ? FTS_NONE : kb.getFullTextSearchIri();
 
         if (FTS_LUCENE.equals(ftsMode)) {
@@ -984,7 +994,10 @@ else if (FTS_WIKIDATA.equals(ftsMode)) {
             addPattern(PRIMARY, withLabelStartingWith_Wikidata_FTS(aPrefixQuery));
         }
         else if (FTS_NONE.equals(ftsMode) || ftsMode == null) {
-            addPattern(PRIMARY, withLabelStartingWith_No_FTS(aPrefixQuery));
+            // Label matching without FTS is slow, so we add this with low prio and hope that some
+            // other higher-prio condition exists which limites the number of candidates to a
+            // manageable level
+            addPattern(SECONDARY, withLabelStartingWith_No_FTS(aPrefixQuery));
         }
         else {
             throw new IllegalStateException(
@@ -1498,7 +1511,7 @@ public SelectQuery selectQuery()
                 GraphPatterns.and(concat(primaryPatterns.stream(), primaryRestrictions.stream())
                         .toArray(GraphPattern[]::new)).getQueryString()));
 
-        // Then add the optional elements
+        // Then add the optional or lower-prio elements 
         secondaryPatterns.stream().forEach(query::where);
 
         if (serverSideReduce) {

diff --git a/...kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java b/...kb/src/test/java/de/tudarmstadt/ukp/inception/kb/querybuilder/SPARQLQueryBuilderTest.java
@@ -456,7 +456,42 @@ public void thatPropertyQueryLimitedToDescendantsDoesNotReturnOutOfScopeResults(
                 .containsExactlyInAnyOrder("http://example.org/#subproperty-1-1",
                         "http://example.org/#subproperty-1-1-1");
     }
+
+    @Test
+    public void thatPropertyQueryListWorks_Wikidata()
+    {
+        assertIsReachable(wikidata);
+
+        kb.setType(REMOTE);
+        kb.setFullTextSearchIri(FTS_WIKIDATA);
+        initWikidataMapping();
+
+        List<KBHandle> results = asHandles(wikidata, SPARQLQueryBuilder
+                .forProperties(kb)
+                .limit(10));
+
+        assertThat(results).extracting(KBHandle::getIdentifier).doesNotHaveDuplicates();
+        assertThat(results).hasSize(10);
+    }
 
+    @Test
+    public void thatPropertyQueryLabelStartingWith_Wikidata()
+    {
+        assertIsReachable(wikidata);
+
+        kb.setType(REMOTE);
+        kb.setFullTextSearchIri(FTS_WIKIDATA);
+        initWikidataMapping();
+
+        List<KBHandle> results = asHandles(wikidata, SPARQLQueryBuilder
+                .forProperties(kb)
+                .withLabelStartingWith("educated"));
+
+        assertThat(results).extracting(KBHandle::getIdentifier).doesNotHaveDuplicates();
+        assertThat(results).isNotEmpty();
+        assertThat(results).extracting(KBHandle::getUiLabel)
+                .allMatch(label -> label.toLowerCase().startsWith("educated"));
+    }
     @Test
     public void thatPropertyQueryLimitedToChildrenDoesNotReturnOutOfScopeResults()
         throws Exception

diff --git a/...ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java b/...ui-kb/src/main/java/de/tudarmstadt/ukp/inception/ui/kb/feature/ConceptFeatureSupport.java
@@ -122,7 +122,8 @@ public List<FeatureType> getSupportedFeatureTypes(AnnotationLayer aAnnotationLay
     {
         // We just start with no specific scope at all (ANY) and let the user refine this via
         // the traits editor
-        return asList(new FeatureType(TYPE_ANY_OBJECT, "KB: Concept/Instance", featureSupportId));
+        return asList(new FeatureType(TYPE_ANY_OBJECT, "KB: Concept/Instance/Property",
+                featureSupportId));
     }
 
     @Override