Infer sig readable work

Author: jrlegrand

parsers/sig.py

@@ -151,12 +151,13 @@ def parse(self, sig_text):
         return match_dict
 
     # infer method, dose_unit, and route from NDC or RXCUI
-    def infer(self, ndc=None, rxcui=None):
-        sig_elements = ['method', 'dose_unit', 'route']
+    def infer(self, match_dict, ndc=None, rxcui=None):
+        #sig_elements = ['method', 'dose_unit', 'route']
+        sig_elements = ['method', 'route']
         inferred = dict.fromkeys(sig_elements)
         for sig_element in sig_elements:
             inferred[sig_element] = infer_sig_element(sig_element, ndc, rxcui)
-        #inferred['sig_readable'] = self.get_readable(match_dict)
+        inferred['sig_readable'] = self.get_readable(match_dict, inferred_method=inferred['method'], inferred_route=inferred['route'])
         return inferred
 
     # parse a csv

sig/views.py

@@ -82,7 +82,8 @@ def create(self, request, *args, **kwargs):
             # else, return optimal sig_parsed (for customers)
             sig = serializer.data if request.user.is_staff else self.replace_sig_parsed_optimal(serializer.data)
             if ndc or rxcui:
-                sig['sig_inferred'] = self.get_sig_inferred(ndc=ndc, rxcui=rxcui)
+                sig_parsed = sig['sig_parsed'][0] if type(sig['sig_parsed']) is list else sig['sig_parsed']
+                sig['sig_inferred'] = self.get_sig_inferred(sig_parsed, ndc=ndc, rxcui=rxcui)
             sig['original_sig_text'] = original_sig_text
             return Response(sig, status=status.HTTP_201_CREATED, headers=headers)
         # if sig DOES exist...
@@ -99,12 +100,13 @@ def create(self, request, *args, **kwargs):
             # else, return optimal sig_parsed (for customers)
             sig = serializer.data if request.user.is_staff else self.replace_sig_parsed_optimal(serializer.data)
             if ndc or rxcui:
-                sig['sig_inferred'] = self.get_sig_inferred(ndc=ndc, rxcui=rxcui)
+                sig_parsed = sig['sig_parsed'][0] if type(sig['sig_parsed']) is list else sig['sig_parsed']
+                sig['sig_inferred'] = self.get_sig_inferred(sig_parsed, ndc=ndc, rxcui=rxcui)
             sig['original_sig_text'] = original_sig_text
             return Response(sig)
 
-    def get_sig_inferred(self, ndc=None, rxcui=None):
-        sig_inferred_data = SigParser().infer(ndc, rxcui)
+    def get_sig_inferred(self, sig_parsed, ndc=None, rxcui=None):
+        sig_inferred_data = SigParser().infer(sig_parsed, ndc, rxcui)
         return sig_inferred_data
 
     def replace_sig_parsed_optimal(self, sig):