From 49a21fb4c6eb88bd479aca6aaebf1ca3a33f75f1 Mon Sep 17 00:00:00 2001 From: Ohad Cohen Date: Mon, 22 Jul 2019 17:13:48 +0300 Subject: [PATCH 1/6] Add backend support for annotation update --- backend/webserver/api/annotations.py | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/backend/webserver/api/annotations.py b/backend/webserver/api/annotations.py index 2c539805..7ecdebae 100644 --- a/backend/webserver/api/annotations.py +++ b/backend/webserver/api/annotations.py @@ -19,6 +19,8 @@ create_annotation.add_argument('keypoints', type=list, location='json') create_annotation.add_argument('color', location='json') +update_annotation = reqparse.RequestParser() +update_annotation.add_argument('category_id', type=int, location='json') @api.route('/') class Annotation(Resource): @@ -90,6 +92,26 @@ def delete(self, annotation_id): set__deleted_date=datetime.datetime.now()) return {'success': True} + @api.expect(update_annotation) + @login_required + def put(self, annotation_id): + """ Updates an annotation by ID """ + annotation = current_user.annotations.filter(id=annotation_id).first() + + if annotation is None: + return { "message": "Invalid annotation id" }, 400 + + args = update_annotation.parse_args() + + new_category_id = args.get('category_id') + if new_category_id is not None: + logger.info( + f'{current_user.username} is trying to update a category for annotation id {annotation.id} ({annotation.metadata.get("name")}) from {annotation.category_id} to {new_category_id}' + ) + annotation.update(category_id=new_category_id) + + return { success: True } + # @api.route('//mask') # class AnnotationMask(Resource): From 483cd79475a05d1fd877e330e5747dc5c5131e76 Mon Sep 17 00:00:00 2001 From: Ohad Cohen Date: Mon, 22 Jul 2019 17:21:07 +0300 Subject: [PATCH 2/6] Return the new annotation from the update --- backend/webserver/api/annotations.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/webserver/api/annotations.py b/backend/webserver/api/annotations.py index 7ecdebae..92bde14d 100644 --- a/backend/webserver/api/annotations.py +++ b/backend/webserver/api/annotations.py @@ -110,7 +110,7 @@ def put(self, annotation_id): ) annotation.update(category_id=new_category_id) - return { success: True } + return query_util.fix_ids(annotation) # @api.route('//mask') From 73310e98d400cd441dec9d5089fbaa3489d92165 Mon Sep 17 00:00:00 2001 From: Ohad Cohen Date: Tue, 23 Jul 2019 09:43:20 +0300 Subject: [PATCH 3/6] Pass allCategories prop to Category and Annotation --- client/src/components/annotator/Category.vue | 13 +++++++++++-- client/src/views/Annotator.vue | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/client/src/components/annotator/Category.vue b/client/src/components/annotator/Category.vue index 7b82be9a..065e3cb5 100755 --- a/client/src/components/annotator/Category.vue +++ b/client/src/components/annotator/Category.vue @@ -76,8 +76,8 @@ :active-tool="activeTool" :scale="scale" @deleted="annotationDeleted" + :all-categories="getCategoriesList" /> -
- @@ -181,6 +180,10 @@ export default { activeTool: { type: String, required: true + }, + allCategories: { + type: Array, + required: true } }, data: function() { @@ -393,6 +396,12 @@ export default { if (search.length === 0) return true; return this.category.name.toLowerCase().includes(search); }, + getCategoriesList() { + return this.allCategories.map(category => ({ + value: category.id, + text: category.name + })); + }, isCurrent() { return this.current.category === this.index; }, diff --git a/client/src/views/Annotator.vue b/client/src/views/Annotator.vue index 5af47287..cbdf2303 100755 --- a/client/src/views/Annotator.vue +++ b/client/src/views/Annotator.vue @@ -125,6 +125,7 @@ :simplify="simplify" :categorysearch="search" :category="category" + :all-categories="categories" :opacity="shapeOpacity" :hover="hover" :index="index" @@ -202,7 +203,6 @@ - From 40b3342fbe4c283c73edd83cc566037b2ea1c3b5 Mon Sep 17 00:00:00 2001 From: Ohad Cohen Date: Tue, 23 Jul 2019 09:45:25 +0300 Subject: [PATCH 4/6] Add annotation-update support in the client --- .../src/components/annotator/Annotation.vue | 42 +++++++++++++++---- client/src/models/annotations.js | 3 ++ client/src/views/Annotator.vue | 35 ++++++++++++---- 3 files changed, 66 insertions(+), 14 deletions(-) diff --git a/client/src/components/annotator/Annotation.vue b/client/src/components/annotator/Annotation.vue index 9eab39bd..d33545b3 100755 --- a/client/src/components/annotator/Annotation.vue +++ b/client/src/components/annotator/Annotation.vue @@ -94,7 +94,7 @@ - + @@ -136,19 +136,31 @@
- -
+ +
-
- -
+ +
- +
+ +
+ +
+
[] } }, data() { @@ -582,6 +598,18 @@ export default { this.compoundPath.fillColor = this.color; this.keypoints.color = this.darkHSL; }, + setCategory(event) { + const newCategoryName = event.target.value; + const annotation = this.annotation; + const oldCategory = this.$parent.category; + + this.$parent.$parent.updateAnnotationCategory( + annotation, + oldCategory, + newCategoryName + ); + $(`#annotationSettings${annotation.id}`).modal("hide"); + }, export() { if (this.compoundPath == null) this.createCompoundPath(); diff --git a/client/src/models/annotations.js b/client/src/models/annotations.js index 2fa9bbc4..eeb20b6b 100644 --- a/client/src/models/annotations.js +++ b/client/src/models/annotations.js @@ -8,5 +8,8 @@ export default { }, delete(id) { return axios.delete(`${baseURL}${id}`); + }, + update(id, newParams) { + return axios.put(`${baseURL}${id}`, newParams); } }; diff --git a/client/src/views/Annotator.vue b/client/src/views/Annotator.vue index cbdf2303..8801539b 100755 --- a/client/src/views/Annotator.vue +++ b/client/src/views/Annotator.vue @@ -730,20 +730,23 @@ export default { category.showAnnotations = false; }); }, - - addAnnotation(category, segments, keypoints) { + findCategoryByName(categoryName) { + let categoryComponent = this.$refs.category.find( + category => + category.category.name.toLowerCase() === categoryName.toLowerCase() + ); + if (!categoryComponent) return null; + return categoryComponent.category; + }, + addAnnotation(categoryName, segments, keypoints) { segments = segments || []; keypoints = keypoints || []; if (keypoints.length == 0 && segments.length == 0) return; - category = this.$refs.category.find( - c => c.category.name.toLowerCase() === category.toLowerCase() - ); + let category = this.findCategoryByName(categoryName); if (category == null) return; - category = category.category; - Annotations.create({ image_id: this.image.id, category_id: category.id, @@ -755,6 +758,24 @@ export default { }); }, + updateAnnotationCategory(annotation, oldCategory, newCategoryName) { + const newCategory = this.findCategoryByName(newCategoryName); + if (!newCategory || !annotation) return; + + Annotations.update(annotation.id, { category_id: newCategory.id }).then( + response => { + let newAnnotation = response.data; + + if (newAnnotation) { + oldCategory.annotations = oldCategory.annotations.filter( + a => a.id !== annotation.id + ); + newCategory.annotations.push(newAnnotation); + } + } + ); + }, + removeFromAnnotatingList() { if (this.user == null) return; From 69ef390d8bfef12d958b7a978b2b7135c02c540a Mon Sep 17 00:00:00 2001 From: Ohad Cohen Date: Tue, 23 Jul 2019 12:14:40 +0300 Subject: [PATCH 5/6] Bug fix - merge annotation data from the server with the current annotation --- backend/webserver/api/annotations.py | 4 ++-- client/src/views/Annotator.vue | 7 ++++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/webserver/api/annotations.py b/backend/webserver/api/annotations.py index 92bde14d..b593d5ab 100644 --- a/backend/webserver/api/annotations.py +++ b/backend/webserver/api/annotations.py @@ -110,8 +110,8 @@ def put(self, annotation_id): ) annotation.update(category_id=new_category_id) - return query_util.fix_ids(annotation) - + newAnnotation = current_user.annotations.filter(id=annotation_id).first() + return query_util.fix_ids(newAnnotation) # @api.route('//mask') # class AnnotationMask(Resource): diff --git a/client/src/views/Annotator.vue b/client/src/views/Annotator.vue index 8801539b..94a7f1cb 100755 --- a/client/src/views/Annotator.vue +++ b/client/src/views/Annotator.vue @@ -764,7 +764,12 @@ export default { Annotations.update(annotation.id, { category_id: newCategory.id }).then( response => { - let newAnnotation = response.data; + let newAnnotation = { + ...response.data, + ...annotation, + metadata: response.data.metadata, + category_id: newCategory.id + }; if (newAnnotation) { oldCategory.annotations = oldCategory.annotations.filter( From cbd9240b2dce1dd133fe3ff8172a31f15817aed5 Mon Sep 17 00:00:00 2001 From: Ohad Cohen Date: Tue, 23 Jul 2019 14:31:41 +0300 Subject: [PATCH 6/6] Shorter category update logs --- backend/webserver/api/annotations.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/webserver/api/annotations.py b/backend/webserver/api/annotations.py index b593d5ab..8d429edd 100644 --- a/backend/webserver/api/annotations.py +++ b/backend/webserver/api/annotations.py @@ -104,12 +104,10 @@ def put(self, annotation_id): args = update_annotation.parse_args() new_category_id = args.get('category_id') - if new_category_id is not None: - logger.info( - f'{current_user.username} is trying to update a category for annotation id {annotation.id} ({annotation.metadata.get("name")}) from {annotation.category_id} to {new_category_id}' - ) - annotation.update(category_id=new_category_id) - + annotation.update(category_id=new_category_id) + logger.info( + f'{current_user.username} has updated category for annotation (id: {annotation.id})' + ) newAnnotation = current_user.annotations.filter(id=annotation_id).first() return query_util.fix_ids(newAnnotation)