phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-19 04:49:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move InterleavedContent to api/common/content_types.py

Browse source
This commit is contained in:
Ashwin Bharambe 2024-12-17 10:22:14 -08:00
parent a30aaaa2e5
commit 4936794de1
16 changed files with 71 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

32
llama_stack/apis/inference/inference.py
View file

@ -25,12 +25,12 @@ from llama_models.llama3.api.datatypes import (
ToolPromptFormat,
)
from llama_models.schema_utils import json_schema_type, register_schema, webmethod
from llama_models.schema_utils import json_schema_type, webmethod
from pydantic import BaseModel, Field, field_validator
from typing_extensions import Annotated
from llama_stack.apis.common.deployment_types import URL
from llama_stack.apis.common.content_types import InterleavedContent
from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol
from llama_stack.apis.models import * # noqa: F403
@ -69,34 +69,6 @@ QuantizationConfig = Annotated[
]
@json_schema_type
class ImageContentItem(BaseModel):
type: Literal["image"] = "image"
data: Union[bytes, URL]
@json_schema_type
class TextContentItem(BaseModel):
type: Literal["text"] = "text"
text: str
# other modalities can be added here
InterleavedContentItem = register_schema(
Annotated[
Union[ImageContentItem, TextContentItem],
Field(discriminator="type"),
],
name="InterleavedContentItem",
)
# accept a single "str" as a special case since it is common
InterleavedContent = register_schema(
Union[str, InterleavedContentItem, List[InterleavedContentItem]],
name="InterleavedContent",
)
@json_schema_type
class UserMessage(BaseModel):
role: Literal["user"] = "user"