From 8ff1b3af138eb7304d4667d56f8238219701d29b Mon Sep 17 00:00:00 2001 From: Dinesh Yeduguru Date: Mon, 4 Nov 2024 12:16:24 -0800 Subject: [PATCH] fix linter errors --- llama_stack/distribution/datatypes.py | 1 - llama_stack/distribution/routers/__init__.py | 2 +- llama_stack/distribution/server/server.py | 14 ++++++-------- llama_stack/distribution/store/registry.py | 3 ++- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/llama_stack/distribution/datatypes.py b/llama_stack/distribution/datatypes.py index e9ec1b9e6..8139895ef 100644 --- a/llama_stack/distribution/datatypes.py +++ b/llama_stack/distribution/datatypes.py @@ -147,7 +147,6 @@ a default SQLite store will be used.""", ) - class BuildConfig(BaseModel): version: str = LLAMA_STACK_BUILD_CONFIG_VERSION name: str diff --git a/llama_stack/distribution/routers/__init__.py b/llama_stack/distribution/routers/__init__.py index 8060f1450..b3ebd1368 100644 --- a/llama_stack/distribution/routers/__init__.py +++ b/llama_stack/distribution/routers/__init__.py @@ -8,7 +8,7 @@ from typing import Any from llama_stack.distribution.datatypes import * # noqa: F403 -from llama_stack.distribution.store import DistributionRegistry +from llama_stack.distribution.store import DistributionRegistry from .routing_tables import ( DatasetsRoutingTable, diff --git a/llama_stack/distribution/server/server.py b/llama_stack/distribution/server/server.py index bb23a6a4d..35d9fe484 100644 --- a/llama_stack/distribution/server/server.py +++ b/llama_stack/distribution/server/server.py @@ -283,19 +283,17 @@ def main( app = FastAPI() # instantiate kvstore for storing and retrieving distribution metadata if config.distribution_registry_store: - dist_kvstore = asyncio.run( - kvstore_impl(config.distribution_registry_store) - ) + dist_kvstore = asyncio.run(kvstore_impl(config.distribution_registry_store)) else: dist_kvstore = asyncio.run( kvstore_impl( - SqliteKVStoreConfig( - db_path=( - DISTRIBS_BASE_DIR / config.image_name / "kvstore.db" - ).as_posix() + SqliteKVStoreConfig( + db_path=( + DISTRIBS_BASE_DIR / config.image_name / "kvstore.db" + ).as_posix() + ) ) ) - ) dist_registry = DiskDistributionRegistry(dist_kvstore) diff --git a/llama_stack/distribution/store/registry.py b/llama_stack/distribution/store/registry.py index d0c67a5c9..d14c66c2a 100644 --- a/llama_stack/distribution/store/registry.py +++ b/llama_stack/distribution/store/registry.py @@ -16,8 +16,9 @@ from llama_stack.providers.utils.kvstore import KVStore class DistributionRegistry(Protocol): - + async def get(self, identifier: str) -> [RoutableObjectWithProvider]: ... + # The current data structure allows multiple objects with the same identifier but different providers. # This is not ideal - we should have a single object that can be served by multiple providers, # suggesting a data structure like (obj: Obj, providers: List[str]) rather than List[RoutableObjectWithProvider].