Merge pull request #1501 from ImagingDataCommons/release-49-sp

Cart and cohort downloads

Author: s-paquette

idc/views.py

@@ -694,7 +694,29 @@ def get_series(request, collection_id=None, patient_id=None, study_uid=None):
             filtergrp_list = body.get("filtergrp_list", {})
             if not(len(partitions) or len(filtergrp_list)):
                 raise Exception("You can only request series IDs based on a filter, collection ID, Patient ID, or study ID!")
-            result = cart_manifest(filtergrp_list, partitions, 0, fields, MAX_FILE_LIST_REQUEST)
+            if len(partitions):
+                result = cart_manifest(filtergrp_list, partitions, 0, fields, MAX_FILE_LIST_REQUEST)
+            else:
+                source = ImagingDataCommonsVersion.objects.get(active=True).get_data_sources(
+                    active=True, source_type=DataSource.SOLR,
+                    aggregate_level="SeriesInstanceUID"
+                ).first()
+                filter_query = build_solr_query(
+                    { w: v for x in filtergrp_list for w, v in list(x.items())},
+                    with_tags_for_ex=False,
+                    search_child_records_by=None, solr_default_op='AND'
+                )
+                result = query_solr_and_format_result(
+                    {
+                        "collection": source.name,
+                        "fields": fields,
+                        "query_string": None,
+                        "fqs": [filter_query['full_query_str']],
+                        "facets": {'instance_size': 'sum(instance_size)'}, "sort": None, "counts_only": False, "limit": MAX_FILE_LIST_REQUEST,
+                        "totals": ['SeriesInstanceUID', 'collection_id', 'PatientID', 'StudyInstanceUID']
+                    },
+                    normalize_facets=False
+                )
         else:
             source = ImagingDataCommonsVersion.objects.get(active=True).get_data_sources(
                 active=True, source_type=DataSource.SOLR,
@@ -718,7 +740,7 @@ def get_series(request, collection_id=None, patient_id=None, study_uid=None):
                     "fields": fields,
                     "query_string": None,
                     "fqs": [filter_query['full_query_str']],
-                    "facets": None, "sort": None, "counts_only": False, "limit": 2000
+                    "facets": None, "sort": None, "counts_only": False, "limit": MAX_FILE_LIST_REQUEST
                 }
             )
 
@@ -733,6 +755,14 @@ def get_series(request, collection_id=None, patient_id=None, study_uid=None):
                 "patient_id": doc["PatientID"],
                 "collection_id": doc['collection_id'][0]
             })
+        if 'facets' in result:
+            response['download_stats'] = {
+                'series_count': result['facets']['total_SeriesInstanceUID'],
+                'study_count': result['facets']['total_StudyInstanceUID'],
+                'collection_count': result['facets']['total_collection_id'],
+                'case_count': result['facets']['total_PatientID'],
+                'queue_byte_size': result['facets']['instance_size'],
+            }
 
     except Exception as e:
         logger.error("[ERROR] While fetching series per study ID:")

static/js/downloader.js

@@ -56,9 +56,9 @@ require([
         }
         let byte_count = 0;
         let converted_size = size;
-        while(converted_size > 1024) {
+        while(converted_size > 1000) {
             byte_count += 1;
-            converted_size /= 1024;
+            converted_size /= 1000;
         }
         let bytes = (Math.round(converted_size*1000)/1000).toFixed(3);
         return `${bytes} ${byte_level[byte_count]}` ;
@@ -219,10 +219,14 @@ require([
         queue_byte_size = 0;
         bytes_downloaded = 0;
         series_count = 0;
+        study_count = 0;
+        case_count = 0;
+        collection_count = 0;
         start_time = -1;
         collections = new Set([]);
         cases = new Set([]);
         studies = new Set([]);
+        preset_totals = false;
 
         cancellation_underway = false;
 
@@ -257,12 +261,24 @@ require([
             this.bytes_downloaded = 0;
             this.series_count = 0;
             this.collections = new Set([]);
+            this.collection_count = 0;
             this.cases = new Set([]);
+            this.case_count = 0;
             this.studies = new Set([]);
+            this.study_count = 0;
             this.cancellation_underway = false;
             this.start_time = -1;
         }
 
+        set_download_totals(queue_byte_size, collection_count, case_count, study_count, series_count) {
+            this.queue_byte_size = queue_byte_size;
+            this.collection_count = collection_count;
+            this.case_count = case_count;
+            this.study_count = study_count;
+            this.series_count = series_count;
+            this.preset_totals = true;
+        }
+
         get active_requests() {
             return (this.working_queue.length > 0);
         }
@@ -294,11 +310,16 @@ require([
             let request_success = false;
             if(this.hopper.length < this.HOPPER_LIMIT && !this.cancellation_underway) {
                 this.hopper.push(new DownloadRequest(request));
-                this.queue_byte_size += parseFloat(request['series_size']);
-                this.series_count += 1;
                 this.studies.add(request['study_id']);
                 this.collections.add(request['collection_id']);
                 this.cases.add(request['patient_id']);
+                if(!this.preset_totals) {
+                    this.queue_byte_size += parseFloat(request['series_size']);
+                    this.series_count += 1;
+                    this.collection_count = this.collections.size;
+                    this.study_count = this.studies.size;
+                    this.case_count = this.cases.size;
+                }
                 request_success = true;
             }
             return request_success;
@@ -494,9 +515,9 @@ require([
 
         get all_requested() {
             return `${this.queues.total_downloads_requested} requested in ` +
-                `${this.queues.collections.size} collection(s) / ` +
-                `${this.queues.cases.size} case(s) / ` +
-                `${this.queues.studies.size} ${this.queues.studies.size <= 1 ? "study" : "studies"} / ` +
+                `${this.queues.collection_count} collection(s) / ` +
+                `${this.queues.case_count} case(s) / ` +
+                `${this.queues.study_count} ${this.queues.study_count <= 1 ? "study" : "studies"} / ` +
                 `${this.queues.series_count} series`;
         }
 
@@ -655,6 +676,12 @@ require([
             });
         }
 
+        set_download_stats(stats) {
+            this.queues.set_download_totals(
+                stats.queue_byte_size, stats.collection_count, stats.case_count, stats.study_count, stats.series_count
+            );
+        }
+
         beginDownloads() {
             if(!this.queues.isEmpty()) {
                 if(this.in_progress <= 0) {
@@ -793,6 +820,9 @@ require([
                 }
                 const series_data = await response.json();
                 series.push(...series_data['result']);
+                if('download_stats' in series_data){
+                    downloader_manager.set_download_stats(series_data['download_stats']);
+                }
             }
         } else {
             series.push({