DeepTutor: Lifelong Personalized Tutoring. https://deeptutor.info/.
Python ai-agentsai-tutorclawbotcli-tooldeepresearchinteractive-learninglearningmulti-agent-systemsrag
fix(rag): preserve runtime settings when enabling query rewrite
Bingxi Zhao (Frank)0d6eb0a5fefa
diff --git a/deeptutor/services/rag/query_rewrite.py b/deeptutor/services/rag/query_rewrite.pyindex 21be05cfb..3365b9530 100644--- a/deeptutor/services/rag/query_rewrite.py+++ b/deeptutor/services/rag/query_rewrite.py@@ -147,16 +147,13 @@ async def maybe_rewrite(when the layer is off so callers only attach provenance when active."""cfg = settings- if cfg is None and rewrite is None:+ if cfg is None:from deeptutor.services.config import get_runtime_settings_servicecfg = get_runtime_settings_service().load_query_rewrite()- elif cfg is None:- cfg = {"enabled": bool(rewrite), "strategy": STRATEGY_STANDALONE}- else:- cfg = dict(cfg)- if rewrite is not None:- cfg["enabled"] = bool(rewrite)+ cfg = dict(cfg)+ if rewrite is not None:+ cfg["enabled"] = bool(rewrite)if not bool(cfg.get("enabled", False)):return query, Nonediff --git a/tests/cli/test_kb_eval_cli.py b/tests/cli/test_kb_eval_cli.pyindex 4cd882f0f..0cd275f6b 100644--- a/tests/cli/test_kb_eval_cli.py+++ b/tests/cli/test_kb_eval_cli.py@@ -356,7 +356,7 @@ def test_eval_diff_rejects_a_non_object_payload(tmp_path: Path) -> None:result = runner.invoke(app, ["kb", "eval-diff", str(array), str(candidate)])assert result.exit_code == 1- assert "is not a JSON object" in result.output+ assert "is not a JSON object" in " ".join(result.output.split())def test_eval_diff_rejects_reports_at_different_k(tmp_path: Path) -> None:diff --git a/tests/services/rag/test_query_rewrite.py b/tests/services/rag/test_query_rewrite.pyindex e2a5308eb..02e62caae 100644--- a/tests/services/rag/test_query_rewrite.py+++ b/tests/services/rag/test_query_rewrite.py@@ -295,3 +295,35 @@ def test_maybe_rewrite_failure_still_returns_original_with_outcome():assert out.rewritten == "what is x"assert out.error != ""assert out.applied is False+++async def test_per_call_enable_preserves_runtime_rewrite_configuration(monkeypatch):+ from types import SimpleNamespace+ from unittest.mock import AsyncMock++ from deeptutor.services import config+ from deeptutor.services.rag import query_rewrite++ settings = _enabled_settings(+ enabled=False, model="configured-rewrite-model", min_query_chars=20, timeout_seconds=0.25+ )+ monkeypatch.setattr(+ config,+ "get_runtime_settings_service",+ lambda: SimpleNamespace(load_query_rewrite=lambda: settings),+ )+ complete = AsyncMock(return_value="resolved search terms")+ wait_for = AsyncMock(wraps=asyncio.wait_for)+ monkeypatch.setattr(query_rewrite.asyncio, "wait_for", wait_for)++ query, outcome = await maybe_rewrite("short", rewrite=True, complete_fn=complete)+ assert query == "short" and outcome is not None+ complete.assert_not_awaited()+ query, outcome = await maybe_rewrite(+ "explain the previous chapter's main result", rewrite=True, complete_fn=complete+ )+ assert query == "resolved search terms" and outcome.applied+ assert complete.await_args.kwargs["model"] == "configured-rewrite-model"+ assert wait_for.await_args.kwargs["timeout"] == 0.25+ assert settings["enabled"] is False