mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-16 14:19:27 +00:00
Resolve merge conflicts
This commit is contained in:
parent
70bfe622cd
commit
f4556f14c7
2 changed files with 0 additions and 15 deletions
|
|
@ -38,7 +38,6 @@ from llama_stack.apis.inference import (
|
|||
OpenAIJSONSchema,
|
||||
OpenAIResponseFormatJSONObject,
|
||||
OpenAIResponseFormatJSONSchema,
|
||||
OpenAISystemMessageParam,
|
||||
OpenAIUserMessageParam,
|
||||
)
|
||||
from llama_stack.apis.tools.tools import ListToolDefsResponse, ToolDef, ToolGroups, ToolInvocationResult, ToolRuntime
|
||||
|
|
@ -840,7 +839,6 @@ async def test_create_openai_response_with_previous_response_instructions(
|
|||
text=OpenAIResponseText(format=OpenAIResponseTextFormat(type="text")),
|
||||
input=[input_item_message],
|
||||
messages=[
|
||||
OpenAISystemMessageParam(content="You are a helpful assistant."),
|
||||
OpenAIUserMessageParam(content="Name some towns in Ireland"),
|
||||
OpenAIAssistantMessageParam(content="Galway, Longford, Sligo"),
|
||||
],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue