From 98b44903378163829b1313302be69969629dfb0a Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Sun, 27 Dec 2020 17:02:04 +0100 Subject: [PATCH 1/9] New interface --- AliceSatellite.py | 15 +- device/AliceSatellite.py | 147 ++++-------------- .../{satellite_online.png => connected.png} | Bin widgets/Satellites.py | 4 +- 4 files changed, 47 insertions(+), 119 deletions(-) rename device/img/{satellite_online.png => connected.png} (100%) diff --git a/AliceSatellite.py b/AliceSatellite.py index f242766..e2d28fb 100644 --- a/AliceSatellite.py +++ b/AliceSatellite.py @@ -1,14 +1,27 @@ from core.base.SuperManager import SuperManager from core.base.model.AliceSkill import AliceSkill +from core.device.model.DeviceAbility import DeviceAbility from core.dialog.model.DialogSession import DialogSession from core.util.Decorators import MqttHandler class AliceSatellite(AliceSkill): + DEVICES = { + 'AliceSatellite': { + 'deviceTypeName' : 'AliceSatellite', + 'perLocationLimit' : 1, + 'totalDeviceLimit' : 0, + 'allowLocationLinks': True, + 'heartbeatRate' : 5, + 'deviceSettings' : dict(), + 'abilities' : [DeviceAbility.PLAY_SOUND, DeviceAbility.CAPTURE_SOUND] + } + } + def __init__(self): self._sensorReadings = dict() - super().__init__() + super().__init__(devices=self.DEVICES) def onBooted(self): diff --git a/device/AliceSatellite.py b/device/AliceSatellite.py index b4bd347..aca8737 100644 --- a/device/AliceSatellite.py +++ b/device/AliceSatellite.py @@ -1,129 +1,44 @@ -import socket import sqlite3 -import threading +from pathlib import Path +from typing import Dict, Union from core.commons import constants from core.device.model.Device import Device -from core.device.model.DeviceType import DeviceType -from core.dialog.model.DialogSession import DialogSession -from core.device.model.DeviceException import DeviceNotPaired -class AliceSatellite(DeviceType): +class AliceSatellite(Device): - def __init__(self, data: sqlite3.Row): - super().__init__(data, self.DEV_SETTINGS, self.LOC_SETTINGS) - self._broadcastFlag = threading.Event() + def __init__(self, data: Union[sqlite3.Row, Dict]): + super().__init__(data) - self._listenSocket = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - self._listenSocket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) - self._listenSocket.settimeout(2) - self._broadcastSocket = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) - self._broadcastSocket.setsockopt(socket.SOL_SOCKET, socket.SO_BROADCAST, 1) - self._broadcastSocket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) + def getDeviceIcon(self) -> Path: + if not self.connected: + return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/{self.typeName}.png') + elif self.connected: + return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/connected.png') - self._broadcastPort = int(self.ConfigManager.getAliceConfigByName('newDeviceBroadcastPort')) # Default 12354 - self._listenPort = self._broadcastPort + 1 - self._listenSocket.bind(('', self._listenPort)) + def onUIClick(self): + super().onUIClick() - self._broadcastTimer = None - - - def onStop(self): - self.stopBroadcasting() - self._broadcastSocket.close() - - - ### to reimplement for any device type - ### Find A new Device - def discover(self, device: Device, uid: str, replyOnSiteId: str = '', session: DialogSession = None) -> bool: - return self.startBroadcastingForNewDevice(device=device, uid=uid, replyOnSiteId=replyOnSiteId) - - - def getDeviceIcon(self, device: Device) -> str: - if not device.connected: - return 'satellite_offline.png' - if device.getCustomValue('dnd'): - return 'satellite_muted.png' - if not device.uid: - return 'AliceSatellite.png' - return 'satellite_online.png' - - - def getDeviceConfig(self): - # return the custom configuration of that deviceType - pass - - - def toggle(self, device: Device): - if device.uid: - # todo use functionality of the connected skill - self.MqttManager.publish( - topic=constants.TOPIC_TOGGLE_DND, - payload={ - 'uid': device.uid - } - ) + # TODO satellites should be able to mic and/or sound mute + if self.getParam('micMuted') and self.getParam('soundMuted'): + topic = constants.TOPIC_STOP_DND + self.updateParams('soundMuted', False) + self.updateParams('micMuted', False) + elif self.getParam('micMuted'): + topic = constants.TOPIC_DND + self.MqttManager.mqttClient.unsubscribe(constants.TOPIC_AUDIO_FRAME.format(self.ConfigManager.getAliceConfigByName('uuid'))) + self.updateParams('soundMuted', True) else: - raise DeviceNotPaired() - - - @property - def broadcastFlag(self) -> threading.Event: - return self._broadcastFlag - - - def startBroadcastingForNewDevice(self, device: Device, uid: str, replyOnSiteId: str = '') -> bool: - if self.isBusy(): - return False - - self.logInfo(f'Started broadcasting on {self._broadcastPort} for new device addition. Attributed uid: {device.uid}') - self._listenSocket.listen(2) - self.ThreadManager.newThread(name='broadcast', target=self.startBroadcast, args=[device, uid, replyOnSiteId]) - - self._broadcastTimer = self.ThreadManager.newTimer(interval=300, func=self.stopBroadcasting) - - self.broadcast(method=constants.EVENT_BROADCASTING_FOR_NEW_DEVICE, exceptions=[self.name], propagateToSkills=True) - return True - - - def stopBroadcasting(self): - if not self.isBusy(): - return - - self.logInfo('Stopped broadcasting for new devices') - self._broadcastFlag.clear() - - self._broadcastTimer.cancel() - self.broadcast(method=constants.EVENT_STOP_BROADCASTING_FOR_NEW_DEVICE, exceptions=[self.name], propagateToSkills=True) - - - def startBroadcast(self, device: Device, uid: str, replyOnSiteId: str = ''): - self._broadcastFlag.set() - location = device.getMainLocation() - while self._broadcastFlag.isSet(): - self._broadcastSocket.sendto(bytes(f'{self.Commons.getLocalIp()}:{self._listenPort}:{location.getSaveName()}:{uid}', encoding='utf8'), ('', self._broadcastPort)) - try: - sock, address = self._listenSocket.accept() - sock.settimeout(None) - answer = sock.recv(1024).decode() - - deviceIp = answer.split(':')[0] - - device.pairingDone(uid=uid) - self.logWarning(f'Device with uid {uid} successfully paired') - if replyOnSiteId: - self.MqttManager.say(text=self.TalkManager.randomTalk('newDeviceAdditionSuccess', skill='system'), client=replyOnSiteId) - - self.ThreadManager.doLater(interval=5, func=self.WakewordRecorder.uploadToNewDevice, args=[uid]) - - self._broadcastSocket.sendto(bytes('ok', encoding='utf8'), (deviceIp, self._broadcastPort)) - self.stopBroadcasting() - except socket.timeout: - self.logInfo('No device query received') - - - def isBusy(self) -> bool: - return self.ThreadManager.isThreadAlive('broadcast') + topic = constants.TOPIC_DND + self.WakewordManager.disableEngine() + self.updateParams('micMuted', True) + + self.MqttManager.publish( + topic=topic, + payload={ + 'uid': self.uid + } + ) diff --git a/device/img/satellite_online.png b/device/img/connected.png similarity index 100% rename from device/img/satellite_online.png rename to device/img/connected.png diff --git a/widgets/Satellites.py b/widgets/Satellites.py index 0399efc..2e48b80 100644 --- a/widgets/Satellites.py +++ b/widgets/Satellites.py @@ -1,7 +1,7 @@ import sqlite3 -from core.base.model.Widget import Widget -from core.base.model.WidgetSizes import WidgetSizes +from core.webui.model.Widget import Widget +from core.webui.model.WidgetSizes import WidgetSizes from core.commons import constants From fbe1b1341794c9a1c7216df813dd7a5d46daceb8 Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Thu, 31 Dec 2020 16:32:31 +0100 Subject: [PATCH 2/9] Fix getting device icon --- device/AliceSatellite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/device/AliceSatellite.py b/device/AliceSatellite.py index aca8737..3e4e8f6 100644 --- a/device/AliceSatellite.py +++ b/device/AliceSatellite.py @@ -14,7 +14,7 @@ def __init__(self, data: Union[sqlite3.Row, Dict]): def getDeviceIcon(self) -> Path: if not self.connected: - return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/{self.typeName}.png') + return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/{self.deviceTypeName}.png') elif self.connected: return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/connected.png') From 2a6dc7f326fc10b835e8a6ee4f3e6631f21f2ac6 Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Sat, 16 Jan 2021 16:33:16 +0100 Subject: [PATCH 3/9] Changes for latest core --- AliceSatellite.py | 17 +------ device/AliceSatellite.py | 44 ------------------ devices/AliceSatellite.py | 33 +++++++++++++ devices/__init__.py | 0 {device => devices}/img/AliceSatellite.png | Bin {device => devices}/img/connected.png | Bin {device => devices}/img/satellite_muted.png | Bin {device => devices}/img/satellite_offline.png | Bin 8 files changed, 35 insertions(+), 59 deletions(-) delete mode 100644 device/AliceSatellite.py create mode 100644 devices/AliceSatellite.py create mode 100644 devices/__init__.py rename {device => devices}/img/AliceSatellite.png (100%) rename {device => devices}/img/connected.png (100%) rename {device => devices}/img/satellite_muted.png (100%) rename {device => devices}/img/satellite_offline.png (100%) diff --git a/AliceSatellite.py b/AliceSatellite.py index e2d28fb..20c7c89 100644 --- a/AliceSatellite.py +++ b/AliceSatellite.py @@ -1,27 +1,14 @@ from core.base.SuperManager import SuperManager from core.base.model.AliceSkill import AliceSkill -from core.device.model.DeviceAbility import DeviceAbility from core.dialog.model.DialogSession import DialogSession from core.util.Decorators import MqttHandler class AliceSatellite(AliceSkill): - DEVICES = { - 'AliceSatellite': { - 'deviceTypeName' : 'AliceSatellite', - 'perLocationLimit' : 1, - 'totalDeviceLimit' : 0, - 'allowLocationLinks': True, - 'heartbeatRate' : 5, - 'deviceSettings' : dict(), - 'abilities' : [DeviceAbility.PLAY_SOUND, DeviceAbility.CAPTURE_SOUND] - } - } - def __init__(self): self._sensorReadings = dict() - super().__init__(devices=self.DEVICES) + super().__init__() def onBooted(self): @@ -52,7 +39,7 @@ def onFullMinute(self): def feedbackSensorIntent(self, session: DialogSession): data = session.payload.get('data') if data: - self._sensorReadings[session.siteId] = data + self._sensorReadings[session.sessionId] = data @MqttHandler('projectalice/devices/disconnection') diff --git a/device/AliceSatellite.py b/device/AliceSatellite.py deleted file mode 100644 index 3e4e8f6..0000000 --- a/device/AliceSatellite.py +++ /dev/null @@ -1,44 +0,0 @@ -import sqlite3 -from pathlib import Path -from typing import Dict, Union - -from core.commons import constants -from core.device.model.Device import Device - - -class AliceSatellite(Device): - - def __init__(self, data: Union[sqlite3.Row, Dict]): - super().__init__(data) - - - def getDeviceIcon(self) -> Path: - if not self.connected: - return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/{self.deviceTypeName}.png') - elif self.connected: - return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/connected.png') - - - def onUIClick(self): - super().onUIClick() - - # TODO satellites should be able to mic and/or sound mute - if self.getParam('micMuted') and self.getParam('soundMuted'): - topic = constants.TOPIC_STOP_DND - self.updateParams('soundMuted', False) - self.updateParams('micMuted', False) - elif self.getParam('micMuted'): - topic = constants.TOPIC_DND - self.MqttManager.mqttClient.unsubscribe(constants.TOPIC_AUDIO_FRAME.format(self.ConfigManager.getAliceConfigByName('uuid'))) - self.updateParams('soundMuted', True) - else: - topic = constants.TOPIC_DND - self.WakewordManager.disableEngine() - self.updateParams('micMuted', True) - - self.MqttManager.publish( - topic=topic, - payload={ - 'uid': self.uid - } - ) diff --git a/devices/AliceSatellite.py b/devices/AliceSatellite.py new file mode 100644 index 0000000..e89f8ec --- /dev/null +++ b/devices/AliceSatellite.py @@ -0,0 +1,33 @@ +import sqlite3 +from pathlib import Path +from typing import Dict, Union + +from core.device.model.Device import Device +from core.device.model.DeviceAbility import DeviceAbility + + +class AliceSatellite(Device): + + @classmethod + def getDeviceTypeDefinition(cls) -> dict: + return { + 'deviceTypeName' : 'AliceSatellite', + 'perLocationLimit' : 1, + 'totalDeviceLimit' : 0, + 'allowLocationLinks' : True, + 'allowHeartbeatOverride': True, + 'heartbeatRate' : 5, + 'deviceSettings' : dict(), + 'abilities' : [DeviceAbility.PLAY_SOUND, DeviceAbility.CAPTURE_SOUND] + } + + + def __init__(self, data: Union[sqlite3.Row, Dict]): + super().__init__(data) + + + def getDeviceIcon(self) -> Path: + if not self.connected: + return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/{self.deviceTypeName}.png') + elif self.connected: + return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/connected.png') diff --git a/devices/__init__.py b/devices/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/device/img/AliceSatellite.png b/devices/img/AliceSatellite.png similarity index 100% rename from device/img/AliceSatellite.png rename to devices/img/AliceSatellite.png diff --git a/device/img/connected.png b/devices/img/connected.png similarity index 100% rename from device/img/connected.png rename to devices/img/connected.png diff --git a/device/img/satellite_muted.png b/devices/img/satellite_muted.png similarity index 100% rename from device/img/satellite_muted.png rename to devices/img/satellite_muted.png diff --git a/device/img/satellite_offline.png b/devices/img/satellite_offline.png similarity index 100% rename from device/img/satellite_offline.png rename to devices/img/satellite_offline.png From c10e164225057ce28ae329b397769c9e0a57f74c Mon Sep 17 00:00:00 2001 From: Philipp <41761223+philipp2310@users.noreply.github.com> Date: Sat, 16 Jan 2021 23:09:46 +0100 Subject: [PATCH 4/9] image folder adjusted to new 'devices' --- devices/AliceSatellite.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devices/AliceSatellite.py b/devices/AliceSatellite.py index e89f8ec..bae1b46 100644 --- a/devices/AliceSatellite.py +++ b/devices/AliceSatellite.py @@ -28,6 +28,6 @@ def __init__(self, data: Union[sqlite3.Row, Dict]): def getDeviceIcon(self) -> Path: if not self.connected: - return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/{self.deviceTypeName}.png') + return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/devices/img/{self.deviceTypeName}.png') elif self.connected: - return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/device/img/connected.png') + return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/devices/img/connected.png') From 06ac71bd5fed7c5273b316a7f5ec442b7a374d23 Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Sun, 17 Jan 2021 10:46:50 +0100 Subject: [PATCH 5/9] Fix icon --- devices/AliceSatellite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/AliceSatellite.py b/devices/AliceSatellite.py index bae1b46..3590302 100644 --- a/devices/AliceSatellite.py +++ b/devices/AliceSatellite.py @@ -28,6 +28,6 @@ def __init__(self, data: Union[sqlite3.Row, Dict]): def getDeviceIcon(self) -> Path: if not self.connected: - return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/devices/img/{self.deviceTypeName}.png') + return super().getDeviceIcon() elif self.connected: return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/devices/img/connected.png') From dcbb870d70b72ce355cb9334fd8e8b466bd4c384 Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Sun, 17 Jan 2021 10:49:53 +0100 Subject: [PATCH 6/9] Fix CI --- devices/AliceSatellite.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devices/AliceSatellite.py b/devices/AliceSatellite.py index 3590302..425ee77 100644 --- a/devices/AliceSatellite.py +++ b/devices/AliceSatellite.py @@ -29,5 +29,5 @@ def __init__(self, data: Union[sqlite3.Row, Dict]): def getDeviceIcon(self) -> Path: if not self.connected: return super().getDeviceIcon() - elif self.connected: + else: return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/devices/img/connected.png') From 0f23ea6bc10dca5e9b7e84e15dae39e27006a4e9 Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Mon, 18 Jan 2021 20:10:36 +0100 Subject: [PATCH 7/9] cleanup --- devices/AliceSatellite.config.template | 30 ++++++++++++++++++++++++++ devices/AliceSatellite.py | 4 ++-- 2 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 devices/AliceSatellite.config.template diff --git a/devices/AliceSatellite.config.template b/devices/AliceSatellite.config.template new file mode 100644 index 0000000..2cefa8f --- /dev/null +++ b/devices/AliceSatellite.config.template @@ -0,0 +1,30 @@ +{ + "deviceConfigs": { + "removeMeOnce": { + "defaultValue": "", + "dataType" : "string", + "isSensitive" : true, + "description" : "demo" + }, + "justADemo": { + "defaultValue": "", + "dataType" : "string", + "isSensitive" : false, + "description" : "demo 2" + } + }, + "linkConfigs": { + "removeThis": { + "defaultValue": 0, + "dataType" : "integer", + "isSensitive" : false, + "description" : "demo" + }, + "configOnceMerging": { + "defaultValue": 0, + "dataType" : "string", + "isSensitive" : false, + "description" : "demo 2" + } + } +} diff --git a/devices/AliceSatellite.py b/devices/AliceSatellite.py index 425ee77..7530adf 100644 --- a/devices/AliceSatellite.py +++ b/devices/AliceSatellite.py @@ -15,8 +15,8 @@ def getDeviceTypeDefinition(cls) -> dict: 'perLocationLimit' : 1, 'totalDeviceLimit' : 0, 'allowLocationLinks' : True, - 'allowHeartbeatOverride': True, - 'heartbeatRate' : 5, + 'allowHeartbeatOverride': False, + 'heartbeatRate' : 2, 'deviceSettings' : dict(), 'abilities' : [DeviceAbility.PLAY_SOUND, DeviceAbility.CAPTURE_SOUND] } From da9db6dc3f3970b462e476734dbfc839b325020c Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Wed, 20 Jan 2021 18:55:32 +0100 Subject: [PATCH 8/9] The UI icons are enough imo? --- devices/AliceSatellite.py | 7 ------- devices/img/connected.png | Bin 5514 -> 0 bytes 2 files changed, 7 deletions(-) delete mode 100644 devices/img/connected.png diff --git a/devices/AliceSatellite.py b/devices/AliceSatellite.py index 7530adf..8d4c24f 100644 --- a/devices/AliceSatellite.py +++ b/devices/AliceSatellite.py @@ -24,10 +24,3 @@ def getDeviceTypeDefinition(cls) -> dict: def __init__(self, data: Union[sqlite3.Row, Dict]): super().__init__(data) - - - def getDeviceIcon(self) -> Path: - if not self.connected: - return super().getDeviceIcon() - else: - return Path(f'{self.Commons.rootDir()}/skills/{self.skillName}/devices/img/connected.png') diff --git a/devices/img/connected.png b/devices/img/connected.png deleted file mode 100644 index 092d27c4ddcc4829dadd9663406a67738453f2d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5514 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 M07*qoM6N<$f)esCFaQ7m From 78e564b0c50b27843e2187766c28ce997c973970 Mon Sep 17 00:00:00 2001 From: Psychokiller1888 Date: Fri, 22 Jan 2021 18:42:05 +0100 Subject: [PATCH 9/9] Update version --- AliceSatellite.install | 6 +++--- devices/AliceSatellite.config.template | 30 -------------------------- 2 files changed, 3 insertions(+), 33 deletions(-) delete mode 100644 devices/AliceSatellite.config.template diff --git a/AliceSatellite.install b/AliceSatellite.install index 14cd91a..58cbcaf 100644 --- a/AliceSatellite.install +++ b/AliceSatellite.install @@ -1,7 +1,7 @@ { "name": "AliceSatellite", "icon": "fas fa-satellite", - "version": "1.3.16", + "version": "1.3.17", "category": "alice", "author": "ProjectAlice", "maintainers": [ @@ -11,7 +11,7 @@ "philipp2310" ], "desc": "AliceSatellite is the official skill to support Project Alice satellites", - "aliceMinVersion": "1.0.0-b3", + "aliceMinVersion": "1.0.0-b5", "systemRequirements": [], "pipRequirements": [], "conditions": { @@ -22,4 +22,4 @@ "it" ] } -} \ No newline at end of file +} diff --git a/devices/AliceSatellite.config.template b/devices/AliceSatellite.config.template deleted file mode 100644 index 2cefa8f..0000000 --- a/devices/AliceSatellite.config.template +++ /dev/null @@ -1,30 +0,0 @@ -{ - "deviceConfigs": { - "removeMeOnce": { - "defaultValue": "", - "dataType" : "string", - "isSensitive" : true, - "description" : "demo" - }, - "justADemo": { - "defaultValue": "", - "dataType" : "string", - "isSensitive" : false, - "description" : "demo 2" - } - }, - "linkConfigs": { - "removeThis": { - "defaultValue": 0, - "dataType" : "integer", - "isSensitive" : false, - "description" : "demo" - }, - "configOnceMerging": { - "defaultValue": 0, - "dataType" : "string", - "isSensitive" : false, - "description" : "demo 2" - } - } -}