Skip to content

Commit d0a169a

Browse files
authored
tests: use langchain partners packages instead of community (#324)
1 parent 61550f7 commit d0a169a

File tree

6 files changed

+22
-22
lines changed

6 files changed

+22
-22
lines changed

ragstack-e2e-tests/e2e_tests/langchain/test_compatibility_rag.py

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33

44
import pytest
55
from langchain import callbacks
6+
from langchain_community.chat_models import BedrockChat
7+
from langchain_community.embeddings import (
8+
BedrockEmbeddings,
9+
HuggingFaceInferenceAPIEmbeddings,
10+
)
11+
from langchain_community.llms.huggingface_hub import HuggingFaceHub
12+
from langchain_google_vertexai import ChatVertexAI, VertexAIEmbeddings
13+
from langchain_openai import (
14+
OpenAIEmbeddings,
15+
ChatOpenAI,
16+
AzureChatOpenAI,
17+
AzureOpenAIEmbeddings,
18+
)
619

720
from e2e_tests.conftest import (
821
set_current_test_info,
@@ -17,15 +30,6 @@
1730
from e2e_tests.test_utils import get_local_resource_path
1831
from e2e_tests.langchain.nemo_guardrails import run_nemo_guardrails
1932

20-
from langchain.chat_models import ChatOpenAI, AzureChatOpenAI, ChatVertexAI, BedrockChat
21-
from langchain.embeddings import (
22-
OpenAIEmbeddings,
23-
VertexAIEmbeddings,
24-
BedrockEmbeddings,
25-
HuggingFaceInferenceAPIEmbeddings,
26-
)
27-
from langchain.embeddings.azure_openai import AzureOpenAIEmbeddings
28-
from langchain.llms.huggingface_hub import HuggingFaceHub
2933
from langchain_core.embeddings import Embeddings
3034
from langchain_core.messages import HumanMessage
3135
from langchain_core.prompts import ChatPromptTemplate
@@ -111,7 +115,6 @@ def azure_openai_gpt35turbo_llm():
111115
azure_deployment=get_required_env("AZURE_OPEN_AI_CHAT_MODEL_DEPLOYMENT"),
112116
azure_endpoint=get_required_env("AZURE_OPENAI_ENDPOINT"),
113117
openai_api_key=get_required_env("AZURE_OPENAI_API_KEY"),
114-
openai_api_type="azure",
115118
openai_api_version="2023-07-01-preview",
116119
),
117120
"nemo_config": None,
@@ -129,7 +132,6 @@ def azure_openai_ada002_embedding():
129132
deployment=model_and_deployment,
130133
openai_api_key=get_required_env("AZURE_OPENAI_API_KEY"),
131134
azure_endpoint=get_required_env("AZURE_OPENAI_ENDPOINT"),
132-
openai_api_type="azure",
133135
openai_api_version="2023-05-15",
134136
chunk_size=1,
135137
)

ragstack-e2e-tests/e2e_tests/langchain/test_document_loaders.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
import boto3
99
import pytest
1010
from azure.storage.blob import ContainerClient
11+
from langchain_astradb import AstraDBLoader
12+
1113
from e2e_tests.conftest import set_current_test_info, get_required_env, is_astra
1214

1315
from langchain.document_loaders import CSVLoader, WebBaseLoader, S3DirectoryLoader
14-
from langchain_community.document_loaders import (
15-
AzureBlobStorageContainerLoader,
16-
AstraDBLoader,
17-
)
16+
from langchain_community.document_loaders import AzureBlobStorageContainerLoader
1817

1918
from e2e_tests.test_utils.astradb_vector_store_handler import AstraDBVectorStoreHandler
2019
from e2e_tests.test_utils.vector_store_handler import VectorStoreImplementation
@@ -161,7 +160,7 @@ def test_astradb_loader() -> None:
161160
projection={"foo": 1},
162161
find_options={"limit": 22},
163162
filter_criteria={"foo": "bar"},
164-
extraction_function=lambda r: "Payload: " + json.dumps(r),
163+
page_content_mapper=lambda r: "Payload: " + json.dumps(r),
165164
)
166165
docs = loader.load()
167166

ragstack-e2e-tests/e2e_tests/langchain_llamaindex/test_astra.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
import langchain_core.documents
44
import pytest
5+
from langchain_openai import OpenAIEmbeddings, ChatOpenAI
6+
57
from e2e_tests.conftest import get_required_env, is_astra
68
from langchain.chains import ConversationalRetrievalChain
7-
from langchain.chat_models import ChatOpenAI
8-
from langchain.embeddings import OpenAIEmbeddings
99
from langchain_astradb import AstraDBVectorStore as LangChainAstraDBVectorStore
1010

1111
try:

ragstack-e2e-tests/e2e_tests/llama_index/test_compatibility_rag.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
import logging
22

33
import pytest
4-
from langchain.embeddings import VertexAIEmbeddings, HuggingFaceInferenceAPIEmbeddings
4+
from langchain.embeddings import HuggingFaceInferenceAPIEmbeddings
5+
from langchain_google_vertexai import VertexAIEmbeddings
56

67
try:
78
# llamaindex 0.9.x

ragstack-e2e-tests/pyproject.ragstack-ai.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@ pytest = "*"
1313
black = "*"
1414
ruff = "*"
1515
google-cloud-aiplatform = "^1.36.4"
16-
langchain-google-genai = "^0.0.4"
17-
langchain-nvidia-ai-endpoints = "^0.0.1"
1816
boto3 = "^1.29.6"
1917
huggingface-hub = "^0.20.3"
2018
azure-storage-blob = "^12.19.0"

ragstack-e2e-tests/tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ envdir = {toxworkdir}/.ragstack-ai-latest
5656
allowlist_externals = cp
5757
commands =
5858
cp pyproject.ragstack-ai.toml pyproject.toml
59-
poetry add ragstack-ai@latest
59+
poetry add "ragstack-ai@latest" -E langchain-google -E langchain-nvidia
6060
poetry lock
6161
poetry install --no-root
6262
poetry run pytest --disable-warnings --junit-xml=results.xml {posargs:e2e_tests}

0 commit comments

Comments
 (0)