Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions jasper/application.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,13 @@ def __init__(self, use_local_mic=False):
self.plugins = pluginstore.PluginStore(plugin_directories)
self.plugins.detect_plugins()

# Initialize Brain
self.brain = brain.Brain(self.config)

# Initialize AudioEngine
ae_info = self.plugins.get_plugin(audio_engine_slug,
category='audioengine')
self.audio = ae_info.plugin_class(ae_info, self.config)
self.audio = ae_info.plugin_class(self.brain, ae_info, self.config)

# Initialize audio input device
devices = [device.slug for device in self.audio.get_devices(
Expand Down Expand Up @@ -167,11 +170,10 @@ def __init__(self, use_local_mic=False):
', '.join(devices))
raise

# Initialize Brain
self.brain = brain.Brain(self.config)
# Initialize speech handler plugins
for info in self.plugins.get_plugins_by_category('speechhandler'):
try:
plugin = info.plugin_class(info, self.config)
plugin = info.plugin_class(self.brain, info, self.config)
except Exception as e:
self._logger.warning(
"Plugin '%s' skipped! (Reason: %s)", info.name,
Expand All @@ -193,8 +195,8 @@ def __init__(self, use_local_mic=False):
active_stt_plugin_info = self.plugins.get_plugin(
active_stt_slug, category='stt')
active_stt_plugin = active_stt_plugin_info.plugin_class(
'default', self.brain.get_plugin_phrases(), active_stt_plugin_info,
self.config)
self.brain, 'default', self.brain.get_plugin_phrases(),
active_stt_plugin_info, self.config)

if passive_stt_slug != active_stt_slug:
passive_stt_plugin_info = self.plugins.get_plugin(
Expand All @@ -203,11 +205,13 @@ def __init__(self, use_local_mic=False):
passive_stt_plugin_info = active_stt_plugin_info

passive_stt_plugin = passive_stt_plugin_info.plugin_class(
'keyword', self.brain.get_standard_phrases() + [keyword],
passive_stt_plugin_info, self.config)
self.brain, 'keyword', self.brain.get_standard_phrases() +
[keyword], passive_stt_plugin_info, self.config)

tts_plugin_info = self.plugins.get_plugin(tts_slug, category='tts')
tts_plugin = tts_plugin_info.plugin_class(tts_plugin_info, self.config)
tts_plugin = tts_plugin_info.plugin_class(self.brain,
tts_plugin_info,
self.config)

# Initialize Mic
if use_local_mic:
Expand Down
26 changes: 23 additions & 3 deletions jasper/plugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@


class GenericPlugin(object):
def __init__(self, info, config):
def __init__(self, brain, info, config):
self._brain = brain
self._plugin_config = config
self._plugin_info = info

Expand All @@ -23,6 +24,24 @@ def profile(self):
def info(self):
return self._plugin_info

@property
def brain(self):
"""Returns the plugin's instance of Jasper's brain."""
return self._brain

def invoke(self, plugin_name, hook_name, *args, **kwargs):
"""Invoke the hook function of a specific plugin."""
for plugin in self.brain.get_plugins():
if plugin.__class__.__name__ == plugin_name:
if hasattr(plugin, hook_name):
return getattr(plugin, hook_name)(*args, **kwargs)

def invoke_all(self, hook_name, *args, **kwargs):
"""Invoke the hook function of all available plugins."""
for plugin in self.brain.get_plugins():
if hasattr(plugin, hook_name):
getattr(plugin, hook_name)(*args, **kwargs)


class AudioEnginePlugin(GenericPlugin, audioengine.AudioEngine):
pass
Expand Down Expand Up @@ -53,8 +72,9 @@ def get_priority(self):


class STTPlugin(GenericPlugin):
def __init__(self, name, phrases, *args, **kwargs):
GenericPlugin.__init__(self, *args, **kwargs)
def __init__(self, brain, name, phrases, *args, **kwargs):
GenericPlugin.__init__(self, brain, *args, **kwargs)
self._brain = brain
self._vocabulary_phrases = phrases
self._vocabulary_name = name
self._vocabulary_compiled = False
Expand Down
4 changes: 3 additions & 1 deletion jasper/testutils.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
import gettext
from . import brain

TEST_PROFILE = {
'prefers_email': False,
Expand Down Expand Up @@ -39,4 +40,5 @@ def get_plugin_instance(plugin_class, *extra_args):
}
})()
args = tuple(extra_args) + (info, TEST_PROFILE)
return plugin_class(*args)
test_brain = brain.Brain(TEST_PROFILE)
return plugin_class(test_brain, *args)