Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 5d01400638 | |||
| 891fbdc101 |
@@ -60,6 +60,18 @@ Decisions inside the set architecture. D-NNN, never renumbered.
|
|||||||
broken classifier must never mute the bot; the budget gate already
|
broken classifier must never mute the bot; the budget gate already
|
||||||
bounds spend. Its verdict gates BEFORE the main call, the
|
bounds spend. Its verdict gates BEFORE the main call, the
|
||||||
envelope's answer_needed still gates after — two independent nets.
|
envelope's answer_needed still gates after — two independent nets.
|
||||||
|
- **D-019** — News memory + on-demand tool (SPEC-013 NEWS-07..12):
|
||||||
|
the news pipeline now carries item summaries (feed descriptions,
|
||||||
|
HTML-stripped) and persists every fetched item into a deduped `news`
|
||||||
|
table (schema v6), pruned to a rolling window (`news-keep`). Both the
|
||||||
|
kroa digest run and the ggg posting run write to it, so the store is
|
||||||
|
a single searchable source across both models. A `get_news` tool
|
||||||
|
reads that store (topic/source-filtered, metered, sanitized) rather
|
||||||
|
than re-fetching feeds live: the ambient `{news}` digest stays a
|
||||||
|
small always-on snapshot, while the tool gives unbounded on-demand
|
||||||
|
reach without a fresh network round-trip per call. The store is the
|
||||||
|
same `bot.db` (WAL) the bot uses; the cron process opens it
|
||||||
|
independently — concurrent reader/writer is what WAL is for.
|
||||||
- **D-018** — Codex Mechanicus search (FDB-019, SPEC-014): Luma's
|
- **D-018** — Codex Mechanicus search (FDB-019, SPEC-014): Luma's
|
||||||
lore is grounded in the priest's real archive at binaric.tech via a
|
lore is grounded in the priest's real archive at binaric.tech via a
|
||||||
`codex_search` tool over the site's public `search-index.json`, not
|
`codex_search` tool over the site's public `search-index.json`, not
|
||||||
|
|||||||
@@ -182,6 +182,9 @@ class FjerkroaBot(commands.Bot):
|
|||||||
if content.startswith("!privacy"):
|
if content.startswith("!privacy"):
|
||||||
await message.channel.send(self.config.get("privacy-notice", DEFAULT_PRIVACY_NOTICE), suppress_embeds=True)
|
await message.channel.send(self.config.get("privacy-notice", DEFAULT_PRIVACY_NOTICE), suppress_embeds=True)
|
||||||
return
|
return
|
||||||
|
if content.startswith("!help"): # OPS-17: context-aware, works even while paused
|
||||||
|
await message.channel.send(self._help_text(staff=self.is_staff_channel(message.channel)), suppress_embeds=True)
|
||||||
|
return
|
||||||
if not self.replies_allowed():
|
if not self.replies_allowed():
|
||||||
return
|
return
|
||||||
if str(message.content).startswith("!wichtel"):
|
if str(message.content).startswith("!wichtel"):
|
||||||
@@ -263,15 +266,35 @@ class FjerkroaBot(commands.Bot):
|
|||||||
return f"Cancelled {store.task_set_state(int(args[1]), 'cancelled')} task(s)."
|
return f"Cancelled {store.task_set_state(int(args[1]), 'cancelled')} task(s)."
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
def _help_text(self, staff: bool) -> str:
|
||||||
|
"""Context-aware command help (OPS-17): every channel lists the user commands; the staff channel also lists operator commands."""
|
||||||
|
everywhere = (
|
||||||
|
"Available to everyone, in any channel:\n"
|
||||||
|
"• `!help` — this help\n"
|
||||||
|
"• `!forgetme` — delete your messages and memory traces (works even while I'm paused)\n"
|
||||||
|
"• `!privacy` — how your data is handled (works even while I'm paused)\n"
|
||||||
|
"• `!wichtel @a @b @c …` — draw Secret Santa pairings (needs ≥2 mentions; only while I'm active)"
|
||||||
|
)
|
||||||
|
if not staff:
|
||||||
|
return everywhere
|
||||||
|
operator = (
|
||||||
|
"Staff commands — this channel only, prefixed `!bot`:\n"
|
||||||
|
"• Control: `pause`, `resume`, `quiet <minutes>`, `status`\n"
|
||||||
|
"• Cost: `spend`, `images on|off`\n"
|
||||||
|
"• Memory: `memory <user>`, `forget-fact <id>`, `pin <channel|global> <text>`, `unpin <id>`, `pins`\n"
|
||||||
|
"• Tasks: `tasks` (list), `tasks on|off`, `task-approve <id>`, `task-cancel <id>`"
|
||||||
|
)
|
||||||
|
return operator + "\n\n" + everywhere
|
||||||
|
|
||||||
async def handle_staff_command(self, message: Message) -> None:
|
async def handle_staff_command(self, message: Message) -> None:
|
||||||
"""Operator kill-switches, staff channel only (OPS-01..05, OPS-09, MEM-07)."""
|
"""Operator kill-switches, staff channel only (OPS-01..05, OPS-09, OPS-17, MEM-07)."""
|
||||||
args = str(message.content).split()[1:]
|
args = str(message.content).split()[1:]
|
||||||
for handler in (self._memory_command, self._task_command):
|
for handler in (self._memory_command, self._task_command):
|
||||||
reply = handler(args)
|
reply = handler(args)
|
||||||
if reply is not None:
|
if reply is not None:
|
||||||
await message.channel.send(reply, suppress_embeds=True)
|
await message.channel.send(reply, suppress_embeds=True)
|
||||||
return
|
return
|
||||||
reply = "Commands: pause, resume, images on|off, tasks on|off, quiet <minutes>, status, spend, memory <user>, forget-fact <id>, pin <channel|global> <fact>, unpin <id>"
|
reply = self._help_text(staff=True) # OPS-17: unknown/`help` -> full grouped help
|
||||||
if args[:1] == ["pause"]:
|
if args[:1] == ["pause"]:
|
||||||
self.replies_enabled = False
|
self.replies_enabled = False
|
||||||
reply = "Replies paused."
|
reply = "Replies paused."
|
||||||
|
|||||||
+110
-10
@@ -11,8 +11,10 @@ CLI: python -m fjerkroa_bot.news --config kroa.toml
|
|||||||
|
|
||||||
import argparse
|
import argparse
|
||||||
import logging
|
import logging
|
||||||
|
import re
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
|
from html import unescape
|
||||||
from typing import Any, Dict, List, Optional, Tuple
|
from typing import Any, Dict, List, Optional, Tuple
|
||||||
|
|
||||||
import defusedxml.ElementTree as ElementTree # hardened XML: feeds are untrusted (XXE/billion-laughs)
|
import defusedxml.ElementTree as ElementTree # hardened XML: feeds are untrusted (XXE/billion-laughs)
|
||||||
@@ -21,8 +23,17 @@ from .ai_responder import sanitize_external_text
|
|||||||
|
|
||||||
DEFAULT_PER_FEED = 3
|
DEFAULT_PER_FEED = 3
|
||||||
DEFAULT_MAX_ITEMS = 15
|
DEFAULT_MAX_ITEMS = 15
|
||||||
|
DEFAULT_SUMMARY_CHARS = 200
|
||||||
|
DEFAULT_NEWS_KEEP = 400
|
||||||
FETCH_TIMEOUT_S = 15
|
FETCH_TIMEOUT_S = 15
|
||||||
_ATOM = "{http://www.w3.org/2005/Atom}"
|
_ATOM = "{http://www.w3.org/2005/Atom}"
|
||||||
|
_TAG_RE = re.compile(r"<[^>]+>")
|
||||||
|
|
||||||
|
|
||||||
|
def _clean_summary(raw: str, max_len: int = 300) -> str:
|
||||||
|
"""Strip HTML, unescape entities, collapse whitespace (feed descriptions are often HTML)."""
|
||||||
|
text = unescape(_TAG_RE.sub(" ", raw or ""))
|
||||||
|
return re.sub(r"\s+", " ", text).strip()[:max_len]
|
||||||
|
|
||||||
|
|
||||||
def parse_feed(data: bytes, source: str = "") -> List[Dict[str, str]]:
|
def parse_feed(data: bytes, source: str = "") -> List[Dict[str, str]]:
|
||||||
@@ -34,31 +45,39 @@ def parse_feed(data: bytes, source: str = "") -> List[Dict[str, str]]:
|
|||||||
logging.warning(f"news: unparseable/unsafe feed {source!r}: {err!r}")
|
logging.warning(f"news: unparseable/unsafe feed {source!r}: {err!r}")
|
||||||
return []
|
return []
|
||||||
items: List[Dict[str, str]] = []
|
items: List[Dict[str, str]] = []
|
||||||
# RSS: <rss><channel><item><title/><link/>
|
# RSS: <rss><channel><item><title/><link/><description/>
|
||||||
for item in root.iter("item"):
|
for item in root.iter("item"):
|
||||||
title = (item.findtext("title") or "").strip()
|
title = (item.findtext("title") or "").strip()
|
||||||
link = (item.findtext("link") or "").strip()
|
link = (item.findtext("link") or "").strip()
|
||||||
|
summary = _clean_summary(item.findtext("description") or "")
|
||||||
if title:
|
if title:
|
||||||
items.append({"title": title, "link": link, "source": source})
|
items.append({"title": title, "link": link, "source": source, "summary": summary})
|
||||||
# Atom: <feed><entry><title/><link href=/>
|
# Atom: <feed><entry><title/><link href=/><summary|content/>
|
||||||
for entry in root.iter(f"{_ATOM}entry"):
|
for entry in root.iter(f"{_ATOM}entry"):
|
||||||
title = (entry.findtext(f"{_ATOM}title") or "").strip()
|
title = (entry.findtext(f"{_ATOM}title") or "").strip()
|
||||||
link_el = entry.find(f"{_ATOM}link")
|
link_el = entry.find(f"{_ATOM}link")
|
||||||
link = link_el.get("href", "") if link_el is not None else ""
|
link = link_el.get("href", "") if link_el is not None else ""
|
||||||
|
summary = _clean_summary(entry.findtext(f"{_ATOM}summary") or entry.findtext(f"{_ATOM}content") or "")
|
||||||
if title:
|
if title:
|
||||||
items.append({"title": title, "link": link, "source": source})
|
items.append({"title": title, "link": link, "source": source, "summary": summary})
|
||||||
return items
|
return items
|
||||||
|
|
||||||
|
|
||||||
def render_digest(items: List[Dict[str, str]], max_items: int = DEFAULT_MAX_ITEMS) -> str:
|
def render_digest(items: List[Dict[str, str]], max_items: int = DEFAULT_MAX_ITEMS, summary_chars: int = DEFAULT_SUMMARY_CHARS) -> str:
|
||||||
"""Compact sanitized digest for the {news} prompt slot."""
|
"""Compact sanitized digest for the {news} prompt slot (title + short summary + link)."""
|
||||||
lines = []
|
lines = []
|
||||||
for item in items[:max_items]:
|
for item in items[:max_items]:
|
||||||
title = sanitize_external_text(item["title"], 200)
|
title = sanitize_external_text(item["title"], 200)
|
||||||
source = item.get("source", "")
|
source = item.get("source", "")
|
||||||
link = item.get("link", "")
|
link = item.get("link", "")
|
||||||
|
summary = sanitize_external_text(item.get("summary", ""), summary_chars) if summary_chars else ""
|
||||||
prefix = f"[{source}] " if source else ""
|
prefix = f"[{source}] " if source else ""
|
||||||
lines.append(f"- {prefix}{title}" + (f" ({link})" if link else ""))
|
line = f"- {prefix}{title}"
|
||||||
|
if summary:
|
||||||
|
line += f" — {summary}"
|
||||||
|
if link:
|
||||||
|
line += f" ({link})"
|
||||||
|
lines.append(line)
|
||||||
return "\n".join(lines)
|
return "\n".join(lines)
|
||||||
|
|
||||||
|
|
||||||
@@ -102,10 +121,11 @@ def item_key(item: Dict[str, str]) -> str:
|
|||||||
class NewsPoster:
|
class NewsPoster:
|
||||||
"""Post NEW feed items to Discord channel webhooks (ggg model, SPEC-013 NEWS-04..06)."""
|
"""Post NEW feed items to Discord channel webhooks (ggg model, SPEC-013 NEWS-04..06)."""
|
||||||
|
|
||||||
def __init__(self, guard, fetch_bytes, post_webhook) -> None:
|
def __init__(self, guard, fetch_bytes, post_webhook, store: Any = None) -> None:
|
||||||
self._guard = guard
|
self._guard = guard
|
||||||
self._fetch_bytes = fetch_bytes
|
self._fetch_bytes = fetch_bytes
|
||||||
self._post_webhook = post_webhook
|
self._post_webhook = post_webhook
|
||||||
|
self._store = store
|
||||||
|
|
||||||
async def run_post(
|
async def run_post(
|
||||||
self,
|
self,
|
||||||
@@ -115,9 +135,11 @@ class NewsPoster:
|
|||||||
per_feed: int,
|
per_feed: int,
|
||||||
max_per_run: int,
|
max_per_run: int,
|
||||||
seed_only: bool,
|
seed_only: bool,
|
||||||
|
keep: int = DEFAULT_NEWS_KEEP,
|
||||||
) -> Tuple[int, set]:
|
) -> Tuple[int, set]:
|
||||||
"""Returns (posted_count, updated_seen). seed_only marks new items seen without posting."""
|
"""Returns (posted_count, updated_seen). seed_only marks new items seen without posting."""
|
||||||
posted = 0
|
posted = 0
|
||||||
|
harvested: List[Dict[str, str]] = []
|
||||||
for url, label, channel in feeds:
|
for url, label, channel in feeds:
|
||||||
reason = self._guard(url)
|
reason = self._guard(url)
|
||||||
if reason:
|
if reason:
|
||||||
@@ -129,6 +151,7 @@ class NewsPoster:
|
|||||||
logging.warning(f"news-post: fetch failed for {label}: {repr(err)}")
|
logging.warning(f"news-post: fetch failed for {label}: {repr(err)}")
|
||||||
continue
|
continue
|
||||||
for item in parse_feed(data, label)[:per_feed]:
|
for item in parse_feed(data, label)[:per_feed]:
|
||||||
|
harvested.append(item) # NEWS-09: everything parsed feeds the searchable store
|
||||||
key = item_key(item)
|
key = item_key(item)
|
||||||
if not key or key in seen:
|
if not key or key in seen:
|
||||||
continue
|
continue
|
||||||
@@ -136,6 +159,9 @@ class NewsPoster:
|
|||||||
may_post = not seed_only and posted < max_per_run
|
may_post = not seed_only and posted < max_per_run
|
||||||
if may_post and await self._deliver(item, label, channel, webhooks):
|
if may_post and await self._deliver(item, label, channel, webhooks):
|
||||||
posted += 1
|
posted += 1
|
||||||
|
if self._store is not None and harvested:
|
||||||
|
self._store.add_news_items(harvested)
|
||||||
|
self._store.prune_news(keep)
|
||||||
return posted, seen
|
return posted, seen
|
||||||
|
|
||||||
async def _deliver(self, item: Dict[str, str], label: str, channel: str, webhooks: Dict[str, str]) -> bool:
|
async def _deliver(self, item: Dict[str, str], label: str, channel: str, webhooks: Dict[str, str]) -> bool:
|
||||||
@@ -154,6 +180,76 @@ class NewsPoster:
|
|||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
|
# --- news memory + on-demand retrieval tool (SPEC-013 NEWS-09..12) ---
|
||||||
|
|
||||||
|
GET_NEWS_TOOL = {
|
||||||
|
"name": "get_news",
|
||||||
|
"description": "Fetch recent real-world news the bot has collected from its RSS feeds (local, national, world, sport, "
|
||||||
|
"culture). Use when someone asks what is new or what is happening, optionally about a topic or from a particular "
|
||||||
|
"source. Returns headlines with a short summary and a link to read more.",
|
||||||
|
"parameters": {
|
||||||
|
"type": "object",
|
||||||
|
"properties": {
|
||||||
|
"topic": {"type": "string", "description": "Optional keywords to filter by, e.g. 'Nordland', 'football', 'weather'."},
|
||||||
|
"source": {"type": "string", "description": "Optional source label, e.g. 'NRK', 'Aftenposten', 'Verden', 'Sport'."},
|
||||||
|
"limit": {"type": "integer", "description": "How many items to return (default 10, max 30)."},
|
||||||
|
},
|
||||||
|
"required": [],
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _news_terms(topic: Optional[str]) -> List[str]:
|
||||||
|
return [t for t in re.split(r"\W+", (topic or "").lower()) if len(t) > 1][:5]
|
||||||
|
|
||||||
|
|
||||||
|
def query_news(
|
||||||
|
store: Any, topic: Optional[str] = None, source: Optional[str] = None, limit: int = 10, summary_chars: int = DEFAULT_SUMMARY_CHARS
|
||||||
|
) -> Dict[str, Any]:
|
||||||
|
"""Retrieve stored news for the get_news tool: term/source-filtered, sanitized (NEWS-11)."""
|
||||||
|
if store is None:
|
||||||
|
return {"error": "news store unavailable"}
|
||||||
|
limit = max(1, min(int(limit or 10), 30))
|
||||||
|
src = (str(source).strip() or None) if source else None
|
||||||
|
terms = _news_terms(topic)
|
||||||
|
try:
|
||||||
|
rows = store.search_news(terms, limit, src) if terms else store.recent_news(limit, src)
|
||||||
|
except Exception as err:
|
||||||
|
logging.warning(f"news: query failed: {err!r}")
|
||||||
|
return {"error": "news lookup failed"}
|
||||||
|
results = [
|
||||||
|
{
|
||||||
|
"source": row.get("source", ""),
|
||||||
|
"title": sanitize_external_text(row.get("title", ""), 200),
|
||||||
|
"summary": sanitize_external_text(row.get("summary", ""), summary_chars),
|
||||||
|
"link": row.get("link", ""),
|
||||||
|
}
|
||||||
|
for row in rows
|
||||||
|
]
|
||||||
|
return {"topic": topic or "", "source": src or "", "results": results}
|
||||||
|
|
||||||
|
|
||||||
|
def _open_store(config: Dict[str, Any]) -> Any:
|
||||||
|
directory = config.get("history-directory")
|
||||||
|
if not directory:
|
||||||
|
return None
|
||||||
|
from pathlib import Path
|
||||||
|
|
||||||
|
from .persistence import PersistentStore
|
||||||
|
|
||||||
|
return PersistentStore(Path(str(directory)).expanduser() / "bot.db")
|
||||||
|
|
||||||
|
|
||||||
|
def persist_news(config: Dict[str, Any], items: List[Dict[str, str]]) -> int:
|
||||||
|
"""Upsert fetched items into the news store, prune to the rolling window (NEWS-09)."""
|
||||||
|
store = _open_store(config)
|
||||||
|
if store is None or not items:
|
||||||
|
return 0
|
||||||
|
added = store.add_news_items(items)
|
||||||
|
store.prune_news(int(config.get("news-keep", DEFAULT_NEWS_KEEP)))
|
||||||
|
return added
|
||||||
|
|
||||||
|
|
||||||
def load_seen(path: str) -> Tuple[set, bool]:
|
def load_seen(path: str) -> Tuple[set, bool]:
|
||||||
"""(seen-set, existed). Missing/broken state -> empty set, existed=False (seed run)."""
|
"""(seen-set, existed). Missing/broken state -> empty set, existed=False (seed run)."""
|
||||||
import json
|
import json
|
||||||
@@ -231,7 +327,7 @@ async def run_post(config: Dict[str, Any]) -> int:
|
|||||||
logging.error("news-post: need news-post-webhooks and news-post-feeds")
|
logging.error("news-post: need news-post-webhooks and news-post-feeds")
|
||||||
return 0
|
return 0
|
||||||
seen, existed = load_seen(state_path)
|
seen, existed = load_seen(state_path)
|
||||||
poster = NewsPoster(guard_url, _aiohttp_fetch, _aiohttp_post)
|
poster = NewsPoster(guard_url, _aiohttp_fetch, _aiohttp_post, store=_open_store(config))
|
||||||
posted, seen = await poster.run_post(
|
posted, seen = await poster.run_post(
|
||||||
feeds,
|
feeds,
|
||||||
webhooks,
|
webhooks,
|
||||||
@@ -239,6 +335,7 @@ async def run_post(config: Dict[str, Any]) -> int:
|
|||||||
int(config.get("news-post-per-feed", DEFAULT_POST_PER_FEED)),
|
int(config.get("news-post-per-feed", DEFAULT_POST_PER_FEED)),
|
||||||
int(config.get("news-post-max-per-run", DEFAULT_POST_MAX_PER_RUN)),
|
int(config.get("news-post-max-per-run", DEFAULT_POST_MAX_PER_RUN)),
|
||||||
seed_only=not existed, # first run seeds without flooding the channels
|
seed_only=not existed, # first run seeds without flooding the channels
|
||||||
|
keep=int(config.get("news-keep", DEFAULT_NEWS_KEEP)),
|
||||||
)
|
)
|
||||||
save_seen(state_path, seen, int(config.get("news-post-seen-cap", DEFAULT_SEEN_CAP)))
|
save_seen(state_path, seen, int(config.get("news-post-seen-cap", DEFAULT_SEEN_CAP)))
|
||||||
logging.info(f"news-post: posted {posted} item(s)" + (" (seed run — nothing posted)" if not existed else ""))
|
logging.info(f"news-post: posted {posted} item(s)" + (" (seed run — nothing posted)" if not existed else ""))
|
||||||
@@ -258,7 +355,10 @@ async def run(config: Dict[str, Any]) -> Optional[str]:
|
|||||||
return None
|
return None
|
||||||
fetcher = NewsFetcher(guard_url, _aiohttp_fetch)
|
fetcher = NewsFetcher(guard_url, _aiohttp_fetch)
|
||||||
items = await fetcher.collect(feeds, int(config.get("news-per-feed", DEFAULT_PER_FEED)))
|
items = await fetcher.collect(feeds, int(config.get("news-per-feed", DEFAULT_PER_FEED)))
|
||||||
digest = render_digest(items, int(config.get("news-max-items", DEFAULT_MAX_ITEMS)))
|
persist_news(config, items) # NEWS-09: feed the searchable rolling store for get_news
|
||||||
|
digest = render_digest(
|
||||||
|
items, int(config.get("news-max-items", DEFAULT_MAX_ITEMS)), int(config.get("news-summary-chars", DEFAULT_SUMMARY_CHARS))
|
||||||
|
)
|
||||||
header = f"News as of {time.strftime('%Y-%m-%d %H:%M UTC', time.gmtime())}:\n"
|
header = f"News as of {time.strftime('%Y-%m-%d %H:%M UTC', time.gmtime())}:\n"
|
||||||
with open(out_path, "w", encoding="utf-8") as fd:
|
with open(out_path, "w", encoding="utf-8") as fd:
|
||||||
fd.write(header + digest + "\n")
|
fd.write(header + digest + "\n")
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ from .codex import DEFAULT_LIMIT as CODEX_DEFAULT_LIMIT
|
|||||||
from .codex import CodexSearch
|
from .codex import CodexSearch
|
||||||
from .igdblib import IGDBQuery
|
from .igdblib import IGDBQuery
|
||||||
from .leonardo_draw import LeonardoAIDrawMixIn
|
from .leonardo_draw import LeonardoAIDrawMixIn
|
||||||
|
from .news import GET_NEWS_TOOL, query_news
|
||||||
from .quota import QuotaLedger
|
from .quota import QuotaLedger
|
||||||
from .url_reader import FETCH_URL_TOOL, URLReader
|
from .url_reader import FETCH_URL_TOOL, URLReader
|
||||||
|
|
||||||
@@ -180,6 +181,8 @@ class OpenAIResponder(AIResponder, LeonardoAIDrawMixIn):
|
|||||||
functions.append(FETCH_URL_TOOL)
|
functions.append(FETCH_URL_TOOL)
|
||||||
if self.codex.enabled(): # CDX-01
|
if self.codex.enabled(): # CDX-01
|
||||||
functions.append(CODEX_SEARCH_TOOL)
|
functions.append(CODEX_SEARCH_TOOL)
|
||||||
|
if self.config.get("enable-news-tool", False) and self.store is not None: # NEWS-10
|
||||||
|
functions.append(GET_NEWS_TOOL)
|
||||||
return functions
|
return functions
|
||||||
|
|
||||||
async def _dispatch_tool(self, name: str, args: Dict[str, Any], author: str) -> Any:
|
async def _dispatch_tool(self, name: str, args: Dict[str, Any], author: str) -> Any:
|
||||||
@@ -197,6 +200,13 @@ class OpenAIResponder(AIResponder, LeonardoAIDrawMixIn):
|
|||||||
self.ledger._add(f"codex:{author}", 1)
|
self.ledger._add(f"codex:{author}", 1)
|
||||||
limit = int(self.config.get("codex-limit", CODEX_DEFAULT_LIMIT))
|
limit = int(self.config.get("codex-limit", CODEX_DEFAULT_LIMIT))
|
||||||
return await self.codex.search(str(args.get("query", "")), str(args.get("lang", "en")), limit)
|
return await self.codex.search(str(args.get("query", "")), str(args.get("lang", "en")), limit)
|
||||||
|
if name == "get_news":
|
||||||
|
per_user_cap = int(self.config.get("news-daily-per-user", 30))
|
||||||
|
if self.ledger._get(f"news:{author}") >= per_user_cap: # NEWS-12
|
||||||
|
return {"error": "daily news lookup limit reached"}
|
||||||
|
self.ledger._add(f"news:{author}", 1)
|
||||||
|
summary_chars = int(self.config.get("news-summary-chars", 200))
|
||||||
|
return query_news(self.store, args.get("topic"), args.get("source"), args.get("limit", 10), summary_chars)
|
||||||
return await self._execute_igdb_function(name, args)
|
return await self._execute_igdb_function(name, args)
|
||||||
|
|
||||||
async def draw_openai(self, description: str, count: int = 1) -> List[BytesIO]:
|
async def draw_openai(self, description: str, count: int = 1) -> List[BytesIO]:
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ from contextlib import closing
|
|||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Dict, List, Optional
|
from typing import Any, Dict, List, Optional
|
||||||
|
|
||||||
SCHEMA_VERSION = 5
|
SCHEMA_VERSION = 6
|
||||||
|
|
||||||
|
|
||||||
class PersistentStore:
|
class PersistentStore:
|
||||||
@@ -72,6 +72,13 @@ class PersistentStore:
|
|||||||
" due_at TEXT NOT NULL, payload TEXT NOT NULL, state TEXT NOT NULL DEFAULT 'queued',"
|
" due_at TEXT NOT NULL, payload TEXT NOT NULL, state TEXT NOT NULL DEFAULT 'queued',"
|
||||||
" created_at TEXT NOT NULL DEFAULT (datetime('now')), executed_at TEXT)"
|
" created_at TEXT NOT NULL DEFAULT (datetime('now')), executed_at TEXT)"
|
||||||
)
|
)
|
||||||
|
if version < 6:
|
||||||
|
# News memory (SPEC-013 NEWS-09): deduped rolling store of fetched items
|
||||||
|
conn.execute(
|
||||||
|
"CREATE TABLE IF NOT EXISTS news (id INTEGER PRIMARY KEY, dedup_key TEXT UNIQUE NOT NULL,"
|
||||||
|
" source TEXT NOT NULL DEFAULT '', title TEXT NOT NULL, link TEXT NOT NULL DEFAULT '',"
|
||||||
|
" summary TEXT NOT NULL DEFAULT '', first_seen TEXT NOT NULL DEFAULT (datetime('now')))"
|
||||||
|
)
|
||||||
if version < SCHEMA_VERSION:
|
if version < SCHEMA_VERSION:
|
||||||
conn.execute(f"PRAGMA user_version = {SCHEMA_VERSION}")
|
conn.execute(f"PRAGMA user_version = {SCHEMA_VERSION}")
|
||||||
os.chmod(self.db_path, 0o600) # conversation data (PER-04)
|
os.chmod(self.db_path, 0o600) # conversation data (PER-04)
|
||||||
@@ -115,6 +122,64 @@ class PersistentStore:
|
|||||||
row = conn.execute("SELECT value FROM usage WHERE day = ? AND key = ?", (day, key)).fetchone()
|
row = conn.execute("SELECT value FROM usage WHERE day = ? AND key = ?", (day, key)).fetchone()
|
||||||
return float(row[0]) if row else 0.0
|
return float(row[0]) if row else 0.0
|
||||||
|
|
||||||
|
# --- news memory (SPEC-013 NEWS-09..12) ---
|
||||||
|
|
||||||
|
def add_news_items(self, items: List[Dict[str, Any]]) -> int:
|
||||||
|
"""Insert deduped news rows (by link or title); returns how many were new (NEWS-09)."""
|
||||||
|
added = 0
|
||||||
|
with closing(self._connect()) as conn, conn:
|
||||||
|
for item in items:
|
||||||
|
title = str(item.get("title") or "").strip()
|
||||||
|
key = (str(item.get("link") or "").strip()) or title
|
||||||
|
if not title or not key:
|
||||||
|
continue
|
||||||
|
cursor = conn.execute(
|
||||||
|
"INSERT OR IGNORE INTO news (dedup_key, source, title, link, summary) VALUES (?, ?, ?, ?, ?)",
|
||||||
|
(key, str(item.get("source") or ""), title, str(item.get("link") or ""), str(item.get("summary") or "")),
|
||||||
|
)
|
||||||
|
added += cursor.rowcount
|
||||||
|
return added
|
||||||
|
|
||||||
|
def recent_news(self, limit: int = 20, source: Optional[str] = None) -> List[Dict[str, Any]]:
|
||||||
|
sql = "SELECT source, title, link, summary FROM news"
|
||||||
|
params: List[Any] = []
|
||||||
|
if source:
|
||||||
|
sql += " WHERE source = ?"
|
||||||
|
params.append(source)
|
||||||
|
sql += " ORDER BY id DESC LIMIT ?"
|
||||||
|
params.append(int(limit))
|
||||||
|
with closing(self._connect()) as conn:
|
||||||
|
rows = conn.execute(sql, params).fetchall()
|
||||||
|
return [{"source": r[0], "title": r[1], "link": r[2], "summary": r[3]} for r in rows]
|
||||||
|
|
||||||
|
def search_news(self, terms: List[str], limit: int = 20, source: Optional[str] = None) -> List[Dict[str, Any]]:
|
||||||
|
"""Rows where every term appears in title or summary; optional source filter (NEWS-11)."""
|
||||||
|
params: List[Any] = []
|
||||||
|
clauses = []
|
||||||
|
for term in terms:
|
||||||
|
clauses.append("(title LIKE ? OR summary LIKE ? OR source LIKE ?)")
|
||||||
|
like = f"%{term}%"
|
||||||
|
params += [like, like, like]
|
||||||
|
where = " AND ".join(clauses) if clauses else "1=1"
|
||||||
|
if source:
|
||||||
|
where = f"({where}) AND source = ?"
|
||||||
|
params.append(source)
|
||||||
|
params.append(int(limit))
|
||||||
|
sql = f"SELECT source, title, link, summary FROM news WHERE {where} ORDER BY id DESC LIMIT ?" # nosec B608 - fixed templates; values parameterised
|
||||||
|
with closing(self._connect()) as conn:
|
||||||
|
rows = conn.execute(sql, params).fetchall()
|
||||||
|
return [{"source": r[0], "title": r[1], "link": r[2], "summary": r[3]} for r in rows]
|
||||||
|
|
||||||
|
def prune_news(self, keep: int) -> int:
|
||||||
|
"""Keep the newest `keep` rows, delete the rest (rolling window, NEWS-09)."""
|
||||||
|
with closing(self._connect()) as conn, conn:
|
||||||
|
cursor = conn.execute("DELETE FROM news WHERE id NOT IN (SELECT id FROM news ORDER BY id DESC LIMIT ?)", (int(keep),))
|
||||||
|
return cursor.rowcount
|
||||||
|
|
||||||
|
def news_count(self) -> int:
|
||||||
|
with closing(self._connect()) as conn:
|
||||||
|
return int(conn.execute("SELECT COUNT(*) FROM news").fetchone()[0])
|
||||||
|
|
||||||
def delete_history_of_user(self, user: str) -> int:
|
def delete_history_of_user(self, user: str) -> int:
|
||||||
"""Remove persisted rows carrying this user's messages (SAF-08)."""
|
"""Remove persisted rows carrying this user's messages (SAF-08)."""
|
||||||
with closing(self._connect()) as conn, conn:
|
with closing(self._connect()) as conn, conn:
|
||||||
|
|||||||
@@ -73,3 +73,15 @@ per-channel) — without it, `!bot unpin <id>` required guessing ids.
|
|||||||
`!bot spend` answers in the staff channel with today's estimated
|
`!bot spend` answers in the staff channel with today's estimated
|
||||||
spend in USD, token and image counts, and the configured budget.
|
spend in USD, token and image counts, and the configured budget.
|
||||||
Management sees the cost, not just the cap.
|
Management sees the cost, not just the cap.
|
||||||
|
|
||||||
|
### OPS-17 — Help is complete and context-aware (coverage: test)
|
||||||
|
|
||||||
|
Help reflects where each command actually works, because not every
|
||||||
|
command is allowed everywhere. `!help` answers in any channel and
|
||||||
|
lists only the commands usable there: in a normal channel the
|
||||||
|
everyone-commands (`!help`, `!forgetme`, `!privacy`, `!wichtel`); in
|
||||||
|
the staff channel it additionally lists the operator commands grouped
|
||||||
|
by purpose (control, cost, memory, tasks). `!bot help` — and any
|
||||||
|
unrecognised `!bot` command — answers with that same full staff help,
|
||||||
|
so the listing is exhaustive rather than the old hand-maintained
|
||||||
|
partial line. Help works even while the bot is paused.
|
||||||
|
|||||||
@@ -52,3 +52,49 @@ whose channel has no configured webhook, and a webhook POST that
|
|||||||
raises are each logged and skipped — one failure never sinks the
|
raises are each logged and skipped — one failure never sinks the
|
||||||
run, and the seen-set still advances for successfully-processed
|
run, and the seen-set still advances for successfully-processed
|
||||||
items.
|
items.
|
||||||
|
|
||||||
|
### NEWS-07 — Item summaries are extracted (coverage: test)
|
||||||
|
|
||||||
|
`parse_feed` also captures each item's short description — RSS
|
||||||
|
`<description>`, Atom `<summary>` or `<content>` — with HTML stripped,
|
||||||
|
entities unescaped, and whitespace collapsed, so an item carries what
|
||||||
|
it is about, not only a headline. Missing descriptions yield an empty
|
||||||
|
summary, never an error.
|
||||||
|
|
||||||
|
### NEWS-08 — The digest carries summaries (coverage: test)
|
||||||
|
|
||||||
|
`render_digest` appends the sanitized, length-capped
|
||||||
|
(`news-summary-chars`, default 200) summary after each headline, so
|
||||||
|
the bot's ambient `{news}` context knows the gist of each story, not
|
||||||
|
just its title. A zero cap restores the title-only digest.
|
||||||
|
|
||||||
|
### NEWS-09 — Fetched news is stored, deduped, and rolled over (coverage: test)
|
||||||
|
|
||||||
|
Both the digest run (kroa) and the posting run (ggg) upsert every
|
||||||
|
fetched item into a `news` table keyed by link (or title), so the same
|
||||||
|
story is stored once. After each run the store is pruned to the newest
|
||||||
|
`news-keep` rows (default 400), a rolling window that bounds growth
|
||||||
|
while keeping recent history searchable.
|
||||||
|
|
||||||
|
### NEWS-10 — get_news is offered as a tool (coverage: test)
|
||||||
|
|
||||||
|
When `enable-news-tool` is true and a store is configured, the chat
|
||||||
|
call's `tools` list includes a `get_news` function (optional `topic`,
|
||||||
|
`source`, `limit`) next to the other tools. Without a store or the
|
||||||
|
flag it is absent.
|
||||||
|
|
||||||
|
### NEWS-11 — get_news retrieves filtered, sanitized items (coverage: test)
|
||||||
|
|
||||||
|
`get_news` returns recent stored items, newest first, optionally
|
||||||
|
narrowed by `topic` (every keyword must appear in the title, summary,
|
||||||
|
or source label — so `topic: "Nordland"` finds items from that source)
|
||||||
|
and/or an exact `source`; `limit` is clamped to 1..30. Each result's title and
|
||||||
|
summary are passed through `sanitize_external_text`. The bot can then
|
||||||
|
`fetch_url` a returned link for the full article.
|
||||||
|
|
||||||
|
### NEWS-12 — get_news is metered per user (coverage: test)
|
||||||
|
|
||||||
|
Each `get_news` call increments a per-user daily counter; over
|
||||||
|
`news-daily-per-user` (default 30) the tool refuses with an error
|
||||||
|
result without touching the store. The budget gate (SAF-04) still
|
||||||
|
applies to the surrounding model calls.
|
||||||
|
|||||||
+146
-4
@@ -1,9 +1,24 @@
|
|||||||
"""Unit coverage for SPEC-013 news digest (NEWS-01..03)."""
|
"""Unit coverage for SPEC-013 news digest + memory + tool (NEWS-01..12)."""
|
||||||
|
|
||||||
|
import tempfile
|
||||||
import unittest
|
import unittest
|
||||||
|
from pathlib import Path
|
||||||
from unittest.mock import AsyncMock
|
from unittest.mock import AsyncMock
|
||||||
|
|
||||||
from fjerkroa_bot.news import NewsFetcher, NewsPoster, load_seen, parse_feed, render_digest, save_seen
|
from fjerkroa_bot.news import (
|
||||||
|
GET_NEWS_TOOL,
|
||||||
|
NewsFetcher,
|
||||||
|
NewsPoster,
|
||||||
|
load_seen,
|
||||||
|
parse_feed,
|
||||||
|
query_news,
|
||||||
|
render_digest,
|
||||||
|
save_seen,
|
||||||
|
)
|
||||||
|
from fjerkroa_bot.openai_responder import OpenAIResponder
|
||||||
|
from fjerkroa_bot.persistence import PersistentStore
|
||||||
|
|
||||||
|
CONFIG = {"openai-token": "t", "model": "m", "system": "s", "history-limit": 5}
|
||||||
|
|
||||||
RSS = b"""<?xml version="1.0"?><rss><channel>
|
RSS = b"""<?xml version="1.0"?><rss><channel>
|
||||||
<item><title>Game X released</title><link>https://ex.com/x</link></item>
|
<item><title>Game X released</title><link>https://ex.com/x</link></item>
|
||||||
@@ -166,10 +181,137 @@ class TestSeenState(unittest.TestCase):
|
|||||||
def test_cap_bounds_state(self):
|
def test_cap_bounds_state(self):
|
||||||
"""NEWS-05: save keeps at most `cap` keys."""
|
"""NEWS-05: save keeps at most `cap` keys."""
|
||||||
import json
|
import json
|
||||||
import tempfile
|
|
||||||
from pathlib import Path
|
|
||||||
|
|
||||||
with tempfile.TemporaryDirectory() as tmp:
|
with tempfile.TemporaryDirectory() as tmp:
|
||||||
path = str(Path(tmp) / "state.json")
|
path = str(Path(tmp) / "state.json")
|
||||||
save_seen(path, {f"k{i}" for i in range(100)}, cap=10)
|
save_seen(path, {f"k{i}" for i in range(100)}, cap=10)
|
||||||
self.assertEqual(len(json.load(open(path))), 10)
|
self.assertEqual(len(json.load(open(path))), 10)
|
||||||
|
|
||||||
|
|
||||||
|
RSS_DESC = b"""<?xml version="1.0"?><rss><channel>
|
||||||
|
<item><title>Storm hits coast</title><link>https://ex.com/s</link>
|
||||||
|
<description><p>Heavy <b>wind</b> expected</p></description></item>
|
||||||
|
</channel></rss>"""
|
||||||
|
|
||||||
|
ATOM_SUM = b"""<?xml version="1.0"?><feed xmlns="http://www.w3.org/2005/Atom">
|
||||||
|
<entry><title>Atom T</title><link href="https://ex.com/a"/><summary>Short gist here</summary></entry>
|
||||||
|
</feed>"""
|
||||||
|
|
||||||
|
|
||||||
|
class TestSummaries(unittest.TestCase):
|
||||||
|
def test_rss_description_stripped(self):
|
||||||
|
"""NEWS-07: RSS description parsed, HTML stripped, entities unescaped, whitespace collapsed."""
|
||||||
|
items = parse_feed(RSS_DESC, "S")
|
||||||
|
self.assertEqual(items[0]["summary"], "Heavy wind expected")
|
||||||
|
|
||||||
|
def test_atom_summary(self):
|
||||||
|
"""NEWS-07: Atom summary collapsed to clean text."""
|
||||||
|
items = parse_feed(ATOM_SUM, "A")
|
||||||
|
self.assertEqual(items[0]["summary"], "Short gist here")
|
||||||
|
|
||||||
|
def test_missing_description_is_empty(self):
|
||||||
|
"""NEWS-07: no description -> empty summary, never an error."""
|
||||||
|
self.assertEqual(parse_feed(RSS, "S")[0]["summary"], "")
|
||||||
|
|
||||||
|
def test_digest_carries_summary(self):
|
||||||
|
"""NEWS-08: digest appends the sanitized capped summary; zero cap = title only."""
|
||||||
|
items = [{"title": "T", "link": "https://ex.com/x", "source": "NRK", "summary": "the gist of it"}]
|
||||||
|
digest = render_digest(items, 10, 100)
|
||||||
|
self.assertIn("[NRK]", digest)
|
||||||
|
self.assertIn("the gist of it", digest)
|
||||||
|
self.assertNotIn("the gist", render_digest(items, 10, 0)) # zero cap -> title only
|
||||||
|
|
||||||
|
|
||||||
|
class NewsStoreBase(unittest.TestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.tmp = tempfile.TemporaryDirectory()
|
||||||
|
self.addCleanup(self.tmp.cleanup)
|
||||||
|
self.store = PersistentStore(Path(self.tmp.name) / "bot.db")
|
||||||
|
|
||||||
|
|
||||||
|
class TestNewsStore(NewsStoreBase):
|
||||||
|
def test_dedup_and_rolling_window(self):
|
||||||
|
"""NEWS-09: items deduped by link; prune keeps the newest N."""
|
||||||
|
first = [
|
||||||
|
{"title": "A", "link": "L1", "source": "S", "summary": "sa"},
|
||||||
|
{"title": "B", "link": "L2", "source": "S", "summary": "sb"},
|
||||||
|
]
|
||||||
|
self.assertEqual(self.store.add_news_items(first), 2)
|
||||||
|
self.assertEqual(self.store.add_news_items([dict(first[0])]), 0) # dup link ignored
|
||||||
|
self.assertEqual(self.store.news_count(), 2)
|
||||||
|
self.store.prune_news(1)
|
||||||
|
self.assertEqual(self.store.news_count(), 1)
|
||||||
|
self.assertEqual(self.store.recent_news(5)[0]["title"], "B") # newest survives
|
||||||
|
|
||||||
|
def test_dedup_by_title_when_no_link(self):
|
||||||
|
"""NEWS-09: linkless items dedup on title."""
|
||||||
|
self.store.add_news_items([{"title": "Same", "link": "", "source": "S", "summary": ""}])
|
||||||
|
self.store.add_news_items([{"title": "Same", "link": "", "source": "S", "summary": ""}])
|
||||||
|
self.assertEqual(self.store.news_count(), 1)
|
||||||
|
|
||||||
|
|
||||||
|
class TestQueryNews(NewsStoreBase):
|
||||||
|
def seed(self):
|
||||||
|
self.store.add_news_items(
|
||||||
|
[
|
||||||
|
{"title": "Nordland storm", "link": "L1", "source": "Nordland", "summary": "strong wind on the coast"},
|
||||||
|
{"title": "Oslo budget", "link": "L2", "source": "NRK", "summary": "@everyone spending plan"},
|
||||||
|
{"title": "Sport result", "link": "L3", "source": "Sport", "summary": "the match ended"},
|
||||||
|
]
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_topic_filter(self):
|
||||||
|
"""NEWS-11: topic keywords must appear in title or summary."""
|
||||||
|
self.seed()
|
||||||
|
res = query_news(self.store, topic="storm")
|
||||||
|
self.assertEqual([r["title"] for r in res["results"]], ["Nordland storm"])
|
||||||
|
|
||||||
|
def test_topic_matches_source_label(self):
|
||||||
|
"""NEWS-11: topic also matches the source label, so 'Nordland' finds regional items."""
|
||||||
|
self.store.add_news_items([{"title": "Ferry delayed", "link": "LX", "source": "Nordland", "summary": "boat late"}])
|
||||||
|
res = query_news(self.store, topic="Nordland")
|
||||||
|
self.assertTrue(any(r["link"] == "LX" for r in res["results"])) # matched via source, not title/summary
|
||||||
|
|
||||||
|
def test_source_filter_and_sanitize(self):
|
||||||
|
"""NEWS-11: source narrows results; title/summary are sanitized."""
|
||||||
|
self.seed()
|
||||||
|
res = query_news(self.store, source="NRK")
|
||||||
|
self.assertTrue(res["results"] and all(r["source"] == "NRK" for r in res["results"]))
|
||||||
|
self.assertNotIn("@everyone", res["results"][0]["summary"])
|
||||||
|
|
||||||
|
def test_limit_clamped_and_no_store(self):
|
||||||
|
"""NEWS-11: limit clamps to 1..30; a missing store returns an error."""
|
||||||
|
self.seed()
|
||||||
|
self.assertLessEqual(len(query_news(self.store, limit=999)["results"]), 30)
|
||||||
|
self.assertGreaterEqual(len(query_news(self.store, limit=0)["results"]), 1)
|
||||||
|
self.assertIn("error", query_news(None))
|
||||||
|
|
||||||
|
|
||||||
|
class TestNewsTool(unittest.IsolatedAsyncioTestCase):
|
||||||
|
def setUp(self):
|
||||||
|
self.tmp = tempfile.TemporaryDirectory()
|
||||||
|
self.addCleanup(self.tmp.cleanup)
|
||||||
|
|
||||||
|
def _responder(self, **extra):
|
||||||
|
cfg = dict(CONFIG, **{"history-directory": self.tmp.name}, **extra)
|
||||||
|
return OpenAIResponder(cfg, "chat")
|
||||||
|
|
||||||
|
def test_tool_offered_needs_flag_and_store(self):
|
||||||
|
"""NEWS-10: get_news offered only with enable-news-tool AND a store."""
|
||||||
|
no_store = OpenAIResponder(dict(CONFIG, **{"enable-news-tool": True}), "chat")
|
||||||
|
self.assertIsNone(no_store.store)
|
||||||
|
self.assertNotIn("get_news", [f["name"] for f in no_store._available_tools()])
|
||||||
|
flag_off = self._responder()
|
||||||
|
self.assertNotIn("get_news", [f["name"] for f in flag_off._available_tools()])
|
||||||
|
on = self._responder(**{"enable-news-tool": True})
|
||||||
|
self.assertIn("get_news", [f["name"] for f in on._available_tools()])
|
||||||
|
self.assertEqual(GET_NEWS_TOOL["name"], "get_news")
|
||||||
|
|
||||||
|
async def test_dispatch_caps_news(self):
|
||||||
|
"""NEWS-12: over news-daily-per-user, get_news refuses without querying."""
|
||||||
|
responder = self._responder(**{"enable-news-tool": True, "news-daily-per-user": 2})
|
||||||
|
responder.store.add_news_items([{"title": "x", "link": "l", "source": "s", "summary": "y"}])
|
||||||
|
for _ in range(2):
|
||||||
|
self.assertIn("results", await responder._dispatch_tool("get_news", {}, "alice"))
|
||||||
|
blocked = await responder._dispatch_tool("get_news", {}, "alice")
|
||||||
|
self.assertIn("error", blocked)
|
||||||
|
|||||||
@@ -133,3 +133,69 @@ class TestTasksKillSwitch(OpsBase):
|
|||||||
"""OPS-09: bot-initiated posts respect pause/quiet."""
|
"""OPS-09: bot-initiated posts respect pause/quiet."""
|
||||||
await self.bot.on_message(self.staff_msg("!bot pause"))
|
await self.bot.on_message(self.staff_msg("!bot pause"))
|
||||||
self.assertFalse(self.bot.bot_initiated_allowed())
|
self.assertFalse(self.bot.bot_initiated_allowed())
|
||||||
|
|
||||||
|
|
||||||
|
class TestHelp(OpsBase):
|
||||||
|
STAFF_CMDS = (
|
||||||
|
"pause",
|
||||||
|
"resume",
|
||||||
|
"quiet <minutes>",
|
||||||
|
"status",
|
||||||
|
"spend",
|
||||||
|
"images on|off",
|
||||||
|
"memory <user>",
|
||||||
|
"forget-fact <id>",
|
||||||
|
"pin <channel|global>",
|
||||||
|
"unpin <id>",
|
||||||
|
"pins",
|
||||||
|
"task-approve <id>",
|
||||||
|
"task-cancel <id>",
|
||||||
|
"(list)",
|
||||||
|
)
|
||||||
|
|
||||||
|
def test_staff_help_is_complete_and_grouped(self):
|
||||||
|
"""OPS-17: staff help lists every operator command, grouped by purpose."""
|
||||||
|
text = self.bot._help_text(staff=True)
|
||||||
|
for cmd in self.STAFF_CMDS:
|
||||||
|
self.assertIn(cmd, text, f"missing {cmd!r} in staff help")
|
||||||
|
for group in ("Control:", "Cost:", "Memory:", "Tasks:"):
|
||||||
|
self.assertIn(group, text)
|
||||||
|
for cmd in ("!help", "!forgetme", "!privacy", "!wichtel"):
|
||||||
|
self.assertIn(cmd, text) # everywhere-commands shown too
|
||||||
|
|
||||||
|
def test_user_help_hides_operator_commands(self):
|
||||||
|
"""OPS-17: non-staff help shows only the everyone-commands."""
|
||||||
|
text = self.bot._help_text(staff=False)
|
||||||
|
for cmd in ("!help", "!forgetme", "!privacy", "!wichtel"):
|
||||||
|
self.assertIn(cmd, text)
|
||||||
|
for op in ("task-approve", "images on|off", "spend", "Staff commands", "Control:"):
|
||||||
|
self.assertNotIn(op, text)
|
||||||
|
|
||||||
|
async def test_bot_help_in_staff_channel_returns_full_help(self):
|
||||||
|
"""OPS-17: `!bot help` answers with the complete staff help."""
|
||||||
|
await self.bot.on_message(self.staff_msg("!bot help"))
|
||||||
|
text = self.bot.staff_channel.send.await_args.args[0]
|
||||||
|
self.assertIn("Staff commands", text)
|
||||||
|
self.assertIn("task-cancel <id>", text)
|
||||||
|
|
||||||
|
async def test_unknown_bot_command_falls_back_to_help(self):
|
||||||
|
"""OPS-17: an unrecognised `!bot` command shows the full help, not a partial line."""
|
||||||
|
await self.bot.on_message(self.staff_msg("!bot wat"))
|
||||||
|
text = self.bot.staff_channel.send.await_args.args[0]
|
||||||
|
self.assertIn("Control:", text)
|
||||||
|
|
||||||
|
async def test_help_in_public_channel_is_user_scoped(self):
|
||||||
|
"""OPS-17: `!help` in a normal channel lists only everyone-commands."""
|
||||||
|
msg = self.public_msg("!help")
|
||||||
|
await self.bot.on_message(msg)
|
||||||
|
text = msg.channel.send.await_args.args[0]
|
||||||
|
self.assertIn("!forgetme", text)
|
||||||
|
self.assertNotIn("Staff commands", text)
|
||||||
|
self.assertNotIn("task-approve", text)
|
||||||
|
|
||||||
|
async def test_help_works_while_paused(self):
|
||||||
|
"""OPS-17: help answers even when replies are paused."""
|
||||||
|
await self.bot.on_message(self.staff_msg("!bot pause"))
|
||||||
|
msg = self.public_msg("!help")
|
||||||
|
await self.bot.on_message(msg)
|
||||||
|
msg.channel.send.assert_awaited()
|
||||||
|
|||||||
Reference in New Issue
Block a user