diff --git a/llama_stack/apis/agents/agents.py b/llama_stack/apis/agents/agents.py index 106d34584..ccd15c3d6 100644 --- a/llama_stack/apis/agents/agents.py +++ b/llama_stack/apis/agents/agents.py @@ -19,7 +19,6 @@ from typing import ( runtime_checkable, ) -from llama_models.schema_utils import json_schema_type, register_schema, webmethod from pydantic import BaseModel, ConfigDict, Field from llama_stack.apis.common.content_types import URL, ContentDelta, InterleavedContent @@ -38,6 +37,7 @@ from llama_stack.apis.inference import ( from llama_stack.apis.safety import SafetyViolation from llama_stack.apis.tools import ToolDef from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, register_schema, webmethod class Attachment(BaseModel): diff --git a/llama_stack/apis/batch_inference/batch_inference.py b/llama_stack/apis/batch_inference/batch_inference.py index 413c81c5a..0fa5c78ce 100644 --- a/llama_stack/apis/batch_inference/batch_inference.py +++ b/llama_stack/apis/batch_inference/batch_inference.py @@ -6,7 +6,6 @@ from typing import List, Optional, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel from llama_stack.apis.inference import ( @@ -21,6 +20,7 @@ from llama_stack.apis.inference import ( ToolDefinition, ToolPromptFormat, ) +from llama_stack.schema_utils import json_schema_type, webmethod @json_schema_type diff --git a/llama_stack/apis/benchmarks/benchmarks.py b/llama_stack/apis/benchmarks/benchmarks.py index af5784bbc..91b1ca927 100644 --- a/llama_stack/apis/benchmarks/benchmarks.py +++ b/llama_stack/apis/benchmarks/benchmarks.py @@ -5,10 +5,10 @@ # the root directory of this source tree. from typing import Any, Dict, List, Literal, Optional, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel, Field from llama_stack.apis.resource import Resource, ResourceType +from llama_stack.schema_utils import json_schema_type, webmethod class CommonBenchmarkFields(BaseModel): diff --git a/llama_stack/apis/common/content_types.py b/llama_stack/apis/common/content_types.py index e648f9a19..5017fa2f5 100644 --- a/llama_stack/apis/common/content_types.py +++ b/llama_stack/apis/common/content_types.py @@ -8,9 +8,10 @@ from enum import Enum from typing import Annotated, List, Literal, Optional, Union from llama_models.llama3.api.datatypes import ToolCall -from llama_models.schema_utils import json_schema_type, register_schema from pydantic import BaseModel, Field, model_validator +from llama_stack.schema_utils import json_schema_type, register_schema + @json_schema_type class URL(BaseModel): diff --git a/llama_stack/apis/common/deployment_types.py b/llama_stack/apis/common/deployment_types.py index 16a5c8ad6..83eea28a2 100644 --- a/llama_stack/apis/common/deployment_types.py +++ b/llama_stack/apis/common/deployment_types.py @@ -7,10 +7,10 @@ from enum import Enum from typing import Any, Dict, Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel from llama_stack.apis.common.content_types import URL +from llama_stack.schema_utils import json_schema_type @json_schema_type diff --git a/llama_stack/apis/common/job_types.py b/llama_stack/apis/common/job_types.py index c945bd8ff..bc070017b 100644 --- a/llama_stack/apis/common/job_types.py +++ b/llama_stack/apis/common/job_types.py @@ -5,9 +5,10 @@ # the root directory of this source tree. from enum import Enum -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel +from llama_stack.schema_utils import json_schema_type + @json_schema_type class Job(BaseModel): diff --git a/llama_stack/apis/common/training_types.py b/llama_stack/apis/common/training_types.py index b4bd1b0c6..d6c6c6919 100644 --- a/llama_stack/apis/common/training_types.py +++ b/llama_stack/apis/common/training_types.py @@ -7,9 +7,10 @@ from datetime import datetime from typing import Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel +from llama_stack.schema_utils import json_schema_type + @json_schema_type class PostTrainingMetric(BaseModel): diff --git a/llama_stack/apis/common/type_system.py b/llama_stack/apis/common/type_system.py index fa9c5e92e..139ae8875 100644 --- a/llama_stack/apis/common/type_system.py +++ b/llama_stack/apis/common/type_system.py @@ -6,10 +6,11 @@ from typing import Literal, Union -from llama_models.schema_utils import json_schema_type, register_schema from pydantic import BaseModel, Field from typing_extensions import Annotated +from llama_stack.schema_utils import json_schema_type, register_schema + @json_schema_type class StringType(BaseModel): diff --git a/llama_stack/apis/datasetio/datasetio.py b/llama_stack/apis/datasetio/datasetio.py index 2ad7aab73..d85d22876 100644 --- a/llama_stack/apis/datasetio/datasetio.py +++ b/llama_stack/apis/datasetio/datasetio.py @@ -6,10 +6,10 @@ from typing import Any, Dict, List, Optional, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel from llama_stack.apis.datasets import Dataset +from llama_stack.schema_utils import json_schema_type, webmethod @json_schema_type diff --git a/llama_stack/apis/datasets/datasets.py b/llama_stack/apis/datasets/datasets.py index 5e2b38697..fe9d30e2a 100644 --- a/llama_stack/apis/datasets/datasets.py +++ b/llama_stack/apis/datasets/datasets.py @@ -6,12 +6,12 @@ from typing import Any, Dict, List, Literal, Optional, Protocol -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel, Field 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 +from llama_stack.schema_utils import json_schema_type, webmethod class CommonDatasetFields(BaseModel): diff --git a/llama_stack/apis/datatypes.py b/llama_stack/apis/datatypes.py index 0751b2c9b..6df93052c 100644 --- a/llama_stack/apis/datatypes.py +++ b/llama_stack/apis/datatypes.py @@ -6,7 +6,7 @@ from enum import Enum -from llama_models.schema_utils import json_schema_type +from llama_stack.schema_utils import json_schema_type @json_schema_type diff --git a/llama_stack/apis/eval/eval.py b/llama_stack/apis/eval/eval.py index e5c782150..e2ff4458e 100644 --- a/llama_stack/apis/eval/eval.py +++ b/llama_stack/apis/eval/eval.py @@ -6,7 +6,6 @@ from typing import Any, Dict, List, Literal, Optional, Protocol, Union -from llama_models.schema_utils import json_schema_type, register_schema, webmethod from pydantic import BaseModel, Field from typing_extensions import Annotated @@ -15,6 +14,7 @@ from llama_stack.apis.common.job_types import Job, JobStatus from llama_stack.apis.inference import SamplingParams, SystemMessage from llama_stack.apis.scoring import ScoringResult from llama_stack.apis.scoring_functions import ScoringFnParams +from llama_stack.schema_utils import json_schema_type, register_schema, webmethod @json_schema_type diff --git a/llama_stack/apis/inference/inference.py b/llama_stack/apis/inference/inference.py index 9fccd3911..a5bc1d72f 100644 --- a/llama_stack/apis/inference/inference.py +++ b/llama_stack/apis/inference/inference.py @@ -25,7 +25,6 @@ from llama_models.llama3.api.datatypes import ( ToolDefinition, ToolPromptFormat, ) -from llama_models.schema_utils import json_schema_type, register_schema, webmethod from pydantic import BaseModel, Field, field_validator from typing_extensions import Annotated @@ -33,6 +32,7 @@ from llama_stack.apis.common.content_types import ContentDelta, InterleavedConte from llama_stack.apis.models import Model from llama_stack.apis.telemetry.telemetry import MetricResponseMixin from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, register_schema, webmethod class LogProbConfig(BaseModel): diff --git a/llama_stack/apis/inspect/inspect.py b/llama_stack/apis/inspect/inspect.py index cd51469c1..4a647a2d9 100644 --- a/llama_stack/apis/inspect/inspect.py +++ b/llama_stack/apis/inspect/inspect.py @@ -6,9 +6,10 @@ from typing import List, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel +from llama_stack.schema_utils import json_schema_type, webmethod + @json_schema_type class ProviderInfo(BaseModel): diff --git a/llama_stack/apis/models/models.py b/llama_stack/apis/models/models.py index 7e6d9854f..64b9510ea 100644 --- a/llama_stack/apis/models/models.py +++ b/llama_stack/apis/models/models.py @@ -7,11 +7,11 @@ from enum import Enum from typing import Any, Dict, List, Literal, Optional, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel, ConfigDict, Field from llama_stack.apis.resource import Resource, ResourceType from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, webmethod class CommonModelFields(BaseModel): diff --git a/llama_stack/apis/post_training/post_training.py b/llama_stack/apis/post_training/post_training.py index 8cd2979a8..ed15c6de4 100644 --- a/llama_stack/apis/post_training/post_training.py +++ b/llama_stack/apis/post_training/post_training.py @@ -8,13 +8,13 @@ from datetime import datetime from enum import Enum from typing import Any, Dict, List, Literal, Optional, Protocol, Union -from llama_models.schema_utils import json_schema_type, register_schema, webmethod from pydantic import BaseModel, Field from typing_extensions import Annotated from llama_stack.apis.common.content_types import URL from llama_stack.apis.common.job_types import JobStatus from llama_stack.apis.common.training_types import Checkpoint +from llama_stack.schema_utils import json_schema_type, register_schema, webmethod @json_schema_type diff --git a/llama_stack/apis/safety/safety.py b/llama_stack/apis/safety/safety.py index 513733d1e..fd2f0292c 100644 --- a/llama_stack/apis/safety/safety.py +++ b/llama_stack/apis/safety/safety.py @@ -7,12 +7,12 @@ from enum import Enum 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.inference import Message from llama_stack.apis.shields import Shield from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, webmethod @json_schema_type diff --git a/llama_stack/apis/scoring/scoring.py b/llama_stack/apis/scoring/scoring.py index 5bacaaf66..960149476 100644 --- a/llama_stack/apis/scoring/scoring.py +++ b/llama_stack/apis/scoring/scoring.py @@ -6,10 +6,10 @@ from typing import Any, Dict, List, Optional, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel from llama_stack.apis.scoring_functions import ScoringFn, ScoringFnParams +from llama_stack.schema_utils import json_schema_type, webmethod # mapping of metric to value ScoringResultRow = Dict[str, Any] diff --git a/llama_stack/apis/scoring_functions/scoring_functions.py b/llama_stack/apis/scoring_functions/scoring_functions.py index fece50fbd..52508d2ec 100644 --- a/llama_stack/apis/scoring_functions/scoring_functions.py +++ b/llama_stack/apis/scoring_functions/scoring_functions.py @@ -16,12 +16,12 @@ from typing import ( runtime_checkable, ) -from llama_models.schema_utils import json_schema_type, register_schema, webmethod from pydantic import BaseModel, Field from typing_extensions import Annotated from llama_stack.apis.common.type_system import ParamType from llama_stack.apis.resource import Resource, ResourceType +from llama_stack.schema_utils import json_schema_type, register_schema, webmethod # Perhaps more structure can be imposed on these functions. Maybe they could be associated diff --git a/llama_stack/apis/shields/shields.py b/llama_stack/apis/shields/shields.py index ae316ee53..ec1179ac4 100644 --- a/llama_stack/apis/shields/shields.py +++ b/llama_stack/apis/shields/shields.py @@ -6,11 +6,11 @@ from typing import Any, Dict, List, Literal, Optional, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel from llama_stack.apis.resource import Resource, ResourceType from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, webmethod class CommonShieldFields(BaseModel): diff --git a/llama_stack/apis/synthetic_data_generation/synthetic_data_generation.py b/llama_stack/apis/synthetic_data_generation/synthetic_data_generation.py index a61fb0cf2..7b41192af 100644 --- a/llama_stack/apis/synthetic_data_generation/synthetic_data_generation.py +++ b/llama_stack/apis/synthetic_data_generation/synthetic_data_generation.py @@ -7,10 +7,10 @@ from enum import Enum from typing import Any, Dict, List, Optional, Protocol, Union -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel from llama_stack.apis.inference import Message +from llama_stack.schema_utils import json_schema_type, webmethod class FilteringFunction(Enum): diff --git a/llama_stack/apis/telemetry/telemetry.py b/llama_stack/apis/telemetry/telemetry.py index 63ae1dc73..f8dbcb5eb 100644 --- a/llama_stack/apis/telemetry/telemetry.py +++ b/llama_stack/apis/telemetry/telemetry.py @@ -18,10 +18,11 @@ from typing import ( ) from llama_models.llama3.api.datatypes import Primitive -from llama_models.schema_utils import json_schema_type, register_schema, webmethod from pydantic import BaseModel, Field from typing_extensions import Annotated +from llama_stack.schema_utils import json_schema_type, register_schema, webmethod + # Add this constant near the top of the file, after the imports DEFAULT_TTL_DAYS = 7 diff --git a/llama_stack/apis/tools/rag_tool.py b/llama_stack/apis/tools/rag_tool.py index 2e6b43eb8..cff8eeefe 100644 --- a/llama_stack/apis/tools/rag_tool.py +++ b/llama_stack/apis/tools/rag_tool.py @@ -7,12 +7,12 @@ from enum import Enum from typing import Any, Dict, List, Literal, Optional, Union -from llama_models.schema_utils import json_schema_type, register_schema, webmethod from pydantic import BaseModel, Field from typing_extensions import Annotated, Protocol, runtime_checkable from llama_stack.apis.common.content_types import URL, InterleavedContent from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, register_schema, webmethod @json_schema_type diff --git a/llama_stack/apis/tools/tools.py b/llama_stack/apis/tools/tools.py index 2a407ca00..b83be127f 100644 --- a/llama_stack/apis/tools/tools.py +++ b/llama_stack/apis/tools/tools.py @@ -7,13 +7,13 @@ from enum import Enum from typing import Any, Dict, List, Literal, Optional -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel, Field from typing_extensions import Protocol, runtime_checkable from llama_stack.apis.common.content_types import URL, InterleavedContent from llama_stack.apis.resource import Resource, ResourceType from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, webmethod from .rag_tool import RAGToolRuntime diff --git a/llama_stack/apis/vector_dbs/vector_dbs.py b/llama_stack/apis/vector_dbs/vector_dbs.py index 1da2c128c..9a4aa322f 100644 --- a/llama_stack/apis/vector_dbs/vector_dbs.py +++ b/llama_stack/apis/vector_dbs/vector_dbs.py @@ -6,11 +6,11 @@ from typing import List, Literal, Optional, Protocol, runtime_checkable -from llama_models.schema_utils import json_schema_type, webmethod from pydantic import BaseModel from llama_stack.apis.resource import Resource, ResourceType from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, webmethod @json_schema_type diff --git a/llama_stack/apis/vector_io/vector_io.py b/llama_stack/apis/vector_io/vector_io.py index 8feeaa6d4..2bbb3bce8 100644 --- a/llama_stack/apis/vector_io/vector_io.py +++ b/llama_stack/apis/vector_io/vector_io.py @@ -10,12 +10,12 @@ # the root directory of this source tree. 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.inference import InterleavedContent from llama_stack.apis.vector_dbs import VectorDB from llama_stack.providers.utils.telemetry.trace_protocol import trace_protocol +from llama_stack.schema_utils import json_schema_type, webmethod class Chunk(BaseModel): diff --git a/llama_stack/providers/datatypes.py b/llama_stack/providers/datatypes.py index b92f9dc0a..384582423 100644 --- a/llama_stack/providers/datatypes.py +++ b/llama_stack/providers/datatypes.py @@ -7,7 +7,6 @@ from typing import Any, List, Optional, Protocol from urllib.parse import urlparse -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field from llama_stack.apis.benchmarks import Benchmark @@ -18,6 +17,7 @@ from llama_stack.apis.scoring_functions import ScoringFn from llama_stack.apis.shields import Shield from llama_stack.apis.tools import Tool from llama_stack.apis.vector_dbs import VectorDB +from llama_stack.schema_utils import json_schema_type class ModelsProtocolPrivate(Protocol): diff --git a/llama_stack/providers/inline/inference/vllm/config.py b/llama_stack/providers/inline/inference/vllm/config.py index de2bae265..51ef2d273 100644 --- a/llama_stack/providers/inline/inference/vllm/config.py +++ b/llama_stack/providers/inline/inference/vllm/config.py @@ -4,10 +4,10 @@ # This source code is licensed under the terms described in the LICENSE file in # the root directory of this source tree. -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field, field_validator from llama_stack.providers.utils.inference import supported_inference_models +from llama_stack.schema_utils import json_schema_type @json_schema_type diff --git a/llama_stack/providers/inline/post_training/torchtune/post_training.py b/llama_stack/providers/inline/post_training/torchtune/post_training.py index ba11736d6..c77d9305f 100644 --- a/llama_stack/providers/inline/post_training/torchtune/post_training.py +++ b/llama_stack/providers/inline/post_training/torchtune/post_training.py @@ -6,8 +6,6 @@ from datetime import datetime from typing import Any, Dict, Optional -from llama_models.schema_utils import webmethod - from llama_stack.apis.datasetio import DatasetIO from llama_stack.apis.datasets import Datasets from llama_stack.apis.post_training import ( @@ -27,6 +25,7 @@ from llama_stack.providers.inline.post_training.torchtune.config import ( from llama_stack.providers.inline.post_training.torchtune.recipes.lora_finetuning_single_device import ( LoraFinetuningSingleDevice, ) +from llama_stack.schema_utils import webmethod class TorchtunePostTrainingImpl: diff --git a/llama_stack/providers/inline/vector_io/faiss/config.py b/llama_stack/providers/inline/vector_io/faiss/config.py index ae859842d..9eae9ed67 100644 --- a/llama_stack/providers/inline/vector_io/faiss/config.py +++ b/llama_stack/providers/inline/vector_io/faiss/config.py @@ -6,13 +6,13 @@ from typing import Any, Dict -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel from llama_stack.providers.utils.kvstore.config import ( KVStoreConfig, SqliteKVStoreConfig, ) +from llama_stack.schema_utils import json_schema_type @json_schema_type diff --git a/llama_stack/providers/remote/inference/cerebras/config.py b/llama_stack/providers/remote/inference/cerebras/config.py index 6eb4dffec..81682c980 100644 --- a/llama_stack/providers/remote/inference/cerebras/config.py +++ b/llama_stack/providers/remote/inference/cerebras/config.py @@ -7,9 +7,10 @@ import os from typing import Any, Dict, Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field, SecretStr +from llama_stack.schema_utils import json_schema_type + DEFAULT_BASE_URL = "https://api.cerebras.ai" diff --git a/llama_stack/providers/remote/inference/databricks/config.py b/llama_stack/providers/remote/inference/databricks/config.py index ae2b056ea..6aaf7e594 100644 --- a/llama_stack/providers/remote/inference/databricks/config.py +++ b/llama_stack/providers/remote/inference/databricks/config.py @@ -5,9 +5,10 @@ # the root directory of this source tree. -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field +from llama_stack.schema_utils import json_schema_type + @json_schema_type class DatabricksImplConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/fireworks/config.py b/llama_stack/providers/remote/inference/fireworks/config.py index aa4c2d1de..005dfe829 100644 --- a/llama_stack/providers/remote/inference/fireworks/config.py +++ b/llama_stack/providers/remote/inference/fireworks/config.py @@ -6,9 +6,10 @@ from typing import Any, Dict, Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field, SecretStr +from llama_stack.schema_utils import json_schema_type + @json_schema_type class FireworksImplConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/groq/config.py b/llama_stack/providers/remote/inference/groq/config.py index 7c5023410..cb2619437 100644 --- a/llama_stack/providers/remote/inference/groq/config.py +++ b/llama_stack/providers/remote/inference/groq/config.py @@ -6,9 +6,10 @@ from typing import Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field +from llama_stack.schema_utils import json_schema_type + @json_schema_type class GroqConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/nvidia/config.py b/llama_stack/providers/remote/inference/nvidia/config.py index 9bf5eb469..abd34b498 100644 --- a/llama_stack/providers/remote/inference/nvidia/config.py +++ b/llama_stack/providers/remote/inference/nvidia/config.py @@ -7,9 +7,10 @@ import os from typing import Any, Dict, Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field, SecretStr +from llama_stack.schema_utils import json_schema_type + @json_schema_type class NVIDIAConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/runpod/config.py b/llama_stack/providers/remote/inference/runpod/config.py index 1a9582052..e59cfe59b 100644 --- a/llama_stack/providers/remote/inference/runpod/config.py +++ b/llama_stack/providers/remote/inference/runpod/config.py @@ -6,9 +6,10 @@ from typing import Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field +from llama_stack.schema_utils import json_schema_type + @json_schema_type class RunpodImplConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/sambanova/config.py b/llama_stack/providers/remote/inference/sambanova/config.py index 1798841df..a30c29b74 100644 --- a/llama_stack/providers/remote/inference/sambanova/config.py +++ b/llama_stack/providers/remote/inference/sambanova/config.py @@ -6,9 +6,10 @@ from typing import Any, Dict, Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field +from llama_stack.schema_utils import json_schema_type + @json_schema_type class SambaNovaImplConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/tgi/config.py b/llama_stack/providers/remote/inference/tgi/config.py index 4f690dec6..6ad663662 100644 --- a/llama_stack/providers/remote/inference/tgi/config.py +++ b/llama_stack/providers/remote/inference/tgi/config.py @@ -6,9 +6,10 @@ from typing import Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field, SecretStr +from llama_stack.schema_utils import json_schema_type + @json_schema_type class TGIImplConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/together/config.py b/llama_stack/providers/remote/inference/together/config.py index a56cb5bb8..fda3b8f43 100644 --- a/llama_stack/providers/remote/inference/together/config.py +++ b/llama_stack/providers/remote/inference/together/config.py @@ -6,9 +6,10 @@ from typing import Any, Dict, Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field, SecretStr +from llama_stack.schema_utils import json_schema_type + @json_schema_type class TogetherImplConfig(BaseModel): diff --git a/llama_stack/providers/remote/inference/vllm/config.py b/llama_stack/providers/remote/inference/vllm/config.py index a3a4c6930..c75cc8926 100644 --- a/llama_stack/providers/remote/inference/vllm/config.py +++ b/llama_stack/providers/remote/inference/vllm/config.py @@ -6,9 +6,10 @@ from typing import Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field +from llama_stack.schema_utils import json_schema_type + @json_schema_type class VLLMInferenceAdapterConfig(BaseModel): diff --git a/llama_stack/providers/remote/safety/bedrock/config.py b/llama_stack/providers/remote/safety/bedrock/config.py index 8c61decf3..1ca8d95cb 100644 --- a/llama_stack/providers/remote/safety/bedrock/config.py +++ b/llama_stack/providers/remote/safety/bedrock/config.py @@ -5,9 +5,8 @@ # the root directory of this source tree. -from llama_models.schema_utils import json_schema_type - from llama_stack.providers.utils.bedrock.config import BedrockBaseConfig +from llama_stack.schema_utils import json_schema_type @json_schema_type diff --git a/llama_stack/providers/remote/vector_io/pgvector/config.py b/llama_stack/providers/remote/vector_io/pgvector/config.py index 2a64d7c67..7811de1ca 100644 --- a/llama_stack/providers/remote/vector_io/pgvector/config.py +++ b/llama_stack/providers/remote/vector_io/pgvector/config.py @@ -4,9 +4,10 @@ # This source code is licensed under the terms described in the LICENSE file in # the root directory of this source tree. -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field +from llama_stack.schema_utils import json_schema_type + @json_schema_type class PGVectorVectorIOConfig(BaseModel): diff --git a/llama_stack/providers/remote/vector_io/qdrant/config.py b/llama_stack/providers/remote/vector_io/qdrant/config.py index 613cfa6e4..f212882d8 100644 --- a/llama_stack/providers/remote/vector_io/qdrant/config.py +++ b/llama_stack/providers/remote/vector_io/qdrant/config.py @@ -6,9 +6,10 @@ from typing import Optional -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel +from llama_stack.schema_utils import json_schema_type + @json_schema_type class QdrantVectorIOConfig(BaseModel): diff --git a/llama_stack/providers/utils/kvstore/sqlite/config.py b/llama_stack/providers/utils/kvstore/sqlite/config.py index a616c90d0..6a8b0a7cf 100644 --- a/llama_stack/providers/utils/kvstore/sqlite/config.py +++ b/llama_stack/providers/utils/kvstore/sqlite/config.py @@ -4,9 +4,10 @@ # This source code is licensed under the terms described in the LICENSE file in # the root directory of this source tree. -from llama_models.schema_utils import json_schema_type from pydantic import BaseModel, Field +from llama_stack.schema_utils import json_schema_type + @json_schema_type class SqliteControlPlaneConfig(BaseModel):