Skip to content

Commit

Permalink
fix: skip out-of-context connections/relations
Browse files Browse the repository at this point in the history 
* style: add light background to context connections/relations (those
  not belonging to the verse being annotated)
* fix #1
  • Loading branch information
@hrishikeshrt
hrishikeshrt committed Apr 12, 2023
1 parent d0e2be1 commit 05cc739
Show file tree
Hide file tree
Showing 4 changed files with 53 additions and 17 deletions.
1 change: 1 addition & 0 deletions TODO.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@

## Bugs

- [x] TokenConnection/SentenceGraph connections/relations show incomplete rows when one of the tokens is out of context.
- [x] Export - boundary not shown in some cases
- (details: bug was when boundary token does not have text (or equals `_`))

Expand Down
8 changes: 8 additions & 0 deletions models_sqla.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -415,6 +415,10 @@ class TokenConnection(db.Model):
boundary_id = Column(
Integer, ForeignKey('boundary.id', ondelete='CASCADE'), nullable=False
)
# TODO:
# Do we need `src_boundary_id` and `dst_boundary_id` both?
# That is what we do in in SentenceGraph task?
# Figure out if there's anything fundamentally different!
src_id = Column(Integer, ForeignKey('token.id'), nullable=False)
dst_id = Column(Integer, ForeignKey('token.id'), nullable=False)
# ----------------------------------------------------------------------- #
Expand Down Expand Up @@ -492,6 +496,10 @@ class SentenceGraph(db.Model):
dst_boundary_id = Column(
Integer, ForeignKey('boundary.id', ondelete='CASCADE'), nullable=False
)
# TODO:
# Why do we need `src_boundary_id` and `dst_boundary_id` both?
# Why not simply use `src_boundary_id` as `boundary_id`
# That is what we do in in TokenConnection task?
src_token_id = Column(Integer, ForeignKey('token.id'), nullable=False)
dst_token_id = Column(Integer, ForeignKey('token.id'), nullable=False)
label_id = Column(
Expand Down
58 changes: 41 additions & 17 deletions static/custom/js/corpus/tasks.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1362,20 +1362,29 @@ function setup_task_token_connection(task_id, verse_id) {

// add existing references
for (const token_connection of existing_token_connections) {
const $source_token = $(`#tokcon-token-${task_id}-${token_connection.src_id}`).clone();
const $original_source_token = $(`#tokcon-token-${task_id}-${token_connection.src_id}`);
const $original_target_token = $(`#tokcon-token-${task_id}-${token_connection.dst_id}`);

if (($original_source_token.length == 0) || ($original_target_token.length == 0)) {
// If either token is out of context, don't show that relation.
continue;
}

const $source_token = $original_source_token.clone();
$source_token.removeAttr("id");
$source_token.data("token-id", token_connection.src_id);
$source_token.data("boundary-id", token_connection.boundary_id);
$source_token.addClass("tokcon-source-token");

const $target_token = $(`#tokcon-token-${task_id}-${token_connection.dst_id}`).clone();
const $target_token = $original_target_token.clone();
const target_token_boundary_id = $(`#tokcon-token-${task_id}-${token_connection.dst_id}`).data("boundary-id");
$target_token.removeAttr("id");
$target_token.data("token-id", token_connection.dst_id);
$target_token.data("boundary-id", target_token_boundary_id);
$target_token.addClass("tokcon-target-token");

add_token_connection_row($token_connection_annotation_container, $source_token, $target_token);
const is_context_connection = (verse_id != token_connection.verse_id);
add_token_connection_row($token_connection_annotation_container, $source_token, $target_token, is_context_connection);
}

/* setup event listeners */
Expand Down Expand Up @@ -1403,9 +1412,12 @@ function setup_task_token_connection(task_id, verse_id) {
}


function add_token_connection_row($location, $source_token, $target_token) {
function add_token_connection_row($location, $source_token, $target_token, is_context_connection) {
const $row = $('<div />').addClass("row").prependTo($location);
$row.addClass('tokcon-annotation-row');
$row.addClass('tokcon-annotation-row p-0 m-0');
if (is_context_connection) {
$row.addClass("bg-light pt-1 mb-1 border rounded");
}

// add source token
var $column = $("<div />", {
Expand Down Expand Up @@ -1759,35 +1771,44 @@ function setup_task_sentence_graph(task_id, verse_id) {
// type == 2: sentence-token connection
// type == 3: sentence-sentence connection

var $source_token, $target_token;
var $original_source_token, $original_target_token;
if ((relation_relation_type == 0) || (relation_relation_type == 1)) {
$source_token = $(`#sentence-graph-token-${task_id}-${sentrel.src_token_id}`).clone();
$original_source_token = $(`#sentence-graph-token-${task_id}-${sentrel.src_token_id}`);
} else {
$source_token = $(`#sentence-graph-sentence-token-${task_id}-${sentrel.src_token_id}`).clone();
$original_source_token = $(`#sentence-graph-sentence-token-${task_id}-${sentrel.src_token_id}`);
}
if ((relation_relation_type == 0) || (relation_relation_type == 2)) {
$original_target_token = $(`#sentence-graph-token-${task_id}-${sentrel.dst_token_id}`);
} else {
$original_target_token = $(`#sentence-graph-sentence-token-${task_id}-${sentrel.dst_token_id}`);
}

if (($original_source_token.length == 0) || ($original_target_token.length == 0)) {
// If either token is out of context, don't show that relation.
continue;
}

const $source_token = $original_source_token.clone();
$source_token.removeAttr("id");
$source_token.data("token-id", sentrel.src_token_id);
$source_token.data("boundary-id", sentrel.src_boundary_id);
$source_token.addClass("sentence-graph-source-token");

if ((relation_relation_type == 0) || (relation_relation_type == 2)) {
$target_token = $(`#sentence-graph-token-${task_id}-${sentrel.dst_token_id}`).clone();
} else {
$target_token = $(`#sentence-graph-sentence-token-${task_id}-${sentrel.dst_token_id}`).clone();
}
const $target_token = $original_target_token.clone();
$target_token.removeAttr("id");
$target_token.data("token-id", sentrel.dst_token_id);
$target_token.data("boundary-id", sentrel.dst_boundary_id);
$target_token.addClass("sentence-graph-target-token");

const relation_label_id = sentrel.label_id;

const is_context_connection = ((verse_id != sentrel.src_verse_id) && (verse_id != sentrel.dst_verse_id));
add_sentence_graph_row(
$sentence_graph_annotation_container,
$sentence_graph_relation_selector,
$source_token,
$target_token,
relation_label_id
relation_label_id,
is_context_connection
);
}

Expand Down Expand Up @@ -1826,9 +1847,12 @@ function setup_task_sentence_graph(task_id, verse_id) {

}

function add_sentence_graph_row($location, $selector, $source_token, $target_token, relation_label_id) {
function add_sentence_graph_row($location, $selector, $source_token, $target_token, relation_label_id, is_context_connection) {
const $row = $('<div />').addClass("row").prependTo($location);
$row.addClass('sentence-graph-annotation-row');
$row.addClass('sentence-graph-annotation-row p-0 m-0');
if (is_context_connection) {
$row.addClass("bg-light pt-1 mb-1 border rounded");
}

// add source token
var $column = $("<div />", {
Expand Down
3 changes: 3 additions & 0 deletions utils/database.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,7 @@ def get_verse_data(
"id": token_connection.id,
"task_id": token_connection.task_id,
"boundary_id": token_connection.boundary_id,
"verse_id": token_connection.boundary.verse_id,
"src_id": token_connection.src_id,
"dst_id": token_connection.dst_id,
"annotator_id": token_connection.annotator_id,
Expand Down Expand Up @@ -839,8 +840,10 @@ def get_verse_data(
"id": sentrel.id,
"task_id": sentrel.task_id,
"src_boundary_id": sentrel.src_boundary_id,
"src_verse_id": sentrel.src_boundary.verse_id,
"src_token_id": sentrel.src_token_id,
"dst_boundary_id": sentrel.dst_boundary_id,
"dst_verse_id": sentrel.dst_boundary.verse_id,
"dst_token_id": sentrel.dst_token_id,
"label_id": sentrel.label_id,
"relation_type": sentrel.relation_type,
Expand Down

0 comments on commit 05cc739

Please sign in to comment.