Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat/skip_skills_in_dialog_transform #30

Merged
merged 2 commits into from
Oct 9, 2023
Merged

feat/skip_skills_in_dialog_transform #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6233ec7
feat/skip_skills_in_dialog_transform
JarbasAl Oct 9, 2023
366ba80
fix indentation
JarbasAl Oct 9, 2023
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
16 changes: 9 additions & 7 deletions ovos_audio/service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,13 +278,15 @@ def handle_speak(self, message):
utterance = message.data['utterance']

# allow dialog transformers to rewrite speech
utt2, message.context = self.dialog_transform.transform(dialog=utterance,
context=message.context,
sess=sess)
if utterance != utt2:
LOG.debug(f"original dialog: {utterance}")
LOG.info(f"dialog transformed to: {utt2}")
utterance = utt2
skill_id = message.data.get("meta", {}).get("skill") or message.context.get("skill_id")
if skill_id and skill_id not in self.dialog_transform.blacklisted_skills:
utt2, message.context = self.dialog_transform.transform(dialog=utterance,
context=message.context,
sess=sess)
if utterance != utt2:
LOG.debug(f"original dialog: {utterance}")
LOG.info(f"dialog transformed to: {utt2}")
utterance = utt2

listen = message.data.get('expect_response', False)
self.execute_tts(utterance, sess.session_id, listen, message)
Expand Down
7 changes: 7 additions & 0 deletions ovos_audio/transformers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,13 @@ def __init__(self, bus, config=None):
self.config = config or Configuration().get("dialog_transformers", {})
self.load_plugins()

@property
def blacklisted_skills(self):
# dialog should NEVER be rewritten if it comes from these skills
return self.config.get("blacklisted_skills",
["skill-ovos-icanhazdadjokes.openvoiceos"] # blacklist jokes by default
)

def load_plugins(self):
for plug_name, plug in find_dialog_transformer_plugins().items():
if plug_name in self.config:
Expand Down