klas/t6_mem0
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Fix dependency of openai env variables for OpenSourceApp (#144)

Browse Source 
This commit fixes dependency of initializing openai env variables
for OpenSourceApp.
This commit is contained in:
Taranjeet Singh
2023-07-05 23:03:15 +05:30
committed by GitHub
parent 659e26e3d7
commit 200f11a0e0
2 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
embedchain/embedchain.py
View File

@@ -19,12 +19,6 @@ from embedchain.chunkers.qna_pair import QnaPairChunker
from embedchain.chunkers.text import TextChunker from embedchain.chunkers.text import TextChunker
from embedchain.vectordb.chroma_db import ChromaDB from embedchain.vectordb.chroma_db import ChromaDB
openai_ef = embedding_functions.OpenAIEmbeddingFunction(
api_key=os.getenv("OPENAI_API_KEY"),
organization_id=os.getenv("OPENAI_ORGANIZATION"),
model_name="text-embedding-ada-002"
)
sentence_transformer_ef = embedding_functions.SentenceTransformerEmbeddingFunction(model_name="all-MiniLM-L6-v2")
gpt4all_model = None gpt4all_model = None
@@ -238,7 +232,11 @@ class App(EmbedChain):
def __int__(self, db=None, ef=None): def __int__(self, db=None, ef=None):
if ef is None: if ef is None:
ef = openai_ef ef = embedding_functions.OpenAIEmbeddingFunction(
api_key=os.getenv("OPENAI_API_KEY"),
organization_id=os.getenv("OPENAI_ORGANIZATION"),
model_name="text-embedding-ada-002"
)
super().__init__(db, ef) super().__init__(db, ef)
def get_llm_model_answer(self, prompt): def get_llm_model_answer(self, prompt):
@@ -270,7 +268,9 @@ class OpenSourceApp(EmbedChain):
def __init__(self, db=None, ef=None): def __init__(self, db=None, ef=None):
print("Loading open source embedding model. This may take some time...") print("Loading open source embedding model. This may take some time...")
if ef is None: if ef is None:
ef = sentence_transformer_ef ef = embedding_functions.SentenceTransformerEmbeddingFunction(
model_name="all-MiniLM-L6-v2"
)
print("Successfully loaded open source embedding model.") print("Successfully loaded open source embedding model.")
super().__init__(db, ef) super().__init__(db, ef)

14
embedchain/vectordb/chroma_db.py
View File

@@ -5,15 +5,17 @@ from chromadb.utils import embedding_functions
from embedchain.vectordb.base_vector_db import BaseVectorDB from embedchain.vectordb.base_vector_db import BaseVectorDB
openai_ef = embedding_functions.OpenAIEmbeddingFunction(
api_key=os.getenv("OPENAI_API_KEY"),
organization_id=os.getenv("OPENAI_ORGANIZATION"),
model_name="text-embedding-ada-002"
)
class ChromaDB(BaseVectorDB): class ChromaDB(BaseVectorDB):
def __init__(self, db_dir=None, ef=None): def __init__(self, db_dir=None, ef=None):
self.ef = ef if ef is not None else openai_ef if ef:
self.ef = ef
else:
self.ef = embedding_functions.OpenAIEmbeddingFunction(
api_key=os.getenv("OPENAI_API_KEY"),
organization_id=os.getenv("OPENAI_ORGANIZATION"),
model_name="text-embedding-ada-002"
)
if db_dir is None: if db_dir is None:
db_dir = "db" db_dir = "db"
self.client_settings = chromadb.config.Settings( self.client_settings = chromadb.config.Settings(