revil-O/platypush
1
0
Fork 0
forked from platypush/platypush
Code Pull requests Activity

[request] The action name can be specified either on action or name.

Browse source 
This is for UI compatibility purposes.
This commit is contained in:
Fabio Manganiello 2024-09-10 19:49:16 +02:00
parent 05b1fcd43a
commit 5a7068501a
Signed by untrusted user: blacklight
GPG key ID: D90FBA7F76362774
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platypush/message/request/__init__.py
View file

@ -64,12 +64,13 @@ class Request(Message):
msg = super().parse(msg) msg = super().parse(msg)
args = { args = {
'target': msg.get('target', Config.get('device_id')), 'target': msg.get('target', Config.get('device_id')),
'action': msg['action'], 'action': msg.get('action', msg.get('name')),
'args': msg.get('args', {}), 'args': msg.get('args', {}),
'id': msg['id'] if 'id' in msg else cls._generate_id(), 'id': msg['id'] if 'id' in msg else cls._generate_id(),
'timestamp': msg['_timestamp'] if '_timestamp' in msg else time.time(), 'timestamp': msg['_timestamp'] if '_timestamp' in msg else time.time(),
} }
assert args.get('action'), 'No action specified in the request'
if 'origin' in msg: if 'origin' in msg:
args['origin'] = msg['origin'] args['origin'] = msg['origin']
if 'token' in msg: if 'token' in msg:

5
platypush/plugins/procedures/__init__.py
View file

@ -286,9 +286,10 @@ class ProceduresPlugin(RunnablePlugin, ProcedureEntityManager):
@classmethod @classmethod
def _serialize_action(cls, data: Union[Iterable, Dict]) -> Union[Dict, List]: def _serialize_action(cls, data: Union[Iterable, Dict]) -> Union[Dict, List]:
if isinstance(data, dict): if isinstance(data, dict):
if data.get('action'): name = data.get('action', data.get('name'))
if name:
return { return {
'action': data['action'], 'action': name,
**({'args': data['args']} if data.get('args') else {}), **({'args': data['args']} if data.get('args') else {}),
} }