sync_send_to implementation

halibot/halmodule.py

@@ -4,18 +4,23 @@
 class HalModule(HalObject):
 
 	def reply(self, msg0=None, **kwargs):
+		# Create the reply message
 		body = kwargs.get('body', msg0.body)
 		mtype = kwargs.get('type', msg0.type)
 		author = kwargs.get('author', msg0.author)
 		origin = kwargs.get('origin', msg0.origin)
 
-		msg = Message(body=body, type=mtype, author=author, origin=origin)
-
 		# For deprecation, remove for 1.0
 		if 'context' in kwargs:
 			msg.context = kwargs['context']
 
-		self.send_to(msg, [ msg.origin ])
+		msg = Message(body=body, type=mtype, author=author, origin=origin)
+
+		# Synchronous reply?
+		if msg0.sync:
+			self.sync_replies[msg0.uuid].append(msg)
+		else:
+			self.send_to(msg, [ msg.origin ])
 
 	def hasPermission(self, msg, perm):
 		return self._hal.auth.hasPermission(msg.origin, msg.identity, perm)

halibot/halobject.py

@@ -3,6 +3,7 @@
 import inspect
 import copy
 from threading import Thread
+from collections import defaultdict
 from .halconfigurer import HalConfigurer
 
 class HalObject():
@@ -12,6 +13,10 @@ def __init__(self, hal, conf={}):
 		self.config = conf
 		self.log = logging.getLogger(self.__class__.__name__) # TODO: Put instantiated name in here too
 
+		# Only used in HalModule.reply right now, but accessed on potentially any
+		# HalObject, so it exists on every HalObject to avoid attribute errors
+		self.sync_replies = defaultdict(lambda: []) # UUID -> [Message, ...]
+
 		self.eventloop = asyncio.SelectorEventLoop()
 		self._thread = Thread(target=self.eventloop.run_forever)
 		self._thread.start()
@@ -48,6 +53,20 @@ def send_to(self, msg, dests):
 				self.log.warning('Unknown module/agent: ' + str(name))
 		return ret
 
+	def sync_send_to(self, msg, dests):
+		msg.sync = True
+
+		futs = self.send_to(msg, dests)
+
+		r = {}
+		for name, fut in futs.items():
+			fut.result()
+			to = self._hal.objects.get(name)
+			if to and msg.uuid in to.sync_replies:
+				# Assure that the module was not removed in the interim
+				r[name] = to.sync_replies.pop(msg.uuid)
+		return r
+
 	async def _receive(self, msg):
 		self.receive(msg)
 

halibot/message.py

@@ -1,4 +1,5 @@
 import logging
+import uuid
 from .jsdict import jsdict
 
 # Deprecated, remove at 1.0
@@ -28,6 +29,8 @@ class Message():
 
 	def __init__(self, **kwargs):
 		self.log = logging.getLogger(self.__class__.__name__)
+		self.uuid = uuid.uuid4()
+		self.sync = False
 
 		self.body = kwargs.get('body', None)
 		self.type = kwargs.get('type', 'simple')