r/hugvey
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Hugveys now always instantiated

Browse source
This commit is contained in:
Ruben van de Ven 2019-04-27 11:51:11 +02:00
parent 92a6046869
commit c4e01ed9bc
8 changed files with 96 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
hugvey/central_command.py
View file

@ -224,7 +224,7 @@ class CentralCommand(object):
logger.warn('Stopping light sender') logger.warn('Stopping light sender')
lightConn._sock.close() lightConn._sock.close()
async def instantiateHugvey(self, hugvey_id, msg): def instantiateHugvey(self, hugvey_id):
''' '''
Start a HugveyState, according to a show_yourself reply Start a HugveyState, according to a show_yourself reply
@ -233,24 +233,19 @@ class CentralCommand(object):
'host': socket.gethostname(), 'host': socket.gethostname(),
'ip': self.getIp(), 'ip': self.getIp(),
''' '''
async with self.hugveyLock: # lock to prevent duplicates on creation # async with self.hugveyLock: # lock to prevent duplicates on creation
if not hugvey_id in self.hugveys: if not hugvey_id in self.hugveys:
thread = threading.Thread( thread = threading.Thread(
target=self.hugveyStateRunner, args=(hugvey_id, msg), name=f"hugvey#{hugvey_id}") target=self.hugveyStateRunner, args=(hugvey_id,), name=f"hugvey#{hugvey_id}")
thread.start() thread.start()
else:
logger.info(f'Reconfigure hugvey #{hugvey_id}')
# (re)configure exisitng hugveys
self.hugveys[hugvey_id].config(msg['host'], msg['ip'])
def hugveyStateRunner(self, hugvey_id, msg): def hugveyStateRunner(self, hugvey_id):
while self.isRunning.is_set(): while self.isRunning.is_set():
logger.info(f'Instantiate hugvey #{hugvey_id}') logger.info(f'Instantiate hugvey #{hugvey_id}')
h = HugveyState(hugvey_id, self) h = HugveyState(hugvey_id, self)
h.config(msg['host'], msg['ip']) # h.config(msg['host'], msg['ip'])
self.hugveys[hugvey_id] = h self.hugveys[hugvey_id] = h
r = h.run() r = h.run()
print(self.hugveys.keys())
self.hugveys.pop(hugvey_id) self.hugveys.pop(hugvey_id)
if not r: if not r:
# stop if False, ie. when stream has gone # stop if False, ie. when stream has gone
@ -304,13 +299,13 @@ class CentralCommand(object):
"Message from alien Hugvey: {}".format(hugvey_id)) "Message from alien Hugvey: {}".format(hugvey_id))
continue continue
elif hugvey_id not in self.hugveys: elif hugvey_id not in self.hugveys:
if msg['event'] == 'connection': # if msg['event'] == 'connection':
# Create a hugvey # # Create a hugvey
await self.instantiateHugvey(hugvey_id, msg) # self.instantiateHugvey(hugvey_id, msg)
else: # else:
logger.warning( logger.warning(
"Message from uninstantiated Hugvey {}".format(hugvey_id)) "Message from uninstantiated Hugvey {}".format(hugvey_id))
logger.debug("Message contains: {}".format(msg)) logger.debug("Message contains: {}".format(msg))
continue continue
else: else:
self.hugveys[hugvey_id].queueEvent(msg) self.hugveys[hugvey_id].queueEvent(msg)
@ -356,6 +351,7 @@ class CentralCommand(object):
for hid in self.hugvey_ids: for hid in self.hugvey_ids:
self.tasks['voiceListener'] = self.loop.create_task( self.tasks['voiceListener'] = self.loop.create_task(
self.catchException(self.voiceListener(hid))) self.catchException(self.voiceListener(hid)))
self.instantiateHugvey(hid)
# we want the web interface in a separate thread # we want the web interface in a separate thread
self.panopticon_thread = threading.Thread( self.panopticon_thread = threading.Thread(
@ -369,7 +365,7 @@ class CentralCommand(object):
async def catchException(self, awaitable): async def catchException(self, awaitable):
try: try:
print(awaitable) # print(awaitable)
await awaitable await awaitable
except Exception as e: except Exception as e:
logger.exception(e) logger.exception(e)
@ -382,24 +378,23 @@ class HugveyState(object):
""" """
# all statusses can only go up or down, except for gone, which is an error state: # all statusses can only go up or down, except for gone, which is an error state:
# off <-> blocked <-> awaiting <-> running <-> paused # off <-> blocked <-> available <-> running <-> paused
STATE_OFF = "off" STATE_OFF = "off"
STATE_BLOCKED = "blocked" STATE_BLOCKED = "blocked"
STATE_AWAITING = "awaiting" STATE_AVAILABLE = "available"
STATE_RUNNING = "running" STATE_RUNNING = "running"
STATE_PAUSE = "paused" STATE_PAUSE = "paused"
STATE_GONE = "gone" STATE_GONE = "gone"
def __init__(self, id: int, command: CentralCommand): def __init__(self, id: int, command: CentralCommand):
self.id = id self.id = id
self.command = command self.command = command
self.logger = mainLogger.getChild(f"{self.id}").getChild("command") self.logger = mainLogger.getChild(f"{self.id}").getChild("command")
self.loop = asyncio.new_event_loop() self.loop = asyncio.new_event_loop()
self.isConfigured = False self.isConfigured = None
self.isRunning = asyncio.Event(loop=self.loop) self.isRunning = asyncio.Event(loop=self.loop)
self.isRunning.clear()
self.eventQueue = None self.eventQueue = None
self.language_code = 'en-GB' self.language_code = 'en-GB'
self.story = None self.story = None
@ -411,7 +406,7 @@ class HugveyState(object):
self.startMsgId = None self.startMsgId = None
self.eventLogger = eventLogger.getChild(f"{self.id}") self.eventLogger = eventLogger.getChild(f"{self.id}")
self.setStatus(self.STATE_BLOCKED) self.setStatus(self.STATE_GONE)
self.requireRestartAfterStop = None self.requireRestartAfterStop = None
@ -423,7 +418,7 @@ class HugveyState(object):
def setStatus(self, status): def setStatus(self, status):
self.status = status self.status = status
lightOn = status in [self.STATE_AWAITING, self.STATE_PAUSE, self.STATE_GONE] lightOn = status in [self.STATE_AVAILABLE, self.STATE_PAUSE]
self.setLightStatus(lightOn) self.setLightStatus(lightOn)
self.eventLogger.info(f"status: {self.status}") self.eventLogger.info(f"status: {self.status}")
@ -431,14 +426,19 @@ class HugveyState(object):
def config(self, hostname, ip): def config(self, hostname, ip):
self.ip = ip self.ip = ip
self.hostname = hostname self.hostname = hostname
self.logger.info(
f"Hugvey {self.id} at {self.ip}, host: {self.hostname}")
if self.isConfigured == True: if self.isConfigured is not None:
# a reconfiguration/reconnection # a reconfiguration/reconnection
pass pass
else:
self.logger.info(
f"Hugvey {self.id} at {self.ip}, host: {self.hostname}")
self.isConfigured = True if self.status == self.STATE_GONE:
# turn on :-)
self.setStatus(self.STATE_BLOCKED)
self.isConfigured = time.time()
def sendCommand(self, msg): def sendCommand(self, msg):
""" """
@ -448,6 +448,7 @@ class HugveyState(object):
self.command.commandHugvey(self.id, msg) self.command.commandHugvey(self.id, msg)
def run(self): def run(self):
self.logger.info(f"Await hugvey #{self.id}")
tasks = asyncio.gather( tasks = asyncio.gather(
self.catchException(self.processAudio()), self.catchException(self.processAudio()),
self.catchException(self.handleEvents()), self.catchException(self.handleEvents()),
@ -481,8 +482,16 @@ class HugveyState(object):
self.loop.call_soon_threadsafe(self._queueEvent, msg) self.loop.call_soon_threadsafe(self._queueEvent, msg)
def _queueEvent(self, msg): def _queueEvent(self, msg):
"""
Put event in both the event loop for the story as well as the Hugvey State handler
"""
self.logger.debug(f"Queue event in hugvey loop: {msg}") self.logger.debug(f"Queue event in hugvey loop: {msg}")
self.eventQueue.put_nowait(msg) self.eventQueue.put_nowait(msg)
# connection events don't need to go to the story
if msg['event'] == 'connection':
return
if self.story: if self.story:
self.story.events.append(msg) self.story.events.append(msg)
else: else:
@ -494,9 +503,19 @@ class HugveyState(object):
try: try:
event = await asyncio.wait_for(self.eventQueue.get(), 2) event = await asyncio.wait_for(self.eventQueue.get(), 2)
except asyncio.futures.TimeoutError as e: except asyncio.futures.TimeoutError as e:
# detect missing heartbeat:
if self.isConfigured and time.time() - self.isConfigured > 5:
self.gone()
continue continue
self.logger.debug("Received: {}".format(event)) self.logger.debug("Received: {}".format(event))
if event['event'] == 'connection':
# 'event': 'connection',
# 'id': self.hugvey_id,
# 'host': socket.gethostname(),
# 'ip': self.getIp(),
self.config(event['host'], event['ip'])
if event['event'] == 'language': if event['event'] == 'language':
self.setLanguage(event['code']) self.setLanguage(event['code'])
@ -506,7 +525,7 @@ class HugveyState(object):
if event['event'] == 'block': if event['event'] == 'block':
self.block() self.block()
if event['event'] == 'unblock': if event['event'] == 'unblock':
self.awaiting() self.available()
if event['event'] == 'restart': if event['event'] == 'restart':
self.restart() self.restart()
if event['event'] == 'finish': if event['event'] == 'finish':
@ -581,11 +600,11 @@ class HugveyState(object):
self.isRunning.clear() self.isRunning.clear()
self.setStatus(self.STATE_BLOCKED) self.setStatus(self.STATE_BLOCKED)
def awaiting(self): def available(self):
"""Put in awaiting mode""" """Put in available mode"""
self.logger.info('Finish/Await') self.logger.info('Finish/Await')
self.pause() self.pause()
self.setStatus(self.STATE_AWAITING) self.setStatus(self.STATE_AVAILABLE)
def setLightStatus(self, on): def setLightStatus(self, on):
status = 1 if on else 0 status = 1 if on else 0
@ -601,6 +620,7 @@ class HugveyState(object):
self.story.stop() self.story.stop()
self.logger.info('Gone') self.logger.info('Gone')
self.isConfigured = None
self.setStatus(self.STATE_GONE) self.setStatus(self.STATE_GONE)
@ -701,4 +721,4 @@ class HugveyState(object):
self.logger.critical(f"stream has left the building from {self.ip}") self.logger.critical(f"stream has left the building from {self.ip}")
self.eventLogger.critical(f"error: stream has left the building from {self.ip}") self.eventLogger.critical(f"error: stream has left the building from {self.ip}")
# if we end up here, the streamer finished, probably meaning hte hugvey shutdown # if we end up here, the streamer finished, probably meaning hte hugvey shutdown
self.shutdown(True) self.gone()

8
hugvey/client.py
View file

@ -385,6 +385,7 @@ class CommandHandler(object):
@staticmethod @staticmethod
def getIp(): def getIp():
s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
# TODO: make it a local ip, eg. 192.168.1.1
s.connect(("185.66.250.60", 80)) s.connect(("185.66.250.60", 80))
return s.getsockname()[0] return s.getsockname()[0]
@ -426,6 +427,11 @@ class CommandHandler(object):
s.close() s.close()
async def heartbeat(self):
while True:
self.showMyself()
await asyncio.sleep(3)
class Hugvey(object): class Hugvey(object):
"""The Hugvey client, to be ran on the Raspberry Pi's """The Hugvey client, to be ran on the Raspberry Pi's
@ -480,6 +486,6 @@ class Hugvey(object):
asyncio.ensure_future(self.voice_server.start()) asyncio.ensure_future(self.voice_server.start())
asyncio.ensure_future(self.cmd_server.command_listener()) asyncio.ensure_future(self.cmd_server.command_listener())
asyncio.ensure_future(self.cmd_server.event_sender()) asyncio.ensure_future(self.cmd_server.event_sender())
self.cmd_server.showMyself() asyncio.ensure_future(self.cmd_server.heartbeat())
loop.run_forever() loop.run_forever()
logger.info('done') logger.info('done')

2
hugvey/speech/streamer.py
View file

@ -30,7 +30,7 @@ class AudioStreamer(object):
address = "tcp://{}:{}".format(self.address, self.port) address = "tcp://{}:{}".format(self.address, self.port)
self.ctx = Context.instance() self.ctx = Context.instance()
self.socket = self.ctx.socket(zmq.SUB) self.socket = self.ctx.socket(zmq.SUB)
self.socket.setsockopt(zmq.RCVTIMEO, 4000) # timeout: 8 sec self.socket.setsockopt(zmq.RCVTIMEO, 6000) # timeout: 8 sec
self.socket.subscribe('') self.socket.subscribe('')
# self.socket.setsockopt(zmq.CONFLATE, 1) # self.socket.setsockopt(zmq.CONFLATE, 1)
self.socket.connect(address) self.socket.connect(address)

4
hugvey/story.py
View file

@ -1085,6 +1085,10 @@ class Story(object):
for i in range(len(self.events)): for i in range(len(self.events)):
await self._processPendingEvents() await self._processPendingEvents()
# Test stability of Central Command with deliberate crash
# if self.timer.getElapsed() > 5:
# raise Exception('test')
# The finish is not here anymore, but only on the playbackFinish event. # The finish is not here anymore, but only on the playbackFinish event.
directions = self.getCurrentDirections() directions = self.getCurrentDirections()

8
www/css/styles.css
View file

@ -103,11 +103,15 @@ img.icon {
text-align: center; } text-align: center; }
#status .hugvey.hugvey--gone { #status .hugvey.hugvey--gone {
background-image: linear-gradient(to top, orange, #ce5c00); } background-image: linear-gradient(to top, orange, #ce5c00); }
#status .hugvey.hugvey--loading {
background-image: linear-gradient(to top, #576074, #3581a5); }
#status .hugvey.hugvey--loading .status {
color: white; }
#status .hugvey.hugvey--blocked { #status .hugvey.hugvey--blocked {
background-image: linear-gradient(to top, #888a85, #555753); } background-image: linear-gradient(to top, #888a85, #555753); }
#status .hugvey.hugvey--awaiting { #status .hugvey.hugvey--available {
background-image: linear-gradient(to top, #888a85, #e2f04a); } background-image: linear-gradient(to top, #888a85, #e2f04a); }
#status .hugvey.hugvey--awaiting .status { #status .hugvey.hugvey--available .status {
color: darkgreen; } color: darkgreen; }
#status .hugvey.hugvey--paused { #status .hugvey.hugvey--paused {
background-image: linear-gradient(to top, #587457, #e2f04a); } background-image: linear-gradient(to top, #587457, #e2f04a); }

6
www/index.html
View file

@ -63,9 +63,9 @@
</div> </div>
</div> </div>
<div class='btn' v-if="hv.status == 'blocked'" @click.stop="unblock(hv)">Unblock</div> <div class='btn' v-if="hv.status == 'blocked'" @click.stop="unblock(hv)">Unblock</div>
<div class='btn' v-if="hv.status == 'awaiting'" @click.stop="block(hv)">Block</div> <div class='btn' v-if="hv.status == 'available'" @click.stop="block(hv)">Block</div>
<div class='btn' v-if="hv.status == 'awaiting'" @click.stop="restart(hv)">Start</div> <div class='btn' v-if="hv.status == 'available'" @click.stop="restart(hv)">Start</div>
<div class='btn' v-if="hv.status == 'running'" @click.stop="finish(hv)">Finish</div> <!-- to awaiting state --> <div class='btn' v-if="hv.status == 'running'" @click.stop="finish(hv)">Finish</div> <!-- to available state -->
<div class='btn' v-if="hv.status == 'running'" @click.stop="pause(hv)">Pause</div> <div class='btn' v-if="hv.status == 'running'" @click.stop="pause(hv)">Pause</div>
<div class='btn' v-if="hv.status == 'paused'" @click.stop="resume(hv)">Resume</div> <div class='btn' v-if="hv.status == 'paused'" @click.stop="resume(hv)">Resume</div>
</div> </div>

12
www/js/hugvey_console.js
View file

@ -1619,11 +1619,15 @@ class Graph {
return; return;
} }
for(let msg of hv['history']['messages']) { if(hv['history'].hasOwnProperty('messages')){
document.getElementById(msg[0]['id']).classList.add('beenHit'); for(let msg of hv['history']['messages']) {
document.getElementById(msg[0]['id']).classList.add('beenHit');
}
} }
for(let msg of hv['history']['directions']) { if(hv['history'].hasOwnProperty('directions')){
document.getElementById(msg[0]['id']).classList.add('beenHit'); for(let msg of hv['history']['directions']) {
document.getElementById(msg[0]['id']).classList.add('beenHit');
}
} }
} }

9
www/scss/styles.scss
View file

@ -163,11 +163,18 @@ img.icon{
// } // }
} }
&.hugvey--loading{
background-image: linear-gradient(to top, #576074, #3581a5);
.status{
color: white;
}
}
&.hugvey--blocked{ &.hugvey--blocked{
background-image: linear-gradient(to top, rgb(136, 138, 133), rgb(85, 87, 83)); background-image: linear-gradient(to top, rgb(136, 138, 133), rgb(85, 87, 83));
} }
&.hugvey--awaiting{ &.hugvey--available{
background-image: linear-gradient(to top, rgb(136, 138, 133), #e2f04a); background-image: linear-gradient(to top, rgb(136, 138, 133), #e2f04a);
.status{ .status{
color: darkgreen; color: darkgreen;