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

move to yarn 4.x #12

Merged
merged 46 commits into from
Apr 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
bfed3fc
move to yarn 3.x
nicoloboschi Apr 3, 2024
0d515d6
move to yarn 3.x
nicoloboschi Apr 3, 2024
caca550
move to yarn 3.x
nicoloboschi Apr 3, 2024
27b95f7
move to yarn 3.x
nicoloboschi Apr 3, 2024
e299e77
move to yarn 3.x
nicoloboschi Apr 3, 2024
6512612
move to yarn 3.x
nicoloboschi Apr 3, 2024
2e8b4b0
move to yarn 3.x
nicoloboschi Apr 3, 2024
6ea1151
move to yarn 3.x
nicoloboschi Apr 3, 2024
b113bef
move to yarn 3.x
nicoloboschi Apr 3, 2024
1a3fd9a
move to yarn 3.x
nicoloboschi Apr 3, 2024
eae3964
move to yarn 3.x
nicoloboschi Apr 3, 2024
94b3fca
move to yarn 3.x
nicoloboschi Apr 3, 2024
9cfccfc
move to yarn 3.x
nicoloboschi Apr 3, 2024
edaa69a
move to yarn 3.x
nicoloboschi Apr 3, 2024
ce4ed4b
move to yarn 3.x
nicoloboschi Apr 3, 2024
c2c8fea
move to yarn 3.x
nicoloboschi Apr 3, 2024
9928cf1
move to yarn 3.x
nicoloboschi Apr 3, 2024
9fa594f
move to yarn 3.x
nicoloboschi Apr 3, 2024
3f35950
move to yarn 3.x
nicoloboschi Apr 3, 2024
dc00261
move to yarn 3.x
nicoloboschi Apr 3, 2024
3a57120
move to yarn 3.x
nicoloboschi Apr 3, 2024
3a51735
move to yarn 3.x
nicoloboschi Apr 3, 2024
2bea4cd
move to yarn 3.x
nicoloboschi Apr 3, 2024
08c1a1e
move to yarn 3.x
nicoloboschi Apr 3, 2024
b5cf37e
move to yarn 3.x
nicoloboschi Apr 3, 2024
afa8fad
move to yarn 3.x
nicoloboschi Apr 3, 2024
d92ea4f
move to yarn 3.x
nicoloboschi Apr 3, 2024
ab5488d
move to yarn 3.x
nicoloboschi Apr 3, 2024
e5667d1
move to yarn 3.x
nicoloboschi Apr 3, 2024
7a95ee8
move to yarn 3.x
nicoloboschi Apr 3, 2024
4c69269
move to yarn 3.x
nicoloboschi Apr 3, 2024
e4c6ef6
move to yarn 3.x
nicoloboschi Apr 3, 2024
34eaaaf
fix
nicoloboschi Apr 3, 2024
cc02cb0
fix
nicoloboschi Apr 3, 2024
b426e1e
fix
nicoloboschi Apr 3, 2024
5f2426f
fix
nicoloboschi Apr 3, 2024
b2829c0
fix
nicoloboschi Apr 3, 2024
89eadcb
fix
nicoloboschi Apr 3, 2024
5874e3c
fix
nicoloboschi Apr 3, 2024
918bd73
fix
nicoloboschi Apr 3, 2024
ef6404e
fix
nicoloboschi Apr 3, 2024
5a708cd
fix
nicoloboschi Apr 3, 2024
ee77ac1
fix
nicoloboschi Apr 3, 2024
c004455
fix
nicoloboschi Apr 3, 2024
a113674
fix
nicoloboschi Apr 3, 2024
935d15d
fix
nicoloboschi Apr 3, 2024
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
20 changes: 17 additions & 3 deletions .github/actions/setup-node/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,29 @@ description: Setup Node and tools

inputs:
node-version:
default: "20"
# 18 is the minimum supported
default: "20.x"
description: "Node version"
runs:
using: "composite"
steps:
- uses: actions/setup-node@v4
- name: Enable Corepack before setting up Node
run: |
corepack enable
shell: bash
- name: Install node
uses: actions/setup-node@v4
with:
node-version: ${{ inputs.node-version }}
- shell: bash
- name: Check versions
shell: bash
run: |
node --version
yarn --version
yarn set version 4.1.1 --yarn-path
rm -rf package.json
yarn --version




3 changes: 2 additions & 1 deletion .github/workflows/_run_e2e_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,10 @@ jobs:
UNSTRUCTURED_API_KEY: "${{ secrets.E2E_TESTS_UNSTRUCTURED_API_KEY }}"
UNSTRUCTURED_API_URL: "${{ secrets.E2E_TESTS_UNSTRUCTURED_API_URL }}"
run: |
export YARN_ENABLE_HARDENED_MODE=0
if [ "${{ inputs.suite-name == 'ragstack' }}" == "true" ]; then
cd ragstack-ai-ts-e2e-tests
yarn install --immutable
YARN_ENABLE_HARDENED_MODE=0 yarn install
yarn run test
elif [ "${{ inputs.suite-name == 'langchain' }}" == "true" ]; then
cd ragstack-ai-ts-e2e-tests
Expand Down
20 changes: 12 additions & 8 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,22 @@ jobs:
is-scheduled: ${{ github.event_name == 'schedule' || github.event_name == 'workflow_dispatch' }}
steps:
- uses: actions/checkout@v4
- name: Lint
- name: "Setup: Node"
uses: ./.github/actions/setup-node
- name: Install and run unit tests
run: |
cd ragstack-ai-ts
yarn install --immutable
yarn install
yarn run lint
cd ../ragstack-ai-ts-e2e-tests
yarn install --immutable
yarn run lint
- name: Unit tests
run: |
cd ragstack-ai-ts
yarn run test
- name: Install E2E tests
run: |
pwd
git status
cd ragstack-ai-ts-e2e-tests
export YARN_ENABLE_HARDENED_MODE=0
yarn install
yarn run lint
- uses: dorny/paths-filter@v2
id: filter
with:
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/release-ragstack.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,11 @@ jobs:
run: |
cd ragstack-ai-ts
yarn install --immutable
- run: yarn npm publish
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: "Release package"
run: |
cd ragstack-ai-ts
yarn config set npmAuthToken "${{ secrets.NPM_TOKEN }}"
yarn run release:publish

- name: Create GitHub Release
uses: ncipollo/release-action@v1
Expand Down
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,6 @@ creds.json
.DS_Store
build.zip

yarn.lock
package-lock.json

junit.xml
Expand Down
14 changes: 1 addition & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,21 +1,9 @@
# RAGStack TS
[![Release Notes](https://img.shields.io/github/v/release/datastax/ragstack-ai-ts.svg)](https://github.com/datastax/ragstack-ai/releases)
![npm](https://img.shields.io/npm/dm/@datastax/ragstack-ai-ts)
[![License: Business Source License](https://img.shields.io/badge/License-BSL-yellow.svg)](https://github.com/datastax/ragstack-ai/blob/main/LICENSE.txt)
[![GitHub star chart](https://img.shields.io/github/stars/datastax/ragstack-ai-ts?style=social)](https://star-history.com/#datastax/ragstack-ai)
[![Tests Dashboard](https://img.shields.io/badge/Tests%20Dashboard-333)](https://ragstack-ai.testspace.com)
# RAGStack (TS)

[RAGStack](https://www.datastax.com/products/ragstack) is an out-of-the-box solution simplifying Retrieval Augmented Generation (RAG) in GenAI apps.

Looking for the Python version? Check out [ragstack](https://github.com/datastax/ragstack-ai).


RAGStack includes the best open-source for implementing RAG, giving developers a comprehensive Gen AI Stack leveraging [LangChainJS](https://github.com/langchain-ai/langchainjs) and more. RAGStack leverages the LangChain ecosystem and is fully compatible with LangSmith for monitoring your AI deployments.

For each open-source project included in RAGStack, we select a version lineup and then test the combination for compatibility, performance, and security. Our extensive test suite ensures that RAGStack components work well together so you can confidently deploy them in production.

RAGStack uses the [Astra DB Serverless (Vector) database](https://docs.datastax.com/en/astra/astra-db-vector/get-started/quickstart.html), which provides a highly performant and scalable vector store for RAG workloads like question answering, semantic search, and semantic caching.

## Quick Install

- Yarn
Expand Down
2 changes: 1 addition & 1 deletion ragstack-ai-ts-e2e-tests/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodeLinker: node-modules
enableHardenedMode: false
1 change: 0 additions & 1 deletion ragstack-ai-ts-e2e-tests/README.md

This file was deleted.

4 changes: 2 additions & 2 deletions ragstack-ai-ts-e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
"node": ">=18"
},
"dependencies": {
"@datastax/ragstack-ai-ts": "../ragstack-ai-ts"
"@datastax/ragstack-ai-ts": "file:../ragstack-ai-ts"
},
"scripts": {
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "cross-env NODE_OPTIONS=--experimental-vm-modules jest"
},
"devDependencies": {
"@langchain/google-genai": "*",
"@aws-crypto/sha256-js": "^5.2.0",
"@aws-sdk/client-bedrock-runtime": "^3.525.0",
"@aws-sdk/client-s3": "^3.525.0",
"@aws-sdk/credential-provider-node": "^3.525.0",
"@aws-sdk/types": "^3.523.0",
"@azure/storage-blob": "^12.17.0",
"@jest/globals": "^29.7.0",
"@langchain/google-genai": "*",
"@smithy/eventstream-codec": "^2.1.3",
"@smithy/protocol-http": "^3.2.1",
"@smithy/signature-v4": "^2.1.3",
Expand Down
2 changes: 1 addition & 1 deletion ragstack-ai-ts/.yarnrc.yml
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nodeLinker: node-modules
npmAuthToken: ""
32 changes: 32 additions & 0 deletions ragstack-ai-ts/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# RAGStack (TS)
[![Release Notes](https://img.shields.io/github/v/release/datastax/ragstack-ai-ts.svg)](https://github.com/datastax/ragstack-ai-ts/releases)
![npm](https://img.shields.io/npm/dm/@datastax/ragstack-ai-ts)
[![License: Business Source License](https://img.shields.io/badge/License-BSL-yellow.svg)](https://github.com/datastax/ragstack-ai/blob/main/LICENSE.txt)
[![GitHub star chart](https://img.shields.io/github/stars/datastax/ragstack-ai-ts?style=social)](https://star-history.com/#datastax/ragstack-ai-ts)
[![Tests Dashboard](https://img.shields.io/badge/Tests%20Dashboard-333)](https://ragstack-ai.testspace.com)

[RAGStack](https://www.datastax.com/products/ragstack) is an out-of-the-box solution simplifying Retrieval Augmented Generation (RAG) in GenAI apps.

Looking for the Python version? Check out [ragstack](https://github.com/datastax/ragstack-ai).


RAGStack includes the best open-source for implementing RAG, giving developers a comprehensive Gen AI Stack leveraging [LangChainJS](https://github.com/langchain-ai/langchainjs) and more. RAGStack leverages the LangChain ecosystem and is fully compatible with LangSmith for monitoring your AI deployments.

For each open-source project included in RAGStack, we select a version lineup and then test the combination for compatibility, performance, and security. Our extensive test suite ensures that RAGStack components work well together so you can confidently deploy them in production.

RAGStack uses the [Astra DB Serverless (Vector) database](https://docs.datastax.com/en/astra/astra-db-vector/get-started/quickstart.html), which provides a highly performant and scalable vector store for RAG workloads like question answering, semantic search, and semantic caching.

## Quick Install

- Yarn
```bash
yarn add @datastax/ragstack-ai-ts
```
- NPM
```bash
npm install @datastax/ragstack-ai-ts
```

## Documentation

[DataStax RAGStack Documentation](https://docs.datastax.com/en/ragstack/docs/index.html)
19 changes: 14 additions & 5 deletions ragstack-ai-ts/package.json
Original file line number Diff line number Diff line change
@@ -1,12 +1,20 @@
{
"name": "@datastax/ragstack-ai-ts",
"description": "DataStax RAGStack TS",
"version": "0.1.0",
"version": "0.1.1",
"license": "BUSL-1.1",
"readme": "../README.md",
"author": {
"name": "DataStax"
},
"keywords": [
"llm",
"ai",
"rag",
"chain",
"embeddings",
"vectorstores",
"astradb"
],
"engines": {
"node": ">=18"
},
Expand All @@ -23,7 +31,9 @@
"scripts": {
"lint": "eslint .",
"lint:fix": "eslint --fix .",
"test": "jest"
"test": "jest",
"release:set-version": "yarn -v && yarn version $NEW_VERSION",
"release:publish": "yarn -v && yarn npm publish --access public"
},
"devDependencies": {
"@babel/core": "^7.23.9",
Expand All @@ -43,6 +53,5 @@
"turbo": "^1.12.4",
"typescript": "^5.3.3",
"typescript-eslint": "^7.0.2"
},
"packageManager": "yarn@0.1.0"
}
}
Loading
Loading