Skip to content

Commit

Permalink
Merge pull request #4459 from inception-project/bugfix/4458-Fully-agr…
Browse files Browse the repository at this point in the history 
…eeing-annotations-shown-as-disagreement-in-overview-sidebar

#4458 - Fully agreeing annotations shown as disagreement in overview sidebar
  • Loading branch information
@reckart
reckart authored Jan 26, 2024
2 parents c426677 + db7e744 commit 6c55e1c
Show file tree
Hide file tree
Showing 5 changed files with 70 additions and 73 deletions.
12 changes: 8 additions & 4 deletions ...tion-legacy/src/main/java/de/tudarmstadt/ukp/clarin/webanno/curation/casdiff/CasDiff.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1015,6 +1015,11 @@ public boolean hasDifferences()
return cachedHasDifferences;
}

public boolean hasDifferencesWithExceptions(String... aCasGroupIDsToIgnore)
{
return !getDifferingConfigurationSetsWithExceptions(aCasGroupIDsToIgnore).isEmpty();
}

public Collection<Position> getPositions()
{
return data.keySet();
Expand Down Expand Up @@ -1156,13 +1161,12 @@ public boolean isCompleteWithExceptions(ConfigurationSet aConfigurationSet,
}

// Short-cut: the common use-case is to ignore a single exception, usually the curator
if (aCasGroupIDsToIgnore.length == 1) {
return unseenGroupCasIDs.size() == 1
&& unseenGroupCasIDs.contains(aCasGroupIDsToIgnore[0]);
if (aCasGroupIDsToIgnore.length == 1 && unseenGroupCasIDs.size() == 1) {
return unseenGroupCasIDs.contains(aCasGroupIDsToIgnore[0]);
}

// The set is complete if the unseen CAS group IDs match exactly the exceptions.
return unseenGroupCasIDs.containsAll(asList(aCasGroupIDsToIgnore));
return subtract(unseenGroupCasIDs, asList(aCasGroupIDsToIgnore)).isEmpty();
}

public Map<Position, ConfigurationSet> getDifferingConfigurationSets()
Expand Down
5 changes: 3 additions & 2 deletions .../main/java/de/tudarmstadt/ukp/inception/curation/merge/strategy/DefaultMergeStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package de.tudarmstadt.ukp.inception.curation.merge.strategy;

import static de.tudarmstadt.ukp.inception.support.WebAnnoConst.CURATION_USER;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE;
Expand Down Expand Up @@ -51,12 +52,12 @@ public List<Configuration> chooseConfigurationsToMerge(DiffResult aDiff, Configu
return emptyList();
}

if (!aDiff.isComplete(aCfgs)) {
if (!aDiff.isCompleteWithExceptions(aCfgs, CURATION_USER)) {
LOG.trace(" `-> Not merging incomplete annotation");
return emptyList();
}

if (!aDiff.isAgreement(aCfgs)) {
if (!aDiff.isAgreementWithExceptions(aCfgs, CURATION_USER)) {
LOG.trace(" `-> Not merging annotation with disagreement");
return emptyList();
}
Expand Down
3 changes: 2 additions & 1 deletion ...in/java/de/tudarmstadt/ukp/inception/curation/merge/strategy/MergeIncompleteStrategy.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
*/
package de.tudarmstadt.ukp.inception.curation.merge.strategy;

import static de.tudarmstadt.ukp.inception.support.WebAnnoConst.CURATION_USER;
import static java.util.Arrays.asList;
import static java.util.Collections.emptyList;
import static org.apache.commons.lang3.builder.ToStringStyle.SHORT_PREFIX_STYLE;
Expand Down Expand Up @@ -53,7 +54,7 @@ public List<Configuration> chooseConfigurationsToMerge(DiffResult aDiff, Configu
return emptyList();
}

if (!aDiff.isAgreement(aCfgs)) {
if (!aDiff.isAgreementWithExceptions(aCfgs, CURATION_USER)) {
LOG.trace(" `-> Not merging annotation with disagreement");
return emptyList();
}
Expand Down
2 changes: 1 addition & 1 deletion ...ration/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@
<button class="btn btn-secondary btn-action dropdown-toggle flex-content border-start" type="button" data-bs-toggle="dropdown"></button>
<ul class="dropdown-menu shadow-lg" role="menu" style="min-width: 20em;">
<li class="dropdown-item-text agree">
<span class="badge badge-pill">&nbsp;</span>
<span class="badge badge-pill border border-secondary">&nbsp;</span>
Agreement
<div class="small text-muted ms-4">
There is no disagreement between annotators. There is nothing to
Expand Down
121 changes: 56 additions & 65 deletions ...ration/src/main/java/de/tudarmstadt/ukp/clarin/webanno/ui/curation/page/CurationPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Set;

import org.apache.uima.UIMAException;
import org.apache.uima.cas.CAS;
Expand Down Expand Up @@ -81,9 +80,7 @@
import de.tudarmstadt.ukp.clarin.webanno.brat.annotation.BratLineOrientedAnnotationEditorFactory;
import de.tudarmstadt.ukp.clarin.webanno.brat.annotation.BratSentenceOrientedAnnotationEditorFactory;
import de.tudarmstadt.ukp.clarin.webanno.constraints.ConstraintsService;
import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.ConfigurationSet;
import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.CasDiff.DiffResult;
import de.tudarmstadt.ukp.clarin.webanno.curation.casdiff.api.DiffAdapter;
import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocument;
import de.tudarmstadt.ukp.clarin.webanno.model.AnnotationDocumentState;
import de.tudarmstadt.ukp.clarin.webanno.model.Mode;
Expand Down Expand Up @@ -113,7 +110,6 @@
import de.tudarmstadt.ukp.inception.editor.state.AnnotatorStateImpl;
import de.tudarmstadt.ukp.inception.project.api.ProjectService;
import de.tudarmstadt.ukp.inception.rendering.editorstate.AnnotatorState;
import de.tudarmstadt.ukp.inception.rendering.paging.Unit;
import de.tudarmstadt.ukp.inception.rendering.request.RenderRequestedEvent;
import de.tudarmstadt.ukp.inception.rendering.selection.SelectionChangedEvent;
import de.tudarmstadt.ukp.inception.schema.api.AnnotationSchemaService;
Expand Down Expand Up @@ -291,7 +287,7 @@ private void actionRefresh(AjaxRequestTarget aTarget)

private WebMarkupContainer createLeftSidebar(String aId)
{
WebMarkupContainer sidebar = new WebMarkupContainer("leftSidebar");
var sidebar = new WebMarkupContainer("leftSidebar");
sidebar.setOutputMarkupPlaceholderTag(true);
sidebar.add(visibleWhen(
() -> getModelObject() != null && getModelObject().getDocument() != null));
Expand All @@ -306,7 +302,7 @@ private WebMarkupContainer createLeftSidebar(String aId)

private WebMarkupContainer createRightSidebar(String aId)
{
WebMarkupContainer sidebar = new WebMarkupContainer(aId);
var sidebar = new WebMarkupContainer(aId);
sidebar.setOutputMarkupPlaceholderTag(true);
// Override sidebar width from preferences
sidebar.add(new AttributeModifier("style",
Expand All @@ -319,7 +315,7 @@ private WebMarkupContainer createRightSidebar(String aId)

private AnnotationDetailEditorPanel createDetailEditor(String aId)
{
AnnotationDetailEditorPanel panel = new AnnotationDetailEditorPanel(aId, this, getModel())
var panel = new AnnotationDetailEditorPanel(aId, this, getModel())
{
private static final long serialVersionUID = 2857345299480098279L;

Expand Down Expand Up @@ -360,8 +356,8 @@ public void onSelectionChangedEvent(SelectionChangedEvent aEvent)
public void onUnitClickedEvent(CurationUnitClickedEvent aEvent)
{
try {
AnnotatorState state = CurationPage.this.getModelObject();
CAS cas = curationDocumentService.readCurationCas(state.getDocument());
var state = getModelObject();
var cas = curationDocumentService.readCurationCas(state.getDocument());
state.getPagingStrategy().moveToOffset(state, cas, aEvent.getUnit().getBegin(),
CENTERED);
state.setFocusUnitIndex(aEvent.getUnit().getUnitIndex());
Expand All @@ -383,13 +379,11 @@ public IModel<List<DecoratedObject<Project>>> getAllowedProjects()
@Override
protected List<DecoratedObject<Project>> load()
{
User user = userRepository.getCurrentUser();
List<DecoratedObject<Project>> allowedProject = new ArrayList<>();
List<Project> projectsWithFinishedAnnos = projectService
.listProjectsWithFinishedAnnos();
for (Project project : projectService.listProjectsWithUserHavingRole(user,
CURATOR)) {
DecoratedObject<Project> dp = DecoratedObject.of(project);
var user = userRepository.getCurrentUser();
var allowedProject = new ArrayList<DecoratedObject<Project>>();
var projectsWithFinishedAnnos = projectService.listProjectsWithFinishedAnnos();
for (var project : projectService.listProjectsWithUserHavingRole(user, CURATOR)) {
var dp = DecoratedObject.of(project);
if (projectsWithFinishedAnnos.contains(project)) {
dp.setColor("green");
}
Expand Down Expand Up @@ -431,7 +425,7 @@ public AnnotatorState getModelObject()
@Override
public List<SourceDocument> getListOfDocs()
{
AnnotatorState state = getModelObject();
var state = getModelObject();
// Since the curatable documents depend on the document state, let's make sure the document
// state is up-to-date
workloadManagementService.getWorkloadManagerExtension(state.getProject())
Expand All @@ -447,18 +441,17 @@ public void renderHead(IHeaderResponse response)
{
super.renderHead(response);

String jQueryString = "";
if (firstLoad) {
jQueryString += "jQuery('#showOpenDocumentModal').trigger('click');";
response.render(OnLoadHeaderItem
.forScript("jQuery('#showOpenDocumentModal').trigger('click');"));
firstLoad = false;
}
response.render(OnLoadHeaderItem.forScript(jQueryString));
}

@Override
public CAS getEditorCas() throws IOException
{
AnnotatorState state = getModelObject();
var state = getModelObject();

if (state.getDocument() == null) {
throw new IllegalStateException("Please open a document first!");
Expand All @@ -480,7 +473,7 @@ public void writeEditorCas(CAS aCas) throws IOException, AnnotationException
{
ensureIsEditable();

AnnotatorState state = getModelObject();
var state = getModelObject();
curationDocumentService.writeCurationCas(aCas, state.getDocument(), true);

// Update timestamp in state
Expand Down Expand Up @@ -509,7 +502,7 @@ private void actionLoadDocument(AjaxRequestTarget aTarget, int aFocus)
LOG.trace("BEGIN LOAD_DOCUMENT_ACTION at focus " + aFocus);

try {
AnnotatorState state = getModelObject();
var state = getModelObject();
state.setUser(userRepository.getCurationUser());
state.reset();

Expand All @@ -531,7 +524,7 @@ private void actionLoadDocument(AjaxRequestTarget aTarget, int aFocus)
currentprojectId = state.getProject().getId();
}

CAS mergeCas = readOrCreateCurationCas(
var mergeCas = readOrCreateCurationCas(
curationService.getDefaultMergeStrategy(getProject()), false);

// Initialize timestamp in state
Expand Down Expand Up @@ -563,9 +556,9 @@ private void actionLoadDocument(AjaxRequestTarget aTarget, int aFocus)
public CAS readOrCreateCurationCas(MergeStrategy aMergeStrategy, boolean aForceRecreateCas)
throws IOException, UIMAException, ClassNotFoundException, AnnotationException
{
AnnotatorState state = getModelObject();
var state = getModelObject();

List<AnnotationDocument> curatableAnnotationDocuments = curationDocumentService
var curatableAnnotationDocuments = curationDocumentService
.listCuratableAnnotationDocuments(state.getDocument());

if (curatableAnnotationDocuments.isEmpty()) {
Expand All @@ -580,16 +573,15 @@ public CAS readOrCreateCurationCas(MergeStrategy aMergeStrategy, boolean aForceR
+ "administration dashboard and if none of the imported users have been "
+ "enabled via the users management page after the import (also something "
+ "that only administrators can do).");
PageParameters pageParameters = new PageParameters();
var pageParameters = new PageParameters();
setProjectPageParameter(pageParameters, getProject());
throw new RestartResponseException(CurationPage.class, pageParameters);
}

Map<String, CAS> casses = documentService
.readAllCasesSharedNoUpgrade(curatableAnnotationDocuments);
var casses = documentService.readAllCasesSharedNoUpgrade(curatableAnnotationDocuments);

AnnotationDocument randomAnnotationDocument = curatableAnnotationDocuments.get(0);
CAS curationCas = readCurationCas(state, state.getDocument(), casses,
var randomAnnotationDocument = curatableAnnotationDocuments.get(0);
var curationCas = readCurationCas(state, state.getDocument(), casses,
randomAnnotationDocument, true, aMergeStrategy, aForceRecreateCas);

return curationCas;
Expand All @@ -613,11 +605,9 @@ public void actionRefreshDocument(AjaxRequestTarget aTarget)
protected void handleParameters(StringValue aDocumentParameter, StringValue aFocusParameter,
StringValue aUser)
{
Project project = getProject();

SourceDocument document = getDocumentFromParameters(project, aDocumentParameter);

AnnotatorState state = getModelObject();
var project = getProject();
var document = getDocumentFromParameters(project, aDocumentParameter);
var state = getModelObject();

// If there is no change in the current document, then there is nothing to do. Mind
// that document IDs are globally unique and a change in project does not happen unless
Expand Down Expand Up @@ -704,32 +694,31 @@ private List<CurationUnit> buildUnitOverview(AnnotatorState aState)
throws UIMAException, ClassNotFoundException, IOException, AnnotationException
{
// get annotation documents
Map<String, CAS> casses = documentService.readAllCasesSharedNoUpgrade(
var casses = documentService.readAllCasesSharedNoUpgrade(
curationDocumentService.listCuratableAnnotationDocuments(aState.getDocument()));

CAS editorCas = readCurationCas(aState, aState.getDocument(), casses, null, false,
var editorCas = readCurationCas(aState, aState.getDocument(), casses, null, false,
curationService.getDefaultMergeStrategy(getProject()), false);

casses.put(CURATION_USER, editorCas);

List<DiffAdapter> adapters = getDiffAdapters(annotationService,
aState.getAnnotationLayers());
var adapters = getDiffAdapters(annotationService, aState.getAnnotationLayers());

long diffStart = System.currentTimeMillis();
var diffStart = System.currentTimeMillis();
LOG.debug("Calculating differences...");
int unitIndex = 0;
List<CurationUnit> curationUnitList = new ArrayList<>();
List<Unit> units = aState.getPagingStrategy().units(editorCas);
for (Unit unit : units) {
var unitIndex = 0;
var curationUnitList = new ArrayList<CurationUnit>();
var units = aState.getPagingStrategy().units(editorCas);
for (var unit : units) {
unitIndex++;
if (unitIndex % 100 == 0) {
LOG.debug("Processing differences: {} of {} units...", unitIndex, units.size());
}

DiffResult diff = doDiffSingle(adapters, LINK_ROLE_AS_LABEL, casses, unit.getBegin(),
var diff = doDiffSingle(adapters, LINK_ROLE_AS_LABEL, casses, unit.getBegin(),
unit.getEnd()).toResult();

CurationUnit curationUnit = new CurationUnit(unit.getBegin(), unit.getEnd(), unitIndex);
var curationUnit = new CurationUnit(unit.getBegin(), unit.getEnd(), unitIndex);
curationUnit.setState(calculateState(diff));

curationUnitList.add(curationUnit);
Expand All @@ -741,27 +730,29 @@ private List<CurationUnit> buildUnitOverview(AnnotatorState aState)

private CurationUnitState calculateState(DiffResult diff)
{
if (!diff.hasDifferences() && diff.getIncompleteConfigurationSets().isEmpty()) {
return AGREE;
}
var differingSets = diff.getDifferingConfigurationSetsWithExceptions(CURATION_USER);

boolean allCurated = true;
curatedDiffSet: for (ConfigurationSet d : diff.getConfigurationSets()) {
if (!d.getCasGroupIds().contains(CURATION_USER)) {
allCurated = false;
break curatedDiffSet;
}
// CURATED:
// The curation user participates in every configuration set
var allCurated = diff.getConfigurationSets().stream() //
.allMatch(set -> set.getCasGroupIds().contains(CURATION_USER));
if (!diff.getConfigurationSets().isEmpty() && allCurated) {
return CURATED;
}

if (allCurated) {
return CURATED;
// AGREE:
// - there are no differences between the annotators
// - the annotations are complete
if (differingSets.isEmpty()
&& diff.getIncompleteConfigurationSetsWithExceptions(CURATION_USER).isEmpty()) {
return AGREE;
}

// Is this confSet a diff due to stacked annotations (with same configuration)?
boolean stackedDiff = false;
stackedDiffSet: for (ConfigurationSet d : diff.getDifferingConfigurationSets().values()) {
for (String user : d.getCasGroupIds()) {
if (d.getConfigurations(user).size() > 1) {
var stackedDiff = false;
stackedDiffSet: for (var set : differingSets.values()) {
for (var user : set.getCasGroupIds()) {
if (set.getConfigurations(user).size() > 1) {
stackedDiff = true;
break stackedDiffSet;
}
Expand All @@ -772,10 +763,10 @@ private CurationUnitState calculateState(DiffResult diff)
return STACKED;
}

Set<String> usersExceptCurator = new HashSet<>(diff.getCasGroupIds());
var usersExceptCurator = new HashSet<>(diff.getCasGroupIds());
usersExceptCurator.remove(CURATION_USER);
for (ConfigurationSet d : diff.getIncompleteConfigurationSets().values()) {
if (!d.getCasGroupIds().containsAll(usersExceptCurator)) {
for (var set : diff.getIncompleteConfigurationSets().values()) {
if (!set.getCasGroupIds().containsAll(usersExceptCurator)) {
return INCOMPLETE;
}
}
Expand Down

0 comments on commit 6c55e1c

Please sign in to comment.