phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-28 04:02:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: Restore previous responses to input list, not messages

Browse source 
This adjusts the restoration of previous responses to prepend them to
the list of Responses API inputs instead of our converted list of Chat
Completion messages. This matches the expected behavior of the
Responses API, and I misinterpreted the nuances here in the initial implementation.

Signed-off-by: Ben Browning <bbrownin@redhat.com>
This commit is contained in:
Ben Browning 2025-05-02 11:08:09 -04:00
parent 467fb19345
commit 263eb6fd37
7 changed files with 400 additions and 303 deletions
Download patch file Download diff file Expand all files Collapse all files

4
llama_stack/providers/inline/agents/meta_reference/agents.py
View file

@ -22,7 +22,7 @@ from llama_stack.apis.agents import (
Document,
ListAgentSessionsResponse,
ListAgentsResponse,
OpenAIResponseInputMessage,
OpenAIResponseInput,
OpenAIResponseInputTool,
OpenAIResponseObject,
Session,
@ -255,7 +255,7 @@ class MetaReferenceAgentsImpl(Agents):
async def create_openai_response(
self,
input: str | list[OpenAIResponseInputMessage],
input: str | list[OpenAIResponseInput],
model: str,
previous_response_id: str | None = None,
store: bool | None = True,

79
llama_stack/providers/inline/agents/meta_reference/openai_responses.py
View file

@ -12,19 +12,18 @@ from typing import cast
from openai.types.chat import ChatCompletionToolParam
from llama_stack.apis.agents.openai_responses import (
OpenAIResponseInput,
OpenAIResponseInputItemList,
OpenAIResponseInputItemMessage,
OpenAIResponseInputMessage,
OpenAIResponseInputMessageContent,
OpenAIResponseInputMessageContentImage,
OpenAIResponseInputMessageContentText,
OpenAIResponseInputTool,
OpenAIResponseMessage,
OpenAIResponseObject,
OpenAIResponseObjectStream,
OpenAIResponseObjectStreamResponseCompleted,
OpenAIResponseObjectStreamResponseCreated,
OpenAIResponseOutput,
OpenAIResponseOutputMessage,
OpenAIResponseOutputMessageContentOutputText,
OpenAIResponseOutputMessageWebSearchToolCall,
OpenAIResponsePreviousResponseWithInputItems,
@ -72,7 +71,7 @@ async def _convert_response_input_content_to_chat_content_parts(
async def _convert_response_input_to_chat_user_content(
input: str | list[OpenAIResponseInputMessage],
input: str | list[OpenAIResponseInput],
) -> str | list[OpenAIChatCompletionContentPartParam]:
user_content: str | list[OpenAIChatCompletionContentPartParam] = ""
if isinstance(input, list):
@ -87,29 +86,7 @@ async def _convert_response_input_to_chat_user_content(
return user_content
async def _previous_response_to_messages(
previous_response: OpenAIResponsePreviousResponseWithInputItems,
) -> list[OpenAIMessageParam]:
messages: list[OpenAIMessageParam] = []
for previous_message in previous_response.input_items.data:
previous_content = await _convert_response_input_content_to_chat_content_parts(previous_message.content)
if previous_message.role == "user":
converted_message = OpenAIUserMessageParam(content=previous_content)
elif previous_message.role == "assistant":
converted_message = OpenAIAssistantMessageParam(content=previous_content)
else:
# TODO: handle other message roles? unclear if system/developer roles are
# used in previous responses
continue
messages.append(converted_message)
for output_message in previous_response.response.output:
if isinstance(output_message, OpenAIResponseOutputMessage):
messages.append(OpenAIAssistantMessageParam(content=output_message.content[0].text))
return messages
async def _openai_choices_to_output_messages(choices: list[OpenAIChoice]) -> list[OpenAIResponseOutputMessage]:
async def _openai_choices_to_output_messages(choices: list[OpenAIChoice]) -> list[OpenAIResponseMessage]:
output_messages = []
for choice in choices:
output_content = ""
@ -119,10 +96,11 @@ async def _openai_choices_to_output_messages(choices: list[OpenAIChoice]) -> lis
output_content = choice.message.content.text
# TODO: handle image content
output_messages.append(
OpenAIResponseOutputMessage(
OpenAIResponseMessage(
id=f"msg_{uuid.uuid4()}",
content=[OpenAIResponseOutputMessageContentOutputText(text=output_content)],
status="completed",
role="assistant",
)
)
return output_messages
@ -148,6 +126,27 @@ class OpenAIResponsesImpl:
raise ValueError(f"OpenAI response with id '{id}' not found")
return OpenAIResponsePreviousResponseWithInputItems.model_validate_json(response_json)
async def _prepend_previous_response(
self, input: str | list[OpenAIResponseInput], previous_response_id: str | None = None
):
if previous_response_id:
previous_response_with_input = await self._get_previous_response_with_input(previous_response_id)
# previous response input items
new_input_items = previous_response_with_input.input_items.data
# previous response output items
new_input_items.extend(previous_response_with_input.response.output)
# new input items from the current request
if isinstance(input, str):
# Normalize input to a list of OpenAIResponseInputMessage objects
input = [OpenAIResponseMessage(content=input, role="user")]
new_input_items.extend(input)
input = new_input_items
return input
async def get_openai_response(
self,
id: str,
@ -157,7 +156,7 @@ class OpenAIResponsesImpl:
async def create_openai_response(
self,
input: str | list[OpenAIResponseInputMessage],
input: str | list[OpenAIResponseInput],
model: str,
previous_response_id: str | None = None,
store: bool | None = True,
@ -167,10 +166,9 @@ class OpenAIResponsesImpl:
):
stream = False if stream is None else stream
input = await self._prepend_previous_response(input, previous_response_id)
messages: list[OpenAIMessageParam] = []
if previous_response_id:
previous_response_with_input = await self._get_previous_response_with_input(previous_response_id)
messages.extend(await _previous_response_to_messages(previous_response_with_input))
user_content = await _convert_response_input_to_chat_user_content(input)
messages.append(OpenAIUserMessageParam(content=user_content))
@ -237,22 +235,29 @@ class OpenAIResponsesImpl:
if store:
# Store in kvstore
new_input_id = f"msg_{uuid.uuid4()}"
if isinstance(input, str):
# synthesize a message from the input string
input_content = OpenAIResponseInputMessageContentText(text=input)
input_content_item = OpenAIResponseInputItemMessage(
input_content_item = OpenAIResponseMessage(
role="user",
content=[input_content],
id=f"msg_{uuid.uuid4()}",
id=new_input_id,
)
input_items_data = [input_content_item]
else:
# we already have a list of messages
input_items_data = []
for input_item in input:
input_items_data.append(
OpenAIResponseInputItemMessage(id=f"msg_{uuid.uuid4()}", **input_item.model_dump())
)
if isinstance(input_item, OpenAIResponseMessage):
# These may or may not already have an id, so dump to dict, check for id, and add if missing
input_item_dict = input_item.model_dump()
if "id" not in input_item_dict:
input_item_dict["id"] = new_input_id
input_items_data.append(OpenAIResponseMessage(**input_item_dict))
else:
input_items_data.append(input_item)
input_items = OpenAIResponseInputItemList(data=input_items_data)
prev_response = OpenAIResponsePreviousResponseWithInputItems(
input_items=input_items,