Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions src/llama_stack_client/lib/agents/event_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,16 +59,19 @@ def __init__(self):
self.previous_event_type = None
self.previous_step_type = None

def process_chunk(self, chunk):
log_event = self._get_log_event(
def yield_printable_events(self, chunk):
for printable_event in self._yield_printable_events(
chunk, self.previous_event_type, self.previous_step_type
)
):
yield printable_event

self.previous_event_type, self.previous_step_type = (
self._get_event_type_step_type(chunk)
)
return log_event

def _get_log_event(self, chunk, previous_event_type=None, previous_step_type=None):
def _yield_printable_events(
self, chunk, previous_event_type=None, previous_step_type=None
):
if hasattr(chunk, "error"):
yield TurnStreamPrintableEvent(
role=None, content=chunk.error["message"], color="red"
Expand Down Expand Up @@ -180,6 +183,4 @@ class EventLogger:
def log(self, event_generator):
printer = TurnStreamEventPrinter()
for chunk in event_generator:
printable_event = printer.process_chunk(chunk)
if printable_event:
yield printable_event
yield from printer.yield_printable_events(chunk)
13 changes: 5 additions & 8 deletions src/llama_stack_client/lib/inference/event_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,20 @@ def print(self, flush=True):


class InferenceStreamLogEventPrinter:
def process_chunk(self, chunk):
def yield_printable_events(self, chunk):
event = chunk.event
if event.event_type == "start":
return InferenceStreamPrintableEvent("Assistant> ", color="cyan", end="")
yield InferenceStreamPrintableEvent("Assistant> ", color="cyan", end="")
elif event.event_type == "progress":
return InferenceStreamPrintableEvent(
yield InferenceStreamPrintableEvent(
event.delta.text, color="yellow", end=""
)
elif event.event_type == "complete":
return InferenceStreamPrintableEvent("")
return None
yield InferenceStreamPrintableEvent("")


class EventLogger:
def log(self, event_generator):
printer = InferenceStreamLogEventPrinter()
for chunk in event_generator:
printable_event = printer.process_chunk(chunk)
if printable_event:
yield printable_event
yield from printer.yield_printable_events(chunk)
8 changes: 2 additions & 6 deletions src/llama_stack_client/lib/stream_printer.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,10 @@ def gen(cls, event_generator):
if hasattr(event, "event_type"):
if not inference_printer:
inference_printer = InferenceStreamLogEventPrinter()
printable_event = inference_printer.process_chunk(chunk)
if printable_event:
yield printable_event
yield from inference_printer.yield_printable_events(chunk)
elif hasattr(event, "payload") and hasattr(event.payload, "event_type"):
if not turn_printer:
turn_printer = TurnStreamEventPrinter()
printable_event = turn_printer.process_chunk(chunk)
if printable_event:
yield printable_event
yield from turn_printer.yield_printable_events(chunk)
else:
raise ValueError(f"Unsupported event: {event}")