Handle return errors

Author: IsabelParedes

ipynao/nao_robot.py

@@ -21,13 +21,11 @@ class NaoRobotService():
     widget = None
     output = None
 
-    def __init__(self, widget, output, service_name):
+    def __init__(self, widget, service_name):
         self.name = service_name
         self.widget = widget
-        self.output = output
 
     async def create_service_msg(self, method_name, *args, **kwargs):
-        self.widget._response = None
         data = {}
         data["command"] = "callService"
         data["service"] = str(self.name)
@@ -41,9 +39,9 @@ async def create_service_msg(self, method_name, *args, **kwargs):
         try:
             await self.widget.wait_for_change('counter')
         except Exception as e:
-            self.output.append_stdout("wrong wrong: " + str(e) + '\n')
+            return e
 
-        return self.widget.js_response
+        return self.widget.response
 
     def __getattr__(self, method_name):
         return lambda *x, **y: self.create_service_msg(method_name, *x, **y)
@@ -59,12 +57,10 @@ class NaoRobotWidget(DOMWidget):
     _view_module = Unicode(module_name).tag(sync=True)
     _view_module_version = Unicode(module_version).tag(sync=True)
 
-    value = Unicode('Hello World').tag(sync=True)
     connected = Unicode("Disconnected").tag(sync=True)
     status = Unicode("Not busy").tag(sync=True)
-    response = Unicode("").tag(sync=True)
     counter = Integer(0).tag(sync=True)
-    js_response = None
+    response = None
 
 
     def __init__(self, **kwargs):
@@ -74,16 +70,19 @@ def __init__(self, **kwargs):
 
     def _handle_frontend_msg(self, model, msg, buffer):
         print("Received frontend msg: ", msg)
-        self.js_response = msg
+        self.response = msg
 
 
     def wait_for_change(widget, value_name):
         future = asyncio.Future()
 
         def get_value_change(change):
             widget.unobserve(get_value_change, names=value_name)
-            future.set_result(widget.js_response)
-
+            if (widget.response != None):
+                future.set_result(widget.response)
+            else:
+                future.set_result(change)    
+        
         widget.observe(get_value_change, names=value_name)
         return future    
 
@@ -96,9 +95,9 @@ def connect(self, ip_address="nao.local", port="80"):
         self.send(data)
 
 
-    def service(self, output, service_name):
+    def service(self, service_name):
         data = {}
         data["command"] = str("createService")
         data["service"] = str(service_name)
         self.send(data)
-        return NaoRobotService(self, output, service_name)
+        return NaoRobotService(self, service_name)

src/widget.ts

@@ -35,10 +35,8 @@ export class NaoRobotModel extends DOMWidgetModel {
       _view_name: NaoRobotModel.view_name,
       _view_module: NaoRobotModel.view_module,
       _view_module_version: NaoRobotModel.view_module_version,
-      value: 'Hello World',
       connected: 'Disconnected',
       status: 'Not busy',
-      response: '',
       counter: 0,
     };
   }
@@ -141,29 +139,25 @@ export class NaoRobotModel extends DOMWidgetModel {
       return;
     }
 
-    let serviceResponse;
+    // let serviceResponse;
     this.changeStatus('Running method ' + methodName);
 
     const servicePromise = this._services[serviceName][methodName](...args);
-    serviceResponse = await servicePromise.then(
+    await servicePromise.then(
       (resolution: any) => {
         this.changeStatus('Task completed');
-        this.set('counter', this.get('counter') + 1);
-        return resolution;
+        if (resolution !== undefined) {
+          this.send(resolution)
+        }
       }
     ).catch(
       (rejection: string) => {
         this.changeStatus(rejection);
+        this.send(rejection);
       }
     );
 
-    
-    if (serviceResponse !== undefined) {
-      console.log("OOO received response ", serviceResponse);
-      this.send(serviceResponse);
-      this.set('status', serviceResponse.toString());
-    }
-
+    this.set('counter', this.get('counter') + 1);
     this.save_changes();
   }