diff --git a/.env.template b/.env.template index e220517bb..aeeecdeef 100644 --- a/.env.template +++ b/.env.template @@ -13,5 +13,6 @@ GRAPH_DB_PW = GRAPH_DB_USER = AWS_ACCESS_KEY_ID = AWS_SECRET_ACCESS_KEY = -QDRANT_API_KEY -QDRANT_API_URL \ No newline at end of file +QDRANT_API_KEY = +QDRANT_API_URL = +DB_TYPE = sqlite \ No newline at end of file diff --git a/cognitive_architecture/database/graphdb/graph.py b/cognitive_architecture/database/graphdb/graph.py index b6f6de89b..480a9fbae 100644 --- a/cognitive_architecture/database/graphdb/graph.py +++ b/cognitive_architecture/database/graphdb/graph.py @@ -34,7 +34,7 @@ from ...utils import ( ) from ...llm.queries import generate_summary, generate_graph import logging -from neo4j import AsyncGraphDatabase, Neo4jError +from neo4j import AsyncGraphDatabase from contextlib import asynccontextmanager from typing import Any, Dict, Optional, List @@ -106,8 +106,8 @@ class Neo4jGraphDB(AbstractGraphDB): async with self.get_session() as session: result = await session.run(query, parameters=params) return await result.data() - except Neo4jError as e: - logging.error(f"Neo4j query error: {e.message}") + except Exception as e: + logging.error(f"Neo4j query error: %s {e}") raise # class Neo4jGraphDB(AbstractGraphDB): diff --git a/cognitive_architecture/database/relationaldb/database.py b/cognitive_architecture/database/relationaldb/database.py index 0c7fddcfa..1533d9f9b 100644 --- a/cognitive_architecture/database/relationaldb/database.py +++ b/cognitive_architecture/database/relationaldb/database.py @@ -13,23 +13,11 @@ from dotenv import load_dotenv load_dotenv() -# this is needed to import classes from other modules -# script_dir = os.path.dirname(os.path.abspath(__file__)) -# # Get the parent directory of your script and add it to sys.path -# parent_dir = os.path.dirname(script_dir) -# sys.path.append(parent_dir) -# from ...config import Config -# config = Config() -# config.load() - # in seconds MAX_RETRIES = 3 RETRY_DELAY = 5 -import os - - class DatabaseConfig: def __init__( self, @@ -84,12 +72,6 @@ class DatabaseConfig: # config = DatabaseConfig(config_file='path/to/config.json') # Or set them programmatically: config = DatabaseConfig( - db_type="postgresql", - db_name="mydatabase", - user="myuser", - password="mypassword", - host="myhost", - port="5432", ) SQLALCHEMY_DATABASE_URL = config.get_sqlalchemy_database_url() diff --git a/cognitive_architecture/database/vectordb/basevectordb.py b/cognitive_architecture/database/vectordb/basevectordb.py index 54f047160..05b62aefd 100644 --- a/cognitive_architecture/database/vectordb/basevectordb.py +++ b/cognitive_architecture/database/vectordb/basevectordb.py @@ -43,7 +43,7 @@ import uuid import weaviate from marshmallow import Schema, fields import json -from vector_db_type import VectorDBType +from cognitive_architecture.database.vectordb.vector_db_type import VectorDBType OPENAI_API_KEY = os.getenv("OPENAI_API_KEY", "") diff --git a/main.py b/main.py index 40036ff10..998088bd9 100644 --- a/main.py +++ b/main.py @@ -880,26 +880,26 @@ async def main(): # load_doc_to_graph = await add_documents_to_graph_db(session, user_id) # print(load_doc_to_graph) user_id = "test_user" - # loader_settings = { - # "format": "PDF", - # "source": "DEVICE", - # "path": [".data"] - # } - # await load_documents_to_vectorstore(session, user_id, loader_settings=loader_settings) + loader_settings = { + "format": "PDF", + "source": "DEVICE", + "path": [".data"] + } + await load_documents_to_vectorstore(session, user_id, loader_settings=loader_settings) # await create_public_memory(user_id=user_id, labels=['sr'], topic="PublicMemory") # await add_documents_to_graph_db(session, user_id) # - neo4j_graph_db = Neo4jGraphDB( - url=config.graph_database_url, - username=config.graph_database_username, - password=config.graph_database_password, - ) - - out = neo4j_graph_db.run_merge_query( - user_id=user_id, memory_type="SemanticMemory", similarity_threshold=0.5 - ) - bb = neo4j_graph_db.query(out) - print(bb) + # neo4j_graph_db = Neo4jGraphDB( + # url=config.graph_database_url, + # username=config.graph_database_username, + # password=config.graph_database_password, + # ) + # + # out = neo4j_graph_db.run_merge_query( + # user_id=user_id, memory_type="SemanticMemory", similarity_threshold=0.5 + # ) + # bb = neo4j_graph_db.query(out) + # print(bb) # await attach_user_to_memory(user_id=user_id, labels=['sr'], topic="PublicMemory")