Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vmware/data-annotator-for-machine-learning
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v3.1.0
Choose a base ref
...
head repository: vmware/data-annotator-for-machine-learning
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 30 files changed
  • 1 contributor

Commits on Apr 8, 2024

  1. Feature enhancement and issue fix (#440) 

    * remove empty followUps && historyBack validation && references display more clear && clear unnecessary console && init new qa data

* init filter

* init enable qachat create with or without csv

* init qachat append csv

* fix some issue
    @rekeyz
    rekeyz authored Apr 8, 2024
    Copy the full SHA
    7b0c444 View commit details

Commits on Apr 16, 2024

  1. fix issue qaRegressionTrue failed to insert data (#441) 

    * remove empty followUps && historyBack validation && references display more clear && clear unnecessary console && init new qa data

* init filter

* init enable qachat create with or without csv

* init qachat append csv

* fix some issue

* fix issue qaRegressionTrue failed to insert data

* fix issue qaRegressionTrue failed to insert data 2
    @rekeyz
    rekeyz authored Apr 16, 2024
    Copy the full SHA
    085b364 View commit details

Commits on Apr 17, 2024

  1. modify email validation (#442)

    @rekeyz
    rekeyz authored Apr 17, 2024
    Copy the full SHA
    da6db4c View commit details

Commits on Apr 18, 2024

  1. Fix issue (#443) 

    * modify email validation

* fix issue
    @rekeyz
    rekeyz authored Apr 18, 2024
    Copy the full SHA
    ccc6dbf View commit details
Showing with 1,072 additions and 269 deletions.
  1. +1 −1 ...n-app/src/app/component/datasets/create-new-dataset-modal/create-new-dataset-modal.component.html
  2. +1 −1 ...ion-app/src/app/component/datasets/create-new-dataset-page/create-new-dataset-page.component.html
  3. +1 −66 annotation-app/src/app/component/datasets/create-new-dataset/create-new-dataset.component.ts
  4. +7 −1 annotation-app/src/app/component/datasets/dataset-analyze/dataset-analyze.component.html
  5. +3 −3 annotation-app/src/app/component/datasets/my-datasets/my-datasets.component.html
  6. +2 −2 annotation-app/src/app/component/permission/permissions/permissions.component.ts
  7. +1 −0 ...ion-app/src/app/component/projects/annotate-progress-board/annotate-progress-board.component.html
  8. +168 −16 annotation-app/src/app/component/projects/create-project/create-project.component.html
  9. +6 −2 annotation-app/src/app/component/projects/create-project/create-project.component.scss
  10. +54 −15 annotation-app/src/app/component/projects/create-project/create-project.component.ts
  11. +3 −3 ...tation-app/src/app/component/projects/labeling-task-list/edit-project/edit-project.component.html
  12. +6 −2 annotation-app/src/app/component/projects/labeling-task-list/edit-project/edit-project.component.ts
  13. +79 −28 annotation-app/src/app/component/projects/project-analyze/append/append.component.html
  14. +61 −10 annotation-app/src/app/component/projects/project-analyze/append/append.component.ts
  15. +113 −22 ...p/component/projects/project-analyze/latest-annotation-data/latest-annotation-data.component.html
  16. +1 −1 ...p/component/projects/project-analyze/latest-annotation-data/latest-annotation-data.component.scss
  17. +85 −9 ...app/component/projects/project-analyze/latest-annotation-data/latest-annotation-data.component.ts
  18. +22 −6 annotation-app/src/app/component/projects/project-analyze/project-analyze.component.html
  19. +22 −8 annotation-app/src/app/component/projects/project-analyze/project-analyze.component.ts
  20. +1 −1 annotation-app/src/app/component/sidenav/sidenav.component.html
  21. +1 −1 annotation-app/src/app/services/api.service.ts
  22. +2 −1 annotation-app/src/app/services/cds-icon.service.ts
  23. +5 −2 annotation-app/src/app/services/common/tool.service.ts
  24. +44 −1 annotation-app/src/app/services/common/up-zip.service.ts
  25. +70 −10 annotation-app/src/app/shared/clr-filter/datagridFilter.component.html
  26. +15 −0 annotation-app/src/app/shared/clr-filter/datagridFilter.component.scss
  27. +42 −9 annotation-app/src/app/shared/clr-filter/datagridFilter.component.ts
  28. +6 −3 annotation-app/src/app/shared/form-validators/dataset-validator.ts
  29. +201 −26 annotation-service/services/srs-service.js
  30. +49 −19 annotation-service/utils/srsImporter.js
2 changes: 1 addition & 1 deletion ...c/app/component/datasets/create-new-dataset-modal/create-new-dataset-modal.component.html
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@
>
<cds-icon shape="close"></cds-icon>
</button>
<h3 class="modal-title">Create New Dataset</h3>
<h3 class="modal-title">Upload New Dataset</h3>
</div>
<div class="modal-body">
<app-create-new-dataset
2 changes: 1 addition & 1 deletion ...src/app/component/datasets/create-new-dataset-page/create-new-dataset-page.component.html
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
<div class="container">
<div class="clr-row">
<div class="clr-col-8">
<h2 class="h2Title">Create New Dataset</h2>
<h2 class="h2Title">Upload New Dataset</h2>
<app-create-new-dataset
[msg]="msg"
(outFormData)="receiveOutFormData($event)"
67 changes: 1 addition & 66 deletions annotation-app/src/app/component/datasets/create-new-dataset/create-new-dataset.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2019-2023 VMware, Inc.
Copyright 2019-2024 VMware, Inc.
SPDX-License-Identifier: Apache-2.0
*/

@@ -156,56 +156,6 @@ export class CreateNewDatasetComponent implements OnInit, OnChanges {
}
}

// papaParse() {
// const previewData = [];
// const hasHeader = this.uploadGroup.get('hasHeader').value === 'yes' ? true : false;
// if (this.uploadGroup.get('localFile').value) {
// this.unZipService.parseCSVChunk(this.uploadGroup.get('localFile').value, hasHeader, false).then((res) => {
// console.log(151, res);
// this.previewHeadDatas = res.previewHeadDatas;
// this.previewContentDatas = res.topReview;
// });
// // return new Promise((resolve, reject) => {
// // this.papa.parse(this.uploadGroup.get('localFile').value, {
// // header: false,
// // // preview: 20,
// // dynamicTyping: true,
// // skipEmptyLines: true,
// // error: (error) => {
// // console.log('parse_error: ', error);
// // },
// // step: (results, parser) => {
// // // check csv headers is empty.
// // if (hasHeader === 'yes') {
// // const data = results.data.map((item) => item && String(item).trim());
// // if (_.sortedUniq(data).includes(null) || _.sortedUniq(data).includes('')) {
// // reject(false);
// // }
// // }
// // if (!(_.sortedUniq(results.data).length == 1 && _.sortedUniq(results.data)[0] == null)) {
// // previewData.push(results.data);
// // }
// // if (previewData.length < 7) {
// // this.previewHeadDatas = [];
// // if (hasHeader == 'yes') {
// // this.previewHeadDatas = previewData[0];
// // this.previewContentDatas = previewData.slice(1, 6);
// // // resolve(null);
// // } else {
// // for (let i = 0; i < previewData[0].length; i++) {
// // this.previewHeadDatas.push('Header' + i);
// // }
// // this.previewContentDatas = previewData.slice(0, 5);
// // // resolve(null);
// // }
// // }
// // },

// // });
// // });
// }
// }

toPostDatasets(uploadFormat, formData, params): void {
let postData;
if (this.env.config.enableAWSS3) {
@@ -435,21 +385,6 @@ export class CreateNewDatasetComponent implements OnInit, OnChanges {
return;
});
}

// this.papaParse()
// .then((e) => {
// if (this.env.config.enableAWSS3) {
// this.uploadToS3(inputFile);
// } else {
// this.updateDatasets('data');
// }
// })
// .catch((err) => {
// console.log(err);
// this.errorMessage = JSON.stringify(err);
// this.outUploadDoneEmitter.emit('no');
// return;
// });
}
if (this.uploadGroup.get('fileFormat').value == 'image') {
if (this.env.config.enableAWSS3) {
8 changes: 7 additions & 1 deletion annotation-app/src/app/component/datasets/dataset-analyze/dataset-analyze.component.html
View file
Original file line number Diff line number Diff line change
@@ -118,14 +118,20 @@ <h6>Creating a labeling Task</h6>
*ngIf="dataset.format === 'csv' || dataset.format === 'tabular'"
class="dropdown-item"
(click)="createLabelingTask('qa')"
>Question Answer</a
>Question Answer Extraction</a
>
<a *ngIf="dataset.format === 'image'" class="dropdown-item" (click)="createLabelingTask('image')"
>Image Classification</a
>
<a *ngIf="dataset.format === 'txt'" class="dropdown-item" (click)="createLabelingTask('log')"
>Log Classification</a
>
<a
*ngIf="dataset.format === 'csv' || dataset.format === 'tabular'"
class="dropdown-item"
(click)="createLabelingTask('qaChat')"
>Question Answer Conversational</a
>
</clr-dropdown-menu>
</clr-dropdown>
</div>
6 changes: 3 additions & 3 deletions annotation-app/src/app/component/datasets/my-datasets/my-datasets.component.html
View file
Original file line number Diff line number Diff line change
@@ -24,13 +24,13 @@ <h2 class="h2Title">Datasets List</h2>
<div title="Refresh Table" class="refreshBtn" (click)="reload()">
<cds-icon shape="refresh"></cds-icon> &nbsp;REFRESH
</div>
<button class="btn btn-primary" (click)="onAddingDataset()">Create New Dataset</button>
<button class="btn btn-primary" (click)="onAddingDataset()">Upload New Dataset</button>
</div>
</div>
<clr-tabs>
<clr-tab>
<button clrTabLink id="link1" (click)="clickTab(1)">My Datasets ({{ totalItems }})</button>
<clr-tab-content id="content1" *clrIfActive="currentTab == 1 ">
<clr-tab-content id="content1" *clrIfActive="currentTab == 1">
<clr-datagrid [clrDgLoading]="loading" class="gridHeight">
<clr-dg-placeholder>We couldn't find any dataset for you!</clr-dg-placeholder>
<clr-dg-column [clrDgField]="'dataSetName'" class="ellipsis-datagrid">Dataset Name </clr-dg-column>
@@ -119,7 +119,7 @@ <h2 class="h2Title">Datasets List</h2>
<ng-container *clrDgHideableColumn="{ hidden: true }">Project Creator</ng-container>
</clr-dg-column>
<clr-dg-column [clrDgField]="'shareDescription'" class="ellipsis-datagrid">Description </clr-dg-column>
<clr-dg-column [clrDgField]="'updatedDate'" class="ellipsis-datagrid">
<clr-dg-column [clrDgField]="'updatedDate'" class="ellipsis-datagrid">
<ng-container *clrDgHideableColumn="{ hidden: true }">Updated Date </ng-container
><clr-dg-string-filter [clrDgStringFilter]="updateTimeFilter"></clr-dg-string-filter>
</clr-dg-column>
4 changes: 2 additions & 2 deletions annotation-app/src/app/component/permission/permissions/permissions.component.ts
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
Copyright 2019-2023 VMware, Inc.
Copyright 2019-2024 VMware, Inc.
SPDX-License-Identifier: Apache-2.0
*/

@@ -133,7 +133,7 @@ export class PermissionsComponent implements OnInit {
this.collaborators[index].setUserErrMessage = '';
} else {
this.collaborators[index].setUserErrMessage = this.env.config.enableAWSS3
? 'Wrong format! Email only accept vmware email box'
? 'Wrong format! Email only accept vmware/broadcom email box'
: 'Wrong format! Only accept email address';
}
} else {
1 change: 1 addition & 0 deletions ...src/app/component/projects/annotate-progress-board/annotate-progress-board.component.html
View file
Original file line number Diff line number Diff line change
@@ -112,6 +112,7 @@ <h5>Annotator Review Progress</h5>
<label class="clr-col-3 keepAllWord" title="{{ item.fullName }}">{{ item.fullName }}</label>
<div class="clr-col">
<clr-progress-bar
*ngIf="msg?.projectInfo.projectType != 'qaChat'"
title="Annotation progress: (annotated tickets / assigned tickets)%"
clrValue="{{ (item.completeCase / (item.assignedCase == 0 ? 1 : item.assignedCase)) * 100 }}"
clrLabeled
Loading