Compare commits
1 Commits
whip/251-1
...
queue/321-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
51d06becd3 |
@@ -234,7 +234,12 @@ class HolographicMemoryProvider(MemoryProvider):
|
||||
return self._handle_fact_feedback(args)
|
||||
return json.dumps({"error": f"Unknown tool: {tool_name}"})
|
||||
|
||||
|
||||
def on_session_end(self, messages: List[Dict[str, Any]]) -> None:
|
||||
if not self._config.get("auto_extract", False):
|
||||
return
|
||||
if not self._store or not messages:
|
||||
return
|
||||
self._auto_extract_facts(messages)
|
||||
|
||||
def on_memory_write(self, action: str, target: str, content: str) -> None:
|
||||
"""Mirror built-in memory writes as facts.
|
||||
@@ -261,44 +266,6 @@ class HolographicMemoryProvider(MemoryProvider):
|
||||
except Exception as e:
|
||||
logger.debug("Holographic memory_write mirror failed: %s", e)
|
||||
|
||||
def on_session_end(self, messages: List[Dict[str, Any]]) -> None:
|
||||
"""Run auto-extraction and periodic contradiction detection."""
|
||||
if self._config.get("auto_extract", False):
|
||||
self._auto_extract_facts(messages)
|
||||
|
||||
# Periodic contradiction detection (run every ~50 sessions or on first session)
|
||||
self._maybe_run_contradiction_scan()
|
||||
|
||||
def _maybe_run_contradiction_scan(self) -> None:
|
||||
"""Run contradiction detection if enough sessions have passed since last run."""
|
||||
if not self._store or not self._retriever:
|
||||
return
|
||||
try:
|
||||
# Use a counter file to track sessions since last scan
|
||||
from hermes_constants import get_hermes_home
|
||||
counter_path = get_hermes_home() / ".contradiction_scan_counter"
|
||||
|
||||
count = 0
|
||||
if counter_path.exists():
|
||||
try:
|
||||
count = int(counter_path.read_text().strip())
|
||||
except (ValueError, OSError):
|
||||
count = 0
|
||||
|
||||
count += 1
|
||||
counter_path.write_text(str(count))
|
||||
|
||||
# Run every 50 sessions
|
||||
if count >= 50:
|
||||
counter_path.write_text("0")
|
||||
from .resolver import ContradictionResolver
|
||||
resolver = ContradictionResolver(self._store, self._retriever)
|
||||
report = resolver.run_detection_and_resolution(limit=50, auto_resolve=True)
|
||||
if report.contradictions_found > 0:
|
||||
logger.info("Periodic contradiction scan: %s", report.summary())
|
||||
except Exception as e:
|
||||
logger.debug("Periodic contradiction scan failed: %s", e)
|
||||
|
||||
def shutdown(self) -> None:
|
||||
self._store = None
|
||||
self._retriever = None
|
||||
|
||||
@@ -1,179 +0,0 @@
|
||||
"""Contradiction detection and resolution for holographic memory.
|
||||
|
||||
Periodically scans the fact store for contradictions using the retriever's
|
||||
contradict() method, then resolves obvious cases and flags ambiguous ones.
|
||||
|
||||
Resolution strategy:
|
||||
- Obvious: same entity, newer fact supersedes older → lower trust on older
|
||||
- Ambiguous: different claims about same entity → flag for review, don't auto-resolve
|
||||
- High-confidence contradiction (>0.7 score): lower trust on both, log warning
|
||||
|
||||
Usage:
|
||||
from plugins.memory.holographic.resolver import ContradictionResolver
|
||||
resolver = ContradictionResolver(store, retriever)
|
||||
report = resolver.run_detection_and_resolution()
|
||||
"""
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
import logging
|
||||
from datetime import datetime
|
||||
from typing import Any, Dict, List, Optional
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Thresholds
|
||||
_OBVIOUS_THRESHOLD = 0.5 # contradiction_score >= this → obvious
|
||||
_AMBIGUOUS_THRESHOLD = 0.3 # contradiction_score >= this → flag
|
||||
_HIGH_CONFIDENCE = 0.7 # contradiction_score >= this → high confidence
|
||||
_TRUST_PENALTY_OLD = 0.3 # trust reduction for superseded fact
|
||||
_TRUST_PENALTY_CONFLICT = 0.15 # trust reduction for ambiguous conflicts
|
||||
|
||||
|
||||
class ContradictionReport:
|
||||
"""Results of a contradiction detection and resolution run."""
|
||||
|
||||
def __init__(self):
|
||||
self.total_scanned: int = 0
|
||||
self.contradictions_found: int = 0
|
||||
self.auto_resolved: int = 0
|
||||
self.flagged_for_review: int = 0
|
||||
self.high_confidence: int = 0
|
||||
self.resolved_pairs: List[Dict[str, Any]] = []
|
||||
self.flagged_pairs: List[Dict[str, Any]] = []
|
||||
|
||||
def summary(self) -> str:
|
||||
lines = [
|
||||
f"Contradiction scan: {self.total_scanned} facts, "
|
||||
f"{self.contradictions_found} contradictions found",
|
||||
f" Auto-resolved: {self.auto_resolved} (newer supersedes older)",
|
||||
f" High-confidence: {self.high_confidence} (trust lowered on both)",
|
||||
f" Flagged for review: {self.flagged_for_review}",
|
||||
]
|
||||
for pair in self.flagged_pairs[:5]:
|
||||
lines.append(
|
||||
f" [REVIEW] score={pair['contradiction_score']:.2f} "
|
||||
f"entities={pair['shared_entities']} "
|
||||
f"A: {pair['fact_a']['content'][:50]}… "
|
||||
f"B: {pair['fact_b']['content'][:50]}…"
|
||||
)
|
||||
return "\n".join(lines)
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
"total_scanned": self.total_scanned,
|
||||
"contradictions_found": self.contradictions_found,
|
||||
"auto_resolved": self.auto_resolved,
|
||||
"high_confidence": self.high_confidence,
|
||||
"flagged_for_review": self.flagged_for_review,
|
||||
"resolved_pairs": self.resolved_pairs,
|
||||
"flagged_pairs": self.flagged_pairs,
|
||||
}
|
||||
|
||||
|
||||
class ContradictionResolver:
|
||||
"""Detects and resolves contradictions in the holographic fact store."""
|
||||
|
||||
def __init__(self, store, retriever):
|
||||
self._store = store
|
||||
self._retriever = retriever
|
||||
|
||||
def run_detection_and_resolution(
|
||||
self,
|
||||
limit: int = 50,
|
||||
auto_resolve: bool = True,
|
||||
) -> ContradictionReport:
|
||||
"""Run a full contradiction detection and resolution pass.
|
||||
|
||||
Args:
|
||||
limit: Max contradiction pairs to process.
|
||||
auto_resolve: If True, auto-resolve obvious cases.
|
||||
|
||||
Returns:
|
||||
ContradictionReport with all findings and actions taken.
|
||||
"""
|
||||
report = ContradictionReport()
|
||||
|
||||
try:
|
||||
contradictions = self._retriever.contradict(limit=limit)
|
||||
except Exception as e:
|
||||
logger.warning("Contradiction detection failed: %s", e)
|
||||
return report
|
||||
|
||||
report.total_scanned = len(contradictions)
|
||||
report.contradictions_found = len(contradictions)
|
||||
|
||||
for pair in contradictions:
|
||||
score = pair.get("contradiction_score", 0.0)
|
||||
|
||||
if score >= _HIGH_CONFIDENCE:
|
||||
report.high_confidence += 1
|
||||
if auto_resolve:
|
||||
self._resolve_high_confidence(pair, report)
|
||||
elif score >= _OBVIOUS_THRESHOLD:
|
||||
if auto_resolve:
|
||||
self._resolve_obvious(pair, report)
|
||||
elif score >= _AMBIGUOUS_THRESHOLD:
|
||||
report.flagged_for_review += 1
|
||||
report.flagged_pairs.append(pair)
|
||||
# Lower trust slightly on both to reduce retrieval weight
|
||||
self._penalize_both(pair, _TRUST_PENALTY_CONFLICT)
|
||||
|
||||
return report
|
||||
|
||||
def _resolve_obvious(self, pair: dict, report: ContradictionReport) -> None:
|
||||
"""Resolve obvious contradiction: newer fact supersedes older.
|
||||
|
||||
Same entity, clearly contradictory claims. Newer wins.
|
||||
"""
|
||||
fact_a = pair["fact_a"]
|
||||
fact_b = pair["fact_b"]
|
||||
|
||||
# Determine which is newer
|
||||
a_time = fact_a.get("updated_at") or fact_a.get("created_at", "")
|
||||
b_time = fact_b.get("updated_at") or fact_b.get("created_at", "")
|
||||
|
||||
if a_time >= b_time:
|
||||
newer, older = fact_a, fact_b
|
||||
else:
|
||||
newer, older = fact_b, fact_a
|
||||
|
||||
# Lower trust on the older (superseded) fact
|
||||
try:
|
||||
self._store.update_fact(
|
||||
older["fact_id"],
|
||||
trust_delta=-_TRUST_PENALTY_OLD,
|
||||
)
|
||||
report.auto_resolved += 1
|
||||
report.resolved_pairs.append({
|
||||
"action": "superseded",
|
||||
"kept": newer["fact_id"],
|
||||
"demoted": older["fact_id"],
|
||||
"reason": f"Newer fact supersedes older (score={pair['contradiction_score']:.2f})",
|
||||
})
|
||||
logger.info(
|
||||
"Contradiction resolved: fact#%d supersedes fact#%d (entities: %s)",
|
||||
newer["fact_id"], older["fact_id"],
|
||||
pair.get("shared_entities", []),
|
||||
)
|
||||
except Exception as e:
|
||||
logger.debug("Failed to resolve contradiction: %s", e)
|
||||
|
||||
def _resolve_high_confidence(self, pair: dict, report: ContradictionReport) -> None:
|
||||
"""Resolve high-confidence contradiction: lower trust on both facts.
|
||||
|
||||
We can't determine which is correct, so both get penalized.
|
||||
"""
|
||||
self._penalize_both(pair, _TRUST_PENALTY_CONFLICT * 2)
|
||||
report.flagged_pairs.append(pair)
|
||||
|
||||
def _penalize_both(self, pair: dict, penalty: float) -> None:
|
||||
"""Lower trust on both contradictory facts."""
|
||||
for key in ("fact_a", "fact_b"):
|
||||
fact = pair.get(key, {})
|
||||
fid = fact.get("fact_id")
|
||||
if fid:
|
||||
try:
|
||||
self._store.update_fact(fid, trust_delta=-penalty)
|
||||
except Exception as e:
|
||||
logger.debug("Failed to penalize fact#%d: %s", fid, e)
|
||||
52
tests/tools/test_tts_speed.py
Normal file
52
tests/tools/test_tts_speed.py
Normal file
@@ -0,0 +1,52 @@
|
||||
"""Tests for TTS speed support (#321)."""
|
||||
import json
|
||||
import pytest
|
||||
from unittest.mock import MagicMock, patch, AsyncMock
|
||||
|
||||
|
||||
class TestTTSSchemaHasSpeed:
|
||||
def test_schema_includes_speed(self):
|
||||
from tools.tts_tool import TTS_SCHEMA
|
||||
assert "speed" in TTS_SCHEMA["parameters"]["properties"]
|
||||
assert TTS_SCHEMA["parameters"]["properties"]["speed"]["type"] == "number"
|
||||
|
||||
def test_speed_not_required(self):
|
||||
from tools.tts_tool import TTS_SCHEMA
|
||||
assert "speed" not in TTS_SCHEMA["parameters"].get("required", [])
|
||||
|
||||
|
||||
class TestTextToSpeechToolSignature:
|
||||
def test_accepts_speed(self):
|
||||
from tools.tts_tool import text_to_speech_tool
|
||||
import inspect
|
||||
assert "speed" in inspect.signature(text_to_speech_tool).parameters
|
||||
|
||||
|
||||
class TestSpeedClamping:
|
||||
@patch("tools.tts_tool._load_tts_config", return_value={})
|
||||
@patch("tools.tts_tool._get_provider", return_value="edge")
|
||||
@patch("tools.tts_tool._import_edge_tts")
|
||||
def test_clamped_low(self, mock_edge, mock_prov, mock_cfg):
|
||||
from tools.tts_tool import text_to_speech_tool
|
||||
with patch("tools.tts_tool.asyncio.run"):
|
||||
with patch("tools.tts_tool.os.path.exists", return_value=True):
|
||||
with patch("tools.tts_tool.os.path.getsize", return_value=1000):
|
||||
assert "success" in json.loads(text_to_speech_tool("test", speed=0.01))
|
||||
|
||||
@patch("tools.tts_tool._load_tts_config", return_value={})
|
||||
@patch("tools.tts_tool._get_provider", return_value="edge")
|
||||
@patch("tools.tts_tool._import_edge_tts")
|
||||
def test_clamped_high(self, mock_edge, mock_prov, mock_cfg):
|
||||
from tools.tts_tool import text_to_speech_tool
|
||||
with patch("tools.tts_tool.asyncio.run"):
|
||||
with patch("tools.tts_tool.os.path.exists", return_value=True):
|
||||
with patch("tools.tts_tool.os.path.getsize", return_value=1000):
|
||||
assert "success" in json.loads(text_to_speech_tool("test", speed=100.0))
|
||||
|
||||
|
||||
class TestEdgeTTSRateConversion:
|
||||
def test_rates(self):
|
||||
for speed, expected in [(1.0, "+0%"), (1.5, "+50%"), (0.5, "-50%"), (2.0, "+100%"), (0.25, "-75%")]:
|
||||
pct = int((speed - 1.0) * 100)
|
||||
rate = f"+{pct}%" if pct >= 0 else f"{pct}%"
|
||||
assert rate == expected
|
||||
@@ -179,8 +179,10 @@ async def _generate_edge_tts(text: str, output_path: str, tts_config: Dict[str,
|
||||
_edge_tts = _import_edge_tts()
|
||||
edge_config = tts_config.get("edge", {})
|
||||
voice = edge_config.get("voice", DEFAULT_EDGE_VOICE)
|
||||
|
||||
communicate = _edge_tts.Communicate(text, voice)
|
||||
speed = tts_config.get("_speed_override") or edge_config.get("speed", 1.0)
|
||||
rate_pct = int((speed - 1.0) * 100)
|
||||
rate_str = f"+{rate_pct}%" if rate_pct >= 0 else f"{rate_pct}%"
|
||||
communicate = _edge_tts.Communicate(text, voice, rate=rate_str)
|
||||
await communicate.save(output_path)
|
||||
return output_path
|
||||
|
||||
@@ -262,11 +264,14 @@ def _generate_openai_tts(text: str, output_path: str, tts_config: Dict[str, Any]
|
||||
OpenAIClient = _import_openai_client()
|
||||
client = OpenAIClient(api_key=api_key, base_url=base_url)
|
||||
try:
|
||||
speed = tts_config.get("_speed_override") or oai_config.get("speed", 1.0)
|
||||
speed = max(0.25, min(4.0, speed))
|
||||
response = client.audio.speech.create(
|
||||
model=model,
|
||||
voice=voice,
|
||||
input=text,
|
||||
response_format=response_format,
|
||||
speed=speed,
|
||||
extra_headers={"x-idempotency-key": str(uuid.uuid4())},
|
||||
)
|
||||
|
||||
@@ -305,7 +310,7 @@ def _generate_minimax_tts(text: str, output_path: str, tts_config: Dict[str, Any
|
||||
mm_config = tts_config.get("minimax", {})
|
||||
model = mm_config.get("model", DEFAULT_MINIMAX_MODEL)
|
||||
voice_id = mm_config.get("voice_id", DEFAULT_MINIMAX_VOICE_ID)
|
||||
speed = mm_config.get("speed", 1)
|
||||
speed = tts_config.get("_speed_override") or mm_config.get("speed", 1)
|
||||
vol = mm_config.get("vol", 1)
|
||||
pitch = mm_config.get("pitch", 0)
|
||||
base_url = mm_config.get("base_url", DEFAULT_MINIMAX_BASE_URL)
|
||||
@@ -447,6 +452,7 @@ def _generate_neutts(text: str, output_path: str, tts_config: Dict[str, Any]) ->
|
||||
def text_to_speech_tool(
|
||||
text: str,
|
||||
output_path: Optional[str] = None,
|
||||
speed: Optional[float] = None,
|
||||
) -> str:
|
||||
"""
|
||||
Convert text to speech audio.
|
||||
@@ -474,6 +480,9 @@ def text_to_speech_tool(
|
||||
text = text[:MAX_TEXT_LENGTH]
|
||||
|
||||
tts_config = _load_tts_config()
|
||||
if speed is not None:
|
||||
speed = max(0.25, min(4.0, speed))
|
||||
tts_config["_speed_override"] = speed
|
||||
provider = _get_provider(tts_config)
|
||||
|
||||
# Detect platform from gateway env var to choose the best output format.
|
||||
@@ -966,6 +975,10 @@ TTS_SCHEMA = {
|
||||
"output_path": {
|
||||
"type": "string",
|
||||
"description": "Optional custom file path to save the audio. Defaults to ~/.hermes/audio_cache/<timestamp>.mp3"
|
||||
},
|
||||
"speed": {
|
||||
"type": "number",
|
||||
"description": "Speech speed multiplier. 1.0 = normal, 0.5 = half speed, 2.0 = double. Range: 0.25-4.0. Edge TTS uses SSML rate, OpenAI uses native speed param, MiniMax passes directly."
|
||||
}
|
||||
},
|
||||
"required": ["text"]
|
||||
@@ -978,7 +991,8 @@ registry.register(
|
||||
schema=TTS_SCHEMA,
|
||||
handler=lambda args, **kw: text_to_speech_tool(
|
||||
text=args.get("text", ""),
|
||||
output_path=args.get("output_path")),
|
||||
output_path=args.get("output_path"),
|
||||
speed=args.get("speed")),
|
||||
check_fn=check_tts_requirements,
|
||||
emoji="🔊",
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user