girder-large-image-annotation 1.32.7.dev2__tar.gz → 1.32.7.dev4__tar.gz

{girder_large_image_annotation-1.32.7.dev2/girder_large_image_annotation.egg-info → girder_large_image_annotation-1.32.7.dev4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-large-image-annotation
-Version: 1.32.7.dev2
+Version: 1.32.7.dev4
 Summary: A Girder plugin to store and display annotations on large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema>=2.5.1
-Requires-Dist: girder-large-image>=1.32.7.dev2
+Requires-Dist: girder-large-image>=1.32.7.dev4
 Requires-Dist: orjson
 Provides-Extra: compute
 Requires-Dist: openpyxl; extra == "compute"
@@ -28,7 +28,7 @@ Requires-Dist: pandas>=2.2; python_version >= "3.9" and extra == "compute"
 Requires-Dist: python-calamine; python_version >= "3.9" and extra == "compute"
 Requires-Dist: umap-learn; extra == "compute"
 Provides-Extra: tasks
-Requires-Dist: girder-large-image[tasks]>=1.32.7.dev2; extra == "tasks"
+Requires-Dist: girder-large-image[tasks]>=1.32.7.dev4; extra == "tasks"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

girder_large_image_annotation-1.32.7.dev4/girder_large_image_annotation/web_client/collections/ElementCollection.js

@@ -0,0 +1,47 @@
+import Backbone from 'backbone';
+
+import ElementModel from '../models/ElementModel';
+
+export default Backbone.Collection.extend({
+    initialize: function () {
+        this.on('add', this.track_addition, this);
+        this.on('remove', this.track_remove, this);
+        this.on('change', this.track_change, this);
+    },
+
+    model: ElementModel,
+    comparator: undefined,
+
+    track_addition: function (element) {
+        if (!this.annotation || !this.annotation.get || !this.annotation.get('_version')) {
+            return;
+        }
+        if (!this.annotation._changeLog) {
+            this.annotation._changeLog = {};
+        }
+        this.annotation._changeLog[element.id] = {op: 'add', path: `elements/id:${element.id}`, value: element.toJSON()};
+    },
+
+    track_remove: function (element) {
+        if (!this.annotation || !this.annotation.get || !this.annotation.get('_version')) {
+            return;
+        }
+        if (!this.annotation._changeLog) {
+            this.annotation._changeLog = {};
+        }
+        if (this.annotation._changeLog[element.id] && this.annotation._changeLog[element.id].op === 'add') {
+            delete this.annotation._changeLog[element.id];
+        } else {
+            this.annotation._changeLog[element.id] = {op: 'remove', path: `elements/id:${element.id}`};
+        }
+    },
+    track_change: function (element) {
+        if (!this.annotation || !this.annotation.get || !this.annotation.get('_version')) {
+            return;
+        }
+        if (!this.annotation._changeLog) {
+            this.annotation._changeLog = {};
+        }
+        this.annotation._changeLog[element.id] = {op: 'replace', path: `elements/id:${element.id}`, value: element.toJSON()};
+    }
+});

{girder_large_image_annotation-1.32.7.dev2 → girder_large_image_annotation-1.32.7.dev4}/girder_large_image_annotation/web_client/models/AnnotationModel.js

@@ -283,11 +283,12 @@ const AnnotationModel = AccessControlledModel.extend({
      * attribute is required.
      */
     save(options) {
-        const data = _.extend({}, this.get('annotation'));
         let url;
         let method;
         const isNew = this.isNew();
-
+        if (isNew && this._changeLog) {
+            delete this._changeLog;
+        }
         if (isNew) {
             if (!this.get('itemId')) {
                 throw new Error('itemId is required to save new annotations');
@@ -302,21 +303,35 @@ const AnnotationModel = AccessControlledModel.extend({
                 this.attributes.updatedId = getCurrentUser().id; // eslint-disable-line backbone/no-model-attributes
             }
         }
+        let data;
 
-        if (this._pageElements === false || isNew) {
-            this._pageElements = false;
-            data.elements = _.map(data.elements, (element) => {
-                element = _.extend({}, element);
-                if (element.label && !element.label.value) {
-                    delete element.label;
+        if (this._changeLog) {
+            method = 'PATCH';
+            const annot = this.get('annotation');
+            data = Object.values(this._changeLog);
+            Object.keys(annot).forEach((k) => {
+                if (k !== 'elements') {
+                    data.push({op: 'replace', path: k, value: annot[k]});
                 }
-                return element;
             });
+            delete this._changeLog;
         } else {
-            delete data.elements;
-            // we don't want to override an annotation with a partial response
-            if (this._pageElements === true) {
-                console.warn('Cannot save elements of a paged annotation');
+            data = _.extend({}, this.get('annotation'));
+            if (this._pageElements === false || isNew) {
+                this._pageElements = false;
+                data.elements = _.map(data.elements, (element) => {
+                    element = _.extend({}, element);
+                    if (element.label && !element.label.value) {
+                        delete element.label;
+                    }
+                    return element;
+                });
+            } else {
+                delete data.elements;
+                // we don't want to override an annotation with a partial response
+                if (this._pageElements === true) {
+                    console.warn('Cannot save elements of a paged annotation');
+                }
             }
         }
 

{girder_large_image_annotation-1.32.7.dev2 → girder_large_image_annotation-1.32.7.dev4/girder_large_image_annotation.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: girder-large-image-annotation
-Version: 1.32.7.dev2
+Version: 1.32.7.dev4
 Summary: A Girder plugin to store and display annotations on large, multiresolution images.
 Home-page: https://github.com/girder/large_image
 Author: Kitware, Inc.
@@ -19,7 +19,7 @@ Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: jsonschema>=2.5.1
-Requires-Dist: girder-large-image>=1.32.7.dev2
+Requires-Dist: girder-large-image>=1.32.7.dev4
 Requires-Dist: orjson
 Provides-Extra: compute
 Requires-Dist: openpyxl; extra == "compute"
@@ -28,7 +28,7 @@ Requires-Dist: pandas>=2.2; python_version >= "3.9" and extra == "compute"
 Requires-Dist: python-calamine; python_version >= "3.9" and extra == "compute"
 Requires-Dist: umap-learn; extra == "compute"
 Provides-Extra: tasks
-Requires-Dist: girder-large-image[tasks]>=1.32.7.dev2; extra == "tasks"
+Requires-Dist: girder-large-image[tasks]>=1.32.7.dev4; extra == "tasks"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier

{girder_large_image_annotation-1.32.7.dev2 → girder_large_image_annotation-1.32.7.dev4}/girder_large_image_annotation.egg-info/requires.txt

@@ -1,5 +1,5 @@
 jsonschema>=2.5.1
-girder-large-image>=1.32.7.dev2
+girder-large-image>=1.32.7.dev4
 orjson
 
 [compute]
@@ -14,4 +14,4 @@ pandas>=2.2
 python-calamine
 
 [tasks]
-girder-large-image[tasks]>=1.32.7.dev2
+girder-large-image[tasks]>=1.32.7.dev4

girder_large_image_annotation-1.32.7.dev2/girder_large_image_annotation/web_client/collections/ElementCollection.js

@@ -1,8 +0,0 @@
-import Backbone from 'backbone';
-
-import ElementModel from '../models/ElementModel';
-
-export default Backbone.Collection.extend({
-    model: ElementModel,
-    comparator: undefined
-});