cancel case feature if grouping (#263)

* cancel case feature if grouping

* remove vocab assertion

* adjust table selection callback to comply with latest bokeh

Author: jmamou

solutions/set_expansion/set_expand.py

@@ -94,8 +94,11 @@ def __id2term(self, id):
         """
         norm = id.replace(self.mark_char, ' ')[:-1]
         if self.grouping:
-            assert(norm in self.id2rep)
-            return self.id2rep[norm]
+            if norm in self.id2rep:
+                return self.id2rep[norm]
+            else:
+                logger.warning("id:#%s#, norm:#%s# is not in id2rep")
+                return ""
         return norm
 
     def get_vocab(self):
@@ -137,17 +140,19 @@ def expand(self, seed, topn=500):
         lower = True
         for np in seed:
             np = np.strip()
-            if np[0].islower():
-                upper = False
-            else:
-                lower = False
+            if not self.grouping and (upper or lower):
+                # case feature is relevant only if we don't have grouping
+                if np[0].islower():
+                    upper = False
+                else:
+                    lower = False
             id = self.__term2id(np)
             if id is not None:
                 seed_ids.append(id)
             else:
                 logger.warning("The term: '%s' is out-of-vocabulary.", np)
         if len(seed_ids) > 0:
-            if upper or lower:
+            if not self.grouping and (upper or lower):
                 res_id = self.np2vec_model.most_similar(seed_ids, topn=2 * topn)
             else:
                 res_id = self.np2vec_model.most_similar(seed_ids, topn=topn)
@@ -156,7 +161,7 @@ def expand(self, seed, topn=500):
                 if len(res) == topn:
                     break
                 # pylint: disable=R0916
-                if (not lower and not upper) or (upper and r[0][0].isupper()) or \
+                if self.grouping or (not lower and not upper) or (upper and r[0][0].isupper()) or \
                         (lower and r[0][0].islower()):
                     res.append((self.__id2term(r[0]), r[1]))
             return res

solutions/set_expansion/ui/main.py

@@ -147,14 +147,15 @@ def send_request_to_server(request):
         sock.close()
 
 
-def row_selected_callback(attr, old, new):
+def row_selected_callback(indices, old, new):
+    logger.info('row selected callback')
     global clear_flag, all_selected_phrases
     if not clear_flag and expand_table_source.data != empty_table:
         logger.info('row selected callback. old indices=%s. new indices=%s',
-                    str(old.indices), str(new.indices))
+                    str(old), str(new))
         # sync phrases lists:
-        old_phrases = [expand_table_source.data['res'][p] for p in old.indices]
-        new_phrases = [expand_table_source.data['res'][p] for p in new.indices]
+        old_phrases = [expand_table_source.data['res'][p] for p in old]
+        new_phrases = [expand_table_source.data['res'][p] for p in new]
         logger.info('selected_expand was updated: old=%s ,new=%s', str(
             old_phrases), str(new_phrases))
         # phrase was de-selected from expand list:
@@ -372,7 +373,7 @@ def get_selected_phrases_for_seed():
     return phrases
 
 
-def expand_data_changed_callback(attr, old, new):
+def expand_data_changed_callback(data, old, new):
     """
     remove the selected indices when table is empty
     """
@@ -384,7 +385,7 @@ def expand_data_changed_callback(attr, old, new):
 
 expand_button.on_click(get_expand_results_callback)
 # save_button.on_click(save_data_callback)
-expand_table_source.on_change('selected', row_selected_callback)
+expand_table_source.selected.on_change('indices', row_selected_callback)
 expand_table_source.on_change('data', expand_data_changed_callback)
 checkbox_group.on_click(show_phrases_callback)
 search_input_box.on_change('value', search_callback)