mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-08-01 16:24:44 +00:00
fixed port and collection_name issue
This commit is contained in:
parent
23df7db896
commit
c2f3a7f87e
2 changed files with 5 additions and 14 deletions
|
@ -17,7 +17,7 @@ from llama_stack.distribution.utils.config_dirs import RUNTIME_BASE_DIR
|
|||
class KVStoreType(Enum):
|
||||
redis = "redis"
|
||||
sqlite = "sqlite"
|
||||
postgres = "postgres",
|
||||
postgres = "postgres"
|
||||
mongodb = "mongodb"
|
||||
|
||||
|
||||
|
@ -110,7 +110,7 @@ class PostgresKVStoreConfig(CommonConfig):
|
|||
class MongoDBKVStoreConfig(CommonConfig):
|
||||
type: Literal[KVStoreType.mongodb.value] = KVStoreType.mongodb.value
|
||||
host: str = "localhost"
|
||||
port: int = 5432
|
||||
port: int = 27017
|
||||
db: str = "llamastack"
|
||||
user: str = None
|
||||
password: Optional[str] = None
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
import datetime
|
||||
import logging
|
||||
from datetime import datetime
|
||||
from typing import Optional, List
|
||||
|
@ -25,11 +24,11 @@ class MongoDBKVStoreImpl(KVStore):
|
|||
"username": self.config.user,
|
||||
"password": self.config.password,
|
||||
}
|
||||
conn_creds = {k: v for k, v in conn_creds if v is not None}
|
||||
conn_creds = {k: v for k, v in conn_creds.items() if v is not None}
|
||||
|
||||
try:
|
||||
self.conn = MongoClient(**conn_creds)
|
||||
self.collection = self.conn[self.config.db]
|
||||
self.collection = self.conn[self.config.db][self.config.collection_name]
|
||||
except (ConnectionError, ConfigurationError) as e:
|
||||
raise Exception(f"Failed to connect to MongoDB: {e}")
|
||||
except Exception as e:
|
||||
|
@ -60,11 +59,7 @@ class MongoDBKVStoreImpl(KVStore):
|
|||
async def get(self, key: str) -> Optional[str]:
|
||||
key = self._namespaced_key(key)
|
||||
query = {
|
||||
"key": key,
|
||||
"$or": [
|
||||
{"expiration": {"$exists": False}},
|
||||
{"expiration": {"$gt": datetime.now(datetime.UTC)}},
|
||||
],
|
||||
"key": key
|
||||
}
|
||||
result = self.collection.find_one(query, {"value": 1, "_id": 0})
|
||||
return result["value"] if result else None
|
||||
|
@ -78,10 +73,6 @@ class MongoDBKVStoreImpl(KVStore):
|
|||
end_key = self._namespaced_key(end_key)
|
||||
query = {
|
||||
"key": {"$gte": start_key, "$lt": end_key},
|
||||
"$or": [
|
||||
{"expiration": {"$exists": False}},
|
||||
{"expiration": {"$gt": datetime.now(datetime.UTC)}},
|
||||
],
|
||||
}
|
||||
cursor = self.collection.find(query, {"value": 1, "_id": 0}).sort("key", 1)
|
||||
return [doc["value"] for doc in cursor]
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue