fixing web export of filtered annotations

Author: BryonLewis

server/dive_server/crud_dataset.py

@@ -263,6 +263,10 @@ def makeAnnotationAndMedia(dsFolder: types.GirderModel):
 
     def stream():
         z = ziputil.ZipGenerator()
+        nestedExcludeBelowThreshold = excludeBelowThreshold
+        nestedTypeFilter = typeFilter
+        if nestedTypeFilter is None:
+            nestedTypeFilter = set()
         for dsFolder in dsFolders:
             zip_path = f"./{dsFolder['name']}/"
             try:
@@ -291,25 +295,23 @@ def makeDiveJson():
                 annotations = crud_annotation.get_annotations(dsFolder)
                 tracks = annotations['tracks']
 
-                if excludeBelowThreshold:
+                if nestedExcludeBelowThreshold:
                     thresholds = fromMeta(dsFolder, "confidenceFilters", {})
-                    if thresholds is None:
-                        thresholds = {}
+                if thresholds is None:
+                    thresholds = {}
 
-                updated_tracks = []
-                if typeFilter is None:
-                    typeFilter = set()
+                updated_tracks = {}
                 for t in tracks:
-                    track = models.Track(**t)
-                    if (not excludeBelowThreshold) or track.exceeds_thresholds(thresholds):
+                    track = models.Track(**tracks[t])
+                    if (not nestedExcludeBelowThreshold) or track.exceeds_thresholds(thresholds):
                         # filter by types if applicable
-                        if typeFilter:
-                            confidence_pairs = [item for item in track.confidencePairs if item[0] in typeFilter]
+                        if nestedTypeFilter:
+                            confidence_pairs = [item for item in track.confidencePairs if item[0] in nestedTypeFilter]
                             # skip line if no confidence pairs
                             if not confidence_pairs:
                                 continue
-                        updated_tracks.append[track]
-                annotations['tracks'] = updated_tracks
+                        updated_tracks[t] = tracks[t]
+                annotations['tracks'] = updated_tracks         
                 yield json.dumps(annotations)
 
             for data in z.addFile(makeMetajson, Path(f'{zip_path}meta.json')):

server/dive_server/views_annotation.py

@@ -9,7 +9,7 @@
 from girder.exceptions import RestException
 from girder.models.folder import Folder
 
-from dive_utils import constants, setContentDisposition
+from dive_utils import constants, setContentDisposition, models, fromMeta
 
 from . import crud, crud_annotation
 
@@ -152,6 +152,29 @@ def export(
             setContentDisposition(f'{folder["name"]}.dive.json', mime='application/json')
             setRawResponse()
             annotations = crud_annotation.get_annotations(folder, revision=revisionId)
+            tracks = annotations['tracks']
+            if excludeBelowThreshold:
+                thresholds = fromMeta(folder, "confidenceFilters", {})
+            if thresholds is None:
+                thresholds = {}
+
+            updated_tracks = []
+            if typeFilter is None:
+                typeFilter = set()
+            print(tracks)
+            for t in tracks:
+                print(t)
+                print(tracks[t])
+                track = models.Track(**tracks[t])
+                if (not excludeBelowThreshold) or track.exceeds_thresholds(thresholds):
+                    # filter by types if applicable
+                    if typeFilter:
+                        confidence_pairs = [item for item in track.confidencePairs if item[0] in typeFilter]
+                        # skip line if no confidence pairs
+                        if not confidence_pairs:
+                            continue
+                    updated_tracks.append(tracks[t])
+            annotations['tracks'] = updated_tracks
             return json.dumps(annotations).encode('utf-8')
         else:
             raise RestException(f'Format {format} is not a valid option.')