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
6 changes: 3 additions & 3 deletions src/llama_stack_client/lib/agents/event_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,10 +95,10 @@ def _get_log_event(self, chunk, previous_event_type=None, previous_step_type=Non
yield LogEvent(role=step_type, content="", end="", color="yellow")
elif event_type == "step_progress":
if event.payload.delta.type == "tool_call":
if isinstance(event.payload.delta.content, str):
if isinstance(event.payload.delta.tool_call, str):
yield LogEvent(
role=None,
content=event.payload.delta.content,
content=event.payload.delta.tool_call,
end="",
color="cyan",
)
Expand All @@ -125,7 +125,7 @@ def _get_log_event(self, chunk, previous_event_type=None, previous_step_type=Non
)

for r in details.tool_responses:
if r.tool_name == "query_memory":
if r.tool_name == "query_from_memory":
inserted_context = interleaved_content_as_str(r.content)
content = f"fetched {len(inserted_context)} bytes from memory"

Expand Down
11 changes: 8 additions & 3 deletions src/llama_stack_client/types/agents/turn.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"OutputAttachment",
"OutputAttachmentContent",
"OutputAttachmentContentImageContentItem",
"OutputAttachmentContentImageContentItemImage",
"OutputAttachmentContentTextContentItem",
"OutputMessage",
"Step",
Expand All @@ -30,14 +31,18 @@
InputMessage: TypeAlias = Union[UserMessage, ToolResponseMessage]


class OutputAttachmentContentImageContentItem(BaseModel):
type: Literal["image"]

class OutputAttachmentContentImageContentItemImage(BaseModel):
data: Optional[str] = None

url: Optional[URL] = None


class OutputAttachmentContentImageContentItem(BaseModel):
image: OutputAttachmentContentImageContentItemImage

type: Literal["image"]


class OutputAttachmentContentTextContentItem(BaseModel):
text: str

Expand Down
11 changes: 8 additions & 3 deletions src/llama_stack_client/types/agents/turn_create_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"Document",
"DocumentContent",
"DocumentContentImageContentItem",
"DocumentContentImageContentItemImage",
"DocumentContentTextContentItem",
"Toolgroup",
"ToolgroupUnionMember1",
Expand All @@ -42,14 +43,18 @@ class TurnCreateParamsBase(TypedDict, total=False):
Message: TypeAlias = Union[UserMessage, ToolResponseMessage]


class DocumentContentImageContentItem(TypedDict, total=False):
type: Required[Literal["image"]]

class DocumentContentImageContentItemImage(TypedDict, total=False):
data: str

url: URL


class DocumentContentImageContentItem(TypedDict, total=False):
image: Required[DocumentContentImageContentItemImage]

type: Required[Literal["image"]]


class DocumentContentTextContentItem(TypedDict, total=False):
text: Required[str]

Expand Down
10 changes: 5 additions & 5 deletions src/llama_stack_client/types/shared/content_delta.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from ..._models import BaseModel
from .tool_call import ToolCall

__all__ = ["ContentDelta", "TextDelta", "ImageDelta", "ToolCallDelta", "ToolCallDeltaContent"]
__all__ = ["ContentDelta", "TextDelta", "ImageDelta", "ToolCallDelta", "ToolCallDeltaToolCall"]


class TextDelta(BaseModel):
Expand All @@ -16,19 +16,19 @@ class TextDelta(BaseModel):


class ImageDelta(BaseModel):
data: str
image: str

type: Literal["image"]


ToolCallDeltaContent: TypeAlias = Union[str, ToolCall]
ToolCallDeltaToolCall: TypeAlias = Union[str, ToolCall]


class ToolCallDelta(BaseModel):
content: ToolCallDeltaContent

parse_status: Literal["started", "in_progress", "failed", "succeeded"]

tool_call: ToolCallDeltaToolCall

type: Literal["tool_call"]


Expand Down
12 changes: 8 additions & 4 deletions src/llama_stack_client/types/shared/interleaved_content.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@
from ..._models import BaseModel
from .interleaved_content_item import InterleavedContentItem

__all__ = ["InterleavedContent", "ImageContentItem", "TextContentItem"]
__all__ = ["InterleavedContent", "ImageContentItem", "ImageContentItemImage", "TextContentItem"]


class ImageContentItem(BaseModel):
type: Literal["image"]

class ImageContentItemImage(BaseModel):
data: Optional[str] = None

url: Optional[URL] = None


class ImageContentItem(BaseModel):
image: ImageContentItemImage

type: Literal["image"]


class TextContentItem(BaseModel):
text: str

Expand Down
12 changes: 8 additions & 4 deletions src/llama_stack_client/types/shared/interleaved_content_item.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,21 @@
from .url import URL
from ..._models import BaseModel

__all__ = ["InterleavedContentItem", "ImageContentItem", "TextContentItem"]
__all__ = ["InterleavedContentItem", "ImageContentItem", "ImageContentItemImage", "TextContentItem"]


class ImageContentItem(BaseModel):
type: Literal["image"]

class ImageContentItemImage(BaseModel):
data: Optional[str] = None

url: Optional[URL] = None


class ImageContentItem(BaseModel):
image: ImageContentItemImage

type: Literal["image"]


class TextContentItem(BaseModel):
text: str

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,21 @@
from .url import URL
from .interleaved_content_item import InterleavedContentItem

__all__ = ["InterleavedContent", "ImageContentItem", "TextContentItem"]
__all__ = ["InterleavedContent", "ImageContentItem", "ImageContentItemImage", "TextContentItem"]


class ImageContentItem(TypedDict, total=False):
type: Required[Literal["image"]]

class ImageContentItemImage(TypedDict, total=False):
data: str

url: URL


class ImageContentItem(TypedDict, total=False):
image: Required[ImageContentItemImage]

type: Required[Literal["image"]]


class TextContentItem(TypedDict, total=False):
text: Required[str]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,21 @@

from .url import URL

__all__ = ["InterleavedContentItem", "ImageContentItem", "TextContentItem"]
__all__ = ["InterleavedContentItem", "ImageContentItem", "ImageContentItemImage", "TextContentItem"]


class ImageContentItem(TypedDict, total=False):
type: Required[Literal["image"]]

class ImageContentItemImage(TypedDict, total=False):
data: str

url: URL


class ImageContentItem(TypedDict, total=False):
image: Required[ImageContentItemImage]

type: Required[Literal["image"]]


class TextContentItem(TypedDict, total=False):
text: Required[str]

Expand Down
18 changes: 14 additions & 4 deletions src/llama_stack_client/types/tool_runtime/document_param.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,27 @@
from ..shared_params.url import URL
from ..shared_params.interleaved_content_item import InterleavedContentItem

__all__ = ["DocumentParam", "Content", "ContentImageContentItem", "ContentTextContentItem"]
__all__ = [
"DocumentParam",
"Content",
"ContentImageContentItem",
"ContentImageContentItemImage",
"ContentTextContentItem",
]


class ContentImageContentItem(TypedDict, total=False):
type: Required[Literal["image"]]

class ContentImageContentItemImage(TypedDict, total=False):
data: str

url: URL


class ContentImageContentItem(TypedDict, total=False):
image: Required[ContentImageContentItemImage]

type: Required[Literal["image"]]


class ContentTextContentItem(TypedDict, total=False):
text: Required[str]

Expand Down
Loading