Modularize with extras

datastax · Dec 4, 2023 · 4e94a90 · 4e94a90
1 parent 0936ed8
commit 4e94a90
Show file tree

Hide file tree

Showing 20 changed files with 11 additions and 4,640 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -33,15 +33,7 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           python -m pip install poetry
-          poetry install --no-root
-
-      - name: Run ragstack-ai-langchain unit tests
-        run: |
-          poetry run tox -c libs/ragstack-ai-langchain
-
-      - name: Run ragstack-ai-llamaindex unit tests
-        run: |
-          poetry run tox -c libs/ragstack-ai-llamaindex
+          poetry install --no-root --all-extras
 
       - name: Run ragstack-ai unit tests
         run: |

diff --git a/.github/workflows/release-ragstack-langchain.yml b/.github/workflows/release-ragstack-langchain.yml
diff --git a/.github/workflows/release-ragstack-llamaindex.yml b/.github/workflows/release-ragstack-llamaindex.yml
diff --git a/libs/ragstack-ai-langchain/README.md b/libs/ragstack-ai-langchain/README.md
diff --git a/libs/ragstack-ai-langchain/poetry.lock b/libs/ragstack-ai-langchain/poetry.lock
diff --git a/libs/ragstack-ai-langchain/pyproject.toml b/libs/ragstack-ai-langchain/pyproject.toml
diff --git a/libs/ragstack-ai-langchain/ragstack_ai_langchain/__init__.py b/libs/ragstack-ai-langchain/ragstack_ai_langchain/__init__.py
diff --git a/libs/ragstack-ai-langchain/tests/__init__.py b/libs/ragstack-ai-langchain/tests/__init__.py
diff --git a/libs/ragstack-ai-langchain/tests/test_ragstack.py b/libs/ragstack-ai-langchain/tests/test_ragstack.py
diff --git a/libs/ragstack-ai-langchain/tox.ini b/libs/ragstack-ai-langchain/tox.ini
diff --git a/libs/ragstack-ai-llamaindex/README.md b/libs/ragstack-ai-llamaindex/README.md
diff --git a/libs/ragstack-ai-llamaindex/poetry.lock b/libs/ragstack-ai-llamaindex/poetry.lock
diff --git a/libs/ragstack-ai-llamaindex/pyproject.toml b/libs/ragstack-ai-llamaindex/pyproject.toml
diff --git a/libs/ragstack-ai-llamaindex/ragstack_ai_llamaindex/__init__.py b/libs/ragstack-ai-llamaindex/ragstack_ai_llamaindex/__init__.py
diff --git a/libs/ragstack-ai-llamaindex/tests/__init__.py b/libs/ragstack-ai-llamaindex/tests/__init__.py
diff --git a/libs/ragstack-ai-llamaindex/tests/test_ragstack_llamaindex.py b/libs/ragstack-ai-llamaindex/tests/test_ragstack_llamaindex.py
diff --git a/libs/ragstack-ai-llamaindex/tox.ini b/libs/ragstack-ai-llamaindex/tox.ini
diff --git a/pyproject.toml b/pyproject.toml
@@ -11,14 +11,21 @@ packages = [
 
 [tool.poetry.dependencies]
 python = ">=3.9,<3.12"
-ragstack-ai-langchain = { path = "libs/ragstack-ai-langchain", develop = true }
-ragstack-ai-llamaindex = { path = "libs/ragstack-ai-llamaindex", develop = true }
+astrapy = "~0.6.2"
+cassio = "~0.1.3"
+unstructured = { version = "^0.10", optional = true }
+langchain = { version = "0.0.343", extras = ["openai"], optional = true }
+llama-index = { version = "0.9.11", optional = true }
 
 [tool.poetry.group.test.dependencies]
 pytest = "*"
 nbmake = "*"
 tox = "*"
 
+[tool.poetry.extras]
+langchain = ["langchain", "unstructured"]
+llama-index = ["llama-index"]
+
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

diff --git a/ragstack-e2e-tests/pyproject.toml b/ragstack-e2e-tests/pyproject.toml
@@ -19,7 +19,7 @@ huggingface-hub = "^0.19.4"
 # From LangChain optional deps, needed by WebBaseLoader
 beautifulsoup4 = "^4"
 
-ragstack-ai = { path = "../", develop = false }
+ragstack-ai = { path = "../", extras = ["langchain"], develop = false }
 
 [build-system]
 requires = ["poetry-core"]

diff --git a/tests/unit-tests/test_ragstack.py b/tests/unit-tests/test_ragstack.py
@@ -1,6 +1,4 @@
 def test_import():
-    from ragstack_ai_langchain import __version__  # noqa
-    from ragstack_ai_llamaindex import __version__  # noqa
     from llama_index.vector_stores import AstraDBVectorStore, CassandraVectorStore  # noqa
     from langchain.vectorstores import AstraDB  # noqa
     import langchain_core  # noqa