@@ -103,7 +145,8 @@
{% for skillName, skill in skills.items() %}
-
{{ skillName }}
+
{{ skillName }}
+
{% endfor %}
diff --git a/core/interface/templates/home.html b/core/interface/templates/home.html
index 822204f53..c31db0266 100644
--- a/core/interface/templates/home.html
+++ b/core/interface/templates/home.html
@@ -62,7 +62,8 @@
{% for widgetName, widget in widgetList.items() %}
{{ widgetName }}
-
+
+
{% endfor %}
@@ -73,33 +74,33 @@
{% for parentName, widgetList in widgets.items() %}
{% for widgetName, widget in widgetList.items() %}
{% if (widget.state|int) == 1 %}
-
{{ widget.html()|safe }}
@@ -108,10 +109,6 @@
-
-
-
-
{% endif %}
{% endfor %}
diff --git a/core/interface/templates/scenarios.html b/core/interface/templates/scenarios.html
index 032f30292..9563027fb 100644
--- a/core/interface/templates/scenarios.html
+++ b/core/interface/templates/scenarios.html
@@ -7,10 +7,6 @@
{% block loaders %}
-
-
-
-
{% endblock %}
{% block pageTitle %}
@@ -18,5 +14,5 @@
{% endblock %}
{% block content %}
-
+
{% endblock %}
diff --git a/core/interface/views/AdminView.py b/core/interface/views/AdminView.py
index f95a27aa5..75c89e006 100644
--- a/core/interface/views/AdminView.py
+++ b/core/interface/views/AdminView.py
@@ -3,6 +3,7 @@
from flask import jsonify, render_template, request
from flask_login import login_required
+from core.ProjectAliceExceptions import ConfigurationUpdateFailed
from core.interface.model.View import View
@@ -49,23 +50,16 @@ def saveAliceSettings(self):
# or float because HTTP data is type less.
confs = {key: self.retrieveValue(value) for key, value in request.form.items()}
- postProcessing = set()
for conf, value in confs.items():
if value == self.ConfigManager.getAliceConfigByName(conf):
continue
- pre = self.ConfigManager.getAliceConfUpdatePreProcessing(conf)
- if pre and not self.ConfigManager.doConfigUpdatePreProcessing(pre, value):
- continue
-
- pp = self.ConfigManager.getAliceConfUpdatePostProcessing(conf)
- if pp:
- postProcessing.add(pp)
-
- confs['supportedLanguages'] = self.ConfigManager.getAliceConfigByName('supportedLanguages')
+ try:
+ self.ConfigManager.updateAliceConfiguration(conf, value, False)
+ except ConfigurationUpdateFailed as e:
+ self.logError(f'Updating config failed for **{conf}**: {e}')
- self.ConfigManager.writeToAliceConfigurationFile(confs=confs)
- self.ConfigManager.doConfigUpdatePostProcessing(postProcessing)
+ self.ConfigManager.writeToAliceConfigurationFile()
return self.index()
except Exception as e:
self.logError(f'Failed saving Alice config: {e}')
diff --git a/core/interface/views/DevModeView.py b/core/interface/views/DevModeView.py
index 9e728477f..9fb9984ff 100644
--- a/core/interface/views/DevModeView.py
+++ b/core/interface/views/DevModeView.py
@@ -44,21 +44,27 @@ def put(self, skillName: str):
try:
newSkill = {
'name' : skillName,
+ 'speakableName' : request.form.get('speakableName', ''),
'description' : request.form.get('description', 'Missing description'),
+ 'category' : request.form.get('skillCategory', 'undefined'),
'fr' : request.form.get('fr', False),
'de' : request.form.get('de', False),
'it' : request.form.get('it', False),
- 'pipreq' : request.form.get('pipreq', list()),
- 'sysreq' : request.form.get('sysreq', list()),
+ 'pl' : request.form.get('pl', False),
+ 'instructions' : request.form.get('createInstructions', False),
+ 'pipreq' : request.form.get('pipreq', ''),
+ 'sysreq' : request.form.get('sysreq', ''),
'conditionOnline' : request.form.get('conditionOnline', False),
'conditionASRArbitrary' : request.form.get('conditionASRArbitrary', False),
- 'conditionSkill' : request.form.get('conditionSkill', list()),
- 'conditionNotSkill' : request.form.get('conditionNotSkill', list()),
- 'conditionActiveManager': request.form.get('conditionActiveManager', list()),
- 'widgets' : request.form.get('widgets', list())
+ 'conditionSkill' : request.form.get('conditionSkill', ''),
+ 'conditionNotSkill' : request.form.get('conditionNotSkill', ''),
+ 'conditionActiveManager': request.form.get('conditionActiveManager', ''),
+ 'widgets' : request.form.get('widgets', ''),
+ 'nodes' : request.form.get('nodes', '')
}
+
if not self.SkillManager.createNewSkill(newSkill):
- raise Exception('Unhandled skill creation exception')
+ raise Exception
return jsonify(success=True)
diff --git a/core/interface/views/IndexView.py b/core/interface/views/IndexView.py
index 98431190a..d59f638bb 100644
--- a/core/interface/views/IndexView.py
+++ b/core/interface/views/IndexView.py
@@ -54,7 +54,7 @@ def removeWidget(self):
widget = self.SkillManager.widgets[parent][widgetName]
widget.state = 0
- widget.saveToDB()
+ widget.zindex = -1
self.SkillManager.sortWidgetZIndexes()
return jsonify(success=True)
@@ -70,7 +70,7 @@ def addWidget(self):
widget = self.SkillManager.widgets[parent][widgetName]
widget.state = 1
- widget.saveToDB()
+ widget.zindex = self.SkillManager.nextZIndex()
self.SkillManager.sortWidgetZIndexes()
return redirect('home.html')
diff --git a/core/nlu/NluManager.py b/core/nlu/NluManager.py
index b6c660f5b..20b82fc19 100644
--- a/core/nlu/NluManager.py
+++ b/core/nlu/NluManager.py
@@ -12,6 +12,7 @@ def __init__(self):
self._pathToCache = Path(self.Commons.rootDir(), 'var/cache/nlu/trainingData')
if not self._pathToCache.exists():
self._pathToCache.mkdir(parents=True)
+ self._training = False
def onStart(self):
@@ -72,3 +73,13 @@ def trainNLU(self):
def clearCache(self):
shutil.rmtree(self._pathToCache)
self._pathToCache.mkdir()
+
+
+ @property
+ def training(self) -> bool:
+ return self._training
+
+
+ @training.setter
+ def training(self, value: bool):
+ self._training = value
diff --git a/core/nlu/model/SnipsNlu.py b/core/nlu/model/SnipsNlu.py
index a57591a72..4dbf4f0d5 100644
--- a/core/nlu/model/SnipsNlu.py
+++ b/core/nlu/model/SnipsNlu.py
@@ -1,9 +1,8 @@
import json
-from pathlib import Path
-from subprocess import CompletedProcess
-
import re
import shutil
+from pathlib import Path
+from subprocess import CompletedProcess
from core.commons import constants
from core.nlu.model.NluEngine import NluEngine
@@ -98,69 +97,82 @@ def convertDialogTemplate(self, file: Path):
def train(self):
+ if self.NluManager.training:
+ self.logWarning("NLU is already training, can't train again now")
+ return
+
self.logInfo('Training Snips NLU')
- dataset = {
- 'entities': dict(),
- 'intents' : dict(),
- 'language': self.LanguageManager.activeLanguage,
- }
+ try:
+ self.NluManager.training = True
+ dataset = {
+ 'entities': dict(),
+ 'intents' : dict(),
+ 'language': self.LanguageManager.activeLanguage,
+ }
- with Path(self._cachePath / f'{self.LanguageManager.activeLanguage}.json').open() as fp:
- trainingData = json.load(fp)
- dataset['entities'].update(trainingData['entities'])
- dataset['intents'].update(trainingData['intents'])
+ with Path(self._cachePath / f'{self.LanguageManager.activeLanguage}.json').open() as fp:
+ trainingData = json.load(fp)
+ dataset['entities'].update(trainingData['entities'])
+ dataset['intents'].update(trainingData['intents'])
- datasetFile = Path('/tmp/snipsNluDataset.json')
+ datasetFile = Path('/tmp/snipsNluDataset.json')
- with datasetFile.open('w') as fp:
- json.dump(dataset, fp, ensure_ascii=False, indent=4)
+ with datasetFile.open('w') as fp:
+ json.dump(dataset, fp, ensure_ascii=False, indent='\t')
- self.logInfo('Generated dataset for training')
+ self.logInfo('Generated dataset for training')
- # Now that we have generated the dataset, let's train in the background if we are already booted, else do it directly
- if self.ProjectAlice.isBooted:
- self.ThreadManager.newThread(name='NLUTraining', target=self.nluTrainingThread, args=[datasetFile])
- else:
- self.nluTrainingThread(datasetFile)
+ # Now that we have generated the dataset, let's train in the background if we are already booted, else do it directly
+ if self.ProjectAlice.isBooted:
+ self.ThreadManager.newThread(name='NLUTraining', target=self.nluTrainingThread, args=[datasetFile])
+ else:
+ self.nluTrainingThread(datasetFile)
+ except:
+ self.NluManager.training = False
def nluTrainingThread(self, datasetFile: Path):
- with Stopwatch() as stopWatch:
- self.logInfo('Begin training...')
- self._timer = self.ThreadManager.newTimer(interval=0.25, func=self.trainingStatus)
+ try:
+ with Stopwatch() as stopWatch:
+ self.logInfo('Begin training...')
+ self._timer = self.ThreadManager.newTimer(interval=0.25, func=self.trainingStatus)
- tempTrainingData = Path('/tmp/snipsNLU')
+ tempTrainingData = Path('/tmp/snipsNLU')
- if tempTrainingData.exists():
- shutil.rmtree(tempTrainingData)
+ if tempTrainingData.exists():
+ shutil.rmtree(tempTrainingData)
- training: CompletedProcess = self.Commons.runSystemCommand([f'./venv/bin/snips-nlu', 'train', str(datasetFile), str(tempTrainingData)])
- if training.returncode != 0:
- self.logError(f'Error while training Snips NLU: {training.stderr.decode()}')
+ training: CompletedProcess = self.Commons.runSystemCommand([f'./venv/bin/snips-nlu', 'train', str(datasetFile), str(tempTrainingData)])
+ if training.returncode != 0:
+ self.logError(f'Error while training Snips NLU: {training.stderr.decode()}')
- assistantPath = Path(self.Commons.rootDir(), f'trained/assistants/{self.LanguageManager.activeLanguage}/nlu_engine')
+ assistantPath = Path(self.Commons.rootDir(), f'trained/assistants/{self.LanguageManager.activeLanguage}/nlu_engine')
- if not tempTrainingData.exists():
- self.logError('Snips NLU training failed')
- self.MqttManager.publish(constants.TOPIC_NLU_TRAINING_STATUS, payload={'status': 'failed'})
- if not assistantPath.exists():
- self.logFatal('No NLU engine found, cannot start')
+ if not tempTrainingData.exists():
+ self.logError('Snips NLU training failed')
+ self.MqttManager.publish(constants.TOPIC_NLU_TRAINING_STATUS, payload={'status': 'failed'})
+ if not assistantPath.exists():
+ self.logFatal('No NLU engine found, cannot start')
- self._timer.cancel()
- return
+ self._timer.cancel()
+ return
- if assistantPath.exists():
- shutil.rmtree(assistantPath)
+ if assistantPath.exists():
+ shutil.rmtree(assistantPath)
- shutil.move(tempTrainingData, assistantPath)
+ shutil.move(tempTrainingData, assistantPath)
- self.broadcast(method=constants.EVENT_NLU_TRAINED, exceptions=[constants.DUMMY], propagateToSkills=True)
- self.Commons.runRootSystemCommand(['systemctl', 'restart', 'snips-nlu'])
+ self.broadcast(method=constants.EVENT_NLU_TRAINED, exceptions=[constants.DUMMY], propagateToSkills=True)
+ self.Commons.runRootSystemCommand(['systemctl', 'restart', 'snips-nlu'])
- self._timer.cancel()
- self.MqttManager.publish(constants.TOPIC_NLU_TRAINING_STATUS, payload={'status': 'done'})
- self.ThreadManager.getEvent('TrainAssistant').clear()
- self.logInfo(f'Snips NLU trained in {stopWatch} seconds')
+ self._timer.cancel()
+ self.MqttManager.publish(constants.TOPIC_NLU_TRAINING_STATUS, payload={'status': 'done'})
+ self.ThreadManager.getEvent('TrainAssistant').clear()
+ self.logInfo(f'Snips NLU trained in {stopWatch} seconds')
+ except:
+ pass # Do nothing, the finally clause will finish the work
+ finally:
+ self.NluManager.training = False
def trainingStatus(self):
diff --git a/core/scenario/__init__.py b/core/scenario/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core/scenario/model/ScenarioTile.py b/core/scenario/model/ScenarioTile.py
deleted file mode 100644
index f9c78e972..000000000
--- a/core/scenario/model/ScenarioTile.py
+++ /dev/null
@@ -1,18 +0,0 @@
-from typing import Any
-
-from core.base.model.ProjectAliceObject import ProjectAliceObject
-from core.scenario.model.ScenarioTileType import ScenarioTileType
-
-
-class ScenarioTile(ProjectAliceObject):
-
- def __init__(self):
- super().__init__()
- self.tileType: ScenarioTileType = ScenarioTileType.ACTION
- self.name: str = ''
- self.description: str = ''
- self.value: Any = ''
-
-
- def interfaceName(self) -> str:
- return self.name
diff --git a/core/scenario/model/ScenarioTileType.py b/core/scenario/model/ScenarioTileType.py
deleted file mode 100644
index cc4f50b00..000000000
--- a/core/scenario/model/ScenarioTileType.py
+++ /dev/null
@@ -1,14 +0,0 @@
-from enum import Enum
-
-
-class ScenarioTileType(Enum):
- CONDITION_BLOCK = 10
- LOOP_BLOCK = 20
- VARIABLE = 30
- INTEGER = 40
- STRING = 50
- FLOAT = 60
- BOOLEAN = 70
- ARRAY = 80
- ACTION = 150
- EVENT = 200
diff --git a/core/scenario/model/__init__.py b/core/scenario/model/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/core/server/AudioServer.py b/core/server/AudioServer.py
index 7b17a6680..1f56d5b5a 100644
--- a/core/server/AudioServer.py
+++ b/core/server/AudioServer.py
@@ -4,7 +4,8 @@
from pathlib import Path
from typing import Dict, Optional
-import pyaudio
+import sounddevice as sd
+# noinspection PyUnresolvedReferences
from webrtcvad import Vad
from core.ProjectAliceExceptions import PlayBytesStopped
@@ -22,41 +23,49 @@ class AudioManager(Manager):
LAST_USER_SPEECH = 'var/cache/lastUserpeech_{}_{}.wav'
SECOND_LAST_USER_SPEECH = 'var/cache/secondLastUserSpeech_{}_{}.wav'
- # Inspired by https://github.com/koenvervloesem/hermes-audio-server
-
def __init__(self):
super().__init__()
self._stopPlayingFlag: Optional[AliceEvent] = None
self._playing = False
self._waves: Dict[str, wave.Wave_write] = dict()
+ self._audioInputStream = None
if self.ConfigManager.getAliceConfigByName('disableSoundAndMic'):
return
- with self.Commons.shutUpAlsaFFS():
- self._audio = pyaudio.PyAudio()
-
self._vad = Vad(2)
+ self._audioInput = None
+ self._audioOutput = None
- try:
- self._audioOutput = self._audio.get_default_output_device_info()
- except:
- self.logFatal('Audio output not found, cannot continue')
- return
+
+ def onStart(self):
+ super().onStart()
+
+ if not self.ConfigManager.getAliceConfigByName('inputDevice'):
+ self.logWarning('Input device not set in config, trying to find default device')
+ try:
+ self._audioInput = sd.query_devices(kind='input')['name']
+ except:
+ self.logFatal('Audio input not found, cannot continue')
+ return
+ self.ConfigManager.updateAliceConfiguration(key='inputDevice', value=self._audioInput)
else:
- self.logInfo(f'Using **{self._audioOutput["name"]}** for audio output')
+ self._audioInput = self.ConfigManager.getAliceConfigByName('inputDevice')
- try:
- self._audioInput = self._audio.get_default_input_device_info()
- except:
- self.logFatal('Audio input not found, cannot continue')
+ if not self.ConfigManager.getAliceConfigByName('outputDevice'):
+ self.logWarning('Output device not set in config, trying to find default device')
+ try:
+ self._audioOutput = sd.query_devices(kind='output')['name']
+ except:
+ self.logFatal('Audio output not found, cannot continue')
+ return
+ self.ConfigManager.updateAliceConfiguration(key='outputDevice', value=self._audioOutput)
else:
- self.logInfo(f'Using **{self._audioInput["name"]}** for audio input')
+ self._audioOutput = self.ConfigManager.getAliceConfigByName('outputDevice')
+ self.setDefaults()
- def onStart(self):
- super().onStart()
self._stopPlayingFlag = self.ThreadManager.newEvent('stopPlaying')
self.MqttManager.mqttClient.subscribe(constants.TOPIC_AUDIO_FRAME.format(self.ConfigManager.getAliceConfigByName('uuid')))
@@ -64,13 +73,19 @@ def onStart(self):
self.ThreadManager.newThread(name='audioPublisher', target=self.publishAudio)
+ def setDefaults(self):
+ self.logInfo(f'Using **{self._audioInput}** for audio input')
+ self.logInfo(f'Using **{self._audioOutput}** for audio output')
+
+ sd.default.device = self._audioInput, self._audioOutput
+
+
def onStop(self):
super().onStop()
+ self._audioInputStream.stop(ignore_errors=True)
+ self._audioInputStream.close(ignore_errors=True)
self.MqttManager.mqttClient.unsubscribe(constants.TOPIC_AUDIO_FRAME.format(self.ConfigManager.getAliceConfigByName('uuid')))
- if not self.ConfigManager.getAliceConfigByName('disableSoundAndMic'):
- self._audio.terminate()
-
def onStartListening(self, session: DialogSession):
if not self.ConfigManager.getAliceConfigByName('recordAudioAfterWakeword'):
@@ -104,13 +119,13 @@ def recordFrame(self, siteId: str, frame: bytes):
def publishAudio(self):
self.logInfo('Starting audio publisher')
- audioStream = self._audio.open(
- format=pyaudio.paInt16,
+ self._audioInputStream = sd.RawInputStream(
+ dtype='int16',
channels=1,
- rate=self.SAMPLERATE,
- frames_per_buffer=self.FRAMES_PER_BUFFER,
- input=True
+ samplerate=self.SAMPLERATE,
+ blocksize=self.FRAMES_PER_BUFFER,
)
+ self._audioInputStream.start()
speech = False
silence = self.SAMPLERATE / self.FRAMES_PER_BUFFER
@@ -122,7 +137,7 @@ def publishAudio(self):
break
try:
- frames = audioStream.read(num_frames=self.FRAMES_PER_BUFFER, exception_on_overflow=False)
+ frames = self._audioInputStream.read(frames=self.FRAMES_PER_BUFFER)[0]
if self._vad.is_speech(frames, self.SAMPLERATE):
if not speech and speechFrames < minSpeechFrames:
@@ -175,30 +190,31 @@ def onPlayBytes(self, requestId: str, payload: bytearray, siteId: str, sessionId
with io.BytesIO(payload) as buffer:
try:
with wave.open(buffer, 'rb') as wav:
- sampleWidth = wav.getsampwidth()
- nFormat = self._audio.get_format_from_width(sampleWidth)
channels = wav.getnchannels()
framerate = wav.getframerate()
- def streamCallback(_inData, frameCount, _timeInfo, _status) -> tuple:
+ def streamCallback(outdata, frameCount, _timeInfo, _status):
data = wav.readframes(frameCount)
- return data, pyaudio.paContinue
+ if len(data) < len(outdata):
+ outdata[:len(data)] = data
+ outdata[len(data):] = b'\x00' * (len(outdata) - len(data))
+ raise sd.CallbackStop
+ else:
+ outdata[:] = data
- audioStream = self._audio.open(
- format=nFormat,
+ stream = sd.RawOutputStream(
+ dtype='int16',
channels=channels,
- rate=framerate,
- output=True,
- output_device_index=self._audioOutput['index'],
- stream_callback=streamCallback
+ samplerate=framerate,
+ callback=streamCallback
)
- self.logDebug(f'Playing wav stream using **{self._audioOutput["name"]}** audio output from site id **{self.DeviceManager.siteIdToDeviceName(siteId)}** (Format: {nFormat}, channels: {channels}, rate: {framerate})')
- audioStream.start_stream()
- while audioStream.is_active():
+ self.logDebug(f'Playing wav stream using **{self._audioOutput}** audio output from site id **{self.DeviceManager.siteIdToDeviceName(siteId)}** (channels: {channels}, rate: {framerate})')
+ stream.start()
+ while stream.active:
if self._stopPlayingFlag.is_set():
- audioStream.stop_stream()
- audioStream.close()
+ stream.stop()
+ stream.close()
if sessionId:
self.MqttManager.publish(
@@ -214,8 +230,8 @@ def streamCallback(_inData, frameCount, _timeInfo, _status) -> tuple:
raise PlayBytesStopped
time.sleep(0.1)
- audioStream.stop_stream()
- audioStream.close()
+ stream.stop()
+ stream.close()
except PlayBytesStopped:
self.logDebug('Playing bytes stopped')
except Exception as e:
@@ -228,7 +244,7 @@ def streamCallback(_inData, frameCount, _timeInfo, _status) -> tuple:
self.MqttManager.publish(
topic=constants.TOPIC_PLAY_BYTES_FINISHED.format(siteId),
payload={
- 'id': requestId,
+ 'id' : requestId,
'sessionId': sessionId
}
)
@@ -238,6 +254,12 @@ def stopPlaying(self):
self._stopPlayingFlag.set()
+ def updateAudioDevices(self):
+ self._audioInput = self.ConfigManager.getAliceConfigByName('inputDevice')
+ self._audioOutput = self.ConfigManager.getAliceConfigByName('outputDevice')
+ self.setDefaults()
+
+
@property
def isPlaying(self) -> bool:
return self._playing
diff --git a/core/server/MqttManager.py b/core/server/MqttManager.py
index de021482e..b87b82a82 100644
--- a/core/server/MqttManager.py
+++ b/core/server/MqttManager.py
@@ -488,11 +488,13 @@ def intentNotRecognized(self, _client, _data, msg: mqtt.MQTTMessage):
if session.notUnderstood <= self.ConfigManager.getAliceConfigByName('notUnderstoodRetries'):
session.notUnderstood = session.notUnderstood + 1
- self.continueDialog(
- sessionId=sessionId,
- text=self.TalkManager.randomTalk('notUnderstood', skill='system'),
- intentFilter=session.intentFilter
- )
+
+ if not self.ConfigManager.getAliceConfigByName('suggestSkillsToInstall'):
+ self.continueDialog(
+ sessionId=sessionId,
+ text=self.TalkManager.randomTalk('notUnderstood', skill='system'),
+ intentFilter=session.intentFilter
+ )
else:
session.notUnderstood = 0
self.endDialog(sessionId=sessionId, text=self.TalkManager.randomTalk('notUnderstoodEnd', skill='system'))
diff --git a/core/util/Decorators.py b/core/util/Decorators.py
index 6a6120b0c..6832cf313 100644
--- a/core/util/Decorators.py
+++ b/core/util/Decorators.py
@@ -2,7 +2,7 @@
import functools
import warnings
-from typing import Any, Callable, Tuple, Union
+from typing import Any, Callable, Optional, Tuple, Union
from flask import jsonify, request
@@ -172,7 +172,7 @@ def wrapper(*args, **kwargs):
return wrapper
-def IfSetting(func: Callable = None, settingName: str = None, settingValue: Any = None, inverted: bool = False, skillName: str = None): #NOSONAR
+def IfSetting(func: Callable = None, settingName: str = None, settingValue: Any = None, inverted: bool = False, skillName: str = None, returnValue: Optional[Any] = None): #NOSONAR
"""
Checks wheter a setting is equal to the given value before executing the wrapped method
If the setting is not equal to the given value, the wrapped method is not called
@@ -183,6 +183,7 @@ def IfSetting(func: Callable = None, settingName: str = None, settingValue: Any
:param settingValue:
:param inverted:
:param skillName:
+ :param returnValue: The value to return if the setting check fails
:return:
"""
@@ -199,11 +200,13 @@ def settingDecorator(*args, **kwargs):
value = configManager.getSkillConfigByName(skillName, settingName) if skillName else configManager.getAliceConfigByName(settingName)
if value is None:
- return None
+ return returnValue
if (not inverted and value == settingValue) or \
(inverted and value != settingValue):
return func(*args, **kwargs)
+ else:
+ return returnValue
return settingDecorator
diff --git a/core/util/InternetManager.py b/core/util/InternetManager.py
index 40de5ce14..31201596d 100644
--- a/core/util/InternetManager.py
+++ b/core/util/InternetManager.py
@@ -1,5 +1,4 @@
import requests
-from requests.exceptions import RequestException
from core.base.model.Manager import Manager
from core.commons import constants
@@ -10,12 +9,19 @@ class InternetManager(Manager):
def __init__(self):
super().__init__()
self._online = False
+ self._checkThread = None
+ self._checkFrequency = 2
def onStart(self):
super().onStart()
if not self.ConfigManager.getAliceConfigByName('stayCompletlyOffline'):
self.checkOnlineState(silent=True)
+ # 20 seconds is the max, 2 seconds the minimum
+ # We have 10 positions in the config (from 1 to 10) So the frequency = max / 10 * setting = 2 * setting
+ internetQuality = self.ConfigManager.getAliceConfigByName('internetQuality') or 1
+ self._checkFrequency = internetQuality * 2
+ self._checkThread = self.ThreadManager.newThread(name='internetCheckThread', target=self.checkInternet)
else:
self.logInfo('Configurations set to stay completly offline')
@@ -29,15 +35,18 @@ def onBooted(self):
self.checkOnlineState()
- def onFullMinute(self):
- if not self.ConfigManager.getAliceConfigByName('stayCompletlyOffline'):
- self.checkOnlineState()
+ def checkInternet(self):
+ self.checkOnlineState()
+ self.ThreadManager.doLater(interval=self._checkFrequency, func=self.checkInternet)
def checkOnlineState(self, addr: str = 'https://clients3.google.com/generate_204', silent: bool = False) -> bool:
+ if self.ConfigManager.getAliceConfigByName('stayCompletlyOffline'):
+ return False
+
try:
online = requests.get(addr).status_code == 204
- except RequestException:
+ except:
online = False
if silent:
diff --git a/core/voice/TTSManager.py b/core/voice/TTSManager.py
index ad807afa4..bfb1ba99c 100644
--- a/core/voice/TTSManager.py
+++ b/core/voice/TTSManager.py
@@ -118,6 +118,11 @@ def onSay(self, session: DialogSession):
if session.textOnly:
return
+ if 'text' not in session.payload:
+ self.logWarning('Was asked to say something but no text provided')
+ self.MqttManager.endSession(sessionId=session.sessionId)
+ return
+
if session and session.user != constants.UNKNOWN_USER:
user: User = self.UserManager.getUser(session.user)
if user and user.tts:
diff --git a/core/voice/WakewordRecorder.py b/core/voice/WakewordRecorder.py
index 16adcdefe..be2ded6c4 100644
--- a/core/voice/WakewordRecorder.py
+++ b/core/voice/WakewordRecorder.py
@@ -233,7 +233,7 @@ def finalizeWakeword(self):
path.mkdir()
- (path/'config.json').write_text(json.dumps(config, indent=4))
+ (path/'config.json').write_text(json.dumps(config, indent='\t'))
for i in range(1, 4):
shutil.move(Path(tempfile.gettempdir(), f'{i}.wav'), path/f'{i}.wav')
diff --git a/core/voice/model/AmazonTts.py b/core/voice/model/AmazonTts.py
index 9bedd0c64..6c091349f 100644
--- a/core/voice/model/AmazonTts.py
+++ b/core/voice/model/AmazonTts.py
@@ -6,6 +6,7 @@
from core.voice.model.Tts import Tts
try:
+ # noinspection PyUnresolvedReferences
import boto3
except ModuleNotFoundError:
pass # Auto installeed
@@ -26,6 +27,7 @@ def __init__(self, user: User = None):
self._online = True
self._privacyMalus = -20
self._client = None
+ self._supportsSSML = True
# TODO implement the others
# https://docs.aws.amazon.com/polly/latest/dg/voicelist.html
@@ -186,7 +188,52 @@ def __init__(self, user: User = None):
'Bianca': {
'neural': False
},
- 'Carla' : {
+ 'Carla' : {
+ 'neural': False
+ }
+ }
+ },
+ 'pl-PL': {
+ 'male' : {
+ 'Jacek': {
+ 'neural': False
+ },
+ 'Jan' : {
+ 'neural': False
+ }
+ },
+ 'female': {
+ 'Ewa' : {
+ 'neural': False
+ },
+ 'Maja': {
+ 'neural': False
+ }
+ }
+ },
+ 'pt-BR': {
+ 'male' : {
+ 'Ricardo': {
+ 'neural': False
+ }
+ },
+ 'female': {
+ 'Camila' : {
+ 'neural': False
+ },
+ 'Vitoria': {
+ 'neural': False
+ }
+ }
+ },
+ 'pt-PT': {
+ 'male' : {
+ 'Cristiano': {
+ 'neural': False
+ }
+ },
+ 'female': {
+ 'Ines': {
'neural': False
}
}
@@ -209,12 +256,11 @@ def getWhisperMarkup() -> tuple:
return '', ''
- @staticmethod
- def _checkText(session: DialogSession) -> str:
- text = session.payload['text']
+ def _checkText(self, session: DialogSession) -> str:
+ text = super()._checkText(session)
- if not re.search('', text):
- text = f'{text}'
+ if not re.search('', text):
+ text = re.sub(r'(.*)', r'\1', text)
return text
diff --git a/core/voice/model/GoogleTts.py b/core/voice/model/GoogleTts.py
index b3e244425..354eb3b50 100644
--- a/core/voice/model/GoogleTts.py
+++ b/core/voice/model/GoogleTts.py
@@ -7,7 +7,9 @@
from core.voice.model.Tts import Tts
try:
+ # noinspection PyUnresolvedReferences,PyPackageRequirements
from google.oauth2.service_account import Credentials
+ # noinspection PyUnresolvedReferences,PyPackageRequirements
from google.cloud import texttospeech
except:
pass # Auto installed
@@ -29,6 +31,7 @@ def __init__(self, user: User = None):
self._online = True
self._privacyMalus = -20
self._client = None
+ self._supportsSSML = True
# TODO implement the others
# https://cloud.google.com/text-to-speech/docs/voices
@@ -142,13 +145,49 @@ def __init__(self, user: User = None):
'it-IT-Standard-A': {
'neural': False
},
- 'it-IT-Standard-B' : {
+ 'it-IT-Standard-B': {
'neural': False
},
'it-IT-Wavenet-A' : {
'neural': True
},
- 'it-IT-Wavenet-B': {
+ 'it-IT-Wavenet-B' : {
+ 'neural': True
+ }
+ }
+ },
+ 'pl-PL': {
+ 'male' : {
+ 'pl-PL-Standard-B': {
+ 'neural': False
+ },
+ 'pl-PL-Standard-C': {
+ 'neural': False
+ },
+ 'pl-PL-Wavenet-B' : {
+ 'neural': True
+ },
+ 'pl-PL-Wavenet-C' : {
+ 'neural': True
+ }
+ },
+ 'female': {
+ 'pl-PL-Standard-A': {
+ 'neural': False
+ },
+ 'pl-PL-Standard-D': {
+ 'neural': False
+ },
+ 'pl-PL-Standard-E': {
+ 'neural': True
+ },
+ 'pl-PL-Wavenet-A' : {
+ 'neural': True
+ },
+ 'pl-PL-Wavenet-D' : {
+ 'neural': True
+ },
+ 'pl-PL-Wavenet-E' : {
'neural': True
}
}
@@ -163,16 +202,6 @@ def onStart(self):
)
- @staticmethod
- def _checkText(session: DialogSession) -> str:
- text = session.payload['text']
-
- if not '' in text:
- text = f'{text}'
-
- return text
-
-
def onSay(self, session: DialogSession):
super().onSay(session)
diff --git a/core/voice/model/MycroftTts.py b/core/voice/model/MycroftTts.py
index 763eafc59..b1157b1dc 100644
--- a/core/voice/model/MycroftTts.py
+++ b/core/voice/model/MycroftTts.py
@@ -107,12 +107,6 @@ def installDependencies(self) -> bool:
return True
- @staticmethod
- def _checkText(session: DialogSession) -> str:
- text = session.payload['text']
- return ' '.join(re.sub('<.*?>', ' ', text).split())
-
-
def onSay(self, session: DialogSession):
super().onSay(session)
diff --git a/core/voice/model/PicoTts.py b/core/voice/model/PicoTts.py
index 61835dc2f..5f4ccfa96 100644
--- a/core/voice/model/PicoTts.py
+++ b/core/voice/model/PicoTts.py
@@ -60,12 +60,6 @@ def __init__(self, user: User = None):
}
- @staticmethod
- def _checkText(session: DialogSession) -> str:
- text = session.payload['text']
- return ' '.join(re.sub('<.*?>', ' ', text).split())
-
-
def onSay(self, session: DialogSession):
super().onSay(session)
diff --git a/core/voice/model/Tts.py b/core/voice/model/Tts.py
index c70094c68..98fbc4e40 100644
--- a/core/voice/model/Tts.py
+++ b/core/voice/model/Tts.py
@@ -1,6 +1,8 @@
import getpass
+import re
import uuid
from pathlib import Path
+from re import Match
from typing import Optional
import hashlib
@@ -17,6 +19,7 @@
class Tts(ProjectAliceObject):
TEMP_ROOT = Path(tempfile.gettempdir(), '/tempTTS')
TTS = None
+ SPELL_OUT = re.compile(r'(.+)')
def __init__(self, user: User = None, *args, **kwargs):
@@ -37,6 +40,8 @@ def __init__(self, user: User = None, *args, **kwargs):
self._text = ''
self._speaking = False
+ self._supportsSSML = False
+
def onStart(self):
if self._user and self._user.ttsLanguage:
@@ -160,6 +165,8 @@ def _speak(self, file: Path, session: DialogSession):
duration = round(len(AudioSegment.from_file(file)) / 1000, 2)
except CouldntDecodeError:
self.logError('Error decoding TTS file')
+ file.unlink()
+ self.onSay(session)
else:
self.DialogManager.increaseSessionTimeout(session=session, interval=duration + 0.2)
self.ThreadManager.doLater(interval=duration + 0.1, func=self._sayFinished, args=[session, uid])
@@ -177,9 +184,21 @@ def _sayFinished(self, session: DialogSession, uid: str):
)
+ def _checkText(self, session: DialogSession) -> str:
+ text = session.payload['text']
+ if not self._supportsSSML:
+ # We need to remove all ssml tags but transform some first
+ text = re.sub(self.SPELL_OUT, self._replaceSpellOuts, text)
+ return ' '.join(re.sub('<.*?>', ' ', text).split())
+ else:
+ if not '' in text:
+ text = f'{text}'
+ return text
+
+
@staticmethod
- def _checkText(session: DialogSession) -> str:
- return session.payload['text']
+ def _replaceSpellOuts(matching: Match) -> str:
+ return ''.join(matching.group(1))
def onSay(self, session: DialogSession):
diff --git a/core/voice/model/WatsonTts.py b/core/voice/model/WatsonTts.py
index b63dc18d3..a12201845 100644
--- a/core/voice/model/WatsonTts.py
+++ b/core/voice/model/WatsonTts.py
@@ -25,6 +25,7 @@ def __init__(self, user: User = None):
self._online = True
self._privacyMalus = -20
self._client = None
+ self._supportsSSML = True
# TODO implement the others
# https://cloud.ibm.com/apidocs/text-to-speech?code=python#list-voices
@@ -117,16 +118,6 @@ def onStart(self):
self._client.set_service_url(self.ConfigManager.getAliceConfigByName('ibmCloudAPIURL'))
- @staticmethod
- def _checkText(session: DialogSession) -> str:
- text = session.payload['text']
-
- if not '' in text:
- text = f'{text}'
-
- return text
-
-
def onSay(self, session: DialogSession):
super().onSay(session)
diff --git a/jetbrainsDebuggers.run/Validate skills.run.xml b/jetbrainsDebuggers.run/Validate skills.run.xml
index 8c9598274..66008f130 100644
--- a/jetbrainsDebuggers.run/Validate skills.run.xml
+++ b/jetbrainsDebuggers.run/Validate skills.run.xml
@@ -1,26 +1,24 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 1fe6d888b..f312451e2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,4 +24,6 @@ PyAudio==0.2.11
pyjwt==1.7.1
toml==0.10.1
markdown==3.2.2
+ProjectAlice-sk
#pyopenssl==19.1.0
+sounddevice==0.4.1
diff --git a/requirements_test.txt b/requirements_test.txt
index 79392e84a..e9cba619e 100644
--- a/requirements_test.txt
+++ b/requirements_test.txt
@@ -27,3 +27,4 @@ webrtcvad~=2.0.10
pyjwt~=1.7.1
toml~=0.10.1
markdown~=3.2.2
+sounddevice==0.4.1
diff --git a/system/manager/LanguageManager/strings.json b/system/manager/LanguageManager/strings.json
index 720acae16..af604e6d3 100644
--- a/system/manager/LanguageManager/strings.json
+++ b/system/manager/LanguageManager/strings.json
@@ -11,6 +11,10 @@
],
"it": [
"fuori"
+ ],
+ "pl": [
+ "na zewnątrz",
+ "na dworze"
]
},
"intentSeparator": {
@@ -25,6 +29,9 @@
],
"it": [
" ed anche "
+ ],
+ "pl": [
+ " a także "
]
},
"inThe": {
@@ -53,6 +60,11 @@
"nei ",
"dentro ",
"in "
+ ],
+ "pl": [
+ "w pokoju ",
+ "w ",
+ "w pomieszczeniu "
]
},
"everywhere": {
@@ -68,6 +80,9 @@
"it": [
"dappertutto",
"ovunque"
+ ],
+ "pl": [
+ "wszędzie"
]
},
"+": {
@@ -82,6 +97,9 @@
],
"it": [
"più"
+ ],
+ "pl": [
+ "plus"
]
},
"-": {
@@ -96,6 +114,9 @@
],
"it": [
"meno"
+ ],
+ "pl": [
+ "minus"
]
},
"*": {
@@ -110,6 +131,9 @@
],
"it": [
"per"
+ ],
+ "pl": [
+ "razy"
]
},
"/": {
@@ -124,6 +148,9 @@
],
"it": [
"diviso"
+ ],
+ "pl": [
+ "dzielone przez"
]
},
"%": {
@@ -138,6 +165,9 @@
],
"it": [
"modulo"
+ ],
+ "en": [
+ "modulo"
]
},
"cancelIntent": {
@@ -165,6 +195,38 @@
"annulla",
"sta 'zitto",
"silenzio"
+ ],
+ "pl": [
+ "anuluj",
+ "stop",
+ "zamknij się",
+ "cisza",
+ "cicho bądź",
+ "bądź cicho",
+ "morda w kubeł",
+ "ucisz się"
+ ]
+ },
+ "politness": {
+ "en": [
+ "please",
+ "could you",
+ "would you be so nice"
+ ],
+ "fr": [
+ "s'il te plaît",
+ "pourrais-tu"
+ ],
+ "de": [
+ "bitte",
+ "danke",
+ "kannst du",
+ "wärst du so nett",
+ "würdest du",
+ "könntest du"
+ ],
+ "it": [
+ "per favore"
]
}
}
diff --git a/system/manager/TalkManager/talks/pl.json b/system/manager/TalkManager/talks/pl.json
new file mode 100644
index 000000000..874143a25
--- /dev/null
+++ b/system/manager/TalkManager/talks/pl.json
@@ -0,0 +1,93 @@
+ {
+ "noAccess": {
+ "default": [
+ "Przepraszam, nie mogę. Nie masz wystarczających uprawnień",
+ "Niemożliwe. Twoje uprawnienia są za niskie"
+ ],
+ "short":[
+ "Brak dostępu"
+ ]
+ },
+ "unknowUser": {
+ "default": [
+ "Przepraszam ale nie wiem kim jesteś",
+ "Przepraszam, nie mogę. Nie znam cię",
+ "Musisz zwracać się do mnie po imieniu abym wiedział kim jesteś"
+ ],
+ "short": [
+ "Nie znam cię"
+ ]
+ },
+ "notUnderstood": {
+ "default": [
+ "Przepraszam ale nie jestem pewien czy dobrze rozumiem czego chcesz",
+ "Nie zrozumiełem czego chcesz",
+ "Przepraszam, czy możesz powtórzyć?",
+ "Co??"
+ ],
+ "short": [
+ "Nie zrozumiałem"
+ ]
+ },
+ "notUnderstoodEnd": {
+ "default": [
+ "Przepraszam ale Cię nie rozumiem",
+ "Przepraszam ale nie rozumiem czego chcesz",
+ "Koniec tematu. Nie rozumiem Twojego polecenia",
+ "Stop. Nic z tego nie rozumiem"
+ ],
+ "short": [
+ "Nie rozumiem"
+ ]
+ },
+ "youreWelcome": {
+ "default": [
+ "Proszę bardzo!",
+ "Cała przyjemność po mojej stronie!",
+ "Nie ma sprawy!",
+ "W porządku!"
+ ]
+ },
+ "error": {
+ "default": [
+ "Coś poszło nie tak, sprawdź logi"
+ ]
+ },
+ "newDeviceAdditionFailed": {
+ "default": [
+ "Przepraszam, pojawił się problem z dodaniem nowego urządzenia"
+ ]
+ },
+ "newDeviceAdditionSuccess": {
+ "default": [
+ "Nowe urządzenie zostało znalezione i pomyślnie dodane!"
+ ]
+ },
+ "maxOneAlicePerRoom": {
+ "default": [
+ "Przepraszam ale nie możesz mieć więcej niż jeden odbiornik w pomieszczeniu",
+ "Przepraszam ale w jednym pomieszczeniu może być tylko jeden odbiornik"
+ ]
+ },
+ "wakewordCaptured": [
+ "Zarejestrowałem twoje wyrażenie wywołujące, sprawdźmy je",
+ "OK, zarejestrowane. Odtwarzam do weryfikacji",
+ "Zarejestrowane. Posłuchaj czy wszystko się zgadza"
+ ],
+ "isWakewordSampleOk": [
+ "Sprawdź czy tak jest dobrze"
+ ],
+ "offline": [
+ "Przepraszam ale nie mogę tego zrobić będąc w trybie offline"
+ ],
+ "notification": [
+ "Tak?",
+ "Słucham?",
+ "Zamieniam się w słuch!",
+ "Do usług!",
+ "Czekam na polecenie",
+ "Czekam na rozkaz",
+ "No co tam?",
+ "Mów o co chodzi"
+ ]
+}
diff --git a/system/node-red/settings.js b/system/node-red/settings.js
new file mode 100644
index 000000000..091767c76
--- /dev/null
+++ b/system/node-red/settings.js
@@ -0,0 +1,306 @@
+/**
+ * Copyright JS Foundation and other contributors, http://js.foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ **/
+
+module.exports = {
+ // the tcp port that the Node-RED web server is listening on
+ uiPort: process.env.PORT || 1880,
+
+ // By default, the Node-RED UI accepts connections on all IPv4 interfaces.
+ // To listen on all IPv6 addresses, set uiHost to "::",
+ // The following property can be used to listen on a specific interface. For
+ // example, the following would only allow connections from the local machine.
+ //uiHost: "127.0.0.1",
+
+ // Retry time in milliseconds for MQTT connections
+ mqttReconnectTime: 15000,
+
+ // Retry time in milliseconds for Serial port connections
+ serialReconnectTime: 15000,
+
+ // Retry time in milliseconds for TCP socket connections
+ //socketReconnectTime: 10000,
+
+ // Timeout in milliseconds for TCP server socket connections
+ // defaults to no timeout
+ //socketTimeout: 120000,
+
+ // Maximum number of messages to wait in queue while attempting to connect to TCP socket
+ // defaults to 1000
+ //tcpMsgQueueSize: 2000,
+
+ // Timeout in milliseconds for HTTP request connections
+ // defaults to 120 seconds
+ //httpRequestTimeout: 120000,
+
+ // The maximum length, in characters, of any message sent to the debug sidebar tab
+ debugMaxLength: 1000,
+
+ // The maximum number of messages nodes will buffer internally as part of their
+ // operation. This applies across a range of nodes that operate on message sequences.
+ // defaults to no limit. A value of 0 also means no limit is applied.
+ //nodeMessageBufferMaxLength: 0,
+
+ // To disable the option for using local files for storing keys and certificates in the TLS configuration
+ // node, set this to true
+ //tlsConfigDisableLocalFiles: true,
+
+ // Colourise the console output of the debug node
+ //debugUseColors: true,
+
+ // The file containing the flows. If not set, it defaults to flows_.json
+ //flowFile: 'flows.json',
+
+ // To enabled pretty-printing of the flow within the flow file, set the following
+ // property to true:
+ //flowFilePretty: true,
+
+ // By default, credentials are encrypted in storage using a generated key. To
+ // specify your own secret, set the following property.
+ // If you want to disable encryption of credentials, set this property to false.
+ // Note: once you set this property, do not change it - doing so will prevent
+ // node-red from being able to decrypt your existing credentials and they will be
+ // lost.
+ //credentialSecret: "a-secret-key",
+
+ // By default, all user data is stored in a directory called `.node-red` under
+ // the user's home directory. To use a different location, the following
+ // property can be used
+ //userDir: '/home/nol/.node-red/',
+
+ // Node-RED scans the `nodes` directory in the userDir to find local node files.
+ // The following property can be used to specify an additional directory to scan.
+ //nodesDir: '/home/nol/.node-red/nodes',
+
+ // By default, the Node-RED UI is available at http://localhost:1880/
+ // The following property can be used to specify a different root path.
+ // If set to false, this is disabled.
+ //httpAdminRoot: '/admin',
+
+ // Some nodes, such as HTTP In, can be used to listen for incoming http requests.
+ // By default, these are served relative to '/'. The following property
+ // can be used to specifiy a different root path. If set to false, this is
+ // disabled.
+ //httpNodeRoot: '/red-nodes',
+
+ // The following property can be used in place of 'httpAdminRoot' and 'httpNodeRoot',
+ // to apply the same root to both parts.
+ //httpRoot: '/red',
+
+ // When httpAdminRoot is used to move the UI to a different root path, the
+ // following property can be used to identify a directory of static content
+ // that should be served at http://localhost:1880/.
+ //httpStatic: '/home/nol/node-red-static/',
+
+ // The maximum size of HTTP request that will be accepted by the runtime api.
+ // Default: 5mb
+ //apiMaxLength: '5mb',
+
+ // If you installed the optional node-red-dashboard you can set it's path
+ // relative to httpRoot
+ //ui: { path: "ui" },
+
+ // Securing Node-RED
+ // -----------------
+ // To password protect the Node-RED editor and admin API, the following
+ // property can be used. See http://nodered.org/docs/security.html for details.
+ //adminAuth: {
+ // type: "credentials",
+ // users: [{
+ // username: "admin",
+ // password: "$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN.",
+ // permissions: "*"
+ // }]
+ //},
+
+ // To password protect the node-defined HTTP endpoints (httpNodeRoot), or
+ // the static content (httpStatic), the following properties can be used.
+ // The pass field is a bcrypt hash of the password.
+ // See http://nodered.org/docs/security.html#generating-the-password-hash
+ //httpNodeAuth: {user:"user",pass:"$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN."},
+ //httpStaticAuth: {user:"user",pass:"$2a$08$zZWtXTja0fB1pzD4sHCMyOCMYz2Z6dNbM6tl8sJogENOMcxWV9DN."},
+
+ // The following property can be used to enable HTTPS
+ // See http://nodejs.org/api/https.html#https_https_createserver_options_requestlistener
+ // for details on its contents.
+ // This property can be either an object, containing both a (private) key and a (public) certificate,
+ // or a function that returns such an object:
+ //// https object:
+ //https: {
+ // key: require("fs").readFileSync('privkey.pem'),
+ // cert: require("fs").readFileSync('cert.pem')
+ //},
+ ////https function:
+ // https: function() {
+ // // This function should return the options object, or a Promise
+ // // that resolves to the options object
+ // return {
+ // key: require("fs").readFileSync('privkey.pem'),
+ // cert: require("fs").readFileSync('cert.pem')
+ // }
+ // },
+
+ // The following property can be used to refresh the https settings at a
+ // regular time interval in hours.
+ // This requires:
+ // - the `https` setting to be a function that can be called to get
+ // the refreshed settings.
+ // - Node.js 11 or later.
+ //httpsRefreshInterval : 12,
+
+ // The following property can be used to cause insecure HTTP connections to
+ // be redirected to HTTPS.
+ //requireHttps: true,
+
+ // The following property can be used to disable the editor. The admin API
+ // is not affected by this option. To disable both the editor and the admin
+ // API, use either the httpRoot or httpAdminRoot properties
+ //disableEditor: false,
+
+ // The following property can be used to configure cross-origin resource sharing
+ // in the HTTP nodes.
+ // See https://github.com/troygoode/node-cors#configuration-options for
+ // details on its contents. The following is a basic permissive set of options:
+ //httpNodeCors: {
+ // origin: "*",
+ // methods: "GET,PUT,POST,DELETE"
+ //},
+
+ // If you need to set an http proxy please set an environment variable
+ // called http_proxy (or HTTP_PROXY) outside of Node-RED in the operating system.
+ // For example - http_proxy=http://myproxy.com:8080
+ // (Setting it here will have no effect)
+ // You may also specify no_proxy (or NO_PROXY) to supply a comma separated
+ // list of domains to not proxy, eg - no_proxy=.acme.co,.acme.co.uk
+
+ // The following property can be used to add a custom middleware function
+ // in front of all http in nodes. This allows custom authentication to be
+ // applied to all http in nodes, or any other sort of common request processing.
+ //httpNodeMiddleware: function(req,res,next) {
+ // // Handle/reject the request, or pass it on to the http in node by calling next();
+ // // Optionally skip our rawBodyParser by setting this to true;
+ // //req.skipRawBodyParser = true;
+ // next();
+ //},
+
+
+ // The following property can be used to add a custom middleware function
+ // in front of all admin http routes. For example, to set custom http
+ // headers
+ // httpAdminMiddleware: function(req,res,next) {
+ // // Set the X-Frame-Options header to limit where the editor
+ // // can be embedded
+ // //res.set('X-Frame-Options', 'sameorigin');
+ // next();
+ // },
+
+ // The following property can be used to pass custom options to the Express.js
+ // server used by Node-RED. For a full list of available options, refer
+ // to http://expressjs.com/en/api.html#app.settings.table
+ //httpServerOptions: { },
+
+ // The following property can be used to verify websocket connection attempts.
+ // This allows, for example, the HTTP request headers to be checked to ensure
+ // they include valid authentication information.
+ //webSocketNodeVerifyClient: function(info) {
+ // // 'info' has three properties:
+ // // - origin : the value in the Origin header
+ // // - req : the HTTP request
+ // // - secure : true if req.connection.authorized or req.connection.encrypted is set
+ // //
+ // // The function should return true if the connection should be accepted, false otherwise.
+ // //
+ // // Alternatively, if this function is defined to accept a second argument, callback,
+ // // it can be used to verify the client asynchronously.
+ // // The callback takes three arguments:
+ // // - result : boolean, whether to accept the connection or not
+ // // - code : if result is false, the HTTP error status to return
+ // // - reason: if result is false, the HTTP reason string to return
+ //},
+
+ // The following property can be used to seed Global Context with predefined
+ // values. This allows extra node modules to be made available with the
+ // Function node.
+ // For example,
+ // functionGlobalContext: { os:require('os') }
+ // can be accessed in a function block as:
+ // global.get("os")
+ functionGlobalContext : {
+ // os:require('os'),
+ // jfive:require("johnny-five"),
+ // j5board:require("johnny-five").Board({repl:false})
+ },
+ // `global.keys()` returns a list of all properties set in global context.
+ // This allows them to be displayed in the Context Sidebar within the editor.
+ // In some circumstances it is not desirable to expose them to the editor. The
+ // following property can be used to hide any property set in `functionGlobalContext`
+ // from being list by `global.keys()`.
+ // By default, the property is set to false to avoid accidental exposure of
+ // their values. Setting this to true will cause the keys to be listed.
+ exportGlobalContextKeys: false,
+
+
+ // Context Storage
+ // The following property can be used to enable context storage. The configuration
+ // provided here will enable file-based context that flushes to disk every 30 seconds.
+ // Refer to the documentation for further options: https://nodered.org/docs/api/context/
+ //
+ //contextStorage: {
+ // default: {
+ // module:"localfilesystem"
+ // },
+ //},
+
+ // The following property can be used to order the categories in the editor
+ // palette. If a node's category is not in the list, the category will get
+ // added to the end of the palette.
+ // If not set, the following default order is used:
+ //paletteCategories: ['subflows', 'common', 'function', 'network', 'sequence', 'parser', 'storage'],
+
+ // Configure the logging output
+ logging: {
+ // Only console logging is currently supported
+ console: {
+ // Level of logging to be recorded. Options are:
+ // fatal - only those errors which make the application unusable should be recorded
+ // error - record errors which are deemed fatal for a particular request + fatal errors
+ // warn - record problems which are non fatal + errors + fatal errors
+ // info - record information about the general running of the application + warn + error + fatal errors
+ // debug - record information which is more verbose than info + info + warn + error + fatal errors
+ // trace - record very detailed logging + debug + info + warn + error + fatal errors
+ // off - turn off all logging (doesn't affect metrics or audit)
+ level : 'info',
+ // Whether or not to include metric events in the log output
+ metrics: false,
+ // Whether or not to include audit events in the log output
+ audit : false
+ }
+ },
+
+ // Customising the editor
+ editorTheme: {
+ page : {
+ title : 'Project Alice Node-RED',
+ favicon: '~/ProjectAlice/core/interface/static/favicon.ico',
+ css : [
+ '/home/pi/.node-red/node_modules/@node-red-contrib-themes/midnight-red/theme.css',
+ '/home/pi/.node-red/node_modules/@node-red-contrib-themes/midnight-red/scrollbars.css'
+ ]
+ },
+ projects: {
+ enabled: false
+ }
+ }
+};
diff --git a/tests/commons/test_CommonsManager.py b/tests/commons/test_CommonsManager.py
index ca452dbc0..1069b43d3 100644
--- a/tests/commons/test_CommonsManager.py
+++ b/tests/commons/test_CommonsManager.py
@@ -1,6 +1,7 @@
import unittest
from unittest import mock
from unittest.mock import MagicMock
+from uuid import UUID
from core.commons.CommonsManager import CommonsManager
@@ -296,5 +297,37 @@ def test_indexOf(self):
self.assertEqual(CommonsManager.indexOf('nn', string3), 1)
+ def test_isUuid(self):
+ validStrings = [
+ '6e9bb2f8-bedb-4ade-9db7-f455e4c03051',
+ '{6e9bb2f8-bedb-4ade-9db7-f455e4c03051}',
+ '6e9bb2f8-becb-4ade-9db7-f455e4c03051',
+ '6e9bb2f8bedb4ade9db7f455e4c03051',
+ 'urn:uuid:6e9bb2f8bedb4ade9db7f455e4c03051'
+ ]
+ invalidStrings = [
+ '{6e9bb2f8-begb-4ade-9db7-f455e4c03051}',
+ '6e9bb2f8-bedb-4ade-9db7-f455e4c030',
+ 'unittests'
+ ]
+
+ for string in validStrings:
+ try:
+ val = UUID(string)
+ except:
+ val = None
+
+ self.assertIsNotNone(val)
+
+
+ for string in invalidStrings:
+ try:
+ val = UUID(string)
+ except:
+ val = None
+
+ self.assertIsNone(val)
+
+
if __name__ == '__main__':
unittest.main()
diff --git a/tests/util/test_InternetManager.py b/tests/util/test_InternetManager.py
index 93dd54b1d..7c2ff6270 100644
--- a/tests/util/test_InternetManager.py
+++ b/tests/util/test_InternetManager.py
@@ -12,11 +12,17 @@ class TestInternetManager(unittest.TestCase):
@mock.patch('core.util.InternetManager.Manager.broadcast')
@mock.patch('core.util.InternetManager.requests')
@mock.patch('core.util.InternetManager.InternetManager.Commons', new_callable=PropertyMock)
- def test_checkOnlineState(self, mock_commons, mock_requests, mock_broadcast):
+ @mock.patch('core.base.SuperManager.SuperManager')
+ def test_checkOnlineState(self, mock_superManager, mock_commons, mock_requests, mock_broadcast):
common_mock = MagicMock()
common_mock.getFunctionCaller.return_value = 'InternetManager'
mock_commons.return_value = common_mock
+ # mock SuperManager
+ mock_instance = MagicMock()
+ mock_superManager.getInstance.return_value = mock_instance
+ mock_instance.configManager.getAliceConfigByName.return_value = False
+
internetManager = InternetManager()
# request returns status code 204
@@ -25,7 +31,14 @@ def test_checkOnlineState(self, mock_commons, mock_requests, mock_broadcast):
type(mock_requestsResult).status_code = mock_statusCode
mock_requests.get.return_value = mock_requestsResult
+ # Not called if stay completly offline
+ mock_instance.configManager.getAliceConfigByName.return_value = True
+ internetManager.checkOnlineState()
+ mock_requests.get.asset_not_called()
+
+ mock_instance.configManager.getAliceConfigByName.return_value = False
internetManager.checkOnlineState()
+
mock_requests.get.assert_called_once_with('https://clients3.google.com/generate_204')
mock_broadcast.assert_called_once_with(method='internetConnected', exceptions=['InternetManager'], propagateToSkills=True)
self.assertEqual(internetManager.online, True)
+ 