Skip to content

Commit cefad01

Browse files
committed
Simplify msg from frontend handling
1 parent c5bfcd8 commit cefad01

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

ipynao/nao_robot.py

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ async def async_call_service(self, method_name, *args, **kwargs):
4949
await self.widget.wait_for_change('counter', self.output)
5050
except Exception as e:
5151
return e
52-
return self.widget.response
52+
return self.widget.response["data"]
5353

5454

5555
def __getattr__(self, method_name):
@@ -73,7 +73,6 @@ class NaoRobotWidget(DOMWidget):
7373
status = Unicode("Not busy").tag(sync=True)
7474
counter = Integer(0).tag(sync=True)
7575
response = None
76-
js_error = None
7776

7877

7978
def __init__(self, **kwargs):
@@ -83,26 +82,22 @@ def __init__(self, **kwargs):
8382

8483
def _handle_frontend_msg(self, model, msg, buffer):
8584
print("Received frontend msg: ", msg)
86-
if (msg["isError"]):
87-
self.js_error = msg["data"]
88-
else:
89-
self.response = msg["data"]
85+
self.response = msg
9086

9187

9288
def wait_for_change(widget, value_name, output=Output()):
9389
future = asyncio.Future()
9490
widget.response = None
95-
widget.js_error = None
9691

9792
def get_value_change(change):
9893
widget.unobserve(get_value_change, names=value_name)
99-
if (widget.response != None or widget.js_error != None):
100-
if (widget.js_error):
101-
future.set_exception(Exception(widget.js_error))
102-
output.append_stderr(widget.js_error)
94+
if (widget.response != None):
95+
if (widget.response["isError"]):
96+
future.set_exception(Exception(widget.response["data"]))
97+
output.append_stderr(widget.response["data"])
10398
else:
104-
future.set_result(widget.response)
105-
output.append_stdout(widget.response)
99+
future.set_result(widget.response["data"])
100+
output.append_stdout(widget.response["data"])
106101
else:
107102
future.set_result(change)
108103

0 commit comments

Comments
 (0)