refactor(tools): collapse tts_tool/delivery/local/lifecycle/plugins guards and single-use locals; tighten docstrings
This commit is contained in:
@@ -1,9 +1,7 @@
|
||||
"""Plugin-registered TTS providers for ``tools.tts_tool``.
|
||||
|
||||
Routes ``tts.provider: <name>`` values that are neither built-in nor a ``type: command``
|
||||
entry to a :class:`agent.tts_provider.TTSProvider` registered by a plugin. Discovery goes
|
||||
through ``hermes_cli.plugins._ensure_plugins_discovered`` (imported lazily so the tool
|
||||
module stays importable without the plugin machinery).
|
||||
"""Plugin-registered TTS providers for ``tools.tts_tool``: routes ``tts.provider: <name>`` values
|
||||
that are neither built-in nor ``type: command`` to a plugin :class:`agent.tts_provider.TTSProvider`.
|
||||
Discovery goes through ``hermes_cli.plugins._ensure_plugins_discovered`` (imported lazily so the
|
||||
tool module stays importable without the plugin machinery).
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
@@ -23,10 +21,8 @@ def _lookup_plugin_provider(key: str, *, discover: bool = True, retry: bool = Fa
|
||||
``retry`` re-discovers with ``force=True`` on a miss (a long-lived session may predate the
|
||||
plugin's install). Raises on registry/discovery failure — callers decide if fatal."""
|
||||
from agent.tts_registry import get_provider
|
||||
|
||||
if discover:
|
||||
from hermes_cli.plugins import _ensure_plugins_discovered
|
||||
|
||||
_ensure_plugins_discovered()
|
||||
plugin_provider = get_provider(key)
|
||||
if plugin_provider is None and retry:
|
||||
@@ -41,10 +37,8 @@ def _dispatch_to_plugin_provider(text: str, output_path: str, provider: str, tts
|
||||
Invariants re-checked here so a caller refactor can't break them: built-in names never reach
|
||||
the registry; a same-named ``type: command`` provider wins; only an exact registered name
|
||||
dispatches. Plugin exceptions propagate to ``text_to_speech_tool``'s error envelope."""
|
||||
if not provider:
|
||||
return None
|
||||
key = provider.lower().strip()
|
||||
if key in BUILTIN_TTS_PROVIDERS:
|
||||
key = (provider or "").lower().strip()
|
||||
if not key or key in BUILTIN_TTS_PROVIDERS:
|
||||
return None
|
||||
if _is_command_provider_config(_get_named_provider_config(tts_config, key)):
|
||||
return None
|
||||
@@ -55,9 +49,7 @@ def _dispatch_to_plugin_provider(text: str, output_path: str, provider: str, tts
|
||||
return None
|
||||
if plugin_provider is None:
|
||||
return None
|
||||
|
||||
# voice/model/speed/format are optional per the TTSProvider.synthesize contract;
|
||||
# providers fall back to their own defaults on None.
|
||||
# voice/model/speed/format are optional per TTSProvider.synthesize; providers default on None.
|
||||
cfg = tts_config if isinstance(tts_config, dict) else {}
|
||||
voice, model, speed = cfg.get("voice"), cfg.get("model"), cfg.get("speed")
|
||||
fmt = cfg.get("output_format", DEFAULT_COMMAND_TTS_OUTPUT_FORMAT)
|
||||
@@ -67,16 +59,13 @@ def _dispatch_to_plugin_provider(text: str, output_path: str, provider: str, tts
|
||||
model=model if isinstance(model, str) and model else None,
|
||||
speed=float(speed) if isinstance(speed, (int, float)) else None,
|
||||
format=str(fmt).lower() if fmt else "mp3")
|
||||
# Contract: returns the (possibly rewritten) output path; tolerate None.
|
||||
return written if isinstance(written, str) and written else output_path
|
||||
|
||||
|
||||
def _plugin_provider_is_voice_compatible(provider: str) -> bool:
|
||||
"""True when the registered plugin provider opts into voice-bubble delivery (any failure -> False)."""
|
||||
if not provider:
|
||||
return False
|
||||
key = provider.lower().strip()
|
||||
if key in BUILTIN_TTS_PROVIDERS:
|
||||
key = (provider or "").lower().strip()
|
||||
if not key or key in BUILTIN_TTS_PROVIDERS:
|
||||
return False
|
||||
try:
|
||||
plugin_provider = _lookup_plugin_provider(key, discover=False)
|
||||
|
||||
Reference in New Issue
Block a user