Merge pull request #48 from almutareb/one_env

app.py

@@ -14,21 +14,18 @@ from innovation_pathfinder_ai.utils.utils import (
 from langchain_community.vectorstores import Chroma
 
 import chromadb
-from configparser import ConfigParser
 import dotenv
 import os
 
 dotenv.load_dotenv()
-config = ConfigParser()
-config.read('innovation_pathfinder_ai/config.ini')
-persist_directory = config.get('main', 'VECTOR_DATABASE_LOCATION')
+persist_directory = os.getenv('VECTOR_DATABASE_LOCATION')
 
 logger = logger.get_console_logger("app")
 
 app = FastAPI()
 
 def initialize_chroma_db() -> Chroma:
-    collection_name = config.get('main', 'CONVERSATION_COLLECTION_NAME')
+    collection_name = os.getenv('CONVERSATION_COLLECTION_NAME')
     
     client = chromadb.PersistentClient(
         path=persist_directory

example.env

@@ -8,11 +8,11 @@ OLLMA_BASE_URL=
 SERPAPI_API_KEY=
 
 # for chromadb
-VECTOR_DATABASE_LOCATION=
+VECTOR_DATABASE_LOCATION="innovation_pathfinder_ai/knowledge_base/"
 
 # Name for the Conversation Memory Collection
 CONVERSATION_COLLECTION_NAME="ConversationMemory"
 
 EMBEDDING_MODEL="sentence-transformers/all-MiniLM-L6-v2"
 
-SOURCES_CACHE = "innovation_pathfinder_ai/database/sources_cache.sqlite3"
+SOURCES_CACHE="innovation_pathfinder_ai/database/sources_cache.sqlite3"

innovation_pathfinder_ai/config.ini

@@ -1,4 +0,0 @@
-[main]
-VECTOR_DATABASE_LOCATION = innovation_pathfinder_ai/knowledge_base/
-CONVERSATION_COLLECTION_NAME = ConversationMemory
-SOURCES_CACHE = innovation_pathfinder_ai/database/sources_cache.sqlite3

innovation_pathfinder_ai/database/db_handler.py

@@ -1,13 +1,13 @@
 from sqlmodel import SQLModel, create_engine, Session, select
 from innovation_pathfinder_ai.database.schema import Sources
 from innovation_pathfinder_ai.utils.logger import get_console_logger
-from configparser import ConfigParser
-# from innovation_pathfinder_ai.utils import create_wikipedia_urls_from_text
+import os
+from dotenv import load_dotenv
 
-config = ConfigParser()
-config.read('innovation_pathfinder_ai/config.ini')
+load_dotenv()
+
+sqlite_file_name = os.getenv('SOURCES_CACHE')
 
-sqlite_file_name = config.get('main', 'SOURCES_CACHE')
 sqlite_url = f"sqlite:///{sqlite_file_name}"
 engine = create_engine(sqlite_url, echo=False)
 

innovation_pathfinder_ai/structured_tools/structured_tools.py

@@ -32,12 +32,9 @@ from innovation_pathfinder_ai.utils.utils import (
     create_wikipedia_urls_from_text, create_folder_if_not_exists,
 )
 import os
-from configparser import ConfigParser
 # from innovation_pathfinder_ai.utils import create_wikipedia_urls_from_text
 
-config = ConfigParser()
-config.read('innovation_pathfinder_ai/config.ini')
-persist_directory = config.get('main', 'VECTOR_DATABASE_LOCATION')
+persist_directory = os.getenv('VECTOR_DATABASE_LOCATION')
 
 @tool
 def memory_search(query:str) -> str:
@@ -48,7 +45,7 @@ def memory_search(query:str) -> str:
      path=persist_directory,
     )
     
-    collection_name = config.get('main', 'CONVERSATION_COLLECTION_NAME')
+    collection_name = os.getenv('CONVERSATION_COLLECTION_NAME')
     #store using envar
     
     embedding_function = SentenceTransformerEmbeddings(

innovation_pathfinder_ai/vector_store/chroma_vector_store.py

@@ -23,14 +23,11 @@ from langchain_community.embeddings.sentence_transformer import (
 from innovation_pathfinder_ai.utils.utils import (
     generate_uuid    
 )
-from configparser import ConfigParser
 import dotenv
 import os
 
 dotenv.load_dotenv()
-config = ConfigParser()
-config.read('innovation_pathfinder_ai/config.ini')
-persist_directory = config.get('main', 'VECTOR_DATABASE_LOCATION')
+persist_directory = os.getenv('VECTOR_DATABASE_LOCATION')
 
 
 def read_markdown_file(file_path: str) -> str: