Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 1cdd240d98 | |||
| f3c25de310 |
@@ -203,6 +203,10 @@ class FjerkroaBot(commands.Bot):
|
||||
|
||||
async def _execute_task(self, channel_name: str, prompt: str) -> None:
|
||||
"""Run a due task through the normal responder path (TSK-02)."""
|
||||
# Never post unprompted into addressed-only channels (BEH-11)
|
||||
if self.channel_addressed_only(channel_name):
|
||||
logging.info(f"task for addressed-only channel {channel_name!r} skipped (BEH-11)")
|
||||
return
|
||||
channel = self.channel_by_name(channel_name, getattr(self, "chat_channel", None), no_ignore=True)
|
||||
if channel is None:
|
||||
raise RuntimeError(f"task channel {channel_name!r} not resolvable")
|
||||
@@ -501,6 +505,21 @@ class FjerkroaBot(commands.Bot):
|
||||
"""fnmatch patterns; plain names match exactly as before (BEH-09)."""
|
||||
return any(fnmatch.fnmatchcase(str(channel_name), pattern) for pattern in self.config.get("ignore-channels", []))
|
||||
|
||||
def channel_addressed_only(self, channel_name) -> bool:
|
||||
"""fnmatch patterns like ignore-channels (BEH-11)."""
|
||||
return any(fnmatch.fnmatchcase(str(channel_name), pattern) for pattern in self.config.get("addressed-only-channels", []))
|
||||
|
||||
def _addressed(self, message, msg: AIMessage) -> bool:
|
||||
"""Mention/DM, reply to the bot, or the bot's name in the text (BEH-11)."""
|
||||
if msg.direct:
|
||||
return True
|
||||
reference = getattr(message, "reference", None)
|
||||
resolved = getattr(reference, "resolved", None) if reference else None
|
||||
if resolved is not None and getattr(resolved, "author", None) == self.user:
|
||||
return True
|
||||
name = str(getattr(self.user, "name", "") or "")
|
||||
return bool(name) and name.lower() in msg.message.lower()
|
||||
|
||||
def ignore_message(self, channel_name, message):
|
||||
return self.channel_ignored(channel_name) and not message.direct
|
||||
|
||||
@@ -554,6 +573,11 @@ class FjerkroaBot(commands.Bot):
|
||||
if attachment_urls:
|
||||
msg.urls = attachment_urls
|
||||
|
||||
# Addressed-only channels: silent unless spoken to (BEH-11)
|
||||
if self.channel_addressed_only(channel_name) and not self._addressed(message, msg):
|
||||
self.log_message_action("addressed-only-skip", msg, channel_name)
|
||||
return
|
||||
|
||||
# Reply/ignore classifier gate — direct messages bypass (BEH-01/02/03/07)
|
||||
handled, factual = await self._classifier_gate(message, msg, airesponder, channel_name)
|
||||
if handled:
|
||||
|
||||
@@ -329,6 +329,17 @@ class OpenAIResponder(AIResponder, LeonardoAIDrawMixIn):
|
||||
items.append(data)
|
||||
return items
|
||||
|
||||
@staticmethod
|
||||
def _split_vision(function_result: Any) -> Tuple[Any, List[str]]:
|
||||
"""Detach cached image data URLs from a tool result (URL-09) — they
|
||||
ride to the model as image input, never as JSON text (a base64 data
|
||||
URL would blow the 8000-char sanitizer cap)."""
|
||||
if isinstance(function_result, dict) and function_result.get("vision"):
|
||||
return function_result, [str(url) for url in function_result.pop("vision")]
|
||||
if isinstance(function_result, dict):
|
||||
function_result.pop("vision", None)
|
||||
return function_result, []
|
||||
|
||||
@staticmethod
|
||||
def _responses_refused(result: Any) -> bool:
|
||||
for item in getattr(result, "output", []) or []:
|
||||
@@ -381,6 +392,7 @@ class OpenAIResponder(AIResponder, LeonardoAIDrawMixIn):
|
||||
function_args = json.loads(call.arguments) if call.arguments else {}
|
||||
logging.info(f"🔧 Executing tool: {call.name} with args: {function_args}")
|
||||
function_result = await self._dispatch_tool(call.name, function_args, author or "")
|
||||
function_result, vision = self._split_vision(function_result)
|
||||
logging.info(f"🔧 Tool result: {type(function_result)} - {str(function_result)[:200]}...")
|
||||
context.append(
|
||||
{
|
||||
@@ -390,6 +402,10 @@ class OpenAIResponder(AIResponder, LeonardoAIDrawMixIn):
|
||||
"output": sanitize_external_text(json.dumps(function_result), 8000) if function_result else "No results found",
|
||||
}
|
||||
)
|
||||
if vision:
|
||||
# fetched images become sight, not text (URL-09)
|
||||
logging.info(f"🔧 Tool returned {len(vision)} image(s) — attached as vision input")
|
||||
context.append({"role": "user", "content": [{"type": "input_image", "image_url": url} for url in vision]})
|
||||
kwargs["input"] = context
|
||||
rounds -= 1
|
||||
if rounds <= 0:
|
||||
@@ -504,6 +520,7 @@ class OpenAIResponder(AIResponder, LeonardoAIDrawMixIn):
|
||||
|
||||
# Route to the right provider (IGDB or URL reader)
|
||||
function_result = await self._dispatch_tool(function_name, function_args, self._last_author(messages) or "")
|
||||
function_result, vision = self._split_vision(function_result)
|
||||
|
||||
logging.info(f"🔧 Tool result: {type(function_result)} - {str(function_result)[:200]}...")
|
||||
|
||||
@@ -517,6 +534,12 @@ class OpenAIResponder(AIResponder, LeonardoAIDrawMixIn):
|
||||
),
|
||||
}
|
||||
)
|
||||
if vision:
|
||||
# fetched images become sight, not text (URL-09)
|
||||
logging.info(f"🔧 Tool returned {len(vision)} image(s) — attached as vision input")
|
||||
messages.append(
|
||||
{"role": "user", "content": [{"type": "image_url", "image_url": {"url": url}} for url in vision]}
|
||||
)
|
||||
|
||||
# Get final response after function execution - remove tools for final call
|
||||
final_chat_kwargs = {
|
||||
|
||||
+31
-13
@@ -149,7 +149,7 @@ class URLReader:
|
||||
def enabled(self) -> bool:
|
||||
return bool(self._config().get("enable-url-reading", False))
|
||||
|
||||
async def _get(self, session, url: str, max_bytes: int) -> Tuple[str, bytes]:
|
||||
async def _get(self, session, url: str, max_bytes: int) -> Tuple[str, bytes, str]:
|
||||
"""Manual redirect handling so every hop is re-guarded (URL-04)."""
|
||||
current = url
|
||||
for _ in range(MAX_REDIRECTS):
|
||||
@@ -161,7 +161,8 @@ class URLReader:
|
||||
current = urljoin(current, response.headers["Location"])
|
||||
continue
|
||||
response.raise_for_status()
|
||||
return str(response.url), await read_capped(response, max_bytes)
|
||||
content_type = str(response.headers.get("Content-Type", "")).split(";")[0].strip().lower()
|
||||
return str(response.url), await read_capped(response, max_bytes), content_type
|
||||
raise ValueError("too many redirects")
|
||||
|
||||
async def fetch(self, url: str, channel: str, user: str) -> Dict[str, Any]:
|
||||
@@ -170,9 +171,11 @@ class URLReader:
|
||||
timeout = aiohttp.ClientTimeout(total=FETCH_TIMEOUT_S)
|
||||
try:
|
||||
async with aiohttp.ClientSession(timeout=timeout, headers={"User-Agent": "FjerkroaBot/1.0"}) as session:
|
||||
final_url, body = await self._get(session, url, max_bytes)
|
||||
final_url, body, content_type = await self._get(session, url, max_bytes)
|
||||
# follow a meta-refresh redirect (link shorteners / getnews stubs), re-guarded — URL-04
|
||||
for _ in range(2):
|
||||
if content_type.startswith("image/"):
|
||||
break
|
||||
extractor = self._extract(body.decode("utf-8", "ignore"))
|
||||
if not extractor.refresh_url:
|
||||
break
|
||||
@@ -180,13 +183,21 @@ class URLReader:
|
||||
if guard_url(target) is not None or target == final_url:
|
||||
break
|
||||
logging.info(f"url reader: following meta-refresh -> {target}")
|
||||
final_url, body = await self._get(session, target, max_bytes)
|
||||
final_url, body, content_type = await self._get(session, target, max_bytes)
|
||||
except Exception as err:
|
||||
return {"error": str(err)}
|
||||
# a URL that IS an image: cache it and hand it over as sight (URL-09)
|
||||
if content_type.startswith("image/"):
|
||||
vision = []
|
||||
if self.image_cache is not None and len(body) < max_bytes: # >= cap means possibly truncated
|
||||
sha = self.image_cache.ingest_bytes(body, channel, user, None)
|
||||
data_url = self._cached_data_url(sha, channel) if sha else None
|
||||
vision = [data_url] if data_url else []
|
||||
return {"url": final_url, "text": "(image)", "images_cached": len(vision), "vision": vision}
|
||||
html = body.decode("utf-8", "ignore")
|
||||
clean = sanitize_external_text(self._to_text(html), int(config.get("url-max-chars", DEFAULT_MAX_CHARS)))
|
||||
images = await self._ingest_images(html, final_url, channel, user)
|
||||
return {"url": final_url, "text": clean, "images_cached": images}
|
||||
vision = await self._ingest_images(html, final_url, channel, user)
|
||||
return {"url": final_url, "text": clean, "images_cached": len(vision), "vision": vision}
|
||||
|
||||
def _extract(self, html: str) -> "_Extractor":
|
||||
extractor = _Extractor()
|
||||
@@ -199,20 +210,27 @@ class URLReader:
|
||||
def _to_text(self, html: str) -> str:
|
||||
return re.sub(r"\s+\n", "\n", " ".join(self._extract(html).content_parts()))
|
||||
|
||||
async def _ingest_images(self, html: str, base_url: str, channel: str, user: str) -> int:
|
||||
async def _ingest_images(self, html: str, base_url: str, channel: str, user: str) -> List[str]:
|
||||
"""Cache page images and return their data URLs for vision input (URL-09)."""
|
||||
if self.image_cache is None:
|
||||
return 0
|
||||
return []
|
||||
extractor = self._extract(html)
|
||||
candidates = ([extractor.og_image] if extractor.og_image else []) + extractor.images
|
||||
limit = int(self._config().get("url-max-images", DEFAULT_MAX_IMAGES))
|
||||
cached = 0
|
||||
data_urls: List[str] = []
|
||||
for src in candidates:
|
||||
if cached >= limit:
|
||||
if len(data_urls) >= limit:
|
||||
break
|
||||
absolute = urljoin(base_url, src)
|
||||
if guard_url(absolute) is not None:
|
||||
continue
|
||||
sha = await self.image_cache.ingest_url(absolute, channel, user, None)
|
||||
if sha is not None:
|
||||
cached += 1
|
||||
return cached
|
||||
data_url = self._cached_data_url(sha, channel) if sha else None
|
||||
if data_url:
|
||||
data_urls.append(data_url)
|
||||
return data_urls
|
||||
|
||||
def _cached_data_url(self, sha: str, channel: str) -> Optional[str]:
|
||||
recent = self.image_cache.recent(channel, 8)
|
||||
ext = next((row["ext"] for row in recent if row["sha256"] == sha), None)
|
||||
return self.image_cache.data_url(sha, ext) if ext else None
|
||||
|
||||
@@ -82,3 +82,16 @@ opening hours, release dates, news lookups get the stronger tier
|
||||
while small talk stays on the cheap default. Unset = no change. The
|
||||
`retry-model` override still wins on retry, and vision inputs keep
|
||||
using `model-vision`.
|
||||
|
||||
### BEH-11 — Addressed-only channels answer only when spoken to (coverage: test)
|
||||
|
||||
Channels matching `addressed-only-channels` (fnmatch patterns like
|
||||
BEH-09) never get spontaneous participation: the handler returns
|
||||
before the classifier gate unless the message addresses the bot — an
|
||||
@mention or DM, a Discord reply to one of the bot's messages, or the
|
||||
bot's name appearing in the message text (case-insensitive). No
|
||||
model call, no emoji reaction otherwise. Scheduled tasks
|
||||
(idle-impulse, follow-up) targeting such a channel are skipped at
|
||||
execution time — the bot never posts there unprompted, whatever a
|
||||
generator proposes. Unlike BEH-09 the bot still answers when
|
||||
addressed; DMs are unaffected.
|
||||
|
||||
@@ -69,3 +69,20 @@ block's characters inside `<a>` and the block shorter than 200 chars
|
||||
boilerplate and removed. Body paragraphs with inline links survive.
|
||||
The default `url-max-chars` cap rises to 8000 now that the budget is
|
||||
spent on content, not chrome.
|
||||
|
||||
### URL-09 — Fetched images become vision input (coverage: test)
|
||||
|
||||
The images the URL reader already caches from a fetched page
|
||||
(`og:image` first, then body images, `url-max-images` cap, every
|
||||
candidate SSRF-guarded and magic-byte-sniffed by the image cache) now
|
||||
travel to the model as image input alongside the tool result — the
|
||||
model sees the picture, not just an `images_cached` count. A URL
|
||||
whose response is itself an image (content-type `image/*`) is
|
||||
ingested directly and returns text `(image)`; a body at the byte cap
|
||||
is treated as possibly truncated and not ingested. The data URLs
|
||||
ride in a `vision` key that the responder detaches before the JSON
|
||||
tool text is built (a base64 data URL would blow the 8000-char
|
||||
sanitizer cap): they are appended as `input_image` items on the
|
||||
Responses path and as `image_url` parts on the legacy path. Vision
|
||||
is per-turn — nothing extra is historised; the file stays in the
|
||||
image cache for later `picture_edit` (IMG-15).
|
||||
|
||||
+75
-2
@@ -4,12 +4,12 @@ import hashlib
|
||||
import tempfile
|
||||
import unittest
|
||||
from pathlib import Path
|
||||
from unittest.mock import AsyncMock, MagicMock, Mock, patch
|
||||
from unittest.mock import AsyncMock, MagicMock, Mock, PropertyMock, patch
|
||||
|
||||
from discord import DMChannel, TextChannel
|
||||
|
||||
from fjerkroa_bot.ai_responder import AIMessage, AIResponse
|
||||
from fjerkroa_bot.discord_bot import quiet_hours_active, split_answer
|
||||
from fjerkroa_bot.discord_bot import FjerkroaBot, quiet_hours_active, split_answer
|
||||
from fjerkroa_bot.openai_responder import OpenAIResponder
|
||||
from fjerkroa_bot.persistence import PersistentStore
|
||||
|
||||
@@ -290,3 +290,76 @@ class TestPinsListing(OpsBase):
|
||||
self.assertIn("Kanalregel", listing)
|
||||
self.assertIn("1", listing)
|
||||
self.assertIn("2", listing)
|
||||
|
||||
|
||||
class TestAddressedOnlyChannels(ClassifierGateBase):
|
||||
FAMILY = "🐾𝕱𝖆𝖒𝖎𝖑𝖎𝖊"
|
||||
|
||||
def family_msg(self, content):
|
||||
message = self.public_msg(content)
|
||||
message.channel.name = self.FAMILY
|
||||
message.add_reaction = AsyncMock()
|
||||
return message
|
||||
|
||||
def family_setup(self):
|
||||
self.gate_setup({"reply": True, "factual": False, "emoji": None})
|
||||
self.bot.config["addressed-only-channels"] = ["*𝕱𝖆𝖒𝖎𝖑𝖎𝖊*"]
|
||||
|
||||
def _user(self, name="Luma"):
|
||||
user = MagicMock()
|
||||
user.name = name
|
||||
return user
|
||||
|
||||
async def test_unaddressed_message_stays_silent(self):
|
||||
"""BEH-11: pattern hit + not addressed -> no classifier, no reaction, no reply."""
|
||||
self.family_setup()
|
||||
message = self.family_msg("wie war euer tag so?")
|
||||
await self.bot.on_message(message)
|
||||
self.bot.airesponder.classify.assert_not_awaited()
|
||||
message.add_reaction.assert_not_awaited()
|
||||
self.bot.respond.assert_not_awaited()
|
||||
|
||||
async def test_mention_is_answered(self):
|
||||
"""BEH-11: an @mention in an addressed-only channel is answered."""
|
||||
self.family_setup()
|
||||
user = self._user()
|
||||
message = self.family_msg("was meinst du dazu?")
|
||||
message.mentions = [user]
|
||||
with patch.object(FjerkroaBot, "user", new_callable=PropertyMock) as mock_user:
|
||||
mock_user.return_value = user
|
||||
await self.bot.on_message(message)
|
||||
self.bot.respond.assert_awaited_once()
|
||||
|
||||
async def test_name_in_text_is_answered(self):
|
||||
"""BEH-11: the bot's name in the text counts as addressed (case-insensitive)."""
|
||||
self.family_setup()
|
||||
message = self.family_msg("luma, was haeltst du davon?")
|
||||
with patch.object(FjerkroaBot, "user", new_callable=PropertyMock) as mock_user:
|
||||
mock_user.return_value = self._user("Luma")
|
||||
await self.bot.on_message(message)
|
||||
self.bot.respond.assert_awaited_once()
|
||||
|
||||
async def test_reply_to_bot_is_answered(self):
|
||||
"""BEH-11: a Discord reply to one of the bot's messages counts as addressed."""
|
||||
self.family_setup()
|
||||
user = self._user()
|
||||
message = self.family_msg("ja genau so!")
|
||||
message.reference.resolved.author = user
|
||||
message.reference.resolved.content = "earlier bot text"
|
||||
with patch.object(FjerkroaBot, "user", new_callable=PropertyMock) as mock_user:
|
||||
mock_user.return_value = user
|
||||
await self.bot.on_message(message)
|
||||
self.bot.respond.assert_awaited_once()
|
||||
|
||||
async def test_other_channels_unaffected(self):
|
||||
"""BEH-11: non-matching channels keep the normal classifier path."""
|
||||
self.family_setup()
|
||||
await self.bot.on_message(self.public_msg("hallo zusammen"))
|
||||
self.bot.respond.assert_awaited_once()
|
||||
|
||||
async def test_tasks_skip_addressed_only_channels(self):
|
||||
"""BEH-11: scheduled tasks never post into addressed-only channels."""
|
||||
self.family_setup()
|
||||
self.bot.channel_by_name = Mock(return_value=MagicMock(spec=TextChannel))
|
||||
await self.bot._execute_task(self.FAMILY, "share a thought")
|
||||
self.bot.respond.assert_not_awaited()
|
||||
|
||||
@@ -163,3 +163,34 @@ class TestResponsesPath(unittest.IsolatedAsyncioTestCase):
|
||||
self.assertEqual(items[0]["content"][0], {"type": "input_text", "text": "look"})
|
||||
self.assertEqual(items[0]["content"][1], {"type": "input_image", "image_url": "data:x"})
|
||||
self.assertEqual(len(items), 2) # tool row dropped
|
||||
|
||||
|
||||
class TestToolVisionInjection(unittest.IsolatedAsyncioTestCase):
|
||||
def _responder(self, **extra):
|
||||
return OpenAIResponder(dict(CONFIG, **extra), "chat")
|
||||
|
||||
async def test_tool_vision_images_attached_as_input_image(self):
|
||||
"""URL-09: a tool result's vision data URLs become input_image items; never JSON text."""
|
||||
responder = self._responder(**{"enable-news-tool": True})
|
||||
responder.store = Mock()
|
||||
responder._dispatch_tool = AsyncMock(
|
||||
return_value={"url": "u", "text": "t", "images_cached": 1, "vision": ["data:image/png;base64,AAA"]}
|
||||
)
|
||||
first = _response([_call_item("fetch_url", {"url": "https://xkcd.com/1"}, "call-2")])
|
||||
second = _response([_msg_item()], envelope(answer="seen", answer_needed=True))
|
||||
with patch("fjerkroa_bot.openai_responder.openai_responses", new_callable=AsyncMock) as responses_mock:
|
||||
responses_mock.side_effect = [first, second]
|
||||
answer, _ = await responder.chat([{"role": "user", "content": "look at this"}], 10)
|
||||
self.assertEqual(json.loads(answer["content"])["answer"], "seen")
|
||||
followup = responses_mock.await_args_list[1].kwargs["input"]
|
||||
image_parts = [
|
||||
part
|
||||
for item in followup
|
||||
if isinstance(item, dict) and isinstance(item.get("content"), list)
|
||||
for part in item["content"]
|
||||
if part.get("type") == "input_image"
|
||||
]
|
||||
self.assertEqual(image_parts[0]["image_url"], "data:image/png;base64,AAA")
|
||||
outputs = [item for item in followup if isinstance(item, dict) and item.get("type") == "function_call_output"]
|
||||
self.assertNotIn("data:image", outputs[0]["output"]) # data URL never in JSON tool text
|
||||
self.assertNotIn("vision", outputs[0]["output"])
|
||||
|
||||
+120
-9
@@ -1,11 +1,14 @@
|
||||
"""Unit coverage for SPEC-011 URL reading (URL-01..07)."""
|
||||
"""Unit coverage for SPEC-011 URL reading (URL-01..09)."""
|
||||
|
||||
import json
|
||||
import unittest
|
||||
from unittest.mock import AsyncMock, patch
|
||||
from unittest.mock import AsyncMock, Mock, patch
|
||||
|
||||
from fjerkroa_bot.openai_responder import OpenAIResponder
|
||||
from fjerkroa_bot.url_reader import FETCH_URL_TOOL, URLReader, guard_url
|
||||
|
||||
from .test_bdd_envelope import envelope
|
||||
|
||||
CONFIG = {"openai-token": "t", "model": "m", "system": "s", "history-limit": 5}
|
||||
|
||||
|
||||
@@ -91,7 +94,7 @@ class TestMetaRefresh(unittest.IsolatedAsyncioTestCase):
|
||||
|
||||
async def fake_get(session, url, max_bytes):
|
||||
calls.append(url)
|
||||
return (url, stub if "stub" in url else article)
|
||||
return (url, stub if "stub" in url else article, "text/html")
|
||||
|
||||
reader._get = fake_get # type: ignore
|
||||
with patch("fjerkroa_bot.url_reader.guard_url", return_value=None):
|
||||
@@ -117,7 +120,7 @@ class TestMetaRefresh(unittest.IsolatedAsyncioTestCase):
|
||||
stub = b'<meta http-equiv="refresh" content="0; url=http://127.0.0.1/secret">Redirecting'
|
||||
|
||||
async def fake_get(session, url, max_bytes):
|
||||
return (url, stub)
|
||||
return (url, stub, "text/html")
|
||||
|
||||
reader._get = fake_get # type: ignore
|
||||
import fjerkroa_bot.url_reader as ur
|
||||
@@ -207,11 +210,11 @@ class TestBodyReadCollectsAllChunks(unittest.IsolatedAsyncioTestCase):
|
||||
return FakeResp()
|
||||
|
||||
with patch("fjerkroa_bot.url_reader.guard_url", return_value=None):
|
||||
_, body = await reader._get(FakeSession(), "http://safe.example.com", 1000)
|
||||
_, body, _ = await reader._get(FakeSession(), "http://safe.example.com", 1000)
|
||||
self.assertEqual(body, b"".join(chunks))
|
||||
|
||||
with patch("fjerkroa_bot.url_reader.guard_url", return_value=None):
|
||||
_, body = await reader._get(FakeSession(), "http://safe.example.com", 20)
|
||||
_, body, _ = await reader._get(FakeSession(), "http://safe.example.com", 20)
|
||||
self.assertEqual(body, b"".join(chunks)[:20])
|
||||
|
||||
|
||||
@@ -220,7 +223,7 @@ class TestFetchSanitizes(unittest.IsolatedAsyncioTestCase):
|
||||
"""URL-05: fetch output is length-capped and @everyone-neutralized."""
|
||||
reader = URLReader(lambda: {"url-max-chars": 50}, None)
|
||||
payload = ("<p>@everyone " + "x" * 5000 + "</p>").encode()
|
||||
with patch.object(reader, "_get", new=AsyncMock(return_value=("http://x.com", payload))):
|
||||
with patch.object(reader, "_get", new=AsyncMock(return_value=("http://x.com", payload, "text/html"))):
|
||||
result = await reader.fetch("http://x.com", "chat", "alice")
|
||||
self.assertLessEqual(len(result["text"]), 50)
|
||||
self.assertNotIn("@everyone", result["text"])
|
||||
@@ -238,6 +241,8 @@ class TestImageIngest(unittest.IsolatedAsyncioTestCase):
|
||||
"""URL-06: og:image + <img> ingested (cap honored), internal srcs skipped."""
|
||||
cache = type("C", (), {})()
|
||||
cache.ingest_url = AsyncMock(side_effect=["sha1", "sha2", "sha3"])
|
||||
cache.recent = Mock(return_value=[{"sha256": "sha1", "ext": "jpg"}, {"sha256": "sha2", "ext": "png"}])
|
||||
cache.data_url = Mock(side_effect=lambda sha, ext: f"data:image/{ext};base64,{sha}")
|
||||
reader = URLReader(lambda: {"url-max-images": 2}, cache)
|
||||
html = (
|
||||
'<meta property="og:image" content="https://cdn.example.com/hero.jpg">'
|
||||
@@ -249,8 +254,9 @@ class TestImageIngest(unittest.IsolatedAsyncioTestCase):
|
||||
return "refused" if "127.0.0.1" in url else None
|
||||
|
||||
with patch("fjerkroa_bot.url_reader.guard_url", side_effect=fake_guard):
|
||||
count = await reader._ingest_images(html, "https://example.com", "chat", "alice")
|
||||
self.assertEqual(count, 2) # og:image + first public img, cap 2
|
||||
data_urls = await reader._ingest_images(html, "https://example.com", "chat", "alice")
|
||||
self.assertEqual(len(data_urls), 2) # og:image + first public img, cap 2
|
||||
self.assertEqual(data_urls[0], "data:image/jpg;base64,sha1") # URL-09: data URLs for vision
|
||||
ingested = [call.args[0] for call in cache.ingest_url.await_args_list]
|
||||
self.assertNotIn("http://127.0.0.1/internal.png", ingested)
|
||||
|
||||
@@ -265,3 +271,108 @@ class TestPerUserCap(unittest.IsolatedAsyncioTestCase):
|
||||
blocked = await responder._dispatch_tool("fetch_url", {"url": "http://x.com"}, "alice")
|
||||
self.assertIn("error", blocked)
|
||||
self.assertEqual(responder.url_reader.fetch.await_count, 2)
|
||||
|
||||
|
||||
class TestFetchedImagesBecomeVision(unittest.IsolatedAsyncioTestCase):
|
||||
"""URL-09: fetch results carry vision data URLs, direct image URLs are ingested."""
|
||||
|
||||
@staticmethod
|
||||
def _cache():
|
||||
cache = Mock()
|
||||
cache.ingest_url = AsyncMock(return_value="abc123")
|
||||
cache.ingest_bytes = Mock(return_value="abc123")
|
||||
cache.recent = Mock(return_value=[{"sha256": "abc123", "ext": "png"}])
|
||||
cache.data_url = Mock(return_value="data:image/png;base64,AAA")
|
||||
return cache
|
||||
|
||||
@staticmethod
|
||||
def _session_cm():
|
||||
import fjerkroa_bot.url_reader as ur
|
||||
|
||||
class FakeCM:
|
||||
async def __aenter__(self):
|
||||
return object()
|
||||
|
||||
async def __aexit__(self, *a):
|
||||
return False
|
||||
|
||||
return patch.object(ur.aiohttp, "ClientSession", return_value=FakeCM())
|
||||
|
||||
async def test_html_page_vision_data_urls(self):
|
||||
"""URL-09: og:image lands in the result's vision list, count matches."""
|
||||
reader = URLReader(lambda: {}, self._cache())
|
||||
html = b'<meta property="og:image" content="https://x.com/c.png"><p>Comic of the day, longer text.</p>'
|
||||
|
||||
async def fake_get(session, url, max_bytes):
|
||||
return (url, html, "text/html")
|
||||
|
||||
reader._get = fake_get # type: ignore
|
||||
with patch("fjerkroa_bot.url_reader.guard_url", return_value=None):
|
||||
with self._session_cm():
|
||||
result = await reader.fetch("https://xkcd.com/1234", "chat", "alice")
|
||||
self.assertEqual(result["vision"], ["data:image/png;base64,AAA"])
|
||||
self.assertEqual(result["images_cached"], 1)
|
||||
|
||||
async def test_direct_image_url_ingested(self):
|
||||
"""URL-09: content-type image/* -> direct ingest, text '(image)'."""
|
||||
cache = self._cache()
|
||||
reader = URLReader(lambda: {}, cache)
|
||||
|
||||
async def fake_get(session, url, max_bytes):
|
||||
return (url, b"\x89PNG-bytes", "image/png")
|
||||
|
||||
reader._get = fake_get # type: ignore
|
||||
with patch("fjerkroa_bot.url_reader.guard_url", return_value=None):
|
||||
with self._session_cm():
|
||||
result = await reader.fetch("https://imgs.xkcd.com/comics/x.png", "chat", "alice")
|
||||
self.assertEqual(result["text"], "(image)")
|
||||
self.assertEqual(result["vision"], ["data:image/png;base64,AAA"])
|
||||
cache.ingest_bytes.assert_called_once()
|
||||
|
||||
async def test_capped_image_body_not_ingested(self):
|
||||
"""URL-09: an image body at the byte cap may be truncated - not ingested."""
|
||||
cache = self._cache()
|
||||
reader = URLReader(lambda: {"url-max-bytes": 10}, cache)
|
||||
|
||||
async def fake_get(session, url, max_bytes):
|
||||
return (url, b"0123456789", "image/png") # len == cap
|
||||
|
||||
reader._get = fake_get # type: ignore
|
||||
with patch("fjerkroa_bot.url_reader.guard_url", return_value=None):
|
||||
with self._session_cm():
|
||||
result = await reader.fetch("https://x.com/big.png", "chat", "alice")
|
||||
self.assertEqual(result["vision"], [])
|
||||
cache.ingest_bytes.assert_not_called()
|
||||
|
||||
|
||||
class TestLegacyPathVision(unittest.IsolatedAsyncioTestCase):
|
||||
async def test_legacy_tool_loop_appends_image_message(self):
|
||||
"""URL-09: legacy path - vision data URLs become an image_url user message; never JSON text."""
|
||||
responder = OpenAIResponder(dict(CONFIG, **{"enable-url-reading": True}), "chat")
|
||||
responder._dispatch_tool = AsyncMock(
|
||||
return_value={"url": "u", "text": "t", "images_cached": 1, "vision": ["data:image/png;base64,AAA"]}
|
||||
)
|
||||
func = Mock()
|
||||
func.name = "fetch_url"
|
||||
func.arguments = json.dumps({"url": "https://xkcd.com/1"})
|
||||
call = Mock(id="tc1", type="function", function=func)
|
||||
first_msg = Mock(content=None, role="assistant", tool_calls=[call], refusal=None)
|
||||
first = Mock(choices=[Mock(message=first_msg)], usage=None)
|
||||
final_msg = Mock(content=envelope(answer="seen", answer_needed=True), role="assistant", tool_calls=None, refusal=None)
|
||||
final = Mock(choices=[Mock(message=final_msg)], usage=None)
|
||||
with patch("fjerkroa_bot.openai_responder.openai_chat", new_callable=AsyncMock) as chat_mock:
|
||||
chat_mock.side_effect = [first, final]
|
||||
answer, _ = await responder.chat([{"role": "user", "content": "look at this"}], 10)
|
||||
self.assertEqual(json.loads(answer["content"])["answer"], "seen")
|
||||
final_messages = chat_mock.await_args_list[1].kwargs["messages"]
|
||||
image_parts = [
|
||||
part
|
||||
for msg in final_messages
|
||||
if isinstance(msg.get("content"), list)
|
||||
for part in msg["content"]
|
||||
if part.get("type") == "image_url"
|
||||
]
|
||||
self.assertEqual(image_parts[0]["image_url"]["url"], "data:image/png;base64,AAA")
|
||||
tool_texts = [msg["content"] for msg in final_messages if msg.get("role") == "tool"]
|
||||
self.assertNotIn("data:image", tool_texts[0]) # data URL never in JSON tool text
|
||||
self.assertNotIn("vision", tool_texts[0])
|
||||
|
||||
Reference in New Issue
Block a user