Skip to content

DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.

fix: contain query rewrite failures at the rewrite service boundary

Bingxi Zhao (Frank)c158bd450519
diff --git a/deeptutor/services/rag/query_rewrite.py b/deeptutor/services/rag/query_rewrite.py
index 3365b9530..31b10a782 100644
--- a/deeptutor/services/rag/query_rewrite.py
+++ b/deeptutor/services/rag/query_rewrite.py
@@ -15,9 +15,12 @@ from __future__ import annotations
import asyncio
from collections.abc import Awaitable, Callable
from dataclasses import dataclass
+import logging
import time
from typing import Any, Optional
+logger = logging.getLogger(__name__)
+
#: Rewrite is disabled / was forced off.
STRATEGY_OFF = "off"
#: Single self-contained query produced by one LLM call.
@@ -77,20 +80,18 @@ async def rewrite_query(
) -> RewriteOutcome:
"""Rewrite ``query`` per ``settings``; always fail open to the original."""
original = query if isinstance(query, str) else ""
- cfg = settings or {}
- strategy = str(cfg.get("strategy") or STRATEGY_STANDALONE)
- if not bool(cfg.get("enabled", False)) or strategy == STRATEGY_OFF:
- return RewriteOutcome(original=original, rewritten=original, strategy=STRATEGY_OFF)
-
- min_chars = int(cfg.get("min_query_chars") or 0)
- if len(original.strip()) < max(0, min_chars):
- return RewriteOutcome(original=original, rewritten=original, strategy=strategy)
-
- timeout = float(cfg.get("timeout_seconds") or 5.0)
- model = str(cfg.get("model") or "").strip() or None
-
started = time.monotonic()
+ strategy = STRATEGY_STANDALONE
try:
+ cfg = settings or {}
+ strategy = str(cfg.get("strategy") or STRATEGY_STANDALONE)
+ if not bool(cfg.get("enabled", False)) or strategy == STRATEGY_OFF:
+ return RewriteOutcome(original=original, rewritten=original, strategy=STRATEGY_OFF)
+ min_chars = int(cfg.get("min_query_chars") or 0)
+ if len(original.strip()) < max(0, min_chars):
+ return RewriteOutcome(original=original, rewritten=original, strategy=strategy)
+ timeout = float(cfg.get("timeout_seconds") or 5.0)
+ model = str(cfg.get("model") or "").strip() or None
complete = complete_fn
if complete is None:
from deeptutor.services.llm import complete as _default_complete
@@ -106,7 +107,9 @@ async def rewrite_query(
complete(query, system_prompt=_SYSTEM_PROMPT),
timeout=timeout,
)
+ rewritten = _clean_rewritten(raw)
except Exception as exc:
+ logger.warning("Query rewrite failed (%s); using the original query", type(exc).__name__)
return RewriteOutcome(
original=original,
rewritten=original,
@@ -116,7 +119,6 @@ async def rewrite_query(
)
latency_ms = (time.monotonic() - started) * 1000.0
- rewritten = _clean_rewritten(raw)
if not rewritten:
return RewriteOutcome(
original=original,
@@ -146,14 +148,27 @@ async def maybe_rewrite(
forces it off, None follows the runtime settings. Returns ``(query, None)``
when the layer is off so callers only attach provenance when active.
"""
- cfg = settings
- if cfg is None:
- from deeptutor.services.config import get_runtime_settings_service
-
- cfg = get_runtime_settings_service().load_query_rewrite()
- cfg = dict(cfg)
- if rewrite is not None:
- cfg["enabled"] = bool(rewrite)
+ if rewrite is False:
+ return query, None
+ try:
+ cfg = settings
+ if cfg is None:
+ from deeptutor.services.config import get_runtime_settings_service
+
+ cfg = get_runtime_settings_service().load_query_rewrite()
+ cfg = dict(cfg)
+ if rewrite is not None:
+ cfg["enabled"] = bool(rewrite)
+ except Exception as exc:
+ logger.warning(
+ "Query rewrite settings failed (%s); using the original query", type(exc).__name__
+ )
+ return query, RewriteOutcome(
+ original=query,
+ rewritten=query,
+ strategy=STRATEGY_OFF,
+ error=f"{type(exc).__name__}: {exc}",
+ )
if not bool(cfg.get("enabled", False)):
return query, None
diff --git a/deeptutor/services/rag/service.py b/deeptutor/services/rag/service.py
index 859b55fab..627da317f 100644
--- a/deeptutor/services/rag/service.py
+++ b/deeptutor/services/rag/service.py
@@ -155,11 +155,7 @@ class RAGService:
# provenance is only attached when a rewrite actually ran.
from deeptutor.services.rag.query_rewrite import maybe_rewrite
- try:
- effective_query, rewrite_outcome = await maybe_rewrite(query, rewrite=rewrite)
- except Exception:
- # Fail open: any settings/load/LLM error keeps the original query.
- effective_query, rewrite_outcome = query, None
+ effective_query, rewrite_outcome = await maybe_rewrite(query, rewrite=rewrite)
if rewrite_outcome is not None:
await self._emit_tool_event(
event_sink,
diff --git a/tests/services/rag/test_query_rewrite.py b/tests/services/rag/test_query_rewrite.py
index 02e62caae..aa7ada860 100644
--- a/tests/services/rag/test_query_rewrite.py
+++ b/tests/services/rag/test_query_rewrite.py
@@ -327,3 +327,34 @@ async def test_per_call_enable_preserves_runtime_rewrite_configuration(monkeypat
assert complete.await_args.kwargs["model"] == "configured-rewrite-model"
assert wait_for.await_args.kwargs["timeout"] == 0.25
assert settings["enabled"] is False
+
+
+async def test_settings_load_failure_keeps_retrieval_query_and_records_diagnostic(
+ monkeypatch, caplog
+):
+ from deeptutor.services import config
+
+ def broken_settings():
+ raise OSError("settings unavailable")
+
+ monkeypatch.setattr(config, "get_runtime_settings_service", broken_settings)
+ query, outcome = await maybe_rewrite("original question")
+ assert query == "original question"
+ assert outcome is not None and outcome.error.startswith("OSError:")
+ assert not outcome.applied
+ assert "Query rewrite settings failed" in caplog.text
+ # An explicit opt-out must not consult potentially broken configuration.
+ assert await maybe_rewrite("original question", rewrite=False) == ("original question", None)
+
+
[email protected]("key", ["min_query_chars", "timeout_seconds"])
+async def test_invalid_rewrite_numeric_settings_fail_open(key):
+ outcome = await rewrite_query(
+ "original question",
+ settings=_enabled_settings(**{key: "invalid"}),
+ complete_fn=_ok_complete(),
+ )
+ assert outcome.rewritten == "original question"
+ assert outcome.error.startswith("ValueError:")