Skip to content

Commit e6f39a9

Browse files
committed
simplify langchain import error handling
1 parent e6c9478 commit e6f39a9

File tree

3 files changed

+18
-33
lines changed

3 files changed

+18
-33
lines changed

examples/configs/rag/multi_kb/config.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,12 @@
2727
from langchain.embeddings import HuggingFaceEmbeddings
2828
from langchain.text_splitter import CharacterTextSplitter
2929
from langchain.vectorstores import FAISS
30-
except ImportError:
31-
try:
32-
from langchain_classic.chains import RetrievalQA
33-
from langchain_classic.embeddings import HuggingFaceEmbeddings
34-
from langchain_classic.text_splitter import CharacterTextSplitter
35-
from langchain_classic.vectorstores import FAISS
36-
except ImportError as second_error:
37-
raise ImportError(
38-
f"Failed to import required LangChain modules. "
39-
f"If you're using LangChain >= 1.0.0, ensure langchain-classic and langchain-text-splitters is installed. "
40-
f"Original error: {second_error}"
41-
) from second_error
30+
except ImportError as e:
31+
raise ImportError(
32+
"Failed to import required LangChain modules. "
33+
"Ensure you have installed the correct version of langchain and its dependencies. "
34+
f"Original error: {e}"
35+
) from e
4236

4337
from langchain_core.language_models.llms import BaseLLM
4438
from transformers import AutoModelForCausalLM, AutoTokenizer, pipeline

examples/configs/rag/pinecone/config.py

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,12 @@
2323
from langchain.chains import RetrievalQA
2424
from langchain.embeddings.openai import OpenAIEmbeddings
2525
from langchain.vectorstores import Pinecone
26-
except ImportError:
27-
try:
28-
from langchain_classic.chains import RetrievalQA
29-
from langchain_classic.embeddings.openai import OpenAIEmbeddings
30-
from langchain_classic.vectorstores import Pinecone
31-
except ImportError as second_error:
32-
raise ImportError(
33-
f"Failed to import required LangChain modules. "
34-
f"If you're using LangChain >= 1.0.0, ensure langchain-classic is installed. "
35-
f"Original error: {second_error}"
36-
) from second_error
26+
except ImportError as e:
27+
raise ImportError(
28+
"Failed to import required LangChain modules. "
29+
"Ensure you have installed the correct version of langchain and its dependencies. "
30+
f"Original error: {e}"
31+
) from e
3732

3833
from langchain_core.language_models import BaseLLM
3934

@@ -44,7 +39,6 @@
4439

4540
OPENAI_API_KEY = os.environ.get("OPENAI_API_KEY")
4641
PINECONE_API_KEY = os.environ.get("PINECONE_API_KEY")
47-
PINECONE_ENVIRONMENT = os.environ.get("PINECONE_ENVIRONMENT")
4842
index_name = "nemoguardrailsindex"
4943

5044
LOG_FILENAME = datetime.now().strftime("logs/mylogfile_%H_%M_%d_%m_%Y.log")

examples/scripts/langchain/experiments.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,12 @@
1717

1818
try:
1919
from langchain.chains import LLMMathChain
20-
except ImportError:
21-
try:
22-
from langchain_classic.chains import LLMMathChain
23-
except ImportError as second_error:
24-
raise ImportError(
25-
f"Failed to import required LangChain modules. "
26-
f"If you're using LangChain >= 1.0.0, ensure langchain-classic is installed. "
27-
f"Original error: {second_error}"
28-
) from second_error
20+
except ImportError as e:
21+
raise ImportError(
22+
"Failed to import required LangChain modules. "
23+
"If you're using LangChain >= 1.0.0, ensure langchain-classic is installed. "
24+
f"Original error: {e}"
25+
) from e
2926

3027
from langchain_core.prompts import ChatPromptTemplate
3128
from langchain_core.tools import Tool

0 commit comments

Comments
 (0)