Skip to content

Commit

Permalink
Merge branch 'main' into refactoring/Upgrade-to-Spring-Boot-3
Browse files Browse the repository at this point in the history
* main: (189 commits)
  No issue. Minor additions to BioC format description
  #4062 - ViewportTracker should focus on block-like elements
  #4032 - Allow using externalized strings from backend code
  #4060 - Clean up redundant code in annotation handlers
  #4026: Support for error tracking with Sentry
  #3673 - Update dependencies
  update dead link to the new file
  #4055 - Editor scrolls up when left sidebar is opened/closed
  [maven-release-plugin] prepare for next development iteration
  [maven-release-plugin] prepare release inception-28.2
  #4052 - Admins no longer see all projects in the project overview
  #3673 - Update dependencies
  #4048 - Document navigation options not visible to manager when viewing other users document
  #3673 - Update dependencies
  #3673 - Update dependencies
  #1496 - Some spans are missing begin offset field
  #1511 - External recommender fails when CAS contains control characters
  #1496 - Some spans are missing begin offset field
  #4040 - Ability to store preferences from client-side code
  #1066 - Recommender status info
  ...

% Conflicts:
%	inception/inception-api-annotation/src/main/java/de/tudarmstadt/ukp/clarin/webanno/api/annotation/page/AnnotationPageBase.java
%	inception/inception-brat-editor/src/main/java/de/tudarmstadt/ukp/clarin/webanno/brat/annotation/BratAnnotationEditor.java
%	inception/inception-diam/src/main/java/de/tudarmstadt/ukp/inception/diam/service/DiamWebsocketController.java
%	inception/inception-documents/src/test/java/de/tudarmstadt/ukp/inception/documents/DocumentServiceImplConcurrencyTest.java
%	inception/inception-external-search-solr/pom.xml
%	inception/inception-html-editor/src/main/java/de/tudarmstadt/ukp/inception/htmleditor/docview/HtmlDocumentViewControllerImpl.java
%	inception/inception-html-editor/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports
%	inception/inception-preferences/src/main/java/de/tudarmstadt/ukp/inception/preferences/config/PreferencesServiceAutoConfig.java
%	inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/LearningRecordServiceImpl.java
%	inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/service/RecommendationServiceImpl.java
%	inception/inception-recommendation/src/main/java/de/tudarmstadt/ukp/inception/recommendation/tasks/TrainingTask.java
%	inception/inception-recommendation/src/test/java/de/tudarmstadt/ukp/inception/recommendation/footer/RecommendationEventWebsocketControllerImplTest.java
%	inception/inception-support/pom.xml
%	inception/inception-ui-core/pom.xml
%	inception/inception-websocket/pom.xml
%	inception/pom.xml
  • Loading branch information
reckart committed Jun 13, 2023
2 parents d6ba149 + 11882d8 commit 14d38be
Show file tree
Hide file tree
Showing 659 changed files with 22,141 additions and 9,090 deletions.
12 changes: 10 additions & 2 deletions inception/inception-active-learning/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<parent>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-app</artifactId>
<version>27.0-SNAPSHOT</version>
<version>29.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
<artifactId>inception-active-learning</artifactId>
Expand Down Expand Up @@ -58,7 +58,7 @@
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-support</artifactId>
</dependency>

<dependency>
<groupId>de.tudarmstadt.ukp.inception.app</groupId>
<artifactId>inception-recommendation</artifactId>
Expand Down Expand Up @@ -116,6 +116,10 @@
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-spring</artifactId>
</dependency>
<dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-extensions</artifactId>
</dependency>
<dependency>
<groupId>org.wicketstuff</groupId>
<artifactId>wicketstuff-annotationeventdispatcher</artifactId>
Expand All @@ -128,6 +132,10 @@
<groupId>de.agilecoders.wicket</groupId>
<artifactId>wicket-bootstrap-extensions</artifactId>
</dependency>
<dependency>
<groupId>org.danekja</groupId>
<artifactId>jdk-serializable-functional</artifactId>
</dependency>

<!-- LOGGING DEPENDENCIES - SLF4J -->
<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import java.util.Optional;

import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationLayer;
import de.tudarmstadt.ukp.clarin.webanno.model.SourceDocument;
import de.tudarmstadt.ukp.clarin.webanno.security.model.User;
import de.tudarmstadt.ukp.inception.active.learning.ActiveLearningServiceImpl.ActiveLearningUserState;
import de.tudarmstadt.ukp.inception.recommendation.api.model.LearningRecord;
Expand All @@ -34,14 +35,14 @@
public interface ActiveLearningService
{
/**
* @param aUser
* @param aDataOwner
* annotator user to get suggestions for
* @param aLayer
* layer to get suggestions for
* @return all suggestions for the given layer and user as a flat list (i.e. not grouped by
* documents, but grouped by alternatives).
*/
List<SuggestionGroup<SpanSuggestion>> getSuggestions(User aUser, AnnotationLayer aLayer);
List<SuggestionGroup<SpanSuggestion>> getSuggestions(User aDataOwner, AnnotationLayer aLayer);

/**
* @param aRecord
Expand All @@ -56,28 +57,27 @@ public interface ActiveLearningService
* @return if the are any records of type {@link LearningRecordType#SKIPPED} in the history of
* the given layer for the given user.
*
* @param aUser
* @param aDataOwner
* annotator user to check suggestions for
* @param aLayer
* layer to check suggestions for
*/
boolean hasSkippedSuggestions(User aUser, AnnotationLayer aLayer);
boolean hasSkippedSuggestions(String aSessionOwner, User aDataOwner, AnnotationLayer aLayer);

void hideRejectedOrSkippedAnnotations(User aUser, AnnotationLayer aLayer,
void hideRejectedOrSkippedAnnotations(String aSessionOwner, User aDataOwner, AnnotationLayer aLayer,
boolean aFilterSkippedRecommendation,
List<SuggestionGroup<SpanSuggestion>> aSuggestionGroups);

Optional<Delta<SpanSuggestion>> generateNextSuggestion(User aUser,
Optional<Delta<SpanSuggestion>> generateNextSuggestion(String aSessionOwner, User aDataOwner,
ActiveLearningUserState aAlState);

void writeLearningRecordInDatabaseAndEventLog(User aUser, AnnotationLayer aLayer,
SpanSuggestion aSuggestion, LearningRecordType aUserAction, String aAnnotationValue);

void acceptSpanSuggestion(User aUser, AnnotationLayer aLayer, SpanSuggestion aSuggestion,
void acceptSpanSuggestion(SourceDocument aDocument, User aDataOwner, SpanSuggestion aSuggestion,
Object aValue)
throws IOException, AnnotationException;

void rejectSpanSuggestion(User aUser, AnnotationLayer aLayer, SpanSuggestion aSuggestion);
void rejectSpanSuggestion(String aSessionOwner, User aDataOwner, AnnotationLayer aLayer,
SpanSuggestion aSuggestion);

void skipSpanSuggestion(User aUser, AnnotationLayer aLayer, SpanSuggestion aSuggestion);
void skipSpanSuggestion(String aSessionOwner, User aDataOwner, AnnotationLayer aLayer,
SpanSuggestion aSuggestion);
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ public class ActiveLearningRecommendationEvent

private final SourceDocument document;
private final SpanSuggestion currentRecommendation;
private final String user;
private final String dataOwner;
private final AnnotationLayer layer;
private final String annotationFeature;
private final LearningRecordType action;
private final List<? extends AnnotationSuggestion> allRecommendations;

public ActiveLearningRecommendationEvent(Object aSource, SourceDocument aDocument,
SpanSuggestion aCurrentRecommendation, String aUser, AnnotationLayer aLayer,
SpanSuggestion aCurrentRecommendation, String aDataOwner, AnnotationLayer aLayer,
String aAnnotationFeature, LearningRecordType aAction,
List<? extends AnnotationSuggestion> aAllRecommendations)
{
super(aSource);
document = aDocument;
currentRecommendation = aCurrentRecommendation;
user = aUser;
dataOwner = aDataOwner;
layer = aLayer;
annotationFeature = aAnnotationFeature;
action = aAction;
Expand All @@ -67,7 +67,7 @@ public SpanSuggestion getCurrentRecommendation()

public String getUser()
{
return user;
return dataOwner;
}

public AnnotationLayer getLayer()
Expand Down
Loading

0 comments on commit 14d38be

Please sign in to comment.