diff --git a/beat/backend/python/loop_executor.py b/beat/backend/python/loop_executor.py index 1c9c9a5a11dafff349f552c5c9f0a76c6a191c11..3f3733127b5d795098fea89cdd617f165d84f773 100644 --- a/beat/backend/python/loop_executor.py +++ b/beat/backend/python/loop_executor.py @@ -68,14 +68,14 @@ class LoopChannel(object): self.socket = socket def setup(self, configuration, algorithm, prefix): - input_format_name = algorithm.loop_map["input"] - self.input_data_format = DataFormat(prefix, input_format_name) + request_format_name = algorithm.loop_map["request"] + self.request_data_format = DataFormat(prefix, request_format_name) - ouput_format_name = algorithm.loop_map["output"] - self.output_data_format = DataFormat(prefix, ouput_format_name) + answer_format_name = algorithm.loop_map["answer"] + self.answer_data_format = DataFormat(prefix, answer_format_name) def is_result_valid(self, result): - data = make_data_format(result, self.output_data_format) + data = make_data_format(result, self.request_data_format) self.socket.send_string("val", zmq.SNDMORE) self.socket.send(data.pack()) @@ -89,7 +89,7 @@ class LoopChannel(object): packed = self.socket.recv() - data = self.input_data_format.type() + data = self.answer_data_format.type() retval = data.unpack(packed) return answer == "True", retval @@ -107,11 +107,11 @@ class LoopMessageHandler(MessageHandler): self.executor = None def setup(self, configuration, algorithm, prefix): - input_format_name = algorithm.loop_map["input"] - self.input_data_format = DataFormat(prefix, input_format_name) + request_format_name = algorithm.loop_map["request"] + self.request_data_format = DataFormat(prefix, request_format_name) - ouput_format_name = algorithm.loop_map["output"] - self.output_data_format = DataFormat(prefix, ouput_format_name) + answer_format_name = algorithm.loop_map["answer"] + self.answer_data_format = DataFormat(prefix, answer_format_name) def set_executor(self, executor): self.executor = executor @@ -122,12 +122,12 @@ class LoopMessageHandler(MessageHandler): result = result.encode("utf-8") logger.debug("recv: val %s", result) - data = self.input_data_format.type() + data = self.request_data_format.type() data.unpack(result) is_valid, retval = self.executor.validate(data) - data = make_data_format(retval, self.output_data_format) + data = make_data_format(retval, self.answer_data_format) self.socket.send_string("True" if is_valid else "False", zmq.SNDMORE) self.socket.send(data.pack()) diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_output/1.json b/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_output/1.json index f407f19b5ae4af3108acd9facc5330b62ce806ec..c3bb5c217394ddc6c75c18c12250b0ee40a9eead 100644 --- a/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_output/1.json +++ b/beat/backend/python/test/prefix/algorithms/autonomous/invalid_loop_output/1.json @@ -12,10 +12,10 @@ } }, "loop": { - "input": { + "request": { "type": "user/single_integer/1" }, - "output": { + "answer": { "type": "user/single_integer/1" } } diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json b/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json index f407f19b5ae4af3108acd9facc5330b62ce806ec..c3bb5c217394ddc6c75c18c12250b0ee40a9eead 100644 --- a/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json +++ b/beat/backend/python/test/prefix/algorithms/autonomous/loop/1.json @@ -12,10 +12,10 @@ } }, "loop": { - "input": { + "request": { "type": "user/single_integer/1" }, - "output": { + "answer": { "type": "user/single_integer/1" } } diff --git a/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json b/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json index 044a00c58749c9584a57f332a79e20de70cfdf96..2ffb9aced7178c13243fa00bb0a1e84e060da307 100644 --- a/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json +++ b/beat/backend/python/test/prefix/algorithms/autonomous/loop_user/1.json @@ -17,10 +17,10 @@ } }, "loop": { - "input": { + "request": { "type": "user/single_integer/1" }, - "output": { + "answer": { "type": "user/single_integer/1" } } diff --git a/beat/backend/python/test/test_loop_executor.py b/beat/backend/python/test/test_loop_executor.py index 769ea50b6826e606705737ee9b4606aeabfbbc60..ce8ef4026e9eeadfcacc899292bf3c7701e889bf 100644 --- a/beat/backend/python/test/test_loop_executor.py +++ b/beat/backend/python/test/test_loop_executor.py @@ -80,11 +80,11 @@ CONFIGURATION = { } }, 'loop': { - 'input': { + 'request': { 'path': 'LOOP', 'channel': 'main' }, - 'output': { + 'answer': { 'path': 'LOOP', 'channel': 'main' }