From 74884d2e5166775a7c801433c5f48c293efb9f0f Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Wed, 22 Jan 2025 12:00:32 -0800 Subject: [PATCH 1/2] Sync updates from stainless branch: ashwinb/dev --- src/llama_stack_client/types/agents/turn.py | 11 ++++++++--- .../types/agents/turn_create_params.py | 11 ++++++++--- .../types/shared/content_delta.py | 10 +++++----- .../types/shared/interleaved_content.py | 12 ++++++++---- .../types/shared/interleaved_content_item.py | 12 ++++++++---- .../types/shared_params/interleaved_content.py | 12 ++++++++---- .../shared_params/interleaved_content_item.py | 12 ++++++++---- .../types/tool_runtime/document_param.py | 18 ++++++++++++++---- 8 files changed, 67 insertions(+), 31 deletions(-) diff --git a/src/llama_stack_client/types/agents/turn.py b/src/llama_stack_client/types/agents/turn.py index c7d424f4..866d8f48 100644 --- a/src/llama_stack_client/types/agents/turn.py +++ b/src/llama_stack_client/types/agents/turn.py @@ -22,6 +22,7 @@ "OutputAttachment", "OutputAttachmentContent", "OutputAttachmentContentImageContentItem", + "OutputAttachmentContentImageContentItemImage", "OutputAttachmentContentTextContentItem", "OutputMessage", "Step", @@ -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 diff --git a/src/llama_stack_client/types/agents/turn_create_params.py b/src/llama_stack_client/types/agents/turn_create_params.py index e8058207..325876c4 100644 --- a/src/llama_stack_client/types/agents/turn_create_params.py +++ b/src/llama_stack_client/types/agents/turn_create_params.py @@ -17,6 +17,7 @@ "Document", "DocumentContent", "DocumentContentImageContentItem", + "DocumentContentImageContentItemImage", "DocumentContentTextContentItem", "Toolgroup", "ToolgroupUnionMember1", @@ -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] diff --git a/src/llama_stack_client/types/shared/content_delta.py b/src/llama_stack_client/types/shared/content_delta.py index 7985f4b3..3ed73413 100644 --- a/src/llama_stack_client/types/shared/content_delta.py +++ b/src/llama_stack_client/types/shared/content_delta.py @@ -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): @@ -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"] diff --git a/src/llama_stack_client/types/shared/interleaved_content.py b/src/llama_stack_client/types/shared/interleaved_content.py index 58fd17cb..3a15e3cb 100644 --- a/src/llama_stack_client/types/shared/interleaved_content.py +++ b/src/llama_stack_client/types/shared/interleaved_content.py @@ -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 diff --git a/src/llama_stack_client/types/shared/interleaved_content_item.py b/src/llama_stack_client/types/shared/interleaved_content_item.py index e90127b6..cc3de8f6 100644 --- a/src/llama_stack_client/types/shared/interleaved_content_item.py +++ b/src/llama_stack_client/types/shared/interleaved_content_item.py @@ -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 diff --git a/src/llama_stack_client/types/shared_params/interleaved_content.py b/src/llama_stack_client/types/shared_params/interleaved_content.py index d6380593..fcdfa7d7 100644 --- a/src/llama_stack_client/types/shared_params/interleaved_content.py +++ b/src/llama_stack_client/types/shared_params/interleaved_content.py @@ -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] diff --git a/src/llama_stack_client/types/shared_params/interleaved_content_item.py b/src/llama_stack_client/types/shared_params/interleaved_content_item.py index 32e17799..8a5da06f 100644 --- a/src/llama_stack_client/types/shared_params/interleaved_content_item.py +++ b/src/llama_stack_client/types/shared_params/interleaved_content_item.py @@ -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] diff --git a/src/llama_stack_client/types/tool_runtime/document_param.py b/src/llama_stack_client/types/tool_runtime/document_param.py index 7df99c11..9e2e5bd7 100644 --- a/src/llama_stack_client/types/tool_runtime/document_param.py +++ b/src/llama_stack_client/types/tool_runtime/document_param.py @@ -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] From 02fa2c2d6a0fd9db003e95277177bc1a8d811d57 Mon Sep 17 00:00:00 2001 From: Ashwin Bharambe Date: Wed, 22 Jan 2025 12:11:30 -0800 Subject: [PATCH 2/2] update event logger --- src/llama_stack_client/lib/agents/event_logger.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/llama_stack_client/lib/agents/event_logger.py b/src/llama_stack_client/lib/agents/event_logger.py index ce5f25d4..f690d93c 100644 --- a/src/llama_stack_client/lib/agents/event_logger.py +++ b/src/llama_stack_client/lib/agents/event_logger.py @@ -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", ) @@ -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"