gmakstutis/cognee
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixes to sqlite

Browse source
This commit is contained in:
Vasilije 2024-02-15 18:44:47 +01:00
parent 14abfd0180
commit 653fe049b4
5 changed files with 24 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.env.template
View file

@ -13,5 +13,6 @@ GRAPH_DB_PW =
GRAPH_DB_USER = GRAPH_DB_USER =
AWS_ACCESS_KEY_ID = AWS_ACCESS_KEY_ID =
AWS_SECRET_ACCESS_KEY = AWS_SECRET_ACCESS_KEY =
QDRANT_API_KEY QDRANT_API_KEY =
QDRANT_API_URL QDRANT_API_URL =
DB_TYPE = sqlite

6
cognitive_architecture/database/graphdb/graph.py
View file

@ -34,7 +34,7 @@ from ...utils import (
) )
from ...llm.queries import generate_summary, generate_graph from ...llm.queries import generate_summary, generate_graph
import logging import logging
from neo4j import AsyncGraphDatabase, Neo4jError from neo4j import AsyncGraphDatabase
from contextlib import asynccontextmanager from contextlib import asynccontextmanager
from typing import Any, Dict, Optional, List from typing import Any, Dict, Optional, List
@ -106,8 +106,8 @@ class Neo4jGraphDB(AbstractGraphDB):
async with self.get_session() as session: async with self.get_session() as session:
result = await session.run(query, parameters=params) result = await session.run(query, parameters=params)
return await result.data() return await result.data()
except Neo4jError as e: except Exception as e:
logging.error(f"Neo4j query error: {e.message}") logging.error(f"Neo4j query error: %s {e}")
raise raise
# class Neo4jGraphDB(AbstractGraphDB): # class Neo4jGraphDB(AbstractGraphDB):

18
cognitive_architecture/database/relationaldb/database.py
View file

@ -13,23 +13,11 @@ from dotenv import load_dotenv
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 # in seconds
MAX_RETRIES = 3 MAX_RETRIES = 3
RETRY_DELAY = 5 RETRY_DELAY = 5
import os
class DatabaseConfig: class DatabaseConfig:
def __init__( def __init__(
self, self,
@ -84,12 +72,6 @@ class DatabaseConfig:
# config = DatabaseConfig(config_file='path/to/config.json') # config = DatabaseConfig(config_file='path/to/config.json')
# Or set them programmatically: # Or set them programmatically:
config = DatabaseConfig( config = DatabaseConfig(
db_type="postgresql",
db_name="mydatabase",
user="myuser",
password="mypassword",
host="myhost",
port="5432",
) )
SQLALCHEMY_DATABASE_URL = config.get_sqlalchemy_database_url() SQLALCHEMY_DATABASE_URL = config.get_sqlalchemy_database_url()

2
cognitive_architecture/database/vectordb/basevectordb.py
View file

@ -43,7 +43,7 @@ import uuid
import weaviate import weaviate
from marshmallow import Schema, fields from marshmallow import Schema, fields
import json 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", "") OPENAI_API_KEY = os.getenv("OPENAI_API_KEY", "")

34
main.py
View file

@ -880,26 +880,26 @@ async def main():
# load_doc_to_graph = await add_documents_to_graph_db(session, user_id) # load_doc_to_graph = await add_documents_to_graph_db(session, user_id)
# print(load_doc_to_graph) # print(load_doc_to_graph)
user_id = "test_user" user_id = "test_user"
# loader_settings = { loader_settings = {
# "format": "PDF", "format": "PDF",
# "source": "DEVICE", "source": "DEVICE",
# "path": [".data"] "path": [".data"]
# } }
# await load_documents_to_vectorstore(session, user_id, loader_settings=loader_settings) 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 create_public_memory(user_id=user_id, labels=['sr'], topic="PublicMemory")
# await add_documents_to_graph_db(session, user_id) # await add_documents_to_graph_db(session, user_id)
# #
neo4j_graph_db = Neo4jGraphDB( # neo4j_graph_db = Neo4jGraphDB(
url=config.graph_database_url, # url=config.graph_database_url,
username=config.graph_database_username, # username=config.graph_database_username,
password=config.graph_database_password, # password=config.graph_database_password,
) # )
#
out = neo4j_graph_db.run_merge_query( # out = neo4j_graph_db.run_merge_query(
user_id=user_id, memory_type="SemanticMemory", similarity_threshold=0.5 # user_id=user_id, memory_type="SemanticMemory", similarity_threshold=0.5
) # )
bb = neo4j_graph_db.query(out) # bb = neo4j_graph_db.query(out)
print(bb) # print(bb)
# await attach_user_to_memory(user_id=user_id, labels=['sr'], topic="PublicMemory") # await attach_user_to_memory(user_id=user_id, labels=['sr'], topic="PublicMemory")