smarter: factual-model routing (beh-10), fetch_url main-content extraction + 8k cap (url-08), get_weather via met.no (spec-016)

2026-07-17 19:15:18 +02:00
parent f8b9bc75ee
commit e0b97363c9
11 changed files with 404 additions and 6 deletions
@@ -114,6 +114,39 @@ class TestIgnoredChannels(ClassifierGateBase):
        self.assertIs(self.bot.channel_by_name("todo-lists", fallback), fallback)


+class TestFactualModel(unittest.IsolatedAsyncioTestCase):
+    async def _model_used(self, config, factual):
+        from .test_spec_structured import ok_result
+
+        responder = OpenAIResponder(dict({"openai-token": "t", "model": "cheap", "system": "s", "history-limit": 5}, **config), "chat")
+        responder._factual = factual
+        with patch("fjerkroa_bot.openai_responder.openai_chat", new_callable=AsyncMock) as chat_mock:
+            chat_mock.return_value = ok_result()
+            await responder.chat([{"role": "user", "content": "hi"}], 10)
+        return chat_mock.await_args.kwargs["model"]
+
+    async def test_factual_uses_stronger_model(self):
+        """BEH-10: factual verdict + factual-model config -> stronger tier."""
+        self.assertEqual(await self._model_used({"factual-model": "strong"}, True), "strong")
+
+    async def test_factual_without_config_stays_default(self):
+        """BEH-10: no factual-model config -> default model, no behavior change."""
+        self.assertEqual(await self._model_used({}, True), "cheap")
+
+    async def test_small_talk_stays_default(self):
+        """BEH-10: non-factual messages stay on the cheap default."""
+        self.assertEqual(await self._model_used({"factual-model": "strong"}, False), "cheap")
+
+    async def test_send_reads_flag_from_message(self):
+        """BEH-10: send() picks the factual flag off the AIMessage."""
+        responder = FakeModelResponder({"system": "s", "history-limit": 5}, "chat")
+        responder.scripted = [envelope(answer="x", answer_needed=True)]
+        message = AIMessage("alice", "opening hours?", "chat")
+        message.factual = True
+        await responder.send(message)
+        self.assertTrue(responder._factual)
+
+
 class TestTypingPacing(OpsBase):
    async def send_with(self, answer, factual, cps=30):
        if cps is not None:
@@ -149,6 +149,31 @@ class TestTextExtraction(unittest.TestCase):
        self.assertNotIn("evil", text)
        self.assertNotIn("x{}", text)

+    def test_chrome_and_link_boilerplate_dropped(self):
+        """URL-08: nav/header/footer skipped; short link-dominated blocks (menus, related lists) removed."""
+        reader = URLReader(lambda: {}, None)
+        html = (
+            "<html><body>"
+            "<nav><a href='/a'>Home</a> <a href='/b'>Games</a></nav>"
+            "<header><a href='/login'>Login</a></header>"
+            "<ul><li><a href='/1'>Related article one</a></li><li><a href='/2'>Related article two</a></li></ul>"
+            "<article><p>The pop-up event runs from August 4 in Shibuya, with details "
+            "<a href='/x'>on the official page</a> for anyone attending the exhibition.</p></article>"
+            "<footer><a href='/imprint'>Imprint</a></footer>"
+            "</body></html>"
+        )
+        text = reader._to_text(html)
+        self.assertIn("pop-up event", text)
+        self.assertIn("on the official page", text)  # inline link in a real paragraph survives
+        for chrome in ("Home", "Login", "Related article one", "Imprint"):
+            self.assertNotIn(chrome, text)
+
+    def test_default_cap_is_8000(self):
+        """URL-08: the default url-max-chars budget is 8000."""
+        from fjerkroa_bot.url_reader import DEFAULT_MAX_CHARS
+
+        self.assertEqual(DEFAULT_MAX_CHARS, 8000)
+

 class TestBodyReadCollectsAllChunks(unittest.IsolatedAsyncioTestCase):
    async def test_get_reads_past_first_chunk(self):
@@ -0,0 +1,120 @@
+"""Unit coverage for SPEC-016 weather tool (WEA-01..04)."""
+
+import unittest
+from unittest.mock import AsyncMock, patch
+
+from fjerkroa_bot.openai_responder import OpenAIResponder
+from fjerkroa_bot.weather import GET_WEATHER_TOOL, Weather, _reduce
+
+CONFIG = {"openai-token": "t", "model": "m", "system": "s", "history-limit": 5}
+LOCATIONS = [["Sleneset", 66.58, 12.68], ["Berlin", 52.52, 13.41]]
+
+MET_DATA = {
+    "properties": {
+        "timeseries": [
+            {
+                "time": f"2026-07-17T{10 + i if 10 + i < 24 else 10 + i - 24:02d}:00:00Z",
+                "data": {
+                    "instant": {"details": {"air_temperature": 14.0 + i, "wind_speed": 5.0}},
+                    "next_1_hours": {"summary": {"symbol_code": "lightrain"}, "details": {"precipitation_amount": 0.3}},
+                },
+            }
+            for i in range(30)
+        ]
+    }
+}
+
+
+def _tool_names(responder):
+    return [f["name"] for f in responder._available_tools()]
+
+
+class TestToolOffered(unittest.TestCase):
+    def test_gate_needs_flag_and_locations(self):
+        """WEA-01: get_weather offered only with enable-weather AND locations."""
+        self.assertNotIn("get_weather", _tool_names(OpenAIResponder(CONFIG, "chat")))
+        flag_only = OpenAIResponder(dict(CONFIG, **{"enable-weather": True}), "chat")
+        self.assertNotIn("get_weather", _tool_names(flag_only))
+        on = OpenAIResponder(dict(CONFIG, **{"enable-weather": True, "weather-locations": LOCATIONS}), "chat")
+        self.assertIn("get_weather", _tool_names(on))
+        self.assertEqual(GET_WEATHER_TOOL["name"], "get_weather")
+
+
+class TestReduce(unittest.TestCase):
+    def test_compact_shape(self):
+        """WEA-02: now + few forecast points; temperature/wind/conditions/precip only."""
+        out = _reduce(MET_DATA, "Sleneset")
+        self.assertEqual(out["location"], "Sleneset")
+        self.assertEqual(out["now"]["temp_c"], 14.0)
+        self.assertEqual(out["now"]["wind_ms"], 5.0)
+        self.assertEqual(out["now"]["conditions"], "lightrain")
+        self.assertEqual(out["now"]["precip_mm"], 0.3)
+        self.assertEqual(len(out["forecast"]), 3)  # +6h, +12h, +24h
+        self.assertEqual(out["forecast"][0]["temp_c"], 20.0)
+        self.assertNotIn("error", out)
+
+    def test_location_name_sanitized_and_empty_series(self):
+        """WEA-02: name passes sanitizer; empty timeseries -> error dict."""
+        out = _reduce(MET_DATA, "@everyone town")
+        self.assertNotIn("@everyone", out["location"])
+        self.assertIn("error", _reduce({"properties": {"timeseries": []}}, "x"))
+
+
+class TestLocationPick(unittest.TestCase):
+    def setUp(self):
+        self.weather = Weather(lambda: {"enable-weather": True, "weather-locations": LOCATIONS})
+
+    def test_substring_case_insensitive(self):
+        """WEA-03: case-insensitive substring match."""
+        self.assertEqual(self.weather._pick("berlin")[0], "Berlin")
+        self.assertEqual(self.weather._pick("slen")[0], "Sleneset")
+
+    def test_unknown_or_absent_defaults_to_first(self):
+        """WEA-03: unknown/absent location -> first configured entry."""
+        self.assertEqual(self.weather._pick(None)[0], "Sleneset")
+        self.assertEqual(self.weather._pick("Atlantis")[0], "Sleneset")
+
+    def test_bad_entries_skipped(self):
+        """WEA-03: malformed location entries are ignored, not fatal."""
+        weather = Weather(lambda: {"enable-weather": True, "weather-locations": [["broken"], ["OK", 1.0, 2.0]]})
+        self.assertEqual(weather._pick(None)[0], "OK")
+
+
+class TestForecast(unittest.IsolatedAsyncioTestCase):
+    async def test_error_returned_not_raised(self):
+        """WEA-04: network failure -> {error}, never an exception."""
+        weather = Weather(lambda: {"enable-weather": True, "weather-locations": LOCATIONS})
+        with patch.object(Weather, "_fetch_json", new_callable=AsyncMock, side_effect=RuntimeError("boom")):
+            out = await weather.forecast("Berlin")
+        self.assertIn("error", out)
+
+    async def test_forecast_happy_path(self):
+        """WEA-02/03: full flow with mocked API."""
+        weather = Weather(lambda: {"enable-weather": True, "weather-locations": LOCATIONS})
+        with patch.object(Weather, "_fetch_json", new_callable=AsyncMock, return_value=MET_DATA):
+            out = await weather.forecast("berlin")
+        self.assertEqual(out["location"], "Berlin")
+        self.assertEqual(out["now"]["temp_c"], 14.0)
+
+
+class TestMetering(unittest.IsolatedAsyncioTestCase):
+    async def test_daily_cap(self):
+        """WEA-04: per-user daily cap refuses beyond weather-daily-per-user."""
+        import tempfile
+
+        with tempfile.TemporaryDirectory() as tmp:
+            config = dict(
+                CONFIG,
+                **{
+                    "enable-weather": True,
+                    "weather-locations": LOCATIONS,
+                    "weather-daily-per-user": 1,
+                    "history-directory": tmp,
+                },
+            )
+            responder = OpenAIResponder(config, "chat")
+            with patch.object(Weather, "_fetch_json", new_callable=AsyncMock, return_value=MET_DATA):
+                first = await responder._dispatch_tool("get_weather", {}, "alice")
+                second = await responder._dispatch_tool("get_weather", {}, "alice")
+        self.assertNotIn("error", first)
+        self.assertIn("error", second)