test(websearch): cover the recorded caller model in Compresr's retrieval follow-up

Also merges the repeated provider-prefix check in core_helpers into one helper
and drops a test docstring
This commit is contained in:
mateo-berri 2026-10-28 20:27:50 -07:00
parent 3d668189d3
commit 40b382cbbd
3 changed files with 63 additions and 8 deletions

View file

@ -46,10 +46,12 @@ def qualify_provider_stripped_model(model: str, custom_llm_provider: str) -> str
def _already_routes_to(model: str, custom_llm_provider: str) -> bool:
from litellm.litellm_core_utils.get_llm_provider_logic import inferred_provider
leading_segment: Final = model.split("/", 1)[0]
if leading_segment == model or not names_a_provider(leading_segment):
return False
return inferred_provider(model) == custom_llm_provider
return _leads_with_provider(model) and inferred_provider(model) == custom_llm_provider
def _leads_with_provider(model: str) -> bool:
leading_segment, separator, _ = model.partition("/")
return bool(separator) and names_a_provider(leading_segment)
def names_a_provider(candidate: str) -> bool:
@ -70,8 +72,7 @@ def qualify_agentic_followup_model(patch_model: str | None, model: str, custom_l
"""Resolve the model an agentic follow-up re-dispatches, keeping a hook's own provider."""
if not patch_model or patch_model == model:
return qualify_provider_stripped_model(model, custom_llm_provider)
leading_segment: Final = patch_model.split("/", 1)[0]
if leading_segment != patch_model and names_a_provider(leading_segment):
if _leads_with_provider(patch_model):
return patch_model
return qualify_provider_stripped_model(patch_model, custom_llm_provider)

View file

@ -15,16 +15,20 @@ Tests cover:
- fail_closed raises HTTPException; fail_open forwards uncompressed
"""
import datetime
import hashlib
import json
from types import SimpleNamespace
from typing import Final
from unittest.mock import AsyncMock, MagicMock, create_autospec, patch
import httpx
import pytest
from fastapi import HTTPException
import litellm
from litellm.constants import PRE_CALL_EXECUTED_GUARDRAILS_KEY
from litellm.litellm_core_utils.litellm_logging import Logging
from litellm.proxy.guardrails.guardrail_hooks.compresr.compresr import (
COMPRESR_RETRIEVE_TOOL_NAME,
CompresrGuardrail,
@ -33,7 +37,7 @@ from litellm.proxy.guardrails.guardrail_hooks.compresr.compresr import (
_scoped_store_key,
has_compresr_retrieve_tool,
)
from litellm.types.utils import GenericGuardrailAPIInputs
from litellm.types.utils import CallTypes, GenericGuardrailAPIInputs
FAKE_API_BASE = "https://compresr.example.com"
FAKE_API_KEY = "cmp_test-key"
@ -1435,6 +1439,57 @@ async def test_agentic_plan_builds_responses_followup_shape(
assert output_item["output"] == TOOL_OUTPUT
@pytest.mark.asyncio
async def test_responses_retrieval_followup_reuses_the_model_the_caller_requested(
guardrail: CompresrGuardrail,
) -> None:
requested_model: Final = "bedrock/converse/us.anthropic.claude-sonnet-5-5"
hash_value: Final = "f" * 24
logging_obj: Final = Logging(
model=requested_model,
messages=[],
stream=False,
call_type=CallTypes.responses.value,
start_time=datetime.datetime(2026, 1, 1, tzinfo=datetime.timezone.utc),
litellm_call_id="call-1",
function_id="fn-compresr-followup",
)
litellm.responses(
model=requested_model,
input=USER_QUESTION,
mock_response="retrieving",
litellm_logging_obj=logging_obj,
)
guardrail._store_originals(_scoped_store_key(logging_obj), {hash_value: TOOL_OUTPUT})
response: Final = MagicMock()
response.output = [{"type": "function_call", "call_id": "fc_1"}]
response.content = None
plan: Final = await guardrail.async_build_agentic_loop_plan(
tools={
"tool_calls": [
{
"id": "fc_1",
"type": "function",
"name": COMPRESR_RETRIEVE_TOOL_NAME,
"arguments": {"hash": hash_value},
}
]
},
model="converse/us.anthropic.claude-sonnet-5-5",
messages=[{"role": "user", "content": USER_QUESTION}],
response=response,
anthropic_messages_provider_config=None,
anthropic_messages_optional_request_params={},
logging_obj=logging_obj,
stream=False,
kwargs={},
)
assert plan.request_patch is not None
assert plan.request_patch.model == requested_model
@pytest.mark.asyncio
async def test_agentic_plan_chat_parallel_tool_calls_echoes_only_retrieve(
guardrail: CompresrGuardrail,

View file

@ -777,7 +777,6 @@ async def test_async_build_agentic_loop_plan_builds_responses_api_function_call_
async def test_responses_retrieval_followup_reuses_the_model_the_caller_requested(
guardrail: HeadroomGuardrail,
) -> None:
"""The retrieval follow-up re-dispatches from the handler, which only sees the provider-stripped model."""
requested_model: Final = "bedrock/converse/us.anthropic.claude-sonnet-5-5"
retrieve_hash: Final = "b573993006976af767214fac"
logging_obj: Final = Logging(