pylib/socket_protocol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arguments and keywordarguments added for response callbacks

Browse Source
This commit is contained in:
Dirk Alders 2020-09-20 19:24:45 +02:00
parent 7322eacce9
commit cd508340e3
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
__init__.py
View File

@ -77,12 +77,12 @@ class callback_storage(dict):
pass # nothing to append pass # nothing to append
return None return None
def add(self, service_id, data_id, callback): def add(self, service_id, data_id, callback, *args, **kwargs):
if self.get(service_id, data_id) is not None: if self.get(service_id, data_id) is not None:
raise RegistrationError("Callback for service_id (%s) and data_id (%s) already exists" % (repr(service_id), repr(data_id))) raise RegistrationError("Callback for service_id (%s) and data_id (%s) already exists" % (repr(service_id), repr(data_id)))
if service_id not in self: if service_id not in self:
self[service_id] = {} self[service_id] = {}
self[service_id][data_id] = callback self[service_id][data_id] = (callback, args, kwargs)
class data_storage(dict): class data_storage(dict):
@ -261,7 +261,7 @@ class struct_json_protocol(object):
repr(msg.get_data_id()), repr(msg.get_data_id()),
repr(msg.get_data()) repr(msg.get_data())
) )
callback = self.__callbacks__.get(msg.get_service_id(), msg.get_data_id()) callback, args, kwargs = self.__callbacks__.get(msg.get_service_id(), msg.get_data_id())
if msg.get_service_id() in self.SID_RESPONSE_DICT.keys(): if msg.get_service_id() in self.SID_RESPONSE_DICT.keys():
# #
# REQUEST RECEIVED # REQUEST RECEIVED
@ -277,7 +277,7 @@ class struct_json_protocol(object):
else: else:
try: try:
logger.debug("%s Executing callback %s to process received data", self.LOG_PREFIX, callback.__name__) logger.debug("%s Executing callback %s to process received data", self.LOG_PREFIX, callback.__name__)
status, data = callback(msg) status, data = callback(msg, *args, **kwargs)
except TypeError: except TypeError:
raise TypeError('Check return value of callback function {callback_name} for service_id {service_id} and data_id {data_id}'.format(callback_name=callback.__name__, service_id=repr(msg.get_service_id()), data_id=repr(msg.get_data_id()))) raise TypeError('Check return value of callback function {callback_name} for service_id {service_id} and data_id {data_id}'.format(callback_name=callback.__name__, service_id=repr(msg.get_service_id()), data_id=repr(msg.get_data_id())))
self.send(self.SID_RESPONSE_DICT[msg.get_service_id()], msg.get_data_id(), data, status=status) self.send(self.SID_RESPONSE_DICT[msg.get_service_id()], msg.get_data_id(), data, status=status)
@ -294,7 +294,7 @@ class struct_json_protocol(object):
else: else:
try: try:
logger.debug("%s Executing callback %s to process received data", self.LOG_PREFIX, callback.__name__) logger.debug("%s Executing callback %s to process received data", self.LOG_PREFIX, callback.__name__)
status, data = callback(msg) status, data = callback(msg, *args, **kwargs)
except TypeError: except TypeError:
raise TypeError('Check return value of callback function {callback_name} for service_id {service_id} and data_id {data_id}'.format(callback_name=callback.__name__, service_id=repr(msg.get_service_id()), data_id=repr(msg.get_data_id()))) raise TypeError('Check return value of callback function {callback_name} for service_id {service_id} and data_id {data_id}'.format(callback_name=callback.__name__, service_id=repr(msg.get_service_id()), data_id=repr(msg.get_data_id())))
@ -349,7 +349,7 @@ class struct_json_protocol(object):
logger.log(log_lvl, '%s TX -> status: %d, service_id: %d, data_id: %d, data: "%s"', self.LOG_PREFIX, status, service_id, data_id, repr(data)) logger.log(log_lvl, '%s TX -> status: %d, service_id: %d, data_id: %d, data: "%s"', self.LOG_PREFIX, status, service_id, data_id, repr(data))
return self.__comm_inst__.send(self.__build_frame__(service_id, data_id, data, status), timeout=timeout, log_lvl=logging.DEBUG) return self.__comm_inst__.send(self.__build_frame__(service_id, data_id, data, status), timeout=timeout, log_lvl=logging.DEBUG)
def register_callback(self, service_id, data_id, callback): def register_callback(self, service_id, data_id, callback, *args, **kwargs):
""" """
:param service_id: The Service-ID for the message. See class definitions starting with ``SID_``. :param service_id: The Service-ID for the message. See class definitions starting with ``SID_``.
:type service_id: int :type service_id: int
@ -373,7 +373,7 @@ class struct_json_protocol(object):
:param msg: A :class:`dict` containing all message information. :param msg: A :class:`dict` containing all message information.
:returns: status (see class definition starting with ``STATUS_``), response_data (JSON compatible object) :returns: status (see class definition starting with ``STATUS_``), response_data (JSON compatible object)
""" """
self.__callbacks__.add(service_id, data_id, callback) self.__callbacks__.add(service_id, data_id, callback, *args, **kwargs)
def authentificate(self, timeout=2): def authentificate(self, timeout=2):
""" """