From b1b1dbc41e1f848d32e43ab07f4737eebc7523bc Mon Sep 17 00:00:00 2001 From: Yuan Tang Date: Thu, 13 Feb 2025 13:14:52 -0500 Subject: [PATCH] fix lint Signed-off-by: Yuan Tang --- llama_stack/apis/telemetry/telemetry.py | 2 +- llama_stack/providers/inline/vector_io/faiss/__init__.py | 1 - llama_stack/providers/remote/vector_io/qdrant/qdrant.py | 1 - llama_stack/providers/remote/vector_io/weaviate/__init__.py | 2 +- llama_stack/providers/remote/vector_io/weaviate/weaviate.py | 2 +- llama_stack/providers/tests/vector_io/fixtures.py | 2 +- llama_stack/templates/ollama/ollama.py | 2 +- 7 files changed, 5 insertions(+), 7 deletions(-) diff --git a/llama_stack/apis/telemetry/telemetry.py b/llama_stack/apis/telemetry/telemetry.py index 5622aaeac..63ae1dc73 100644 --- a/llama_stack/apis/telemetry/telemetry.py +++ b/llama_stack/apis/telemetry/telemetry.py @@ -13,8 +13,8 @@ from typing import ( Literal, Optional, Protocol, - runtime_checkable, Union, + runtime_checkable, ) from llama_models.llama3.api.datatypes import Primitive diff --git a/llama_stack/providers/inline/vector_io/faiss/__init__.py b/llama_stack/providers/inline/vector_io/faiss/__init__.py index 6fdd4169f..f23e1fa4f 100644 --- a/llama_stack/providers/inline/vector_io/faiss/__init__.py +++ b/llama_stack/providers/inline/vector_io/faiss/__init__.py @@ -8,7 +8,6 @@ from typing import Dict from llama_stack.providers.datatypes import Api, ProviderSpec - from .config import FaissVectorIOConfig diff --git a/llama_stack/providers/remote/vector_io/qdrant/qdrant.py b/llama_stack/providers/remote/vector_io/qdrant/qdrant.py index acdd443a3..e1091e2cf 100644 --- a/llama_stack/providers/remote/vector_io/qdrant/qdrant.py +++ b/llama_stack/providers/remote/vector_io/qdrant/qdrant.py @@ -21,7 +21,6 @@ from llama_stack.providers.utils.memory.vector_store import ( VectorDBWithIndex, ) - from .config import QdrantVectorIOConfig log = logging.getLogger(__name__) diff --git a/llama_stack/providers/remote/vector_io/weaviate/__init__.py b/llama_stack/providers/remote/vector_io/weaviate/__init__.py index 3f343de44..c93c628d8 100644 --- a/llama_stack/providers/remote/vector_io/weaviate/__init__.py +++ b/llama_stack/providers/remote/vector_io/weaviate/__init__.py @@ -8,7 +8,7 @@ from typing import Dict from llama_stack.providers.datatypes import Api, ProviderSpec -from .config import WeaviateVectorIOConfig, WeaviateRequestProviderData # noqa: F401 +from .config import WeaviateRequestProviderData, WeaviateVectorIOConfig # noqa: F401 async def get_adapter_impl(config: WeaviateVectorIOConfig, deps: Dict[Api, ProviderSpec]): diff --git a/llama_stack/providers/remote/vector_io/weaviate/weaviate.py b/llama_stack/providers/remote/vector_io/weaviate/weaviate.py index 9e9dc5d7f..52aa2f3a3 100644 --- a/llama_stack/providers/remote/vector_io/weaviate/weaviate.py +++ b/llama_stack/providers/remote/vector_io/weaviate/weaviate.py @@ -23,7 +23,7 @@ from llama_stack.providers.utils.memory.vector_store import ( VectorDBWithIndex, ) -from .config import WeaviateVectorIOConfig, WeaviateRequestProviderData +from .config import WeaviateRequestProviderData, WeaviateVectorIOConfig log = logging.getLogger(__name__) diff --git a/llama_stack/providers/tests/vector_io/fixtures.py b/llama_stack/providers/tests/vector_io/fixtures.py index d86059f49..30a2679d7 100644 --- a/llama_stack/providers/tests/vector_io/fixtures.py +++ b/llama_stack/providers/tests/vector_io/fixtures.py @@ -12,9 +12,9 @@ import pytest_asyncio from llama_stack.apis.models import ModelInput, ModelType from llama_stack.distribution.datatypes import Api, Provider -from llama_stack.providers.inline.vector_io.sqlite_vec import SQLiteVectorIOConfig from llama_stack.providers.inline.vector_io.chroma import ChromaVectorIOConfig as InlineChromaVectorIOConfig from llama_stack.providers.inline.vector_io.faiss import FaissVectorIOConfig +from llama_stack.providers.inline.vector_io.sqlite_vec import SQLiteVectorIOConfig from llama_stack.providers.remote.vector_io.chroma import ChromaVectorIOConfig from llama_stack.providers.remote.vector_io.pgvector import PGVectorVectorIOConfig from llama_stack.providers.remote.vector_io.weaviate import WeaviateVectorIOConfig diff --git a/llama_stack/templates/ollama/ollama.py b/llama_stack/templates/ollama/ollama.py index c4442e25b..f3383cd5a 100644 --- a/llama_stack/templates/ollama/ollama.py +++ b/llama_stack/templates/ollama/ollama.py @@ -16,8 +16,8 @@ from llama_stack.distribution.datatypes import ( from llama_stack.providers.inline.inference.sentence_transformers import ( SentenceTransformersInferenceConfig, ) -from llama_stack.providers.inline.vector_io.sqlite_vec.config import SQLiteVectorIOConfig from llama_stack.providers.inline.vector_io.faiss.config import FaissVectorIOConfig +from llama_stack.providers.inline.vector_io.sqlite_vec.config import SQLiteVectorIOConfig from llama_stack.providers.remote.inference.ollama import OllamaImplConfig from llama_stack.templates.template import DistributionTemplate, RunConfigSettings