Support deprecated v1 clara version for backward comptability (NVIDIA#60

)

* Support deprecated v1 clara version for backward comptability

* fix session check condition for deepgrow

* fix cursor movement/position error during model upload for deepgrow action

* Update readme for deepgrow action

* Don't save default server in register + disable aiaa session by default

* Update README.md

py-client/client_api.py

@@ -217,7 +217,7 @@ def segmentation(self, model, image_in, image_out, session_id=None):
             selector += '&session_id=' + AIAAUtils.urllib_quote_plus(session_id)
 
         in_fields = {'params': '{}'}
-        in_files = {'image': image_in} if not session_id else {}
+        in_files = {'datapoint': image_in} if not session_id else {}
 
         logger.debug('Using Selector: {}'.format(selector))
         logger.debug('Using Fields: {}'.format(in_fields))
@@ -231,6 +231,9 @@ def segmentation(self, model, image_in, image_out, session_id=None):
 
         form = json.loads(form) if isinstance(form, str) else form
         params = form.get('params')
+        if params is None: # v1 backward compatibility
+            points = json.loads(form.get('points'))
+            params = {'points': (json.loads(points) if isinstance(points, str) else points)}
         params = json.loads(params) if isinstance(params, str) else params
 
         AIAAUtils.save_result(files, image_out)
@@ -272,7 +275,7 @@ def dextr3d(self, model, point_set, image_in, image_out, pad=20, roi_size='128x1
             selector += '&session_id=' + AIAAUtils.urllib_quote_plus(session_id)
 
         in_fields = {'params': json.dumps({'points': json.dumps(points)})}
-        in_files = {'image': cropped_file} if not use_session_input else {}
+        in_files = {'datapoint': cropped_file} if not use_session_input else {}
 
         logger.debug('Using Selector: {}'.format(selector))
         logger.debug('Using Fields: {}'.format(in_fields))
@@ -322,7 +325,7 @@ def deepgrow(self, model, foreground, background, image_in, image_out, session_i
             selector += '&session_id=' + AIAAUtils.urllib_quote_plus(session_id)
 
         in_fields = {'params': json.dumps({'foreground': foreground, 'background': background})}
-        in_files = {'image': image_in} if not session_id else {}
+        in_files = {'datapoint': image_in} if not session_id else {}
 
         logger.debug('Using Selector: {}'.format(selector))
         logger.debug('Using Fields: {}'.format(in_fields))
@@ -358,7 +361,7 @@ def mask2polygon(self, image_in, point_ratio):
         params['more_points'] = point_ratio
 
         fields = {'params': json.dumps(params)}
-        files = {'image': image_in}
+        files = {'datapoint': image_in}
 
         status, response = AIAAUtils.http_multipart('POST', self._server_url, selector, fields, files,
                                                     multipart_response=False)
@@ -411,7 +414,7 @@ def fixpolygon(self, image_in, image_out, polygons, index, vertex_offset, propag
             params['propagate_neighbor'] = propagate_neighbor
 
         fields = {'params': json.dumps(params)}
-        files = {'image': image_in}
+        files = {'datapoint': image_in}
 
         status, form, files = AIAAUtils.http_multipart('POST', self._server_url, selector, fields, files)
         if status != 200:

slicer-plugin/NvidiaAIAA/SegmentEditorNvidiaAIAA.py

@@ -83,6 +83,16 @@ def __init__(self, parent):
       "NVIDIA-AIAA/compressData", compressDataMapper,
       "valueAsInt", str(qt.SIGNAL("valueAsIntChanged(int)")))
 
+    useSessionCheckBox = qt.QCheckBox()
+    useSessionCheckBox.checked = False
+    useSessionCheckBox.toolTip = ("Enable this option to make use of AIAA sessions."
+      " Volume is uploaded to AIAA as part of session once and it makes segmentation/dextr3d/deepgrow operations faster.")
+    aiaaGroupLayout.addRow("AIAA Session:", useSessionCheckBox)
+    useSessionMapper = ctk.ctkBooleanMapper(useSessionCheckBox, "checked", str(qt.SIGNAL("toggled(bool)")))
+    parent.registerProperty(
+      "NVIDIA-AIAA/aiaaSession", useSessionMapper,
+      "valueAsInt", str(qt.SIGNAL("valueAsIntChanged(int)")))
+
     vBoxLayout.addWidget(aiaaGroupBox)
     vBoxLayout.addStretch(1)