Clean up

Author: IsabelParedes

ipynao/nao_robot.py

@@ -4,9 +4,9 @@
 # Copyright (c) Isabel Paredes.
 # Distributed under the terms of the Modified BSD License.
 
-"""
+'''
 TODO: Add module docstring
-"""
+'''
 
 from ipywidgets import DOMWidget, Output
 from traitlets import Unicode, Integer
@@ -26,12 +26,12 @@ def __init__(self, widget, service_name, output=Output()):
 
     def _create_msg(self, method_name, *args, **kwargs):
         data = {}
-        data["command"] = "callService"
-        data["service"] = str(self.name)
-        data["method"]  = str(method_name)
+        data['command'] = 'callService'
+        data['service'] = str(self.name)
+        data['method']  = str(method_name)
         # convert tuple to list to avoid empty arg values
-        data["args"]    = list(args)
-        data["kwargs"]  = kwargs
+        data['args']    = list(args)
+        data['kwargs']  = kwargs
         return data
 
     def call_service(self, method_name, *args, **kwargs):
@@ -44,32 +44,30 @@ async def async_call_service(self, method_name, *args, **kwargs):
 
         try:
             self.output.clear_output()
-            self.output.append_stdout("Calling service... \n")
+            self.output.append_stdout('Calling service... \n')
             await self.widget.wait_for_change('counter', self.output)
         except Exception as e:
             return e
-        return self.widget.response["data"]
+        return self.widget.response['data']
 
 
     def __getattr__(self, method_name):
-        if (method_name[:6] == "async_"):
+        if (method_name[:6] == 'async_'):
             return lambda *x, **y: self.async_call_service(method_name[6:], *x, **y)
         else:
             return lambda *x, **y: self.call_service(method_name, *x, **y)
 
 
 class NaoRobotWidget(DOMWidget):
-    """TODO: Add docstring here
-    """
     _model_name = Unicode('NaoRobotModel').tag(sync=True)
     _model_module = Unicode(module_name).tag(sync=True)
     _model_module_version = Unicode(module_version).tag(sync=True)
     _view_name = Unicode('NaoRobotView').tag(sync=True)
     _view_module = Unicode(module_name).tag(sync=True)
     _view_module_version = Unicode(module_version).tag(sync=True)
 
-    connected = Unicode("Disconnected").tag(sync=True)
-    status = Unicode("Not busy").tag(sync=True)
+    connected = Unicode('Disconnected').tag(sync=True)
+    status = Unicode('Not busy').tag(sync=True)
     counter = Integer(0).tag(sync=True)
     response = None
 
@@ -80,7 +78,7 @@ def __init__(self, **kwargs):
 
 
     def _handle_frontend_msg(self, model, msg, buffer):
-        print("Received frontend msg: ", msg)
+        print('Received frontend msg: ', msg)
         self.response = msg
 
 
@@ -91,36 +89,36 @@ def wait_for_change(widget, value_name, output=Output()):
         def get_value_change(change):
             widget.unobserve(get_value_change, names=value_name)
             if (widget.response != None):
-                if (widget.response["isError"]):
-                    future.set_exception(Exception(widget.response["data"]))
-                    output.append_stderr(widget.response["data"])
+                if (widget.response['isError']):
+                    future.set_exception(Exception(widget.response['data']))
+                    output.append_stderr(widget.response['data'])
                 else:
-                    future.set_result(widget.response["data"])
-                    output.append_stdout(widget.response["data"])
+                    future.set_result(widget.response['data'])
+                    output.append_stdout(widget.response['data'])
             else:
                 future.set_result(change)    
 
         widget.observe(get_value_change, names=value_name)
         return future    
 
 
-    def connect(self, ip_address="nao.local", port="80"):      
+    def connect(self, ip_address='nao.local', port='80'):      
         data = {}
-        data["command"] = str("connect")
-        data["ipAddress"] = str(ip_address)
-        data["port"] = str(port)
+        data['command'] = str('connect')
+        data['ipAddress'] = str(ip_address)
+        data['port'] = str(port)
         self.send(data)
 
 
     def disconnect(self):
         data = {}
-        data["command"] = str("disconnect")
+        data['command'] = str('disconnect')
         self.send(data)
 
 
     def service(self, service_name, output=Output()):
         data = {}
-        data["command"] = str("createService")
-        data["service"] = str(service_name)
+        data['command'] = str('createService')
+        data['service'] = str(service_name)
         self.send(data)
         return NaoRobotService(self, service_name, output)

src/widget.ts

@@ -118,7 +118,7 @@ export class NaoRobotModel extends DOMWidgetModel {
 
     // Skip if service exists already
     if (this._services[serviceName] !== undefined) {
-      console.log("Service " + serviceName + " exists.");
+      console.log('Service ' + serviceName + ' exists.');
       return;
     }
 
@@ -147,7 +147,6 @@ export class NaoRobotModel extends DOMWidgetModel {
     args: any,
     _kwargs: any
   ) {
-
     // Reconnect as needed
     if (!this.qiSession.isConnected()) {
       await this.connect(this._ipAddress, this._port);
@@ -163,7 +162,7 @@ export class NaoRobotModel extends DOMWidgetModel {
         break;
       }
       await sleep(100);
-    }    
+    }
 
     if (this._services[serviceName][methodName] === undefined) {
       this.changeStatus(methodName + ' does not exist for ' + serviceName);
@@ -178,15 +177,14 @@ export class NaoRobotModel extends DOMWidgetModel {
         this.changeStatus('Task completed');
         this.send({
           isError: false,
-          data: resolution ?? true
+          data: resolution ?? true,
         });
-        
       })
       .catch((rejection: string) => {
         this.changeStatus(rejection);
         this.send({
           isError: true,
-          data: rejection
+          data: rejection,
         });
       });