update QA (#364)

* combine setdata step 2/3 together * combine QA setdata step 2/3 together * hot fix delete project error (#361) * hot fix project dataset map issue (#362) * update QA setdata export and annotation auto select words

Author: Kai-Qiao

annotation-app/src/app/components/projects/annotate/annotate.component.ts

@@ -2818,6 +2818,7 @@ export class AnnotateComponent implements OnInit, AfterViewInit, OnDestroy {
  selection = window.getSelection();
 
  if (selection.isCollapsed) return [];
+ selection = this.extendWordSelection(selection);
  const mySelf = document.getElementsByClassName('nerPassage')[0];
 
  for (i = 0; i < selection.rangeCount; i++) {
@@ -2870,6 +2871,38 @@ export class AnnotateComponent implements OnInit, AfterViewInit, OnDestroy {
  return ranges;
  }
 
+ extendWordSelection(selection){
+ if (this.projectType != 'qa') {
+ return selection;
+ }
+
+ let range = document.createRange();
+ range.setStart(selection.anchorNode, selection.anchorOffset);
+ range.setEnd(selection.focusNode, selection.focusOffset);
+ let backwards = range.collapsed;
+ range.detach();
+
+ // modify() works on the focus of the selection
+ let endNode = selection.focusNode;
+ let endOffset = selection.focusOffset;
+ selection.collapse(selection.anchorNode, selection.anchorOffset);
+ 
+ let direction = [];
+ if (backwards) {
+ direction = ['backward', 'forward'];
+ } else {
+ direction = ['forward', 'backward'];
+ }
+
+ selection.modify("move", direction[0], "character");
+ selection.modify("move", direction[1], "word");
+ selection.extend(endNode, endOffset);
+ selection.modify("extend", direction[1], "character");
+ selection.modify("extend", direction[0], "word");
+
+ return selection;
+ }
+
  initNerPassage(element, selectedEntityID0) {
  if (element.start === element.end) return;
  this.createNewRange(element, selectedEntityID0);

annotation-app/src/app/components/projects/create-project.component.ts

@@ -393,7 +393,11 @@ export class CreateNewComponent implements OnInit {
  );
  formData.append(
  'selectLabels',
- this.msg.type === 'ner' ? JSON.stringify(this.checkboxChecked) : this.dropdownSelected,
+ this.msg.type === 'ner' 
+ ? JSON.stringify(this.checkboxChecked)
+ : this.msg.type === 'qa' 
+ ? JSON.stringify([])
+ : this.dropdownSelected,
  );
 
  formData.append('ticketQuestions', JSON.stringify(this.helpfulText));

annotation-app/src/app/components/projects/set-data/set-data.component.html

@@ -42,21 +42,18 @@
  </clr-wizard-page>
  <!-- select label -->
  <clr-wizard-page
- [clrWizardPageNextDisabled]="(wizardData.projectType !== 'qa' && !selectedDropDownItem) || !formPageOne.valid"
+ *ngIf="wizardData.projectType != 'qa'"
+ [clrWizardPageNextDisabled]="!selectedDropDownItem || !formPageOne.valid"
  (clrWizardPageOnLoad)="clrWizardPageOnLoad('page2')"
  >
  <ng-template clrPageTitle>{{
  wizardData.projectType === 'ner'
  ? 'Please select a single text column which you intend to present to annotators to annotate'
- : wizardData.projectType === 'qa'
- ? 'Please select the question column which you intend to labels from'
  : 'Please select the column which you intend to calculate labels from'
  }}</ng-template>
  <ng-template clrPageNavTitle>{{
  wizardData.projectType === 'ner'
  ? 'Select Text Column'
- : wizardData.projectType === 'qa'
- ? 'Select Question Column'
  : 'Select Label Column'
  }}</ng-template>
  <form clrForm #formPageOne="ngForm">
@@ -72,13 +69,15 @@
  [clrWizardPageNextDisabled]="wizardData.projectType === 'ner' ? false : selectDescription.length == 0"
  >
  <ng-template clrPageNavTitle>
- {{ wizardData.projectType === 'ner' ? 'Select Helpful Column' : 'Select Text Column' }}
+ {{ wizardData.projectType === 'ner' ? 'Select Helpful Column' : wizardData.projectType === 'qa'? 'Select Column':'Select Text Column' }}
  </ng-template>
 
  <ng-template clrPageTitle>
  {{
  wizardData.projectType === 'ner'
  ? 'Select the columns to present to annotators about the existing labels (optional) or helpful text (optional)'
+ : wizardData.projectType === 'qa'
+ ? 'Select the question column and text column to present to annotators'
  : 'Select the columns to present to annotators'
  }}
  </ng-template>
@@ -88,6 +87,10 @@
  <div *ngIf="wizardData.projectType === 'qa'">
  <app-clr-select
  [data]="clrSelectData" 
+ (valueChange)="onReceiveSelectedItem($event)">
+ </app-clr-select>
+ <app-clr-select
+ [data]="clrSelectData2" 
  (valueChange)="onReciveSelectedText($event)">
  </app-clr-select>
  </div>

annotation-app/src/app/components/projects/set-data/set-data.component.ts

@@ -34,6 +34,7 @@ export class SetDataComponent implements OnInit, OnChanges {
  selectDescription = [];
  checkboxColumns = [];
  clrSelectData = {};
+ clrSelectData2 = {};
  isLoading: boolean;
  formDatagrid: any;
 
@@ -68,7 +69,12 @@ export class SetDataComponent implements OnInit, OnChanges {
  this.clrSelectData = {
  required: false,
  options: [...this.wizardData.csvHeaders],
- labelText: 'Select The Column',
+ labelText: 'Select Question Column',
+ };
+ this.clrSelectData2 = {
+ required: true,
+ options: [...this.wizardData.csvHeaders],
+ labelText: 'Select Text Column',
  };
  }else{
  this.clrSelectData = {

annotation-service/services/file-service.js

@@ -181,7 +181,11 @@ async function prepareHeaders(project, format) {
  } else if (project.projectType == PROJECTTYPE.LOG) {
  headerArray.push({ id: "fileName", title: "fileName" });
  headerArray.push({ id: "freeText", title: "freeText" });
- } else {
+ } else if(project.projectType == PROJECTTYPE.QA){
+ headerArray.push({ id: 'context', title: 'context' });
+ headerArray.push({ id: 'question', title: 'question' });
+ headerArray.push({ id: 'answers', title: 'answers' });
+ }else {
  await project.selectedColumn.forEach(item => {
  headerArray.push({ id: item, title: item });
  });
@@ -196,10 +200,7 @@ async function prepareHeaders(project, format) {
  await labelsArray.forEach(item => {
  headerArray.push({ id: item, title: item });
  });
- } else if(project.projectType == PROJECTTYPE.QA){
- headerArray.push({ id: 'Questions', title: 'Questions' });
- headerArray.push({ id: 'Answers', title: 'Answers' });
- }else {
+ } else if(project.projectType != PROJECTTYPE.QA){
  await project.categoryList.split(",").forEach(item => {
  headerArray.push({ id: item, title: item });
  });
@@ -314,52 +315,34 @@ async function prepareContents(srData, project, format) {
  newCase[item] = newCase[item][0] ? JSON.stringify(newCase[item]) : [];
  });
  } else if(project.projectType == PROJECTTYPE.QA){
- // init selected data
- await project.selectedColumn.forEach(item => {
- newCase[item] = (srs.originalData)[item];
- });
+ // take user input or reviewed info
+ const userInputDatas = await prepareUserInputs(srs);
  // init questions cloumn
  let questionForText = srs.questionForText;
- // init pop-up lables
- await project.popUpLabels.forEach(item => {
- newCase[item] = [];
- });
-
- const userInputDatas = await prepareUserInputs(srs);
  if (srs.reviewInfo.modified) {
  questionForText = userInputDatas[0].questionForText;
  }
  // init answer cloumn
- let answersList = [];
  for await(const item of userInputDatas) {
- //answers cloumn data
  for await(const question of questionForText) {
- let answer = {question: question, answers: []};
+ let answers = {text: [], answer_start: []};
  for await(const lb of item.problemCategory) {
  if (lb.label === question) { 
- answer['answers'].push([lb.text, lb.start, lb.end]);
- } 
- }
- await answersList.push(answer);
- }
- 
- //popup lablels
- for await(const label of project.popUpLabels) {
- for await(const lb of item.problemCategory) {
- if (lb.popUpLabel === label) {
- newCase[label].push([lb.text, lb.start, lb.end])
+ answers['text'].push(lb.text);
+ answers['answer_start'].push(lb.start);
  }
  }
+ // current question has answer
+ if (answers.text.length) {
+ cvsData.push({
+ context: Object.values(srs.originalData)[0],
+ question: question,
+ answers: JSON.stringify(answers)
+ });
+ }
  }
  }
- //add questions column
- newCase['Questions'] = await JSON.stringify(questionForText);
- //add answers cloumn
- newCase['Answers'] = await JSON.stringify(answersList);
- //change annotations pop-up labels to a string array
- await project.popUpLabels.forEach(item => {
- newCase[item] = newCase[item][0] ? JSON.stringify(newCase[item]) : [];
- });
+ 
  }else if (project.projectType == PROJECTTYPE.LOG) {
  // init log classification fileName
  newCase.fileName = srs.fileInfo.fileName;
@@ -492,7 +475,9 @@ async function prepareContents(srData, project, format) {
  }
  }
  }
- cvsData.push(newCase);
+ if (project.projectType != PROJECTTYPE.QA) {
+ cvsData.push(newCase);
+ }
  }
  return cvsData;
 }

annotation-service/utils/imgImporter.js

@@ -58,7 +58,7 @@ async function execute(req, sendEmail, annotators) {
  }
  emailService.sendEmailToAnnotator(param).catch(err => console.error(`[ IMAGE ][ ERROR ] send email:`, err));
  }
- await updateDatasetProjectInfo(selectedDataset, req.body.pname, OPERATION.ADD)
+ await updateDatasetProjectInfo(req.body.selectedDataset, req.body.pname, OPERATION.ADD)
  console.log(`[ IMAGE ] Utils imgImporter.execute end: `, Date.now());
 
 }