Skip to content

Commit f116dcb

Browse files
authored
Bump LangChain to 0.1.4 and add some extras (#204)
1 parent 1109776 commit f116dcb

File tree

5 files changed

+27
-16
lines changed

5 files changed

+27
-16
lines changed

pyproject.toml

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,17 @@ astrapy = "~0.7.0"
1515
cassio = "~0.1.3"
1616
unstructured = "^0.10"
1717
llama-index = { version = "0.9.34", extras = ["langchain"] }
18-
langchain = { version = "0.0.354", extras = ["openai"] }
19-
langchain-core = "0.1.9"
20-
langchain-community = "0.0.11"
18+
langchain = {version = "0.1.4"}
19+
langchain-core = "0.1.16"
20+
langchain-community = "0.0.16"
21+
langchain-openai = {version = "0.0.3"}
22+
langchain-google-genai = {version = "0.0.6", optional = true}
23+
langchain-google-vertexai = {version = "0.0.3", optional = true}
24+
langchain-nvidia-ai-endpoints = {version = "0.0.1", optional = true}
25+
26+
[tool.poetry.extras]
27+
langchain-google = ["langchain-google-genai", "langchain-google-vertexai"]
28+
langchain-nvidia = ["langchain-nvidia-ai-endpoints"]
2129

2230
[tool.poetry.group.test.dependencies]
2331
pytest = "*"

ragstack-e2e-tests/benchmarks/testcases.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,9 @@ def embeddings_batch100_chunk512(embeddings_fn):
9999

100100

101101
def openai_ada002(batch_size):
102-
return OpenAIEmbeddings(chunk_size=batch_size, api_key=os.environ.get("OPEN_AI_KEY"))
102+
return OpenAIEmbeddings(
103+
chunk_size=batch_size, api_key=os.environ.get("OPEN_AI_KEY")
104+
)
103105

104106

105107
def nvidia_nvolveqa40k(batch_size):

ragstack-e2e-tests/pyproject.langchain.toml

Lines changed: 4 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.19.4"
2018
azure-storage-blob = "^12.19.0"
@@ -28,6 +26,10 @@ beautifulsoup4 = "^4"
2826
langchain = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/langchain", extras = ["openai"] }
2927
langchain_core = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/core" }
3028
langchain_community = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/community" }
29+
langchain-openai = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/partners/openai" }
30+
langchain-google-genai = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/partners/google-genai" }
31+
langchain-google-vertexai = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/partners/google-vertexai" }
32+
langchain-nvidia-ai-endpoints = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/partners/nvidia-ai-endpoints" }
3133
llama-index = { version = "0.9.34", extras = ["langchain"] }
3234
astrapy = "~0.7.0"
3335
# we need this specific feature from cassio: https://github.com/CassioML/cassio/pull/128

ragstack-e2e-tests/pyproject.llamaindex.toml

Lines changed: 7 additions & 5 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.19.4"
2018
azure-storage-blob = "^12.19.0"
@@ -27,9 +25,13 @@ beautifulsoup4 = "^4"
2725

2826
llama-index = { git = "https://github.com/run-llama/llama_index.git", branch = "main" }
2927

30-
langchain = { version = "0.0.354", extras = ["openai"] }
31-
langchain-core = "0.1.9"
32-
langchain-community = "0.0.11"
28+
langchain = {version = "0.1.2"}
29+
langchain-core = "0.1.15"
30+
langchain-community = "0.0.15"
31+
langchain-openai = {version = "0.0.3"}
32+
langchain-google-genai = {version = "0.0.6", optional = true}
33+
langchain-google-vertexai = {version = "0.0.3", optional = true}
34+
langchain-nvidia-ai-endpoints = {version = "0.0.1", optional = true}
3335
astrapy = "~0.7.0"
3436
# we need this specific feature from cassio: https://github.com/CassioML/cassio/pull/128
3537
cassio = "~0.1.4"

ragstack-e2e-tests/pyproject.toml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@ python = ">=3.9,<3.12,!=3.9.7"
1414
pytest = "*"
1515
black = "*"
1616
ruff = "*"
17-
google-cloud-aiplatform = "^1.36.4"
18-
langchain-google-genai = "^0.0.4"
19-
langchain-nvidia-ai-endpoints = "^0.0.1"
20-
boto3 = "^1.29.6"
17+
boto3 = "^1.34.21"
2118
huggingface-hub = "^0.19.4"
2219
azure-storage-blob = "^12.19.0"
2320
pillow = "^10.2.0"
@@ -27,7 +24,7 @@ python-dotenv = "^1.0.1"
2724
# From LangChain optional deps, needed by WebBaseLoader
2825
beautifulsoup4 = "^4"
2926

30-
ragstack-ai = { path = "../", develop = false }
27+
ragstack-ai = { path = "../", develop = false, extras = ["langchain-google", "langchain-nvidia"]}
3128
# we need this specific feature from cassio: https://github.com/CassioML/cassio/pull/128
3229
cassio = "~0.1.4"
3330

0 commit comments

Comments
 (0)