Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include ragstack-langchain, ragstack-langserve and ragstack-langsmith modules in the package #8

Merged
merged 1 commit into from
Nov 11, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -12,6 +12,17 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3

- name: Add SSH private keys for submodule repositories
uses: webfactory/ssh-agent@v0.8.0
with:
ssh-private-key: |
${{ secrets.SSH_PRIVATE_KEY_LANGCHAIN_SUBMODULE }}
${{ secrets.SSH_PRIVATE_KEY_LANGSERVE_SUBMODULE }}
${{ secrets.SSH_PRIVATE_KEY_LANGSMITH_SUBMODULE }}

- name: Update submodules
run: git submodule update --init --recursive

- name: 'Setup: Python 3.11'
uses: actions/setup-python@v4
with:
11 changes: 11 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -11,6 +11,17 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3

- name: Add SSH private keys for submodule repositories
uses: webfactory/ssh-agent@v0.8.0
with:
ssh-private-key: |
${{ secrets.SSH_PRIVATE_KEY_LANGCHAIN_SUBMODULE }}
${{ secrets.SSH_PRIVATE_KEY_LANGSERVE_SUBMODULE }}
${{ secrets.SSH_PRIVATE_KEY_LANGSMITH_SUBMODULE }}

- name: Update submodules
run: git submodule update --init --recursive

- name: 'Setup: Python 3.11'
uses: actions/setup-python@v4
with:
11 changes: 11 additions & 0 deletions .github/workflows/test-release.yml
Original file line number Diff line number Diff line change
@@ -11,6 +11,17 @@ jobs:
- name: Check out the repo
uses: actions/checkout@v3

- name: Add SSH private keys for submodule repositories
uses: webfactory/ssh-agent@v0.8.0
with:
ssh-private-key: |
${{ secrets.SSH_PRIVATE_KEY_LANGCHAIN_SUBMODULE }}
${{ secrets.SSH_PRIVATE_KEY_LANGSERVE_SUBMODULE }}
${{ secrets.SSH_PRIVATE_KEY_LANGSMITH_SUBMODULE }}

- name: Update submodules
run: git submodule update --init --recursive

- name: 'Setup: Python 3.11'
uses: actions/setup-python@v4
with:
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
[submodule "ragstack-langchain"]
path = ragstack-langchain
url = https://github.com/riptano/ragstack-langchain.git
[submodule "ragstack-langsmith"]
path = ragstack-langsmith
url = https://github.com/riptano/ragstack-langsmith.git
[submodule "ragstack-langserve"]
path = ragstack-langserve
url = https://github.com/riptano/ragstack-langserve.git
516 changes: 428 additions & 88 deletions poetry.lock

Large diffs are not rendered by default.

37 changes: 34 additions & 3 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -5,12 +5,43 @@ description = "RAGStack"
license = "Apache-2.0"
authors = ["DataStax"]
readme = "README.md"
packages = [{include = "ragstack"}]
packages = [
{include = "ragstack"},
{include = "langchain", from = "ragstack-langchain/libs/langchain"},
{include = "langsmith", from = "ragstack-langsmith/python"},
{include = "langserve", from = "ragstack-langserve"}
]
exclude = ["ragstack-langserve/langserve/playground"]
include = ["ragstack-langserve/langserve/playground/dist/**/*"]

[tool.poetry.dependencies]
python = ">=3.9,<4.0"
ragstack-ai-langchain = { version = "0.0.1a2", extras = ["openai"] }
ragstack-ai-langserve = "0.0.1a2"
astrapy = "0.5.8"

# Common LangChain/LangSmith/LangServe dependencies
pydantic = ">=1,<3"
requests = "^2"

# Langchain non-optional dependencies
SQLAlchemy = ">=1.4,<3"
PyYAML = ">=5.3"
numpy = "^1"
dataclasses-json = ">= 0.5.7, < 0.7"
tenacity = "^8.1.0"
aiohttp = "^3.8.3"
async-timeout = {version = "^4.0.0", python = "<3.11"}
anyio = "<4.0"
jsonpatch = "^1.33"

# LangChain openai extra-dependencies
openai = "^0"
tiktoken = ">=0.3.2,<0.6.0"

# LangSmith dependencies
pytest-subtests = "^0.11.0"

# LangServe non-optional dependencies
httpx = ">=0.23.0" # May be able to decrease this version

[tool.poetry.group.test.dependencies]
pytest = "*"
1 change: 1 addition & 0 deletions ragstack-langchain
Submodule ragstack-langchain added at 6fa19e
1 change: 1 addition & 0 deletions ragstack-langserve
Submodule ragstack-langserve added at 81c6ec
1 change: 1 addition & 0 deletions ragstack-langsmith
Submodule ragstack-langsmith added at abd249