Move InterleavedContent to api/common/content_types.py

llama_stack/apis/agents/agents.py

@@ -29,8 +29,7 @@ from llama_stack.apis.common.deployment_types import *  # noqa: F403
 from llama_stack.apis.inference import *  # noqa: F403
 from llama_stack.apis.safety import *  # noqa: F403
 from llama_stack.apis.memory import *  # noqa: F403
-from llama_stack.apis.common.deployment_types import URL
-from llama_stack.apis.inference import InterleavedContent
+from llama_stack.apis.common.content_types import InterleavedContent, URL
 
 
 @json_schema_type

llama_stack/apis/common/content_types.py

@@ -0,0 +1,49 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the terms described in the LICENSE file in
+# the root directory of this source tree.
+
+from typing import Annotated, List, Literal, Union
+
+from llama_models.schema_utils import json_schema_type, register_schema
+
+from pydantic import BaseModel, Field
+
+
+@json_schema_type(
+    schema={"type": "string", "format": "uri", "pattern": "^(https?://|file://|data:)"}
+)
+class URL(BaseModel):
+    uri: str
+
+    def __str__(self) -> str:
+        return self.uri
+
+
+@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",
+)

llama_stack/apis/common/deployment_types.py

@@ -12,16 +12,6 @@ from llama_models.schema_utils import json_schema_type
 from pydantic import BaseModel
 
 
-@json_schema_type(
-    schema={"type": "string", "format": "uri", "pattern": "^(https?://|file://|data:)"}
-)
-class URL(BaseModel):
-    uri: str
-
-    def __str__(self) -> str:
-        return self.uri
-
-
 @json_schema_type
 class RestAPIMethod(Enum):
     GET = "GET"

llama_stack/apis/datasets/datasets.py

@@ -10,7 +10,7 @@ from llama_models.schema_utils import json_schema_type, webmethod
 
 from pydantic import BaseModel, Field
 
-from llama_stack.apis.common.deployment_types import URL
+from llama_stack.apis.common.content_types import URL
 
 from llama_stack.apis.common.type_system import ParamType
 from llama_stack.apis.resource import Resource, ResourceType

llama_stack/apis/inference/inference.py

@@ -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"

llama_stack/apis/memory/memory.py

@@ -13,7 +13,7 @@ from typing import Any, Dict, List, Optional, Protocol, runtime_checkable
 from llama_models.schema_utils import json_schema_type, webmethod
 from pydantic import BaseModel, Field
 
-from llama_stack.apis.common.deployment_types import URL
+from llama_stack.apis.common.content_types import URL
 from llama_stack.apis.inference import InterleavedContent
 from llama_stack.apis.memory_banks import MemoryBank
 from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol

llama_stack/distribution/routers/routing_tables.py

@@ -16,7 +16,7 @@ from llama_stack.apis.memory_banks import *  # noqa: F403
 from llama_stack.apis.datasets import *  # noqa: F403
 from llama_stack.apis.eval_tasks import *  # noqa: F403
 
-from llama_stack.apis.common.deployment_types import URL
+from llama_stack.apis.common.content_types import URL
 
 from llama_stack.apis.common.type_system import ParamType
 from llama_stack.distribution.store import DistributionRegistry

llama_stack/providers/inline/safety/llama_guard/llama_guard.py

@@ -12,6 +12,7 @@ from typing import Any, Dict, List, Optional
 from llama_models.llama3.api.datatypes import *  # noqa: F403
 from llama_stack.apis.inference import *  # noqa: F403
 from llama_stack.apis.safety import *  # noqa: F403
+from llama_stack.apis.common.content_types import ImageContentItem, TextContentItem
 from llama_stack.distribution.datatypes import Api
 
 from llama_stack.providers.datatypes import ShieldsProtocolPrivate

llama_stack/providers/remote/inference/ollama/ollama.py

@@ -21,8 +21,8 @@ from llama_stack.providers.utils.inference.model_registry import (
 )
 
 from llama_stack.apis.inference import *  # noqa: F403
+from llama_stack.apis.common.content_types import ImageContentItem, TextContentItem
 from llama_stack.providers.datatypes import ModelsProtocolPrivate
-
 from llama_stack.providers.utils.inference.openai_compat import (
     get_sampling_options,
     OpenAICompatCompletionChoice,

llama_stack/providers/tests/inference/test_vision_inference.py

@@ -11,6 +11,7 @@ import pytest
 
 from llama_models.llama3.api.datatypes import *  # noqa: F403
 from llama_stack.apis.inference import *  # noqa: F403
+from llama_stack.apis.common.content_types import ImageContentItem, TextContentItem
 
 from .utils import group_chunks
 

llama_stack/providers/tests/post_training/fixtures.py

@@ -8,7 +8,7 @@ import pytest
 import pytest_asyncio
 
 from llama_stack.apis.common.type_system import *  # noqa: F403
-from llama_stack.apis.common.deployment_types import URL
+from llama_stack.apis.common.content_types import URL
 from llama_stack.apis.datasets import DatasetInput
 from llama_stack.apis.models import ModelInput
 

llama_stack/providers/utils/datasetio/url_utils.py

@@ -10,7 +10,7 @@ from urllib.parse import unquote
 
 import pandas
 
-from llama_stack.apis.common.deployment_types import URL
+from llama_stack.apis.common.content_types import URL
 
 from llama_stack.providers.utils.memory.vector_store import parse_data_url
 

llama_stack/providers/utils/inference/openai_compat.py

@@ -13,6 +13,8 @@ from llama_models.llama3.api.datatypes import StopReason
 from llama_stack.apis.inference import *  # noqa: F403
 from pydantic import BaseModel
 
+from llama_stack.apis.common.content_types import ImageContentItem, TextContentItem
+
 from llama_stack.providers.utils.inference.prompt_adapter import (
     convert_image_content_to_url,
 )

llama_stack/providers/utils/inference/prompt_adapter.py

@@ -34,19 +34,21 @@ from llama_models.llama3.prompt_templates import (
 from llama_models.sku_list import resolve_model
 from PIL import Image as PIL_Image
 
-from llama_stack.apis.common.deployment_types import URL
+from llama_stack.apis.common.content_types import (
+    ImageContentItem,
+    InterleavedContent,
+    InterleavedContentItem,
+    TextContentItem,
+    URL,
+)
 
 from llama_stack.apis.inference import (
     ChatCompletionRequest,
     CompletionRequest,
-    ImageContentItem,
-    InterleavedContent,
-    InterleavedContentItem,
     Message,
     ResponseFormat,
     ResponseFormatType,
     SystemMessage,
-    TextContentItem,
     ToolChoice,
     UserMessage,
 )

llama_stack/providers/utils/memory/file_utils.py

@@ -8,7 +8,7 @@ import base64
 import mimetypes
 import os
 
-from llama_stack.apis.common.deployment_types import URL
+from llama_stack.apis.common.content_types import URL
 
 
 def data_url_from_file(file_path: str) -> URL:

llama_stack/providers/utils/memory/vector_store.py

@@ -21,7 +21,7 @@ from pypdf import PdfReader
 from llama_models.llama3.api.datatypes import *  # noqa: F403
 from llama_models.llama3.api.tokenizer import Tokenizer
 
-from llama_stack.apis.inference import InterleavedContent, TextContentItem
+from llama_stack.apis.common.content_types import InterleavedContent, TextContentItem
 from llama_stack.apis.memory import *  # noqa: F403
 from llama_stack.apis.memory_banks import VectorMemoryBank
 from llama_stack.providers.datatypes import Api