Skip to content

Commit

Permalink
Merge pull request KruxAI#4 from KruxAI/langchain-upgrade
Browse files Browse the repository at this point in the history
Langchain upgrade
  • Loading branch information
aravind10x authored Aug 8, 2024
2 parents af789ea + a584cdb commit 0b19dfb
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 9 deletions.
1 change: 1 addition & 0 deletions src/ragbuilder/eval.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
"gpt-3.5-turbo": {"input": 0.0015, "output": 0.002}, # gpt-3.5-turbo still defaults to gpt-3.5-turbo-0613
"gpt-3.5-turbo-16k": {"input": 0.003, "output": 0.004},
"gpt-4o": {"input": 0.005, "output": 0.015},
"gpt-4o-mini": {"input": 0.00015, "output": 0.0006},
"gpt-4": {"input": 0.03, "output": 0.06},
"gpt-4-turbo": {"input": 0.01, "output": 0.03},
"gpt-4-32k": {"input": 0.06, "output": 0.12},
Expand Down
16 changes: 14 additions & 2 deletions src/ragbuilder/executor.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
RUN_CONFIG_MAX_RETRIES = int(os.getenv('RUN_CONFIG_MAX_RETRIES', '10'))
RUN_CONFIG_IS_ASYNC = os.getenv('RUN_CONFIG_IS_ASYNC', 'true').lower() == 'true'
chat_model = ChatOpenAI(
model="gpt-3.5-turbo-0125",
model="gpt-4o-mini",
temperature=0.2,
verbose=True
)
Expand All @@ -53,7 +53,19 @@
import dotenv
from langchain_community.document_loaders import *
from langchain_text_splitters import *
from langchain.retrievers import *
from langchain_community.retrievers import AmazonKendraRetriever
from langchain.retrievers import (
ContextualCompressionRetriever,
EnsembleRetriever,
MergerRetriever,
MultiQueryRetriever,
MultiVectorRetriever,
ParentDocumentRetriever,
RePhraseQueryRetriever,
SelfQueryRetriever,
TimeWeightedVectorStoreRetriever
)

from langchain.retrievers.document_compressors import *
from langchain_community.document_transformers import *
from langchain.retrievers.multi_query import *
Expand Down
2 changes: 1 addition & 1 deletion src/ragbuilder/langchain_module/rag/test_codegen.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ def format_docs(docs):



from langchain.retrievers import BM25Retriever
from langchain_community.retrievers import BM25Retriever

from langchain.retrievers import ContextualCompressionRetriever

Expand Down
10 changes: 4 additions & 6 deletions src/ragbuilder/langchain_module/retriever/retriever.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@
from langchain_community.cross_encoders import HuggingFaceCrossEncoder

from langchain.retrievers.multi_query import MultiQueryRetriever
from langchain.retrievers import (
ContextualCompressionRetriever,
ParentDocumentRetriever,
BM25Retriever
)
from langchain.retrievers import ContextualCompressionRetriever, ParentDocumentRetriever
from langchain_community.retrievers import BM25Retriever

from langchain.storage import InMemoryStore
from langchain.retrievers.document_compressors import *

Expand Down Expand Up @@ -81,7 +79,7 @@ def getRetriever(**kwargs):
elif retriever_type == "bm25Retriever":
logger.info("BM25Retriever Retriever Invoked")
code_string= f"""retriever=BM25Retriever.from_documents(docs)"""
import_string = f"""from langchain.retrievers import BM25Retriever"""
import_string = f"""from langchain_community.retrievers import BM25Retriever"""
return {'code_string':code_string,'import_string':import_string}

else:
Expand Down

0 comments on commit 0b19dfb

Please sign in to comment.