Merge pull request #4432 from inception-project/feature/2696-Document…

…-level-recommendations #2696 - Document-level recommendations
inception-project · Jan 8, 2024 · cd7b6ab · cd7b6ab
2 parents 5676615 + 7ab7476
commit cd7b6ab
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/inception/inception-layer-docmetadata/pom.xml b/inception/inception-layer-docmetadata/pom.xml
@@ -73,6 +73,10 @@
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-recommendation-api</artifactId>
     </dependency>
+    <dependency>
+      <groupId>de.tudarmstadt.ukp.inception.app</groupId>
+      <artifactId>inception-recommendation</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.apache.uima</groupId>

diff --git a/...t/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java b/...t/ukp/inception/ui/core/docanno/config/DocumentMetadataLayerSupportAutoConfiguration.java
@@ -17,6 +17,8 @@
  */
 package de.tudarmstadt.ukp.inception.ui.core.docanno.config;
 
+import org.springframework.boot.autoconfigure.AutoConfigureAfter;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.ApplicationEventPublisher;
@@ -26,6 +28,7 @@
 import de.tudarmstadt.ukp.inception.documents.api.DocumentService;
 import de.tudarmstadt.ukp.inception.recommendation.api.LearningRecordService;
 import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService;
+import de.tudarmstadt.ukp.inception.recommendation.config.RecommenderServiceAutoConfiguration;
 import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService;
 import de.tudarmstadt.ukp.inception.schema.api.feature.FeatureSupportRegistry;
 import de.tudarmstadt.ukp.inception.schema.api.layer.LayerSupportRegistry;
@@ -40,6 +43,7 @@
  * Provides support for document-level annotations.
  */
 @Configuration
+@AutoConfigureAfter(RecommenderServiceAutoConfiguration.class)
 @EnableConfigurationProperties(DocumentMetadataLayerSupportPropertiesImpl.class)
 public class DocumentMetadataLayerSupportAutoConfiguration
 {
@@ -85,6 +89,7 @@ public DocumentMetadataAnnotationActionUndoSupport documentMetadataAnnotationAct
 
     @Bean
     @ConditionalOnProperty(prefix = "documentmetadata", name = "enabled", havingValue = "true", matchIfMissing = true)
+    @ConditionalOnBean(RecommendationService.class)
     public MetadataSuggestionSupport metadataSuggestionSupport(
             RecommendationService aRecommendationService,
             LearningRecordService aLearningRecordService,

diff --git a/inception/inception-recommendation/pom.xml b/inception/inception-recommendation/pom.xml
@@ -129,10 +129,6 @@
       <groupId>de.tudarmstadt.ukp.inception.app</groupId>
       <artifactId>inception-support-bootstrap</artifactId>
     </dependency>
-    <dependency>
-      <groupId>de.tudarmstadt.ukp.inception.app</groupId>
-      <artifactId>inception-layer-docmetadata</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>org.dkpro.core</groupId>

diff --git a/...main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java b/...main/java/de/tudarmstadt/ukp/inception/recommendation/project/RecommenderEditorPanel.java
@@ -60,8 +60,7 @@
 import de.tudarmstadt.ukp.clarin.webanno.security.UserDao;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Sentence;
 import de.tudarmstadt.ukp.dkpro.core.api.segmentation.type.Token;
-import de.tudarmstadt.ukp.inception.annotation.layer.relation.RelationLayerSupport;
-import de.tudarmstadt.ukp.inception.annotation.layer.span.SpanLayerSupport;
+import de.tudarmstadt.ukp.inception.annotation.layer.chain.ChainLayerSupport;
 import de.tudarmstadt.ukp.inception.recommendation.api.RecommendationService;
 import de.tudarmstadt.ukp.inception.recommendation.api.RecommenderFactoryRegistry;
 import de.tudarmstadt.ukp.inception.recommendation.api.model.Recommender;
@@ -73,7 +72,6 @@
 import de.tudarmstadt.ukp.inception.support.lambda.LambdaModelAdapter;
 import de.tudarmstadt.ukp.inception.support.spring.ApplicationEventPublisherHolder;
 import de.tudarmstadt.ukp.inception.support.wicket.ModelChangedVisitor;
-import de.tudarmstadt.ukp.inception.ui.core.docanno.layer.DocumentMetadataLayerSupport;
 
 public class RecommenderEditorPanel
     extends Panel
@@ -408,11 +406,9 @@ protected void onModelChanged()
     private List<AnnotationLayer> listLayers()
     {
         return annotationSchemaService.listAnnotationLayer(projectModel.getObject()).stream() //
-                .filter(layer -> (SpanLayerSupport.TYPE.equals(layer.getType())
-                        || RelationLayerSupport.TYPE.equals(layer.getType()) //
-                        || DocumentMetadataLayerSupport.TYPE.equals(layer.getType())) //
-                        && !(Token._TypeName.equals(layer.getName())
-                                || Sentence._TypeName.equals(layer.getName())))
+                .filter(layer -> !ChainLayerSupport.TYPE.equals(layer.getType()) && //
+                        !Token._TypeName.equals(layer.getName()) && //
+                        !Sentence._TypeName.equals(layer.getName()))
                 .toList();
     }