refactor(tui_gateway): W4 wave2 pass 12 — record_repos pairs comprehension, voice.tts/tts_stop folds

This commit is contained in:
Teknium
2026-09-03 02:57:32 -07:00
parent f5a3ea3686
commit db7b8c7d02
2 changed files with 12 additions and 18 deletions
+8 -12
View File
@@ -24,8 +24,8 @@ def _projects_handler(name: str):
def _reconcile_repo_discovery(pdb, conn, policy, policy_key):
pdb.reconcile_discovered_repos_policy(
conn, policy_key, preserve_unversioned=_repo_discovery_policy_is_default(policy))
pdb.reconcile_discovered_repos_policy(conn, policy_key,
preserve_unversioned=_repo_discovery_policy_is_default(policy))
@_projects_handler("projects.discover_repos")
@@ -52,19 +52,15 @@ def _(rid, params: dict) -> dict:
from hermes_cli import projects_db as pdb
policy = _repo_discovery_policy()
policy_key = _repo_discovery_policy_key(policy)
incoming_raw = params.get("discovery_policy")
incoming_policy = _repo_discovery_policy(incoming_raw) if isinstance(incoming_raw, dict) else None
if incoming_policy is not None:
accepted = _repo_discovery_policy_key(incoming_policy) == policy_key
incoming = params.get("discovery_policy")
if isinstance(incoming, dict):
accepted = _repo_discovery_policy_key(_repo_discovery_policy(incoming)) == policy_key
else:
accepted = _repo_discovery_policy_is_default(policy) # legacy client without a policy
accepted = bool(policy["enabled"] and accepted)
pairs: list[tuple[str, str | None]] = []
for item in params.get("repos") or []:
if isinstance(item, str):
pairs.append((item, None))
elif isinstance(item, dict) and item.get("root"):
pairs.append((str(item["root"]), item.get("label")))
pairs = [(item, None) if isinstance(item, str) else (str(item["root"]), item.get("label"))
for item in params.get("repos") or []
if isinstance(item, str) or (isinstance(item, dict) and item.get("root"))]
with pdb.connect_closing() as conn:
_reconcile_repo_discovery(pdb, conn, policy, policy_key)
if accepted:
+4 -6
View File
@@ -124,10 +124,10 @@ def _tts_stream_stop(user_barge: bool = True) -> None:
if state is None:
return
if user_barge and not state["done"].is_set():
import traceback as _tb
logger.debug("TTS CUT: _tts_stream_stop(user_barge=True) — new turn or "
"interrupt cutting in-flight TTS\n%s", "".join(_tb.format_stack()))
import traceback
from tools.tts_streaming import mark_speech_interrupted
logger.debug("TTS CUT: _tts_stream_stop(user_barge=True) — new turn or "
"interrupt cutting in-flight TTS\n%s", "".join(traceback.format_stack()))
mark_speech_interrupted()
state["stop"].set()
with contextlib.suppress(Exception):
@@ -761,10 +761,8 @@ def _(rid, params: dict) -> dict:
return _err(rid, 4020, "text required")
try:
import hermes_cli.voice # noqa: F401 (a missing module must answer 5026, not die in a thread)
except ImportError:
return _err(rid, 5026, "voice module not available")
except Exception as e:
return _err(rid, 5026, str(e))
return _err(rid, 5026, "voice module not available" if isinstance(e, ImportError) else str(e))
threading.Thread(target=_speak_text_with_barge, args=(text,), daemon=True).start()
return _ok(rid, {"status": "speaking"})