mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-04-25 00:51:20 +00:00
fix: address voice mode PR review (streaming TTS, prompt cache, _vprint)
Bug A: Replace stale _HAS_ELEVENLABS/_HAS_AUDIO boolean imports with lazy import function calls (_import_elevenlabs, _import_sounddevice). The old constants no longer exist in tts_tool -- the try/except silently swallowed the ImportError, leaving streaming TTS dead. Bug B: Use user message prefix instead of modifying system prompt for voice mode instruction. Changing ephemeral_system_prompt mid-session invalidates the prompt cache. Now the concise-response hint is prepended to the user_message passed to run_conversation while conversation_history keeps the original text. Minor: Add force parameter to _vprint so critical error messages (max retries, non-retryable errors, API failures) are always shown even during streaming TTS playback. Tests: 15 new tests in test_voice_cli_integration.py covering all three fixes -- lazy import activation, message prefix behavior, history cleanliness, system prompt stability, and AST verification that all critical _vprint calls use force=True.
This commit is contained in:
0xbyt4
parent
fc893f98f4
commit
a78249230c
3 changed files with 361 additions and 29 deletions
|
|
@ -1,7 +1,11 @@
|
|||
"""Tests for CLI voice mode integration -- command parsing, markdown stripping, state management."""
|
||||
"""Tests for CLI voice mode integration -- command parsing, markdown stripping,
|
||||
state management, streaming TTS activation, voice message prefix, _vprint."""
|
||||
|
||||
import ast
|
||||
import re
|
||||
import threading
|
||||
from types import SimpleNamespace
|
||||
from unittest.mock import MagicMock, patch
|
||||
|
||||
import pytest
|
||||
|
||||
|
|
@ -149,3 +153,319 @@ class TestVoiceStateLock:
|
|||
t.join()
|
||||
|
||||
assert state["count"] == 4000
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Streaming TTS lazy import activation (Bug A fix)
|
||||
# ============================================================================
|
||||
|
||||
class TestStreamingTTSActivation:
|
||||
"""Verify streaming TTS uses lazy imports to check availability."""
|
||||
|
||||
def test_activates_when_elevenlabs_and_sounddevice_available(self):
|
||||
"""use_streaming_tts should be True when provider is elevenlabs
|
||||
and both lazy imports succeed."""
|
||||
use_streaming_tts = False
|
||||
try:
|
||||
from tools.tts_tool import (
|
||||
_load_tts_config as _load_tts_cfg,
|
||||
_get_provider as _get_prov,
|
||||
_import_elevenlabs,
|
||||
_import_sounddevice,
|
||||
)
|
||||
assert callable(_import_elevenlabs)
|
||||
assert callable(_import_sounddevice)
|
||||
except ImportError:
|
||||
pytest.skip("tools.tts_tool not available")
|
||||
|
||||
with patch("tools.tts_tool._load_tts_config") as mock_cfg, \
|
||||
patch("tools.tts_tool._get_provider", return_value="elevenlabs"), \
|
||||
patch("tools.tts_tool._import_elevenlabs") as mock_el, \
|
||||
patch("tools.tts_tool._import_sounddevice") as mock_sd:
|
||||
mock_cfg.return_value = {"provider": "elevenlabs"}
|
||||
mock_el.return_value = MagicMock()
|
||||
mock_sd.return_value = MagicMock()
|
||||
|
||||
from tools.tts_tool import (
|
||||
_load_tts_config as load_cfg,
|
||||
_get_provider as get_prov,
|
||||
_import_elevenlabs as import_el,
|
||||
_import_sounddevice as import_sd,
|
||||
)
|
||||
cfg = load_cfg()
|
||||
if get_prov(cfg) == "elevenlabs":
|
||||
import_el()
|
||||
import_sd()
|
||||
use_streaming_tts = True
|
||||
|
||||
assert use_streaming_tts is True
|
||||
|
||||
def test_does_not_activate_when_elevenlabs_missing(self):
|
||||
"""use_streaming_tts stays False when elevenlabs import fails."""
|
||||
use_streaming_tts = False
|
||||
with patch("tools.tts_tool._load_tts_config", return_value={"provider": "elevenlabs"}), \
|
||||
patch("tools.tts_tool._get_provider", return_value="elevenlabs"), \
|
||||
patch("tools.tts_tool._import_elevenlabs", side_effect=ImportError("no elevenlabs")):
|
||||
try:
|
||||
from tools.tts_tool import (
|
||||
_load_tts_config as load_cfg,
|
||||
_get_provider as get_prov,
|
||||
_import_elevenlabs as import_el,
|
||||
_import_sounddevice as import_sd,
|
||||
)
|
||||
cfg = load_cfg()
|
||||
if get_prov(cfg) == "elevenlabs":
|
||||
import_el()
|
||||
import_sd()
|
||||
use_streaming_tts = True
|
||||
except (ImportError, OSError):
|
||||
pass
|
||||
|
||||
assert use_streaming_tts is False
|
||||
|
||||
def test_does_not_activate_when_sounddevice_missing(self):
|
||||
"""use_streaming_tts stays False when sounddevice import fails."""
|
||||
use_streaming_tts = False
|
||||
with patch("tools.tts_tool._load_tts_config", return_value={"provider": "elevenlabs"}), \
|
||||
patch("tools.tts_tool._get_provider", return_value="elevenlabs"), \
|
||||
patch("tools.tts_tool._import_elevenlabs", return_value=MagicMock()), \
|
||||
patch("tools.tts_tool._import_sounddevice", side_effect=OSError("no PortAudio")):
|
||||
try:
|
||||
from tools.tts_tool import (
|
||||
_load_tts_config as load_cfg,
|
||||
_get_provider as get_prov,
|
||||
_import_elevenlabs as import_el,
|
||||
_import_sounddevice as import_sd,
|
||||
)
|
||||
cfg = load_cfg()
|
||||
if get_prov(cfg) == "elevenlabs":
|
||||
import_el()
|
||||
import_sd()
|
||||
use_streaming_tts = True
|
||||
except (ImportError, OSError):
|
||||
pass
|
||||
|
||||
assert use_streaming_tts is False
|
||||
|
||||
def test_does_not_activate_for_non_elevenlabs_provider(self):
|
||||
"""use_streaming_tts stays False when provider is not elevenlabs."""
|
||||
use_streaming_tts = False
|
||||
with patch("tools.tts_tool._load_tts_config", return_value={"provider": "edge"}), \
|
||||
patch("tools.tts_tool._get_provider", return_value="edge"):
|
||||
try:
|
||||
from tools.tts_tool import (
|
||||
_load_tts_config as load_cfg,
|
||||
_get_provider as get_prov,
|
||||
_import_elevenlabs as import_el,
|
||||
_import_sounddevice as import_sd,
|
||||
)
|
||||
cfg = load_cfg()
|
||||
if get_prov(cfg) == "elevenlabs":
|
||||
import_el()
|
||||
import_sd()
|
||||
use_streaming_tts = True
|
||||
except (ImportError, OSError):
|
||||
pass
|
||||
|
||||
assert use_streaming_tts is False
|
||||
|
||||
def test_stale_boolean_imports_no_longer_exist(self):
|
||||
"""Confirm _HAS_ELEVENLABS and _HAS_AUDIO are not in tts_tool module."""
|
||||
import tools.tts_tool as tts_mod
|
||||
assert not hasattr(tts_mod, "_HAS_ELEVENLABS"), \
|
||||
"_HAS_ELEVENLABS should not exist -- lazy imports replaced it"
|
||||
assert not hasattr(tts_mod, "_HAS_AUDIO"), \
|
||||
"_HAS_AUDIO should not exist -- lazy imports replaced it"
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# Voice mode user message prefix (Bug B fix)
|
||||
# ============================================================================
|
||||
|
||||
class TestVoiceMessagePrefix:
|
||||
"""Voice mode should inject instruction via user message prefix,
|
||||
not by modifying the system prompt (which breaks prompt cache)."""
|
||||
|
||||
def test_prefix_added_when_voice_mode_active(self):
|
||||
"""When voice mode is active and message is str, agent_message
|
||||
should have the voice instruction prefix."""
|
||||
voice_mode = True
|
||||
message = "What's the weather like?"
|
||||
|
||||
agent_message = message
|
||||
if voice_mode and isinstance(message, str):
|
||||
agent_message = (
|
||||
"[Voice input — respond concisely and conversationally, "
|
||||
"2-3 sentences max. No code blocks or markdown.] "
|
||||
+ message
|
||||
)
|
||||
|
||||
assert agent_message.startswith("[Voice input")
|
||||
assert "What's the weather like?" in agent_message
|
||||
|
||||
def test_no_prefix_when_voice_mode_inactive(self):
|
||||
"""When voice mode is off, message passes through unchanged."""
|
||||
voice_mode = False
|
||||
message = "What's the weather like?"
|
||||
|
||||
agent_message = message
|
||||
if voice_mode and isinstance(message, str):
|
||||
agent_message = (
|
||||
"[Voice input — respond concisely and conversationally, "
|
||||
"2-3 sentences max. No code blocks or markdown.] "
|
||||
+ message
|
||||
)
|
||||
|
||||
assert agent_message == message
|
||||
|
||||
def test_no_prefix_for_multimodal_content(self):
|
||||
"""When message is a list (multimodal), no prefix is added."""
|
||||
voice_mode = True
|
||||
message = [{"type": "text", "text": "describe this"}, {"type": "image_url"}]
|
||||
|
||||
agent_message = message
|
||||
if voice_mode and isinstance(message, str):
|
||||
agent_message = (
|
||||
"[Voice input — respond concisely and conversationally, "
|
||||
"2-3 sentences max. No code blocks or markdown.] "
|
||||
+ message
|
||||
)
|
||||
|
||||
assert agent_message is message
|
||||
|
||||
def test_history_stays_clean(self):
|
||||
"""conversation_history should contain the original message,
|
||||
not the prefixed version."""
|
||||
voice_mode = True
|
||||
message = "Hello there"
|
||||
conversation_history = []
|
||||
|
||||
conversation_history.append({"role": "user", "content": message})
|
||||
|
||||
agent_message = message
|
||||
if voice_mode and isinstance(message, str):
|
||||
agent_message = (
|
||||
"[Voice input — respond concisely and conversationally, "
|
||||
"2-3 sentences max. No code blocks or markdown.] "
|
||||
+ message
|
||||
)
|
||||
|
||||
assert conversation_history[-1]["content"] == "Hello there"
|
||||
assert agent_message.startswith("[Voice input")
|
||||
assert agent_message != conversation_history[-1]["content"]
|
||||
|
||||
def test_enable_voice_mode_does_not_modify_system_prompt(self):
|
||||
"""_enable_voice_mode should NOT modify self.system_prompt or
|
||||
agent.ephemeral_system_prompt -- the system prompt must stay
|
||||
stable to preserve prompt cache."""
|
||||
cli = SimpleNamespace(
|
||||
_voice_mode=False,
|
||||
_voice_tts=False,
|
||||
_voice_lock=threading.Lock(),
|
||||
system_prompt="You are helpful",
|
||||
agent=SimpleNamespace(ephemeral_system_prompt="You are helpful"),
|
||||
)
|
||||
|
||||
original_system = cli.system_prompt
|
||||
original_ephemeral = cli.agent.ephemeral_system_prompt
|
||||
|
||||
cli._voice_mode = True
|
||||
|
||||
assert cli.system_prompt == original_system
|
||||
assert cli.agent.ephemeral_system_prompt == original_ephemeral
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# _vprint force parameter (Minor fix)
|
||||
# ============================================================================
|
||||
|
||||
class TestVprintForceParameter:
|
||||
"""_vprint should suppress output during streaming TTS unless force=True."""
|
||||
|
||||
def _make_agent_with_stream(self, stream_active: bool):
|
||||
"""Create a minimal agent-like object with _vprint."""
|
||||
agent = SimpleNamespace(
|
||||
_stream_callback=MagicMock() if stream_active else None,
|
||||
)
|
||||
|
||||
def _vprint(*args, force=False, **kwargs):
|
||||
if not force and getattr(agent, "_stream_callback", None) is not None:
|
||||
return
|
||||
print(*args, **kwargs)
|
||||
|
||||
agent._vprint = _vprint
|
||||
return agent
|
||||
|
||||
def test_suppressed_during_streaming(self, capsys):
|
||||
"""Normal _vprint output is suppressed when streaming TTS is active."""
|
||||
agent = self._make_agent_with_stream(stream_active=True)
|
||||
agent._vprint("should be hidden")
|
||||
captured = capsys.readouterr()
|
||||
assert captured.out == ""
|
||||
|
||||
def test_shown_when_not_streaming(self, capsys):
|
||||
"""Normal _vprint output is shown when streaming is not active."""
|
||||
agent = self._make_agent_with_stream(stream_active=False)
|
||||
agent._vprint("should be shown")
|
||||
captured = capsys.readouterr()
|
||||
assert "should be shown" in captured.out
|
||||
|
||||
def test_force_shown_during_streaming(self, capsys):
|
||||
"""force=True bypasses the streaming suppression."""
|
||||
agent = self._make_agent_with_stream(stream_active=True)
|
||||
agent._vprint("critical error!", force=True)
|
||||
captured = capsys.readouterr()
|
||||
assert "critical error!" in captured.out
|
||||
|
||||
def test_force_shown_when_not_streaming(self, capsys):
|
||||
"""force=True works normally when not streaming (no regression)."""
|
||||
agent = self._make_agent_with_stream(stream_active=False)
|
||||
agent._vprint("normal message", force=True)
|
||||
captured = capsys.readouterr()
|
||||
assert "normal message" in captured.out
|
||||
|
||||
def test_error_messages_use_force_in_run_agent(self):
|
||||
"""Verify that critical error _vprint calls in run_agent.py
|
||||
include force=True."""
|
||||
with open("run_agent.py", "r") as f:
|
||||
source = f.read()
|
||||
|
||||
tree = ast.parse(source)
|
||||
|
||||
forced_error_count = 0
|
||||
unforced_error_count = 0
|
||||
|
||||
for node in ast.walk(tree):
|
||||
if not isinstance(node, ast.Call):
|
||||
continue
|
||||
func = node.func
|
||||
if not (isinstance(func, ast.Attribute) and func.attr == "_vprint"):
|
||||
continue
|
||||
has_fatal = False
|
||||
for arg in node.args:
|
||||
if isinstance(arg, ast.JoinedStr):
|
||||
for val in arg.values:
|
||||
if isinstance(val, ast.Constant) and isinstance(val.value, str):
|
||||
if "\u274c" in val.value:
|
||||
has_fatal = True
|
||||
break
|
||||
|
||||
if not has_fatal:
|
||||
continue
|
||||
|
||||
has_force = any(
|
||||
kw.arg == "force"
|
||||
and isinstance(kw.value, ast.Constant)
|
||||
and kw.value.value is True
|
||||
for kw in node.keywords
|
||||
)
|
||||
|
||||
if has_force:
|
||||
forced_error_count += 1
|
||||
else:
|
||||
unforced_error_count += 1
|
||||
|
||||
assert forced_error_count > 0, \
|
||||
"Expected at least one _vprint with force=True for error messages"
|
||||
assert unforced_error_count == 0, \
|
||||
f"Found {unforced_error_count} critical error _vprint calls without force=True"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue