Merge pull request #2 from flywheel-apps/GEAR-1498-custom-classification

[GEAR-1498] custom classification

Author: naterichman

README.md

@@ -1,3 +1,5 @@
+# This repo is now hosted in [flywheel-apps](https://github.com/flywheel-apps/dicom-mr-classifer)
+
 [![Docker Pulls](https://img.shields.io/docker/pulls/scitran/dicom-mr-classifier.svg)](https://hub.docker.com/r/scitran/dicom-mr-classifier/)
 [![Docker Stars](https://img.shields.io/docker/stars/scitran/dicom-mr-classifier.svg)](https://hub.docker.com/r/scitran/dicom-mr-classifier/)
 [![CircleCI](https://circleci.com/gh/scitran-apps/dicom-mr-classifier.svg?style=svg)](https://circleci.com/gh/scitran-apps/dicom-mr-classifier)

dicom-mr-classifier.py

@@ -408,7 +408,7 @@ def get_custom_classification(label, config=None):
     for k in classifications.keys():
         val = classifications[k]
 
-        if not isinstance(val, basestring):
+        if not isinstance(val, str):
             log.warn("Expected string value for classification key %s", k)
             continue
 
@@ -587,18 +587,27 @@ def dicom_classify(zip_file_path, outbase, timezone, config=None):
                 classification = {'Custom': ['N/A']}
         elif dcm.get("Modality") != "MR":
             classification = {}
-        dicom_file["classification"] = classification
+        dicom_file["classification"].update(classification)
 
     # If no pixel data present, make classification intent "Non-Image"
     if not hasattr(dcm, "PixelData"):
-        nonimage_intent = {"Intent": ["Non-Image"]}
+        nonimage_intent = "Non-Image"
         # If classification is a dict, update dict with intent
         if isinstance(dicom_file["classification"], dict):
-            dicom_file["classification"].update(nonimage_intent)
+            classification  = dicom_file['classification']
+            # If intent not present, add it with nonimage_intent
+            if 'Intent' not in classification:
+                classification['Intent'] = nonimage_intent
+            else:
+                # Otherwise append non-image if not in Intent
+                if nonimage_intent not in classification['Intent']:
+                    classification['Intent'].append(nonimage_intent)
         # Else classification is a list, assign dict with intent
         else:
             dicom_file["classification"] = nonimage_intent
 
+
+
     # File info from dicom header
     dicom_file["info"] = get_dicom_header(dcm)
 

manifest.json

@@ -8,10 +8,10 @@
   "source": "https://github.com/flywheel-apps/dicom-mr-classifier/releases",
   "license": "Apache-2.0",
   "flywheel": "0",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "custom": {
     "gear-builder": {
-      "image": "flywheel/dicom-mr-classifier:1.4.4",
+      "image": "flywheel/dicom-mr-classifier:1.4.5",
       "category": "converter"
     },
     "flywheel": {