From df32ba622e84fd507d4c79c2715e7ffbccb3e7c6 Mon Sep 17 00:00:00 2001 From: Vasilije <8619304+Vasilije1990@users.noreply.github.com> Date: Sun, 26 May 2024 10:04:47 +0200 Subject: [PATCH] Updates to the configs --- cognee/api/v1/cognify/cognify.py | 5 +++-- cognee/infrastructure/InfrastructureConfig.py | 16 ++++------------ cognee/infrastructure/databases/graph/config.py | 5 +++-- .../databases/relational/config.py | 1 + 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/cognee/api/v1/cognify/cognify.py b/cognee/api/v1/cognify/cognify.py index c33bce4f5..066849aef 100644 --- a/cognee/api/v1/cognify/cognify.py +++ b/cognee/api/v1/cognify/cognify.py @@ -6,6 +6,7 @@ import nltk from nltk.corpus import stopwords from cognee.config import Config from cognee.infrastructure.data.chunking.LangchainChunkingEngine import LangchainChunkEngine +from cognee.infrastructure.databases.graph.config import get_graph_config from cognee.infrastructure.databases.vector.embeddings.DefaultEmbeddingEngine import LiteLLMEmbeddingEngine from cognee.modules.cognify.graph.add_node_connections import group_nodes_by_layer, \ graph_ready_output, connect_nodes_in_graph @@ -29,7 +30,7 @@ from cognee.shared.data_models import ChunkStrategy, KnowledgeGraph from cognee.utils import send_telemetry from cognee.modules.tasks import create_task_status_table, update_task_status from cognee.shared.SourceCodeGraph import SourceCodeGraph - +graph_config = get_graph_config() config = Config() config.load() @@ -161,7 +162,7 @@ async def cognify(datasets: Union[str, List[str]] = None): async def process_text(chunk_collection: str, chunk_id: str, input_text: str, file_metadata: dict, document_id: str): print(f"Processing chunk ({chunk_id}) from document ({file_metadata['id']}).") - graph_client = await get_graph_client(infrastructure_config.get_config()["graph_engine"]) + graph_client = await get_graph_client(graph_config.graph_engine) graph_topology = infrastructure_config.get_config()["graph_model"] if graph_topology == SourceCodeGraph: diff --git a/cognee/infrastructure/InfrastructureConfig.py b/cognee/infrastructure/InfrastructureConfig.py index 07256222b..c147441a0 100644 --- a/cognee/infrastructure/InfrastructureConfig.py +++ b/cognee/infrastructure/InfrastructureConfig.py @@ -17,7 +17,8 @@ logging.basicConfig(level=logging.DEBUG) config = Config() config.load() from cognee.infrastructure.databases.relational.config import get_relationaldb_config - +from cognee.infrastructure.databases.vector.config import get_vectordb_config +vector_db_config = get_vectordb_config() relational = get_relationaldb_config() chunk_config = get_chunk_config() class InfrastructureConfig(): @@ -135,17 +136,8 @@ class InfrastructureConfig(): ) self.vector_engine_choice = "qdrant" else: - from .databases.vector.lancedb.LanceDBAdapter import LanceDBAdapter - config.load() - lance_db_path = self.database_directory_path + "/cognee.lancedb" - LocalStorage.ensure_directory_exists(lance_db_path) - - self.vector_engine = LanceDBAdapter( - url = lance_db_path, - api_key = None, - embedding_engine = self.embedding_engine, - ) - self.vector_engine_choice = "lancedb" + self.vector_engine = vector_db_config.vector_engine + self.vector_engine_choice = vector_db_config.vector_engine_choice if config_entity is not None: return getattr(self, config_entity) diff --git a/cognee/infrastructure/databases/graph/config.py b/cognee/infrastructure/databases/graph/config.py index 839bf4759..c65e8646d 100644 --- a/cognee/infrastructure/databases/graph/config.py +++ b/cognee/infrastructure/databases/graph/config.py @@ -3,8 +3,9 @@ import os from functools import lru_cache from pydantic_settings import BaseSettings, SettingsConfigDict from cognee.base_config import get_base_config +from cognee.infrastructure.databases.relational.config import get_relationaldb_config from cognee.shared.data_models import DefaultGraphModel, GraphDBType - +relational_config = get_relationaldb_config() base_config = get_base_config() class GraphConfig(BaseSettings): @@ -15,7 +16,7 @@ class GraphConfig(BaseSettings): graph_database_username: str = "" graph_database_password: str = "" graph_database_port: int = "" - graph_file_path: str = os.path.join(base_config.database_directory_path,graph_filename) + graph_file_path: str = os.path.join(relational_config.database_directory_path,graph_filename) graph_engine: object = GraphDBType.NETWORKX graph_model: object = DefaultGraphModel diff --git a/cognee/infrastructure/databases/relational/config.py b/cognee/infrastructure/databases/relational/config.py index 035387de9..86cef5b7c 100644 --- a/cognee/infrastructure/databases/relational/config.py +++ b/cognee/infrastructure/databases/relational/config.py @@ -16,6 +16,7 @@ class RelationalConfig(BaseSettings): db_name=db_name, db_path=db_path ) + database_directory_path: str = os.path.join(config.system_root_directory,"databases") model_config = SettingsConfigDict(env_file = ".env", extra = "allow")