mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-16 09:22:22 +00:00
fix(google_genai): list skipped results after the answers to their turn
A model reads parallel tool results in order, so a skipped result listed before the caller's answers made GPT give Paris the skipped result and Rome the Paris forecast. A skipped result now follows the answers the next turn sent, which is the order the modify_params filler uses
This commit is contained in:
parent
86e1fd53f2
commit
085b603fee
2 changed files with 33 additions and 17 deletions
|
|
@ -396,7 +396,7 @@ def _genai_answered_calls(turns: Sequence[_GenAITurn]) -> tuple[int | None, ...]
|
|||
|
||||
|
||||
def _genai_turn_messages(
|
||||
turn: _GenAITurn, call_ids: Sequence[str], response_ids: Sequence[str], skipped: Sequence[bool]
|
||||
turn: _GenAITurn, call_ids: Sequence[str], response_ids: Sequence[str]
|
||||
) -> tuple[AllMessageValues, ...]:
|
||||
converted: Final = turn.parts
|
||||
if turn.role == "user":
|
||||
|
|
@ -416,19 +416,25 @@ def _genai_turn_messages(
|
|||
text: Final = "".join(part["text"] for part in converted if part["type"] == "text")
|
||||
calls: Final = list(map(_genai_tool_call, turn.calls, call_ids))
|
||||
assistant_content: Final = list(converted) if any(part["type"] != "text" for part in converted) else text or None
|
||||
skipped_results: Final = (
|
||||
skipped_tool_result(call_id, _function_name(call))
|
||||
for call, call_id, is_skipped in zip(turn.calls, call_ids, skipped)
|
||||
if is_skipped
|
||||
)
|
||||
return (
|
||||
ChatCompletionAssistantMessage(role="assistant", content=assistant_content, tool_calls=calls)
|
||||
(ChatCompletionAssistantMessage(role="assistant", content=assistant_content, tool_calls=calls),)
|
||||
if calls
|
||||
else ChatCompletionAssistantMessage(role="assistant", content=assistant_content),
|
||||
*skipped_results,
|
||||
else (ChatCompletionAssistantMessage(role="assistant", content=assistant_content),)
|
||||
)
|
||||
|
||||
|
||||
def _answered_by_next_turn(turns: Sequence[_GenAITurn], index: int) -> bool:
|
||||
return index + 1 < len(turns) and bool(turns[index + 1].responses)
|
||||
|
||||
|
||||
def _skipped_results_after(
|
||||
turns: Sequence[_GenAITurn], skipped_results: Sequence[tuple[ChatCompletionToolMessage, ...]], index: int
|
||||
) -> tuple[ChatCompletionToolMessage, ...]:
|
||||
previous: Final = skipped_results[index - 1] if index > 0 and _answered_by_next_turn(turns, index - 1) else ()
|
||||
own: Final = () if _answered_by_next_turn(turns, index) else skipped_results[index]
|
||||
return (*previous, *own)
|
||||
|
||||
|
||||
def _genai_contents_messages(contents: Sequence[object]) -> tuple[AllMessageValues, ...]:
|
||||
turns: Final = tuple(turn for content in contents if (turn := _genai_turn(content)) is not None)
|
||||
calls: Final = tuple(chain.from_iterable(turn.calls for turn in turns))
|
||||
|
|
@ -444,13 +450,23 @@ def _genai_contents_messages(contents: Sequence[object]) -> tuple[AllMessageValu
|
|||
skipped: Final = tuple(index not in answered and call_turns[index] < len(turns) - 1 for index in range(len(calls)))
|
||||
call_starts: Final = tuple(accumulate((len(turn.calls) for turn in turns), initial=0))
|
||||
response_starts: Final = tuple(accumulate((len(turn.responses) for turn in turns), initial=0))
|
||||
skipped_results: Final = tuple(
|
||||
tuple(
|
||||
skipped_tool_result(call_id, _function_name(call))
|
||||
for call, call_id, is_skipped in zip(turn.calls, call_ids[start:end], skipped[start:end])
|
||||
if is_skipped
|
||||
)
|
||||
for turn, (start, end) in zip(turns, pairwise(call_starts))
|
||||
)
|
||||
return tuple(
|
||||
chain.from_iterable(
|
||||
_genai_turn_messages(
|
||||
turn,
|
||||
call_ids[call_starts[index] : call_starts[index + 1]],
|
||||
response_ids[response_starts[index] : response_starts[index + 1]],
|
||||
skipped[call_starts[index] : call_starts[index + 1]],
|
||||
(
|
||||
*_genai_turn_messages(
|
||||
turn,
|
||||
call_ids[call_starts[index] : call_starts[index + 1]],
|
||||
response_ids[response_starts[index] : response_starts[index + 1]],
|
||||
),
|
||||
*_skipped_results_after(turns, skipped_results, index),
|
||||
)
|
||||
for index, turn in enumerate(turns)
|
||||
)
|
||||
|
|
|
|||
|
|
@ -661,9 +661,9 @@ def _call_tags(messages: list[dict[str, object]]) -> dict[str, str]:
|
|||
|
||||
|
||||
def _ids_answered_right_after(messages: list[dict[str, object]], index: int) -> list[str]:
|
||||
return sorted(
|
||||
return [
|
||||
answer["tool_call_id"] for answer in takewhile(lambda message: message["role"] == "tool", messages[index + 1 :])
|
||||
)
|
||||
]
|
||||
|
||||
|
||||
@pytest.mark.parametrize(
|
||||
|
|
@ -710,7 +710,7 @@ def test_a_call_a_later_turn_left_unanswered_gets_one_skipped_result_and_the_oth
|
|||
|
||||
tag_by_call_id: Final = _call_tags(messages)
|
||||
call_ids_per_turn: Final = {
|
||||
index: sorted(call["id"] for call in message["tool_calls"])
|
||||
index: [call["id"] for call in message["tool_calls"]]
|
||||
for index, message in enumerate(messages)
|
||||
if message.get("tool_calls")
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue