7d3c0b2f94
`provider: auto` resolves a compression summary model per call WITHOUT setting `summary_model`, so the main-model retry gate saw "no separate model" and re-hit the same bad route (e.g. a proxy channel answering HTTP 200 with empty content) on every attempt, and the user-visible aux-failure warning had no model to name. Record the model the aux lane actually resolved (`_last_aux_resolved_model`), use it in the retry gate, and pass it into `_fallback_to_main_for_compression` so the warning names it. Cherry-picked from #116592 (9bb16bd6aee6): only the context_compressor / _last_aux_resolved_model hunks, the attempt-state field, and its test; the over-window wait cap, preflight fail-closed and Desktop renderer hunks are carried by #117084 / #117140. Part of #116472 (request 4).
59 lines
2.5 KiB
Python
59 lines
2.5 KiB
Python
"""#116472: an ``auto``-resolved compression summary model that fails (e.g. a proxy channel
|
|
answering HTTP 200 with empty content) must fall back to the main model. ``auto`` resolves a
|
|
model per call without setting ``summary_model``, so the retry gate previously saw "no separate
|
|
model" and re-hit the same bad route forever; the resolved model is also recorded so the
|
|
user-visible warning names it instead of only appearing in errors.log.
|
|
"""
|
|
|
|
from unittest.mock import MagicMock, patch
|
|
|
|
from agent.context_compressor import ContextCompressor
|
|
|
|
|
|
def _msgs():
|
|
return [
|
|
{"role": "user", "content": "do something"},
|
|
{"role": "assistant", "content": "ok"},
|
|
]
|
|
|
|
|
|
def test_auto_resolved_summary_model_falls_back_to_main_on_empty_content():
|
|
calls = {"n": 0}
|
|
|
|
def _route(**kwargs):
|
|
calls["n"] += 1
|
|
if calls["n"] == 1:
|
|
# First (auto) attempt: a proxy channel answers 200 with empty content.
|
|
kwargs["route_info"].update(provider="openrouter", model="z-ai/glm-5.3")
|
|
return {"choices": [{"message": {"content": " "}}]}
|
|
# Main-model retry succeeds.
|
|
kwargs["route_info"].update(provider="openrouter", model="main-model")
|
|
ok = MagicMock()
|
|
ok.choices = [MagicMock()]
|
|
ok.choices[0].message.content = "summary via main model"
|
|
return ok
|
|
|
|
with patch("agent.context_compressor.get_model_context_length", return_value=100000):
|
|
c = ContextCompressor(model="main-model", quiet_mode=True) # no override → provider: auto
|
|
|
|
with patch("agent.context_compressor.call_llm", side_effect=_route) as mock_call:
|
|
result = c._generate_summary(_msgs())
|
|
|
|
assert mock_call.call_count == 2 # first auto route failed → retried on main
|
|
assert "model" not in mock_call.call_args_list[1].kwargs
|
|
assert result is not None and "summary via main model" in result
|
|
# The model that actually failed (the auto-resolved one) is recorded for the user warning.
|
|
assert c._last_aux_model_failure_model == "z-ai/glm-5.3"
|
|
assert "empty content" in (c._last_aux_model_failure_error or "").lower()
|
|
|
|
|
|
def test_fallback_records_the_explicit_failed_model():
|
|
with patch("agent.context_compressor.get_model_context_length", return_value=100000):
|
|
c = ContextCompressor(model="main-model", quiet_mode=True)
|
|
|
|
c._fallback_to_main_for_compression(Exception("boom"), "failed", failed_model="bad/route")
|
|
|
|
assert c.summary_model == "" # empty = use the main model
|
|
assert c._summary_model_fallen_back is True
|
|
assert c._last_aux_model_failure_model == "bad/route"
|