mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-08-12 13:00:39 +00:00
fix
This commit is contained in:
parent
58f9fd135b
commit
a99706ec5e
1 changed files with 0 additions and 24 deletions
|
@ -17,7 +17,6 @@ from typing import Any, AsyncGenerator, Dict, List, Optional, Tuple
|
||||||
from urllib.parse import urlparse
|
from urllib.parse import urlparse
|
||||||
|
|
||||||
import httpx
|
import httpx
|
||||||
from rich.pretty import pprint
|
|
||||||
|
|
||||||
from llama_stack.apis.agents import (
|
from llama_stack.apis.agents import (
|
||||||
AgentConfig,
|
AgentConfig,
|
||||||
|
@ -187,19 +186,9 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
|
|
||||||
turns = await self.storage.get_session_turns(request.session_id)
|
turns = await self.storage.get_session_turns(request.session_id)
|
||||||
|
|
||||||
print("!! create and execute turn turns", len(turns))
|
|
||||||
pprint(turns)
|
|
||||||
|
|
||||||
messages = await self.get_messages_from_turns(turns)
|
messages = await self.get_messages_from_turns(turns)
|
||||||
|
|
||||||
print("!! create and execute turn messages", len(messages))
|
|
||||||
pprint(messages)
|
|
||||||
|
|
||||||
messages.extend(request.messages)
|
messages.extend(request.messages)
|
||||||
|
|
||||||
print("!! create and execute turn messages extended", len(messages))
|
|
||||||
pprint(messages)
|
|
||||||
|
|
||||||
turn_id = str(uuid.uuid4())
|
turn_id = str(uuid.uuid4())
|
||||||
span.set_attribute("turn_id", turn_id)
|
span.set_attribute("turn_id", turn_id)
|
||||||
start_time = datetime.now().astimezone().isoformat()
|
start_time = datetime.now().astimezone().isoformat()
|
||||||
|
@ -284,22 +273,15 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
if len(turns) == 0:
|
if len(turns) == 0:
|
||||||
raise ValueError("No turns found for session")
|
raise ValueError("No turns found for session")
|
||||||
|
|
||||||
pprint("!! resume turn turns")
|
|
||||||
pprint(turns)
|
|
||||||
messages = await self.get_messages_from_turns(turns)
|
messages = await self.get_messages_from_turns(turns)
|
||||||
messages.extend(request.tool_responses)
|
messages.extend(request.tool_responses)
|
||||||
|
|
||||||
print("!! resume turn")
|
|
||||||
pprint(messages)
|
|
||||||
|
|
||||||
last_turn = turns[-1]
|
last_turn = turns[-1]
|
||||||
last_turn_messages = self.turn_to_messages(last_turn)
|
last_turn_messages = self.turn_to_messages(last_turn)
|
||||||
last_turn_messages = [
|
last_turn_messages = [
|
||||||
x for x in last_turn_messages if isinstance(x, UserMessage) or isinstance(x, ToolResponseMessage)
|
x for x in last_turn_messages if isinstance(x, UserMessage) or isinstance(x, ToolResponseMessage)
|
||||||
]
|
]
|
||||||
|
|
||||||
print("last turn messages")
|
|
||||||
pprint(last_turn_messages)
|
|
||||||
# TODO: figure out whether we should add the tool responses to the last turn messages
|
# TODO: figure out whether we should add the tool responses to the last turn messages
|
||||||
last_turn_messages.extend(request.tool_responses)
|
last_turn_messages.extend(request.tool_responses)
|
||||||
|
|
||||||
|
@ -405,9 +387,6 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
documents: Optional[List[Document]] = None,
|
documents: Optional[List[Document]] = None,
|
||||||
toolgroups_for_turn: Optional[List[AgentToolGroup]] = None,
|
toolgroups_for_turn: Optional[List[AgentToolGroup]] = None,
|
||||||
) -> AsyncGenerator:
|
) -> AsyncGenerator:
|
||||||
print("!!RUN input messages")
|
|
||||||
|
|
||||||
pprint(input_messages)
|
|
||||||
# Doing async generators makes downstream code much simpler and everything amenable to
|
# Doing async generators makes downstream code much simpler and everything amenable to
|
||||||
# streaming. However, it also makes things complicated here because AsyncGenerators cannot
|
# streaming. However, it also makes things complicated here because AsyncGenerators cannot
|
||||||
# return a "final value" for the `yield from` statement. we simulate that by yielding a
|
# return a "final value" for the `yield from` statement. we simulate that by yielding a
|
||||||
|
@ -452,9 +431,6 @@ class ChatAgent(ShieldRunnerMixin):
|
||||||
else:
|
else:
|
||||||
yield res
|
yield res
|
||||||
|
|
||||||
pprint("!!RUN final response")
|
|
||||||
pprint(messages)
|
|
||||||
|
|
||||||
yield final_response
|
yield final_response
|
||||||
|
|
||||||
async def run_multiple_shields_wrapper(
|
async def run_multiple_shields_wrapper(
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue