From 8706b08d37bdb6600134023dee19c44289147de2 Mon Sep 17 00:00:00 2001 From: Yang Yang Date: Tue, 25 Mar 2025 14:02:51 -0700 Subject: [PATCH] remove image.data temporarily because llamastack request encoding produces data=null --- docs/_static/llama-stack-spec.html | 5 ----- docs/_static/llama-stack-spec.yaml | 4 ---- llama_stack/apis/common/content_types.py | 2 +- llama_stack/providers/utils/inference/prompt_adapter.py | 3 --- 4 files changed, 1 insertion(+), 13 deletions(-) diff --git a/docs/_static/llama-stack-spec.html b/docs/_static/llama-stack-spec.html index 7b1b6a0b6..e0a4bcf32 100644 --- a/docs/_static/llama-stack-spec.html +++ b/docs/_static/llama-stack-spec.html @@ -3911,11 +3911,6 @@ "url": { "$ref": "#/components/schemas/URL", "description": "A URL of the image or data URL in the format of data:image/{type};base64,{data}. Note that URL could have length limits." - }, - "data": { - "type": "string", - "contentEncoding": "base64", - "description": "base64 encoded image data as string" } }, "additionalProperties": false, diff --git a/docs/_static/llama-stack-spec.yaml b/docs/_static/llama-stack-spec.yaml index a815931de..71e72c662 100644 --- a/docs/_static/llama-stack-spec.yaml +++ b/docs/_static/llama-stack-spec.yaml @@ -2702,10 +2702,6 @@ components: description: >- A URL of the image or data URL in the format of data:image/{type};base64,{data}. Note that URL could have length limits. - data: - type: string - contentEncoding: base64 - description: base64 encoded image data as string additionalProperties: false description: >- Image as a base64 encoded string or an URL diff --git a/llama_stack/apis/common/content_types.py b/llama_stack/apis/common/content_types.py index 9d4e21308..1b6192e94 100644 --- a/llama_stack/apis/common/content_types.py +++ b/llama_stack/apis/common/content_types.py @@ -28,7 +28,7 @@ class _URLOrData(BaseModel): url: Optional[URL] = None # data is a base64 encoded string, hint with contentEncoding=base64 - data: Optional[str] = Field(contentEncoding="base64", default=None) + # data: Optional[str] = Field(contentEncoding="base64", default=None) @model_validator(mode="before") @classmethod diff --git a/llama_stack/providers/utils/inference/prompt_adapter.py b/llama_stack/providers/utils/inference/prompt_adapter.py index 1edf445c0..5af73cbeb 100644 --- a/llama_stack/providers/utils/inference/prompt_adapter.py +++ b/llama_stack/providers/utils/inference/prompt_adapter.py @@ -142,9 +142,6 @@ async def interleaved_content_convert_to_raw( data = response.content else: raise ValueError("Unsupported URL type") - elif image.data: - # data is a base64 encoded string, decode it to bytes for RawMediaItem - data = base64.b64decode(image.data) else: raise ValueError("No data or URL provided")