mirrors/hermes-agent
1
0
Fork 0
mirror of https://github.com/NousResearch/hermes-agent.git synced 2026-06-09 08:21:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

refactor(bluebubbles): simplify mention-gating helpers

Browse source 
Collapse the three mention-parsing helpers into one _compile_mention_patterns
that handles list/string/None inputs, and inline the require_mention bool
coercion to match the signal/dingtalk convention. Same behavior, 16 fewer
lines, no per-instance state in the staticmethod.
This commit is contained in:
teknium1 2026-06-01 17:36:47 -07:00 • committed by Teknium
parent d967e74427
commit abe0e19c0a
1 changed files with 28 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

72
gateway/platforms/bluebubbles.py
View file

@ -136,13 +136,12 @@ class BlueBubblesAdapter(BasePlatformAdapter):
if not str(self.webhook_path).startswith("/"):
self.webhook_path = f"/{self.webhook_path}"
self.send_read_receipts = bool(extra.get("send_read_receipts", True))
self.require_mention = self._bool_setting(
extra.get("require_mention"),
os.getenv("BLUEBUBBLES_REQUIRE_MENTION"),
default=False,
)
_require_mention = extra.get("require_mention")
if _require_mention is None:
_require_mention = os.getenv("BLUEBUBBLES_REQUIRE_MENTION")
self.require_mention = str(_require_mention).strip().lower() in {"true", "1", "yes", "on"}
self._mention_patterns = self._compile_mention_patterns(
extra.get("mention_patterns")
extra["mention_patterns"]
if "mention_patterns" in extra
else os.getenv("BLUEBUBBLES_MENTION_PATTERNS")
)
@ -161,54 +160,39 @@ class BlueBubblesAdapter(BasePlatformAdapter):
return f"{self.server_url}{path}{sep}password={quote(self.password, safe='')}"
@staticmethod
def _bool_setting(*values: Any, default: bool = False) -> bool:
for value in values:
if value is None:
continue
if isinstance(value, bool):
return value
text = str(value).strip().lower()
if not text:
continue
return text in {"true", "1", "yes", "on"}
return default
def _compile_mention_patterns(raw: Any) -> List[re.Pattern]:
"""Compile group-mention wake words from config/env.
@staticmethod
def _coerce_mention_patterns(raw: Any) -> List[str]:
``raw`` is a list (from config or env JSON), a string (raw env var:
JSON list, or comma/newline-separated), or None (use Hermes defaults).
"""
if raw is None:
return list(DEFAULT_MENTION_PATTERNS)
if isinstance(raw, list):
values = raw
patterns = list(DEFAULT_MENTION_PATTERNS)
elif isinstance(raw, str):
text = raw.strip()
if not text:
return []
try:
parsed = json.loads(text)
loaded = json.loads(text) if text else []
except Exception:
parsed = None
if isinstance(parsed, list):
values = parsed
else:
values = [
part.strip()
for line in text.splitlines()
for part in line.split(",")
if part.strip()
]
loaded = None
patterns = loaded if isinstance(loaded, list) else [
part.strip()
for line in text.splitlines()
for part in line.split(",")
]
elif isinstance(raw, list):
patterns = raw
else:
values = [raw]
return [str(value).strip() for value in values if str(value).strip()]
patterns = [raw]
def _compile_mention_patterns(self, raw: Any) -> List[re.Pattern]:
compiled: List[re.Pattern] = []
for pattern in self._coerce_mention_patterns(raw):
compiled: List["re.Pattern"] = []
for pattern in patterns:
text = str(pattern).strip()
if not text:
continue
try:
compiled.append(re.compile(pattern, re.IGNORECASE))
compiled.append(re.compile(text, re.IGNORECASE))
except re.error as exc:
logger.warning("[%s] Invalid BlueBubbles mention pattern %r: %s", self.name, pattern, exc)
if compiled:
logger.info("[%s] Loaded %d BlueBubbles mention pattern(s)", self.name, len(compiled))
logger.warning("[bluebubbles] Invalid mention pattern %r: %s", text, exc)
return compiled
def _message_matches_mention_patterns(self, text: str) -> bool: