Cleaned up references to JSON. Transport now hides all this, instead of double-converting into JSON each time.

Author: Sean Trott

src/main/nluas/app/core_solver.py

@@ -72,8 +72,8 @@ def initialize_templates(self):
         self.parameter_templates = self.read_templates(self.__path__+"parameter_templates.json")
 
     def request_clarification(self, ntuple, message="This ntuple requires clarification."):
-        new = self.decoder.convert_to_JSON(ntuple)
-        request = {'ntuple': new, 'message': message, 'type': 'clarification', 'tag': self.address}
+        #new = self.decoder.convert_to_JSON(ntuple)
+        request = {'ntuple': ntuple, 'message': message, 'type': 'clarification', 'tag': self.address}
         self.transport.send(self.ui_address, json.dumps(request))
 
     def identification_failure(self, message):
@@ -88,8 +88,8 @@ def return_error_descriptor(self, message):
         request = {'type': 'error_descriptor', 'message': message, 'tag': self.address}
         self.transport.send(self.ui_address, json.dumps(request))
 
-    def solve(self, json_ntuple):
-        ntuple = self.decoder.convert_JSON_to_ntuple(json_ntuple)
+    def solve(self, ntuple):
+        #ntuple = self.decoder.convert_JSON_to_ntuple(json_ntuple)
         if self.check_for_clarification(ntuple):
             self.request_clarification(ntuple=ntuple)
         else:
@@ -139,6 +139,7 @@ def solve_conditional_query(self, ntuple):
         print(ntuple.keys())
 
     def route_event(self, eventDescription, predicate):
+        print(eventDescription)
         if "complexKind" in eventDescription and eventDescription['complexKind'] == "conditional":
             dispatch = getattr(self, "solve_conditional_{}".format(predicate))
             return dispatch(eventDescription)

src/main/nluas/language/__pycache__/core_specializer.cpython-34.pyc

@@ -74,6 +74,8 @@ def specialize_fragment(self, fs):
             return None
         elif self.analyzer.issubtype("SCHEMA", fs.m.type(), "RD"):
             return self.get_objectDescriptor(fs.m)
+        elif self.analyzer.issubtype("SCHEMA", fs.m.type(), "HeadingSchema"):
+            return self.get_headingDescriptor(fs.m)
         elif self.analyzer.issubtype("SCHEMA", fs.m.type(), "PropertyModifier"):
             return self.get_property(fs.m)
         #elif self.analyzer.issubtype("SCHEMA", fs.m.type(), "EventDescriptor"): # Testing...

src/main/nluas/language/core_specializer.py

@@ -49,28 +49,15 @@ def prompt(self):
                 self.clarification = False
             else:
                 ntuple = {'text': msg, 'type': "standard"}
-            json_ntuple = json.dumps(ntuple)
-            self.transport.send(self.ui_destination, json_ntuple)
+            self.transport.send(self.ui_destination, ntuple)
 
     def callback(self, ntuple):
         """ Callback for receiving information from UI-Agent. """
-        ntuple = json.loads(ntuple)
+        #ntuple = json.loads(ntuple)
         if "type" in ntuple and ntuple['type'] == "clarification":
             self.clarification = True
             self.original = ntuple['original']
             self.output_stream(ntuple['tag'], ntuple['message'])
-            """
-            while True:
-                print("++++++++++++++")
-                msg = input("> ")
-                if msg == "q":
-                    self.clarification = False
-
-                    break
-                elif msg != None and msg != "":
-                    self.transport.send(self.ui_destination, json.dumps({'text': msg, 'type': 'clarification', 'original': ntuple['original']}))
-                    self.clarification = False
-            """
 
 
 

src/main/nluas/language/text_agent.py

@@ -47,8 +47,6 @@ def __init__(self, args):
         self.transport.subscribe(self.solve_destination, self.callback)
         self.transport.subscribe(self.speech_address, self.speech_callback)
         self.transport.subscribe(self.text_address, self.text_callback)
-        print(self.speech_address)
-        print(self.address)
 
 
     def setup_ui_parser(self):
@@ -110,8 +108,8 @@ def process_input(self, msg):
                     self.specializer.set_spans(matched)
                     ntuple = self.specializer.specialize(fs)
 
-                    json_ntuple = self.decoder.convert_to_JSON(ntuple)
-                    return json_ntuple
+                    #json_ntuple = self.decoder.convert_to_JSON(ntuple)
+                    return ntuple
                 except Exception as e:
                     self.output_stream(self.name, e)
                     #traceback.print_exc()
@@ -126,20 +124,17 @@ def output_stream(self, tag, message):
     def speech_callback(self, ntuple):
         """ Processes text from a SpeechAgent. """
         #print(ntuple)
-        print(ntuple)
         #ntuple = json.loads(ntuple)
-        print(ntuple['text'])
-        json_ntuple = self.process_input(ntuple['text'])
-        
-        if json_ntuple and json_ntuple != "null" and "predicate_type" in json.loads(json_ntuple):
-            self.transport.send(self.solve_destination, json_ntuple)
+        new_ntuple = self.process_input(ntuple['text']) 
+        if new_ntuple and new_ntuple != "null" and "predicate_type" in new_ntuple:
+            self.transport.send(self.solve_destination, new_ntuple)
 
 
     def text_callback(self, ntuple):
         """ Processes text from a SpeechAgent. """
         #print(ntuple)
         specialize = True
-        ntuple = json.loads(ntuple)
+        #ntuple = json.loads(ntuple)
         msg = ntuple['text']
         if ntuple['type'] == "standard":
             if msg == None or msg == "":
@@ -148,19 +143,14 @@ def text_callback(self, ntuple):
                 self.specializer.set_debug()
                 specialize = False
             elif specialize:
-                json_ntuple = self.process_input(ntuple['text'])
-                if json_ntuple and json_ntuple != "null" and "predicate_type" in json.loads(json_ntuple):
-                    self.transport.send(self.solve_destination, json_ntuple)
+                new_ntuple = self.process_input(ntuple['text'])
+                if new_ntuple and new_ntuple != "null" and "predicate_type" in new_ntuple:
+                    self.transport.send(self.solve_destination, new_ntuple)
         elif ntuple['type'] == "clarification":
-            first = self.process_input(msg)
-            descriptor = json.loads(first)
-            #print(descriptor)
-            converted = json.loads(ntuple['original'])
+            descriptor = self.process_input(msg)
             self.clarification = False
-            new_ntuple = self.clarify_ntuple(converted, descriptor)
-            json_ntuple = self.decoder.convert_to_JSON(new_ntuple)
-            #json_ntuple = json.dumps(new_ntuple)
-            self.transport.send(self.solve_destination, json_ntuple)
+            new_ntuple = self.clarify_ntuple(ntuple['original'], descriptor)
+            self.transport.send(self.solve_destination, new_ntuple)
             self.clarification = False
 
 
@@ -206,17 +196,17 @@ def prompt(self):
                     specialize = False
                 elif specialize:
                     #if self.check_spelling(msg):
-                    json_ntuple = self.process_input(msg)
-                    if json_ntuple and json_ntuple != "null" and "predicate_type" in json.loads(json_ntuple):
-                        self.transport.send(self.solve_destination, json_ntuple)
+                    ntuple = self.process_input(msg)
+                    if ntuple and ntuple != None and "predicate_type" in ntuple:
+                        self.transport.send(self.solve_destination, ntuple)
 
 
 
     def process_clarification(self, tag, msg, ntuple):
         self.clarification = True
         #self.output_stream(tag, msg)
-        json_ntuple = json.dumps({'tag': tag, 'message': msg, 'type': "clarification", 'original': ntuple})
-        self.transport.send(self.text_address, json_ntuple)
+        new_ntuple = {'tag': tag, 'message': msg, 'type': "clarification", 'original': ntuple}
+        self.transport.send(self.text_address, new_ntuple)
         """
         #print(ntuple)
         while True: