Merge pull request #1078 from girder/user-annotation-validation

Speed up validating validating annotations with user fields.
girder · Mar 8, 2023 · 0016e08 · 0016e08
2 parents eabb84e + 0b12e6e
commit 0016e08
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,8 @@
 - Allow ICC correction to specify intent ([#1066](../../pull/1066))
 - Make tile sources pickleable ([#1071](../../pull/1071))
 - Extract scale information from more bioformats files ([#1074](../../pull/1074))
+- Speed up validating validating annotations with user fields ([#1078](../../pull/1078))
+
 
 ### Bug Fixes
 - The cache could reuse a class inappropriately ([#1070](../../pull/1070))

diff --git a/girder_annotation/girder_large_image_annotation/models/annotation.py b/girder_annotation/girder_large_image_annotation/models/annotation.py
@@ -1009,6 +1009,8 @@ def _similarElementStructure(self, a, b, parentKey=None):  # noqa
                 if k == 'id':
                     if not isinstance(b[k], str) or not self.idRegex.match(b[k]):
                         return False
+                elif parentKey == 'user':
+                    continue
                 elif parentKey != 'label' or k != 'value':
                     if not self._similarElementStructure(a[k], b[k], k):
                         return False