Merge remote-tracking branch 'upstream/main'

.changeset/clever-doors-invite.md

@@ -0,0 +1,5 @@
+---
+"llamaindex": patch
+---
+
+feat: experimental package + json query engine

.changeset/config.json

@@ -1,7 +1,7 @@
 {
  "$schema": "https://unpkg.com/@changesets/[email protected]/schema.json",
  "changelog": "@changesets/cli/changelog",
- "commit": false,
+ "commit": true,
  "fixed": [],
  "linked": [],
  "access": "public",

.changeset/eight-dogs-burn.md

@@ -0,0 +1,12 @@
+---
+"llamaindex": patch
+"@llamaindex/core-test": patch
+---
+
+- Add missing exports:
+ - `IndexStructType`,
+ - `IndexDict`,
+ - `jsonToIndexStruct`,
+ - `IndexList`,
+ - `IndexStruct`
+- Fix `IndexDict.toJson()` method

.changeset/few-chicken-exercise.md

@@ -0,0 +1,5 @@
+---
+"create-llama": patch
+---
+
+Add "Start in VSCode" option to postInstallAction

.changeset/khaki-rivers-unite.md

@@ -0,0 +1,5 @@
+---
+"llamaindex": patch
+---
+
+Add streaming to agents

.changeset/plenty-onions-relate.md

@@ -0,0 +1,5 @@
+---
+"create-llama": patch
+---
+
+Add devcontainers to generated code

.changeset/strange-waves-sit.md

@@ -0,0 +1,5 @@
+---
+"llamaindex": minor
+---
+
+Use parameter object for retrieve function of Retriever (to align usage with query function of QueryEngine)

.cjs.swcrc

@@ -0,0 +1,12 @@
+{
+ "jsc": {
+ "parser": {
+ "syntax": "typescript"
+ },
+ "target": "esnext"
+ },
+ "module": {
+ "type": "commonjs",
+ "ignoreDynamic": true
+ }
+}

.eslintrc.js

@@ -7,4 +7,17 @@ module.exports = {
  rootDir: ["apps/*/"],
  },
  },
+ rules: {
+ "max-params": ["error", 4],
+ "prefer-const": "error",
+ },
+ overrides: [
+ {
+ files: ["examples/**/*.ts"],
+ rules: {
+ "turbo/no-undeclared-env-vars": "off",
+ },
+ },
+ ],
+ ignorePatterns: ["dist/", "lib/"],
 };

.gitattributes

@@ -0,0 +1,2 @@
+examples/readers/data/** binary
+examples/data/** binary

.github/ISSUE_TEMPLATE/bugfix.yml

@@ -1,6 +1,6 @@
 name: Bugfix
 title: ""
-description: Write something like "We notice ... behavior when ... happens instead of ...""
+description: Write something like "We notice ... behavior when ... happens instead of ..." If you would like to use sweep.dev prefix with "Sweep:"
 body:
  - type: textarea
  id: description

.github/workflows/e2e.yml

@@ -0,0 +1,68 @@
+name: E2E Tests
+on:
+ push:
+ branches: [main]
+ pull_request:
+ paths:
+ - "packages/create-llama/**"
+ - ".github/workflows/e2e.yml"
+ branches: [main]
+
+env:
+ POETRY_VERSION: "1.6.1"
+
+jobs:
+ e2e:
+ name: create-llama
+ timeout-minutes: 60
+ strategy:
+ fail-fast: true
+ matrix:
+ node-version: [18, 20]
+ python-version: ["3.11"]
+ os: [macos-latest, windows-latest]
+ defaults:
+ run:
+ shell: bash
+ runs-on: ${{ matrix.os }}
+ steps:
+ - uses: actions/checkout@v4
+ - name: Set up python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ - name: Install Poetry
+ uses: snok/install-poetry@v1
+ with:
+ version: ${{ env.POETRY_VERSION }}
+ - uses: pnpm/action-setup@v2
+ - name: Setup Node.js ${{ matrix.node-version }}
+ uses: actions/setup-node@v4
+ with:
+ node-version: ${{ matrix.node-version }}
+ cache: "pnpm"
+ - name: Install dependencies
+ run: pnpm install
+ - name: Install Playwright Browsers
+ run: pnpm exec playwright install --with-deps
+ working-directory: ./packages/create-llama
+ - name: Build create-llama
+ run: pnpm run build
+ working-directory: ./packages/create-llama
+ - name: Pack
+ run: pnpm pack --pack-destination ./output
+ working-directory: ./packages/create-llama
+ - name: Extract Pack
+ run: tar -xvzf ./output/*.tgz -C ./output
+ working-directory: ./packages/create-llama
+ - name: Run Playwright tests
+ run: pnpm exec playwright test
+ env:
+ OPENAI_API_KEY: ${{ secrets.OPENAI_API_KEY }}
+ working-directory: ./packages/create-llama
+ - uses: actions/upload-artifact@v3
+ if: always()
+ with:
+ name: playwright-report
+ path: ./packages/create-llama/playwright-report/
+ retention-days: 30

.github/workflows/lint_on_push_or_pull.yml

@@ -12,14 +12,18 @@ jobs:
  lint:
  runs-on: ubuntu-latest
  steps:
- - name: Checkout code
- uses: actions/checkout@v2
-
- - name: Install pnpm
- run: npm install -g pnpm
-
+ - uses: actions/checkout@v4
+ - uses: pnpm/action-setup@v2
+ with:
+ version: latest
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: ".nvmrc"
+ cache: "pnpm"
  - name: Install dependencies
  run: pnpm install
-
  - name: Run lint
  run: pnpm run lint
+ - name: Run Prettier
+ run: pnpm run format

.github/workflows/publish.yml

@@ -0,0 +1,28 @@
+name: Publish
+on:
+ push:
+ branches:
+ - main
+
+jobs:
+ publish:
+ runs-on: ubuntu-latest
+
+ permissions:
+ contents: read
+ id-token: write
+
+ steps:
+ - uses: actions/checkout@v4
+
+ - name: Publish @llamaindex/env
+ run: npx jsr publish
+ working-directory: packages/env
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+ - name: Publish @llamaindex/core
+ run: npx jsr publish --allow-slow-types
+ working-directory: packages/core
+ env:
+ GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -7,18 +7,69 @@ jobs:
  runs-on: ubuntu-latest
 
  steps:
- - name: Checkout code
- uses: actions/checkout@v2
-
+ - uses: actions/checkout@v4
+ - uses: pnpm/action-setup@v2
  - name: Setup Node.js
- uses: actions/setup-node@v2
+ uses: actions/setup-node@v4
  with:
- node-version: "18"
-
+ node-version-file: ".nvmrc"
+ cache: "pnpm"
  - name: Install dependencies
- run: |
- npm i -g pnpm
- pnpm install
-
+ run: pnpm install
  - name: Run tests
  run: pnpm run test
+ typecheck:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+ - uses: pnpm/action-setup@v2
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: ".nvmrc"
+ cache: "pnpm"
+ - name: Install dependencies
+ run: pnpm install
+ - name: Build
+ run: pnpm run build --filter llamaindex
+ - name: Run Type Check
+ run: pnpm run type-check
+ - name: Run Circular Dependency Check
+ run: pnpm run circular-check
+ working-directory: ./packages/core
+ - uses: actions/upload-artifact@v3
+ if: failure()
+ with:
+ name: typecheck-build-dist
+ path: ./packages/core/dist
+ if-no-files-found: error
+ typecheck-examples:
+ runs-on: ubuntu-latest
+
+ steps:
+ - uses: actions/checkout@v4
+ - uses: pnpm/action-setup@v2
+ - name: Setup Node.js
+ uses: actions/setup-node@v4
+ with:
+ node-version-file: ".nvmrc"
+ cache: "pnpm"
+ - name: Install dependencies
+ run: pnpm install
+ - name: Build
+ run: pnpm run build --filter llamaindex
+ - name: Copy examples
+ run: rsync -rv --exclude=node_modules ./examples ${{ runner.temp }}
+ - name: Pack @llamaindex/env
+ run: pnpm pack --pack-destination ${{ runner.temp }}
+ working-directory: packages/env
+ - name: Pack llamaindex
+ run: pnpm pack --pack-destination ${{ runner.temp }}
+ working-directory: packages/core
+ - name: Install
+ run: npm add ${{ runner.temp }}/*.tgz
+ working-directory: ${{ runner.temp }}/examples
+ - name: Run Type Check
+ run: npx tsc --project ./tsconfig.json
+ working-directory: ${{ runner.temp }}/examples

.gitignore

@@ -37,9 +37,15 @@ yarn-error.log*
 .vercel
 
 dist/
-
-# vs code
-.vscode/launch.json
-
-# jetbrains ide
-.idea/
+lib/
+
+.cache
+test-results/
+playwright-report/
+blob-report/
+playwright/.cache/
+.tsbuildinfo
+packages/create-llama/e2e/cache
+
+# intellij
+**/.idea

.husky/pre-commit

@@ -1,5 +1,3 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
+pnpm format
 pnpm lint
 npx lint-staged

.husky/pre-push

@@ -1,4 +1 @@
-#!/usr/bin/env sh
-. "$(dirname -- "$0")/_/husky.sh"
-
 pnpm test

.npmrc

@@ -1 +1,2 @@
 auto-install-peers = true
+enable-pre-post-scripts = true

.nvmrc

@@ -0,0 +1 @@
+18

.prettierignore

@@ -0,0 +1,7 @@
+apps/docs/i18n
+apps/docs/docs/api
+pnpm-lock.yaml
+lib/
+dist/
+.docusaurus/
+packages/create-llama/e2e/cache/

.swcrc

@@ -0,0 +1,8 @@
+{
+ "jsc": {
+ "parser": {
+ "syntax": "typescript"
+ },
+ "target": "esnext"
+ }
+}

.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+ // Use IntelliSense to learn about possible attributes.
+ // Hover to view descriptions of existing attributes.
+ // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+ "version": "0.2.0",
+ "configurations": [
+ {
+ "type": "node",
+ "request": "launch",
+ "name": "Debug Example",
+ "skipFiles": ["<node_internals>/**"],
+ "runtimeExecutable": "pnpm",
+ "cwd": "${workspaceFolder}/examples",
+ "runtimeArgs": ["ts-node", "${fileBasename}"]
+ }
+ ]
+}

.vscode/settings.json

@@ -5,5 +5,13 @@
  "[xml]": {
  "editor.defaultFormatter": "redhat.vscode-xml"
  },
- "jest.rootPath": "./packages/core"
-}
+ "[python]": {
+ "editor.defaultFormatter": "ms-python.black-formatter"
+ },
+ "[jsonc]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ },
+ "[json]": {
+ "editor.defaultFormatter": "esbenp.prettier-vscode"
+ }
+}