chore: remove llamaindex dep (#826)

* chore: remove llamaindex dep

* chore: remove all dependency on llamaindex

* feat: restructure docs/examples

* chore: remove llamaindex dep

* chore: remove all dependency on llamaindex

* simplify querytool

* fix tests

* revert version

* add missing import

* remove unused file

* feat: change default description to adapt it to LlamaCloud Index

---------

Co-authored-by: Clelia (Astra) Bertelli <clelia@runllama.ai>

.changeset/README.md

@@ -1,8 +0,0 @@
-# Changesets
-
-Hello and welcome! This folder has been automatically generated by `@changesets/cli`, a build tool that works
-with multi-package repos, or single-package repos to help you version and publish your code. You can
-find the full documentation for it [in our repository](https://github.com/changesets/changesets)
-
-We have a quick list of common questions to get you started engaging with this project in
-[our documentation](https://github.com/changesets/changesets/blob/main/docs/common-questions.md)

.changeset/config.json

@@ -1,11 +0,0 @@
-{
-  "$schema": "https://unpkg.com/@changesets/config@3.1.1/schema.json",
-  "changelog": "@changesets/cli/changelog",
-  "commit": false,
-  "fixed": [],
-  "linked": [],
-  "access": "restricted",
-  "baseBranch": "main",
-  "updateInternalDependencies": "patch",
-  "ignore": []
-}

.github/workflows/build_package_py.yml

@@ -6,8 +6,11 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "py/**"
   pull_request:
-
+    paths:
+      - "py/**"
 env:
   UV_VERSION: "0.7.20"
 
@@ -35,16 +38,16 @@ jobs:
         run: python --version
 
       - name: Build
-        working-directory: py/llama-cloud-services-py
+        working-directory: py
         run: uv build
 
       - name: Test installing built package
         shell: bash
-        working-directory: py/llama-cloud-services-py
+        working-directory: py
         run: |
           uv venv
           uv pip install dist/*.whl
 
       - name: Test import
-        working-directory: py/llama-cloud-services-py
+        working-directory: py
         run: uv run -- python -c "import llama_cloud_services"

.github/workflows/build_package_ts.yml

@@ -0,0 +1,36 @@
+name: Build Package - TypeScript
+on:
+  push:
+    branches:
+      - main
+    paths:
+      - "ts/**"
+  pull_request:
+    paths:
+      - "ts/**"
+
+jobs:
+  pre_release:
+    name: Pre Release
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - uses: pnpm/action-setup@v4
+        with:
+          version: 10
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version-file: "ts/llama_cloud_services/.nvmrc"
+
+      - name: Install dependencies
+        working-directory: ts/llama_cloud_services/
+        run: pnpm install --no-frozen-lockfile
+
+      - name: Build
+        working-directory: ts/llama_cloud_services/
+        run: pnpm run build

.github/workflows/changeset_release.yml

@@ -1,67 +0,0 @@
-name: Release
-
-on:
-  push:
-    branches:
-      - main
-
-concurrency: ${{ github.workflow }}-${{ github.ref }}
-
-jobs:
-  release:
-    name: Release
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-
-      - uses: pnpm/action-setup@v3
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: "3.11"
-
-      - name: Install uv
-        uses: astral-sh/setup-uv@v3
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: ".nvmrc"
-          cache: "pnpm"
-
-      - name: Install dependencies
-        run: pnpm install
-
-      - name: Add auth token to .npmrc file
-        run: |
-          cat << EOF >> ".npmrc"
-            //registry.npmjs.org/:_authToken=$NPM_TOKEN
-          EOF
-        env:
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-
-      - name: Get changeset status
-        id: get-changeset-status
-        run: |
-          pnpm changeset status --output .changeset/status.json
-          new_version=$(jq -r '.releases[0].newVersion' < .changeset/status.json)
-          rm -v .changeset/status.json
-          echo "new-version=${new_version}" >> "$GITHUB_OUTPUT"
-
-      - name: Create Release Pull Request or Publish to npm
-        id: changesets
-        uses: changesets/action@v1
-        with:
-          commit: Release ${{ steps.get-changeset-status.outputs.new-version }}
-          title: Release ${{ steps.get-changeset-status.outputs.new-version }}
-          # bump versions
-          version: pnpm new-version
-          # build package and call changeset publish
-          publish: pnpm release
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-          LLAMA_PARSE_PYPI_TOKEN: ${{ secrets.LLAMA_PARSE_PYPI_TOKEN }}
-          UV_PUBLISH_TOKEN: ${{ secrets.LLAMA_PARSE_PYPI_TOKEN }}

.github/workflows/lint_py.yml

@@ -31,5 +31,5 @@ jobs:
 
       - name: Run linter
         shell: bash
-        working-directory: py/llama-cloud-services-py
+        working-directory: py
         run: uv run -- pre-commit run -a

.github/workflows/lint_ts.yml

@@ -1,10 +1,14 @@
-name: Lint, Format and Build - TypeScript
+name: Lint - TypeScript
 
 on:
   push:
     branches:
       - main
+    paths:
+      - "ts/**"
   pull_request:
+    paths:
+      - "ts/**"
 
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
@@ -18,7 +22,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: pnpm/action-setup@v4
         with:
-          version: "10.12.4"
+          version: 10
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
@@ -26,5 +30,9 @@ jobs:
       - name: Install dependencies
         working-directory: ts/llama_cloud_services/
         run: pnpm install --no-frozen-lockfile
-      - name: Run lint, formatting and building
-        run: pnpm pre-commit
+      - name: Run lint
+        working-directory: ts/llama_cloud_services/
+        run: pnpm run lint
+      - name: Run Prettier
+        working-directory: ts/llama_cloud_services/
+        run: pnpm run format

.github/workflows/release_py.yml

@@ -24,20 +24,33 @@ jobs:
         with:
           version: ${{ env.UV_VERSION }}
 
-      - name: Install pnpm
-      - uses: pnpm/action-setup@v4
-        with:
-          version: 10
+      - name: Set up Python
+        run: uv python install
 
-      - name: Setup Node.js
-        uses: actions/setup-node@v4
-        with:
-          node-version-file: "ts/llama_cloud_services/.nvmrc"
+      - name: Display Python version
+        run: python --version
 
-      - name: Publish llama-cloud-services and llama-parse
-        run: pnpm release-py
-        env:
-          LLAMA_PARSE_PYPI_TOKEN: ${{ secrets.LLAMA_PARSE_PYPI_TOKEN }}
+      - name: Build
+        working-directory: py
+        run: uv build
+
+      - name: Test installing built package
+        shell: bash
+        working-directory: py
+        run: |
+          uv venv
+          uv pip install dist/*.whl
+
+      - name: Publish package
+        shell: bash
+        working-directory: py
+        run: uv publish --token ${{ secrets.LLAMA_PARSE_PYPI_TOKEN }}
+
+      - name: Build and publish llama-parse
+        working-directory: py/llama_parse/
+        run: |
+          uv build
+          uv publish --token ${{ secrets.LLAMA_PARSE_PYPI_TOKEN }}
 
       - name: Create GitHub Release
         id: create_release

.github/workflows/release_ts.yml

@@ -36,10 +36,11 @@ jobs:
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
 
       - name: Release
+        working-directory: ts/llama_cloud_services
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
-        run: pnpm release-ts
+        run: pnpm publish --access public --no-git-checks
 
       - name: Create release
         uses: ncipollo/release-action@v1

.github/workflows/test_py.yml

@@ -4,7 +4,11 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "py/**"
   pull_request:
+    paths:
+      - "py/**"
 
 env:
   UV_VERSION: "0.7.20"
@@ -31,9 +35,9 @@ jobs:
         run: uv python install ${{ matrix.python-version }} && uv python pin ${{ matrix.python-version }}
 
       - name: Run Tests
-        working-directory: py/llama-cloud-services-py
+        working-directory: py
         run: uv run -- pytest tests/**/test_*.py
 
       - name: Remove virtual environment
-        working-directory: py/llama-cloud-services-py
+        working-directory: py
         run: rm -rf .venv/

.github/workflows/test_ts.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - main
+    paths:
+      - "ts/**"
   pull_request:
-    branches:
-      - main
+    paths:
+      - "ts/**"
 
 env:
   TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
@@ -15,7 +17,8 @@ env:
   LLAMA_CLOUD_API_KEY: ${{ secrets.LLAMA_CLOUD_API_KEY }}
 
 jobs:
-  lint:
+  test:
+    name: Test - TypeScript
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -31,4 +34,4 @@ jobs:
         run: pnpm install --no-frozen-lockfile
       - name: Run tests
         working-directory: ts/llama_cloud_services/
-        run: pnpm test --run
+        run: pnpm test

.gitignore

@@ -9,5 +9,3 @@ __pycache__/
 node_modules/
 .turbo/
 dist/
-pnpm-lock.yaml
-.venv/

.pre-commit-config.yaml

@@ -33,7 +33,7 @@ repos:
     rev: v1.0.1
     hooks:
       - id: mypy
-        exclude: ^py/llama-cloud-services-py/tests/
+        exclude: ^py/tests/
         additional_dependencies:
           [
             "types-requests",
@@ -63,13 +63,13 @@ repos:
     rev: v3.0.3
     hooks:
       - id: prettier
-        exclude: uv.lock
+        exclude: ^(uv.lock|ts/llama_cloud_services/pnpm-lock.yaml)
   - repo: https://github.com/codespell-project/codespell
     rev: v2.2.6
     hooks:
       - id: codespell
         additional_dependencies: [tomli]
-        exclude: ^(uv.lock|docs|ts)
+        exclude: ^(uv.lock|docs|ts|examples)
         args:
           [
             "--ignore-words-list",

CONTRIBUTING.md

@@ -1,167 +1,33 @@
-# Contribute to `llama-cloud-services`
+# Python
 
-## Common Patterns
+## Installation
 
-### Issues
+This project uses uv. Create a virtual environment, and run `uv sync`
 
-One of the forms of contribution can be issues.
+## Versioning (Maintainers only)
 
-Issues should be used when there are bugs or feature request you would like to bring to the attention of the maintainers.
+Before merging your changes, make sure to bump the versions.
 
-When opening an issue:
+Make a version bump to `pyproject.toml`. If the underlying dependency on the llamacloud platform OpenAPI
+sdk needs bumping, make sure to bring that in as well. If updating dependencies, run `uv lock`.
 
-- preferably, use the provided templates
-- check for other issues (closed and open) to avoid duplicates
-- try to be detailed and specific, reporting all the pieces the maintainer would need to have in order to reproduce your issue.
+The legacy `llama_parse` package re-exports some of `llama_cloud_services` in the old namespace. The
+versions need to be kept consistent to sidecar it with `llama_cloud_services`. Bump it's version in `llama_parse/pyproject.toml`, and also bump it's dependency version of `llama-cloud-services` to match.
 
-### Pull requests
+**Note**: Don't worry about updating the `llama_parse/poetry.lock` file when bumping versions. The GitHub action will automatically run `poetry lock` for the llama_parse package during the build process (though it doesn't commit the updated lockfile back to the repo).
 
-In order to open a valid pull request:
+You can also do this with `./scripts/version-bump.py set 0.x.x` if you have `uv` installed.
 
-- Fork the repository
-- Checkout a secondary branch (common prefixes for secondary branches include: `fix`, `feat`, `chore`, `docs`). We tend to prefer the naming convention that uses `/`, such as: `fix/your-awesome-bug-fix`.
-- Add and commit the changes to the secondary branch, following language-specific logic (see below)
-- When the changes are pushed to your branch, open a pull request
+Once the change is merged, push a tag `git tag -a v0.x.x -m 0.x.x` and `git push origin 0.x.x`.
 
-## Python
+This tagging step can be done with `./scripts/version-bump tag`.
 
-### Set Up
+# Typescript
 
-The two python packages, which can be found under `py/llama-cloud-services-py/`, are:
+## Installation
 
-- `llama-cloud-services`
-- `llama-parse`
+...
 
-> [!NOTE]
->
-> `llama-parse` mostly re-exports from `llama-cloud-services`, so you should not modify that directly.
+## Versioning
 
-These packages are managed through [uv](https://docs.astral.sh/uv/), so make sure to have uv [installed](https://docs.astral.sh/uv/getting-started/installation/).
-
-### Tests
-
-It is important to make sure all tests pass after your changes, and cover new features with suitable unit tests.
-
-Tests are found in `py/llama-cloud-services-py/tests/` and you can execute them with:
-
-```bash
-pytest tests/**/test_*.py
-```
-
-### Pre-Commit Versioning
-
-Once you made your changes and tested them, **prior to committing** you should run (from the root folder) this command to automatically bump the version of python packages:
-
-```bash
-pnpm pre-commit-version
-```
-
-this will prompt you to choose what package's version you want to bump and what kind of bump you want to perform. Choose `@llama_cloud_services/llama-cloud-services-py` for python and choose the version bump according to the type of changing you made.
-
-### Pre-commit checks
-
-Before you commit, your files should pass the linting and formatting requirements. In order to do that, you should have `pre-commit` installed and set-up in your repository:
-
-```bash
-pip install pre-commit
-pre-commit install
-```
-
-Once you have that set up, the files will be automatically linted and formatted according to the requirements.
-
-## TypeScript
-
-### Set Up
-
-The TypeScript package, which can be found under `ts/llama_cloud_services/`, is managed through [`pnpm`](https://pnpm.io), so make sure to have it [installed](https://pnpm.io/installation).
-
-In order to be able to run and test the package, make sure to install all the dependencies:
-
-```bash
-pnpm install
-```
-
-### Activate Test Mode
-
-In order to activate test mode (to dynamically test your changes while you are performing them) you can use:
-
-```bash
-pnpm turbo run dev
-```
-
-### Test
-
-It is important to make sure all tests pass after your changes, and cover new features with suitable unit tests.
-
-Tests are found in `ts/llama_cloud_services/tests/` and you can execute them with:
-
-```bash
-pnpm test
-```
-
-### Pre-Commit Versioning
-
-Once you made your changes and tested them, **prior to committing** you should run (from the root folder) two commands to automatically bump the version of python packages:
-
-```bash
-pnpm pre-commit-version
-```
-
-This will prompt you to choose what package's version you want to bump and what kind of bump you want to perform. Choose `llama-cloud-services` for TypeScript and choose the version bump according to the type of changing you made.
-
-### Pre-commit checks
-
-Before you commit, your files should pass the linting and formatting requirements. In order to do that, run (from the root folder):
-
-```bash
-pnpm pre-commit
-```
-
-The files will be then automatically linted and formatted according to the requirements.
-
-## TypeScript _and_ Python
-
-If you change **both PY and TS**, for versioning run:
-
-```bash
-pnpm pre-commit-version # choose both packages
-pnpm new-version # bumps the version for both packages
-```
-
-## Release (maintainers only)
-
-Every push to main might trigger a release.
-
-Whether a release is pushed out or not depends on the presence of versioning files in `.changesets`: if you want a release to be packaged, then, you need to always run `pnpm pre-commit-version` prior to merging a pull request into main.
-
-You can, nevertheless, manually set up language-specific releases, using the logic reported below.
-
-### Python
-
-To release `llama-cloud-services` and `llama-parse` in Python, run:
-
-```bash
-git checkout main
-git pull
-git tag <your-version> # e.g. v0.7.0
-git push <your-version>
-```
-
-> [!NOTE]
->
-> The tag must start with `v`
-
-This will trigger the release workflow automatically.
-
-### TypeScript
-
-To release `llama-cloud-services` in TypeScript, run:
-
-```bash
-git checkout main
-git pull
-git tag llama-cloud-services@<your-version> # e.g. llama-cloud-services@0.3.0
-git push origin llama-cloud-services@<your-version>
-```
-
-This will trigger the release workflow automatically.
+...

docs/examples-py/README.md

@@ -1,9 +0,0 @@
-# LlamaCloud Services Examples - Python
-
-In this folder you will find several python notebooks with examples regarding:
-
-- [LlamaParse](./parse/)
-- [LlamaExtract](./extract/)
-- [LlamaReport](./report/)
-
-Follow the instructions of each notebook to get started!

docs/examples-ts/README.md

@@ -1,10 +0,0 @@
-# LlamaCloud Services Examples - TypeScript
-
-In this folder you will find two end-to-end examples on how to build applications with:
-
-- [LlamaParse](./parse/)
-- [LlamaCloud Index](./index)
-
-In TypeScript.
-
-Follow the instruction in each of the example sub-folders to get started!

docs/examples-ts/index/.example.env

@@ -1,3 +0,0 @@
-LLAMA_CLOUD_API_KEY="llx-***"
-OPENAI_API_KEY="sk-***"
-PIPELINE_NAME="my-pipeline"

examples/README.md

@@ -0,0 +1,11 @@
+# LlamaCloud Services Examples
+
+In this folder you will find several python notebooks and two end-to-end typescript applications that contain examples regarding:
+
+- [LlamaParse - Python](./parse/)
+- [LlamaParse - TypeScript](./parse-ts/)
+- [LlamaExtract - Python](./extract/)
+- [LlamaReport - Python](./report/)
+- [LlamaCloud Index - TypeScript](./index-ts/)
+
+Follow the instructions of each notebook/application to get started!

examples/index-ts/README.md

@@ -22,7 +22,7 @@ A TypeScript demo application showcasing the power of **LlamaCloud Index** - a f
 
 ## Features
 
-- 🤖 **RAG**: Simple-yet-effective Retrieval Augmented Generation pipeline built on top of LlamaCloud Index adn OpenAI
+- 🤖 **RAG**: Simple-yet-effective Retrieval Augmented Generation pipeline built on top of LlamaCloud Index and OpenAI
 - 🎨 **Beautiful CLI**: Styled console interface with colors and ASCII art
 - ⚡ **Fast Development**: Hot reload support with watch mode
 - 🛠️ **TypeScript**: Full TypeScript support with strict type checking