revert astra package and upgrade langchain (#320)

Author: nicoloboschi

.snyk

@@ -4,7 +4,16 @@ version: v1.25.0
 ignore:
   SNYK-PYTHON-LLAMAINDEX-5843542:
     - '*':
-        reason: False positive, fixed by https://github.com/run-llama/llama_index/pull/8890
+        reason: >-
+          False positive, fixed by
+          https://github.com/run-llama/llama_index/pull/8890
         expires: 2025-01-31T15:54:04.149Z
         created: 2023-12-11T15:54:04.157Z
+  SNYK-PYTHON-LLAMAINDEX-6184684:
+    - '*':
+        reason: >-
+          False positive, fixed by
+          https://github.com/run-llama/llama_index/pull/8890
+        expires: 2025-01-31T15:54:04.149Z
+        created: 2024-03-13T10:14:18.712Z
 patch: {}

pyproject.toml

@@ -13,17 +13,16 @@ packages = [{ include = "ragstack" }]
 python = ">=3.9,<3.12"
 astrapy = "~0.7.0"
 cassio = "~0.1.3"
-unstructured = "0.12.5"
+unstructured = { version = "0.12.5" }
 llama-index = { version = "0.9.48", extras = ["langchain"] }
-llama-parse = "0.1.4"
-langchain = "0.1.4"
-langchain-astradb = "0.0.1"
-langchain-core = "0.1.16"
-langchain-community = "0.0.16"
-langchain-openai = "0.0.3"
-langchain-google-genai = { version = "0.0.6", optional = true }
-langchain-google-vertexai = { version = "0.0.3", optional = true }
-langchain-nvidia-ai-endpoints = { version = "0.0.1", optional = true }
+llama-parse = { version = "0.1.4" }
+langchain = "0.1.12"
+langchain-core = "0.1.31"
+langchain-community = "0.0.28"
+langchain-openai = "0.0.8"
+langchain-google-genai = { version = "0.0.9", optional = true }
+langchain-google-vertexai = { version = "0.1.0", optional = true }
+langchain-nvidia-ai-endpoints = { version = "0.0.3", optional = true }
 
 [tool.poetry.extras]
 langchain-google = ["langchain-google-genai", "langchain-google-vertexai"]

ragstack-e2e-tests/pyproject.langchain.toml

@@ -27,9 +27,8 @@ beautifulsoup4 = "^4"
 langchain = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/langchain", extras = [
     "openai",
 ] }
-langchain-astradb = { git = "https://github.com/langchain-ai/langchain-datastax.git", branch = "main", subdirectory = "libs/astradb" }
-langchain-core = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/core" }
-langchain-community = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/community" }
+langchain_core = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/core" }
+langchain_community = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/community" }
 langchain-openai = { git = "https://github.com/langchain-ai/langchain.git", branch = "master", subdirectory = "libs/partners/openai" }
 langchain-google-genai = { git = "https://github.com/langchain-ai/langchain-google.git", branch = "main", subdirectory = "libs/genai" }
 langchain-google-vertexai = { git = "https://github.com/langchain-ai/langchain-google.git", branch = "main", subdirectory = "libs/vertexai" }

ragstack-e2e-tests/pyproject.llamaindex.toml

@@ -41,18 +41,17 @@ llama-index-multi-modal-llms-gemini = { git = "https://github.com/run-llama/llam
 
 llama-parse = { git = "https://github.com/run-llama/llama_parse.git", branch = "main" }
 
-langchain = "0.1.2"
-langchain-astradb = "0.0.1"
-langchain-core = "0.1.15"
-langchain-community = "0.0.15"
-langchain-openai = "0.0.3"
-langchain-google-genai = "0.0.6"
-langchain-google-vertexai = "0.0.3"
-langchain-nvidia-ai-endpoints = "0.0.1"
+langchain = "0.1.12"
+langchain-core = "0.1.31"
+langchain-community = "0.0.28"
+langchain-openai = "0.0.8"
+langchain-google-genai = "0.0.9"
+langchain-google-vertexai = "0.1.0"
+langchain-nvidia-ai-endpoints = "0.0.3"
 astrapy = "~0.7.0"
 # we need this specific feature from cassio: https://github.com/CassioML/cassio/pull/128
 cassio = "~0.1.4"
-unstructured = "0.12.5"
+unstructured = { version = "0.12.5" }
 
 [build-system]
 requires = ["poetry-core"]

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

@@ -28,9 +28,6 @@ beautifulsoup4 = "^4"
 # we need this specific feature from cassio: https://github.com/CassioML/cassio/pull/128
 cassio = "~0.1.4"
 
-# Remove when langchain-astradb is part of ragstack-ai package
-langchain-astradb = "0.0.1"
-
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

tests/unit-tests/test_ragstack.py

@@ -2,7 +2,6 @@ def test_import():
     from llama_index.vector_stores import AstraDBVectorStore  # noqa
     from llama_index.vector_stores import CassandraVectorStore  # noqa
     from langchain.vectorstores import AstraDB  # noqa
-    from langchain_astradb import AstraDBVectorStore  # noqa
     import langchain_core  # noqa
     import langsmith  # noqa
     import astrapy  # noqa