Merge branch 'main' into ms/add-chat-ui-example

.changeset/fresh-dancers-refuse.md

@@ -0,0 +1,5 @@
+---
+"chat-ui": patch
+---
+
+Add example using chat-ui components

.changeset/wet-pandas-study.md

@@ -0,0 +1,5 @@
+---
+"@llamaindex/community": patch
+---
+
+feat: added support for Haiku 3.5 via Bedrock

.github/workflows/test.yml

@@ -119,7 +119,7 @@ jobs:
         run: pnpm run build
       - name: Build ${{ matrix.packages }}
         run: pnpm run build
-        working-directory: e2e/examples/${{ matrix.packages }}
+        working-directory: packages/llamaindex/e2e/examples/${{ matrix.packages }}
 
   typecheck-examples:
     runs-on: ubuntu-latest

CONTRIBUTING.md

@@ -2,58 +2,86 @@
 
 ## Structure
 
-LlamaIndex.TS uses pnpm monorepo.
+This is a monorepo built with Turborepo
 
-We recommend you to understand the basics of Node.js, TypeScript, pnpm, and of course, LLM before contributing.
+Right now, for first-time contributors, these three packages are of the highest importance:
 
-There are some important folders in the repository:
+- `packages/llamaindex` which is the main NPM library `llamaindex`
+- `examples` is where the demo code lives
+- `apps/docs` is where the code for the documentation of https://ts.llamaindex.ai/ is located
 
-- `packages/*`: Contains the source code of the packages. Each package is a separate npm package.
-  - `llamaindex`: The starter package for LlamaIndex.TS, which contains the all sub-packages.
-  - `core`: The core package of LlamaIndex.TS, which contains the abstract classes and interfaces. It is designed for
-    all JS runtime environments.
-  - `env`: The environment package of LlamaIndex.TS, which contains the environment-specific classes and interfaces. It
-    includes compatibility layers for Node.js, Deno, Vercel Edge Runtime, Cloudflare Workers...
-- `apps/*`: The applications based on LlamaIndex.TS.
-  - `next`: Our documentation website based on Next.js.
-- `examples`: The code examples of LlamaIndex.TS using Node.js.
+### Turborepo docs
+
+You can checkout how Turborepo works using the default [README-turborepo.md](/README-turborepo.md)
 
 ## Getting Started
 
-Make sure you have Node.js LIS (Long-term Support) installed. You can check your Node.js version by running:
+Install NodeJS. Preferably v18 using nvm or n.
+
+Inside the LlamaIndexTS directory:
 
-```shell
-node -v
-# v20.x.x
 ```
-
-### Use pnpm
-
-```shell
-corepack enable
-```
-
-### Install dependencies
-
-```shell
+npm i -g pnpm ts-node
 pnpm install
 ```
 
-### Build the packages
+Note: we use pnpm in this repo, which has a lot of the same functionality and CLI options as npm but it does do some things better in a monorepo, like centralizing dependencies and caching.
 
-```shell
-# Build all packages
-turbo build --filter "./packages/*"
+PNPM's has documentation on its [workspace feature](https://pnpm.io/workspaces) and Turborepo had some [useful documentation also](https://turbo.build/repo/docs/core-concepts/monorepos/running-tasks).
+
+### Running Typescript
+
+When we publish to NPM we will have a tsc compiled version of the library in JS. For now, the easiest thing to do is use ts-node.
+
+### Test cases
+
+To run them, run
+
+```
+pnpm run test
+```
+
+To write new test cases write them in [packages/llamaindex/tests](/packages/llamaindex/tests)
+
+We use Vitest https://vitest.dev to write our test cases. Vitest comes with a bunch of built-in assertions using the expect function: https://vitest.dev/api/expect.html#expect
+
+### Demo applications
+
+There is an existing ["example"](/examples/README.md) demos folder with mainly NodeJS scripts. Feel free to add additional demos to that folder. If you would like to try out your changes in the `llamaindex` package with a new demo, you need to run the build command in the README.
+
+You can create new demo applications in the apps folder. Just run pnpm init in the folder after you create it to create its own package.json
+
+### Installing packages
+
+To install packages for a specific package or demo application, run
+
+```
+pnpm add [NPM Package] --filter [package or application i.e. llamaindex or docs]
+```
+
+To install packages for every package or application run
+
+```
+pnpm add -w [NPM Package]
 ```
 
 ### Docs
 
-See the [docs](./apps/next/README.md) for more information.
+To contribute to the docs, go to the docs website folder and run the Docusaurus instance.
+
+```bash
+cd apps/docs
+pnpm install
+pnpm start
+```
+
+That should start a webserver which will serve the docs on https://localhost:3000
+
+Any changes you make should be reflected in the browser. If you need to regenerate the API docs and find that your TSDoc isn't getting the updates, feel free to remove apps/docs/api. It will automatically regenerate itself when you run pnpm start again.
 
 ## Changeset
 
-We use [changesets](https://github.com/changesets/changesets) for managing versions and changelogs. To create a new
-changeset, run in the root folder:
+We use [changesets](https://github.com/changesets/changesets) for managing versions and changelogs. To create a new changeset, run in the root folder:
 
 ```
 pnpm changeset
@@ -67,6 +95,6 @@ The [Release Github Action](.github/workflows/release.yml) is automatically gene
 PR called "Release {version}".
 
 This PR will update the `package.json` and `CHANGELOG.md` files of each package according to
-the current changesets in the [.changeset](.changeset) folder.
+the current changesets in the [.changeset](.changeset/) folder.
 
 If this PR is merged it will automatically add version tags to the repository and publish the updated packages to NPM.

README.md

@@ -1,16 +1,12 @@
-<p align="center">
-  <img height="100" width="100" alt="LlamaIndex logo" src="https://ts.llamaindex.ai/square.svg" />
-</p>
-<h1 align="center">LlamaIndex.TS</h1>
-<h3 align="center">
-  Data framework for your LLM application.
-</h3>
+# LlamaIndex.TS
 
 [![NPM Version](https://img.shields.io/npm/v/llamaindex)](https://www.npmjs.com/package/llamaindex)
 [![NPM License](https://img.shields.io/npm/l/llamaindex)](https://www.npmjs.com/package/llamaindex)
 [![NPM Downloads](https://img.shields.io/npm/dm/llamaindex)](https://www.npmjs.com/package/llamaindex)
 [![Discord](https://img.shields.io/discord/1059199217496772688)](https://discord.com/invite/eN6D2HQ4aX)
 
+LlamaIndex is a data framework for your LLM application.
+
 Use your own data with large language models (LLMs, OpenAI ChatGPT and others) in JS runtime environments with TypeScript support.
 
 Documentation: https://ts.llamaindex.ai/

apps/docs/CHANGELOG.md

@@ -1,76 +1,5 @@
 # docs
 
-## 0.0.118
-
-### Patch Changes
-
-- llamaindex@0.8.13
-- @llamaindex/examples@0.0.16
-
-## 0.0.117
-
-### Patch Changes
-
-- @llamaindex/examples@0.0.15
-
-## 0.0.116
-
-### Patch Changes
-
-- llamaindex@0.8.12
-
-## 0.0.115
-
-### Patch Changes
-
-- llamaindex@0.8.11
-
-## 0.0.114
-
-### Patch Changes
-
-- Updated dependencies [f066e50]
-  - llamaindex@0.8.10
-  - @llamaindex/examples@0.0.14
-
-## 0.0.113
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-- Updated dependencies [4d4cd8a]
-  - llamaindex@0.8.9
-
-## 0.0.112
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - llamaindex@0.8.8
-  - @llamaindex/examples@0.0.13
-
-## 0.0.111
-
-### Patch Changes
-
-- llamaindex@0.8.7
-
-## 0.0.110
-
-### Patch Changes
-
-- Updated dependencies [95a5cc6]
-  - llamaindex@0.8.6
-
-## 0.0.109
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-- Updated dependencies [a6db5dd]
-- Updated dependencies [396b1e1]
-  - llamaindex@0.8.5
-
 ## 0.0.108
 
 ### Patch Changes

apps/docs/docusaurus.config.js

@@ -62,12 +62,6 @@ const config = {
     ({
       // Replace with your project's social card
       image: "img/favicon.png", // TODO change this
-      announcementBar: {
-        id: "migrate_to_next",
-        content:
-          'We are migrating to Next.js based documentation. Check it out <a href="https://ts.llamaindex.ai/docs/llamaindex">here</a>!',
-        isCloseable: false,
-      },
       navbar: {
         title: "LlamaIndex.TS",
         logo: {

apps/docs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "0.0.118",
+  "version": "0.0.108",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

apps/next/CHANGELOG.md

@@ -1,131 +1,5 @@
 # @llamaindex/doc
 
-## 0.0.16
-
-### Patch Changes
-
-- Updated dependencies [a7b0ac3]
-- Updated dependencies [ee20c44]
-- Updated dependencies [c69605f]
-  - @llamaindex/core@0.4.10
-  - @llamaindex/workflow@0.0.6
-  - llamaindex@0.8.13
-  - @llamaindex/cloud@2.0.10
-  - @llamaindex/node-parser@0.0.11
-  - @llamaindex/openai@0.1.35
-  - @llamaindex/readers@1.0.11
-
-## 0.0.15
-
-### Patch Changes
-
-- Updated dependencies [ea92b69]
-- Updated dependencies [fadc8b8]
-  - @llamaindex/workflow@0.0.5
-
-## 0.0.14
-
-### Patch Changes
-
-- Updated dependencies [7ae6eaa]
-  - @llamaindex/core@0.4.9
-  - @llamaindex/openai@0.1.34
-  - @llamaindex/cloud@2.0.9
-  - llamaindex@0.8.12
-  - @llamaindex/node-parser@0.0.10
-  - @llamaindex/readers@1.0.10
-
-## 0.0.13
-
-### Patch Changes
-
-- Updated dependencies [f865c98]
-  - @llamaindex/core@0.4.8
-  - @llamaindex/cloud@2.0.8
-  - llamaindex@0.8.11
-  - @llamaindex/node-parser@0.0.9
-  - @llamaindex/openai@0.1.33
-  - @llamaindex/readers@1.0.9
-
-## 0.0.12
-
-### Patch Changes
-
-- Updated dependencies [f066e50]
-- Updated dependencies [d89ebe0]
-- Updated dependencies [fd8c882]
-- Updated dependencies [fd8c882]
-  - llamaindex@0.8.10
-  - @llamaindex/core@0.4.7
-  - @llamaindex/workflow@0.0.4
-  - @llamaindex/cloud@2.0.7
-  - @llamaindex/node-parser@0.0.8
-  - @llamaindex/openai@0.1.32
-  - @llamaindex/readers@1.0.8
-
-## 0.0.11
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-- Updated dependencies [4d4cd8a]
-  - llamaindex@0.8.9
-  - @llamaindex/cloud@2.0.6
-  - @llamaindex/core@0.4.6
-  - @llamaindex/node-parser@0.0.7
-  - @llamaindex/openai@0.1.31
-  - @llamaindex/readers@1.0.7
-
-## 0.0.10
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - @llamaindex/core@0.4.5
-  - llamaindex@0.8.8
-  - @llamaindex/node-parser@0.0.6
-  - @llamaindex/workflow@0.0.3
-  - @llamaindex/cloud@2.0.5
-  - @llamaindex/openai@0.1.30
-  - @llamaindex/readers@1.0.6
-
-## 0.0.9
-
-### Patch Changes
-
-- @llamaindex/cloud@2.0.4
-- @llamaindex/core@0.4.4
-- llamaindex@0.8.7
-- @llamaindex/node-parser@0.0.5
-- @llamaindex/openai@0.1.29
-- @llamaindex/readers@1.0.5
-
-## 0.0.8
-
-### Patch Changes
-
-- Updated dependencies [95a5cc6]
-  - @llamaindex/core@0.4.3
-  - llamaindex@0.8.6
-  - @llamaindex/cloud@2.0.3
-  - @llamaindex/node-parser@0.0.4
-  - @llamaindex/openai@0.1.28
-  - @llamaindex/readers@1.0.4
-
-## 0.0.7
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-- Updated dependencies [a6db5dd]
-- Updated dependencies [396b1e1]
-  - llamaindex@0.8.5
-  - @llamaindex/cloud@2.0.2
-  - @llamaindex/core@0.4.2
-  - @llamaindex/node-parser@0.0.3
-  - @llamaindex/openai@0.1.27
-  - @llamaindex/readers@1.0.3
-
 ## 0.0.6
 
 ### Patch Changes

apps/next/README.md

@@ -1,4 +1,4 @@
-# Docs
+# next
 
 This is a Next.js application generated with
 [Create Fumadocs](https://github.com/fuma-nama/fumadocs).
@@ -6,10 +6,15 @@ This is a Next.js application generated with
 Run development server:
 
 ```bash
-turbo run dev
-# turbo will build all required packages before running the dev server
+npm run dev
+# or
+pnpm dev
+# or
+yarn dev
 ```
 
+Open http://localhost:3000 with your browser to see the result.
+
 ## Learn More
 
 To learn more about Next.js and Fumadocs, take a look at the following

apps/next/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/doc",
-  "version": "0.0.16",
+  "version": "0.0.6",
   "private": true,
   "scripts": {
     "build": "pnpm run build:docs && next build",

apps/next/src/app/(home)/page.tsx

@@ -25,16 +25,15 @@ export default function HomePage() {
   return (
     <main className="container mx-auto px-4 py-12">
       <h1 className="text-4xl md:text-6xl font-bold text-center mb-4">
-        Build context-augmented web apps using
+        Build RAG Web App using
         <br /> <span className="text-blue-500">LlamaIndex.TS</span>
       </h1>
       <p className="text-xl text-center text-fd-muted-foreground mb-12 ">
-        LlamaIndex.TS is the JS/TS version of{" "}
-        <a href="https://llamaindex.ai">LlamaIndex</a>, the framework for
-        building agentic generative AI applications connected to your data.
+        LlamaIndex.TS is the JS/TS library from our popular Python library
+        llama-index for building LLM applications
       </p>
       <div className="text-center text-lg text-fd-muted-foreground mb-12">
-        <span>Designed for building web applications in </span>
+        <span>Designed for building web applications under </span>
         <TextEffect />
       </div>
 
@@ -59,8 +58,8 @@ export default function HomePage() {
         <Feature
           icon={Footprints}
           subheading="Progressive"
-          heading="From the simplest to the most complex"
-          description="LlamaIndex.TS is designed to be simple to get started, but powerful enough to build complex, agentic AI applications."
+          heading="Adding AI feature from simple to complex"
+          description="LlamaIndex.TS is designed to be simple to start with and can be extended to build complex AI applications."
         >
           <Suspense
             fallback={
@@ -114,9 +113,9 @@ const response = await agent.chat({
         </Feature>
         <Feature
           icon={Bot}
-          subheading="Agents"
-          heading="Build agentic RAG applications"
-          description="Truly powerful retrieval-augmented generation applications use agentic techniques, and LlamaIndex.TS makes it easy to build them."
+          subheading="Agent"
+          heading="Build agent for RAG"
+          description="Build agents for RAG using LlamaIndex.TS. Agents are the core building blocks of RAG applications."
         >
           <CodeBlock
             code={`import { FunctionTool } from "llamaindex";
@@ -138,19 +137,19 @@ await agent.chat('...');`}
         <Feature
           icon={Blocks}
           subheading="Providers"
-          heading="LLMs, Data Loaders, Vector Stores and more!"
-          description="LlamaIndex.TS has hundreds of integrations to connect to your data, index it, and query it with LLMs."
+          heading="LLM / Data Loader / Vector Store"
+          description="LlamaIndex.TS provides various providers to turn your data into valuable insights."
         >
           <div className="mt-8 flex flex-col gap-8">
             <div>
               <h3 className="text-lg font-semibold text-fd-muted-foreground mb-2">
-                LLMs
+                LLM
               </h3>
               <InfiniteLLMProviders />
             </div>
             <div>
               <h3 className="text-lg font-semibold text-fd-muted-foreground mb-2">
-                Vector Stores
+                Vector Store
               </h3>
               <InfiniteVectorStoreProviders />
             </div>
@@ -158,8 +157,8 @@ await agent.chat('...');`}
         </Feature>
         <Feature
           icon={Terminal}
-          subheading="create-llama CLI"
-          heading="Build a RAG app with a single command"
+          subheading="Create Llama CLI"
+          heading="CLI for starting RAG app with one line"
           description="A command line tool to generate LlamaIndex apps, the easiest way to get started with LlamaIndex."
         >
           <div className="my-6">

apps/next/src/components/contribution.tsx

@@ -7,8 +7,9 @@ import { ReactElement } from "react";
 export function Contributing(): ReactElement {
   return (
     <div className="flex flex-col items-center border-x border-t px-4 py-16 text-center">
+      <Heart className="mb-4" />
       <h2 className="mb-4 text-xl font-semibold sm:text-2xl">
-        Made possible by you <Heart className="inline align-middle" />
+        Made Possible by You.
       </h2>
       <p className="mb-4 text-fd-muted-foreground">
         LlamaIndex.TS is powered by the open source community.

apps/next/src/components/contributor-count.tsx

@@ -53,6 +53,9 @@ export default async function ContributorCounter({
           </div>
         ) : null}
       </div>
+      <div className="text-center text-sm text-fd-muted-foreground">
+        Some of our best contributors.
+      </div>
     </div>
   );
 }

apps/next/src/content/docs/llamaindex/setup/typescript.mdx

@@ -93,35 +93,6 @@ See more about [moduleResolution](https://www.typescriptlang.org/docs/handbook/m
 	</Accordion>
 </Accordions>
 
-## Enable AsyncIterable for `Web Stream` API
-
-Some modules uses `Web Stream` API like `ReadableStream` and `WritableStream`, you need to enable `DOM.AsyncIterable` in your `tsconfig.json`.
-
-```json5
-{
-  compilerOptions: {
-    // ⬇️ add this lib to your tsconfig.json
-    lib: ["DOM.AsyncIterable"],
-  },
-}
-```
-
-```ts twoslash
-import { OpenAIAgent } from '@llamaindex/openai'
-
-const agent = new OpenAIAgent({
-  tools: []
-})
-
-const response = await agent.chat({
-  message: 'Hello, how are you?',
-  stream: true
-})
-for await (const _ of response) {
-                      //^?
-  // ...
-}
-```
 
 ## Run TypeScript Script in Node.js
 

apps/next/turbo.json

@@ -1,16 +0,0 @@
-{
-  "extends": ["//"],
-  "tasks": {
-    "build": {
-      "outputs": [
-        ".next",
-        ".source",
-        "next-env.d.ts",
-        "src/content/docs/cloud/api/**"
-      ]
-    },
-    "dev": {
-      "dependsOn": ["^build"]
-    }
-  }
-}

e2e/fixtures/llm/ollama.ts

@@ -1,3 +0,0 @@
-import { OpenAI } from "./openai.js";
-
-export class Ollama extends OpenAI {}

e2e/node/ollama.e2e.ts

@@ -1,35 +0,0 @@
-import { Ollama } from "@llamaindex/ollama";
-import assert from "node:assert";
-import { test } from "node:test";
-import { getWeatherTool } from "./fixtures/tools.js";
-import { mockLLMEvent } from "./utils.js";
-
-await test("ollama", async (t) => {
-  await mockLLMEvent(t, "ollama");
-  await t.test("ollama function call", async (t) => {
-    const llm = new Ollama({
-      model: "llama3.2",
-    });
-    const chatResponse = await llm.chat({
-      messages: [
-        {
-          role: "user",
-          content: "What is the weather in Paris?",
-        },
-      ],
-      tools: [getWeatherTool],
-    });
-    if (
-      chatResponse.message.options &&
-      "toolCall" in chatResponse.message.options
-    ) {
-      assert.equal(chatResponse.message.options.toolCall.length, 1);
-      assert.equal(
-        chatResponse.message.options.toolCall[0]!.name,
-        getWeatherTool.metadata.name,
-      );
-    } else {
-      throw new Error("Expected tool calls in response");
-    }
-  });
-});

e2e/node/snapshot/#1281.snap

@@ -1,393 +0,0 @@
-{
-  "llmEventStart": [
-    {
-      "id": "PRESERVE_0",
-      "messages": [
-        {
-          "role": "user",
-          "content": "calculate 2 + 2"
-        }
-      ]
-    },
-    {
-      "id": "PRESERVE_1",
-      "messages": [
-        {
-          "role": "user",
-          "content": "calculate 2 + 2"
-        },
-        {
-          "role": "assistant",
-          "content": "",
-          "options": {
-            "toolCall": [
-              {
-                "name": "sumNumbers",
-                "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-                "input": {
-                  "a": 2,
-                  "b": 2
-                }
-              }
-            ]
-          }
-        },
-        {
-          "role": "user",
-          "content": "4",
-          "options": {
-            "toolResult": {
-              "result": "4",
-              "isError": false,
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd"
-            }
-          }
-        }
-      ]
-    }
-  ],
-  "llmEventEnd": [
-    {
-      "id": "PRESERVE_0",
-      "response": {
-        "raw": null,
-        "message": {
-          "content": "",
-          "role": "assistant",
-          "options": {
-            "toolCall": [
-              {
-                "name": "sumNumbers",
-                "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-                "input": {
-                  "a": 2,
-                  "b": 2
-                }
-              }
-            ]
-          }
-        }
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "response": {
-        "raw": null,
-        "message": {
-          "content": "The result of \\(2 + 2\\) is \\(4\\).",
-          "role": "assistant",
-          "options": {}
-        }
-      }
-    }
-  ],
-  "llmEventStream": [
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": "{\"a\":2,\"b\":2}"
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_0",
-      "chunk": {
-        "raw": null,
-        "options": {
-          "toolCall": [
-            {
-              "name": "sumNumbers",
-              "id": "call_S2x0FUa475GVpNQJ796Rc9fd",
-              "input": {
-                "a": 2,
-                "b": 2
-              }
-            }
-          ]
-        },
-        "delta": ""
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": "The"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": " result"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": " of"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": " \\("
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": "2"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": " +"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": " "
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": "2"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": "\\"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": ")"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": " is"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": " \\("
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": "4"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": "\\"
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": ")."
-      }
-    },
-    {
-      "id": "PRESERVE_1",
-      "chunk": {
-        "raw": null,
-        "options": {},
-        "delta": ""
-      }
-    }
-  ]
-}

e2e/node/snapshot/ollama.snap

@@ -1,37 +0,0 @@
-{
-  "llmEventStart": [
-    {
-      "id": "PRESERVE_0",
-      "messages": [
-        {
-          "role": "user",
-          "content": "What is the weather in Paris?"
-        }
-      ]
-    }
-  ],
-  "llmEventEnd": [
-    {
-      "id": "PRESERVE_0",
-      "response": {
-        "message": {
-          "role": "assistant",
-          "content": "",
-          "options": {
-            "toolCall": [
-              {
-                "name": "getWeather",
-                "input": {
-                  "city": "Paris"
-                },
-                "id": "5d198775-5268-4552-993b-9ecb4425385b"
-              }
-            ]
-          }
-        },
-        "raw": null
-      }
-    }
-  ],
-  "llmEventStream": []
-}

examples/CHANGELOG.md

@@ -1,48 +1,5 @@
 # examples
 
-## 0.0.16
-
-### Patch Changes
-
-- Updated dependencies [a7b0ac3]
-- Updated dependencies [ee20c44]
-- Updated dependencies [c69605f]
-  - @llamaindex/core@0.4.10
-  - @llamaindex/workflow@0.0.6
-  - llamaindex@0.8.13
-  - @llamaindex/readers@1.0.11
-
-## 0.0.15
-
-### Patch Changes
-
-- Updated dependencies [ea92b69]
-- Updated dependencies [fadc8b8]
-  - @llamaindex/workflow@0.0.5
-
-## 0.0.14
-
-### Patch Changes
-
-- Updated dependencies [f066e50]
-- Updated dependencies [d89ebe0]
-- Updated dependencies [fd8c882]
-- Updated dependencies [fd8c882]
-  - llamaindex@0.8.10
-  - @llamaindex/core@0.4.7
-  - @llamaindex/workflow@0.0.4
-  - @llamaindex/readers@1.0.8
-
-## 0.0.13
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - @llamaindex/core@0.4.5
-  - llamaindex@0.8.8
-  - @llamaindex/workflow@0.0.3
-  - @llamaindex/readers@1.0.6
-
 ## 0.0.12
 
 ### Patch Changes

examples/anthropic/prompt-caching.ts

@@ -1,38 +0,0 @@
-import { Anthropic } from "llamaindex";
-
-async function main() {
-  const anthropic = new Anthropic({
-    model: "claude-3-5-sonnet-20241022",
-  });
-
-  const entireBook = await fetch(
-    "https://www.gutenberg.org/files/1342/1342-0.txt",
-  ).then((response) => response.text());
-
-  const response = await anthropic.chat({
-    messages: [
-      {
-        content:
-          "You are an AI assistant tasked with analyzing literary works. Your goal is to provide insightful commentary on themes, characters, and writing style.\n",
-        role: "system",
-      },
-      {
-        content: entireBook,
-        role: "system",
-        options: {
-          cache_control: {
-            type: "ephemeral",
-          },
-        },
-      },
-      {
-        content: "analyze the major themes in Pride and Prejudice.",
-        role: "user",
-      },
-    ],
-  });
-
-  console.log(response.message.content);
-}
-
-main().catch(console.error);

examples/azure-cosmosdb.ts

@@ -1,71 +0,0 @@
-import "dotenv/config";
-
-import {
-  DefaultAzureCredential,
-  getBearerTokenProvider,
-} from "@azure/identity";
-import {
-  AzureCosmosDBNoSqlVectorStore,
-  AzureCosmosNoSqlDocumentStore,
-  AzureCosmosNoSqlIndexStore,
-  Document,
-  OpenAI,
-  OpenAIEmbedding,
-  Settings,
-  storageContextFromDefaults,
-  VectorStoreIndex,
-} from "llamaindex";
-/**
- * This example demonstrates how to use Azure CosmosDB with LlamaIndex.
- * It uses Azure CosmosDB as IndexStore, DocumentStore, and VectorStore.
- *
- * To run this example, create an .env file under /examples and set the following environment variables:
- *
- * AZURE_OPENAI_ENDPOINT="https://AOAI-ACCOUNT.openai.azure.com" // Sample Azure OpenAI endpoint.
- * AZURE_DEPLOYMENT_NAME="gpt-4o" // Sample Azure OpenAI deployment name.
- * EMBEDDING_MODEL="text-embedding-3-large" // Sample Azure OpenAI embedding model.
- * AZURE_COSMOSDB_NOSQL_ACCOUNT_ENDPOINT = "https://DB-ACCOUNT.documents.azure.com:443/" // Sample CosmosDB account endpoint.
- *
- * This example uses managed identity to authenticate with Azure CosmosDB and Azure OpenAI. Make sure to assign the required roles to the managed identity.
- * You can also use connectionString for Azure CosmosDB and Keys with Azure OpenAI for authentication.
- */
-(async () => {
-  const credential = new DefaultAzureCredential();
-  const azureADTokenProvider = getBearerTokenProvider(
-    credential,
-    "https://cognitiveservices.azure.com/.default",
-  );
-
-  const azure = {
-    azureADTokenProvider,
-    deployment: process.env.AZURE_DEPLOYMENT_NAME,
-  };
-  Settings.llm = new OpenAI({ azure });
-  Settings.embedModel = new OpenAIEmbedding({
-    model: process.env.EMBEDDING_MODEL,
-    azure: {
-      ...azure,
-      deployment: process.env.EMBEDDING_MODEL,
-    },
-  });
-  const docStore = AzureCosmosNoSqlDocumentStore.fromAadToken();
-  console.log({ docStore });
-  const indexStore = AzureCosmosNoSqlIndexStore.fromAadToken();
-  console.log({ indexStore });
-  const vectorStore = AzureCosmosDBNoSqlVectorStore.fromUriAndManagedIdentity();
-  console.log({ vectorStore });
-  const storageContext = await storageContextFromDefaults({
-    docStore,
-    indexStore,
-    vectorStore,
-  });
-  console.log({ storageContext });
-
-  const document = new Document({ text: "Test Text" });
-  const index = await VectorStoreIndex.fromDocuments([document], {
-    storageContext,
-    logProgress: true,
-  });
-
-  console.log({ index });
-})();

examples/cosmosdb/loadVectorData.ts

@@ -6,21 +6,17 @@ import {
 } from "@llamaindex/readers/cosmosdb";
 import * as dotenv from "dotenv";
 import {
-  AzureCosmosDBNoSQLConfig,
+  AzureCosmosDBNoSqlVectorStore,
   OpenAI,
   OpenAIEmbedding,
   Settings,
   storageContextFromDefaults,
   VectorStoreIndex,
 } from "llamaindex";
-import {
-  createStoresFromConnectionString,
-  createStoresFromManagedIdentity,
-} from "./utils";
 // Load environment variables from local .env file
 dotenv.config();
 
-const cosmosEndpoint = process.env.AZURE_COSMOSDB_NOSQL_ACCOUNT_ENDPOINT!;
+const cosmosEndpoint = process.env.AZURE_COSMOSDB_NOSQL_ENDPOINT!;
 const cosmosConnectionString =
   process.env.AZURE_COSMOSDB_NOSQL_CONNECTION_STRING!;
 const databaseName =
@@ -30,7 +26,7 @@ const collectionName =
 const vectorCollectionName =
   process.env.AZURE_COSMOSDB_VECTOR_CONTAINER_NAME || "vectorContainer";
 
-// This example uses Azure OpenAI llm and embedding models
+// This exampple uses Azure OpenAI llm and embedding models
 const llmInit = {
   azure: {
     apiVersion: process.env.AZURE_OPENAI_LLM_API_VERSION,
@@ -50,48 +46,24 @@ const embedModelInit = {
 Settings.llm = new OpenAI(llmInit);
 Settings.embedModel = new OpenAIEmbedding(embedModelInit);
 
-// Initialize the CosmosDB client
-async function initializeCosmosClient() {
-  if (cosmosConnectionString) {
-    return new CosmosClient(cosmosConnectionString);
-  } else {
-    const credential = new DefaultAzureCredential();
-    return new CosmosClient({
-      endpoint: cosmosEndpoint,
-      aadCredentials: credential,
-    });
-  }
-}
-
-// Initialize CosmosDB to be used as a vectorStore, docStore, and indexStore
-async function initializeStores() {
-  // Create a configuration object for the Azure CosmosDB NoSQL Vector Store
-  const dbConfig: AzureCosmosDBNoSQLConfig = {
-    databaseName,
-    containerName: vectorCollectionName,
-    flatMetadata: false,
-  };
-
-  if (cosmosConnectionString) {
-    return createStoresFromConnectionString(cosmosConnectionString, dbConfig);
-  } else {
-    // Use managed identity to authenticate with Azure CosmosDB
-    const credential = new DefaultAzureCredential();
-    return createStoresFromManagedIdentity(
-      cosmosEndpoint,
-      credential,
-      dbConfig,
-    );
-  }
-}
-
 async function loadVectorData() {
   if (!cosmosConnectionString && !cosmosEndpoint) {
     throw new Error(
       "Azure CosmosDB connection string or endpoint must be set.",
     );
   }
-  const cosmosClient = await initializeCosmosClient();
+
+  let cosmosClient: CosmosClient;
+  // initialize the cosmos client
+  if (cosmosConnectionString) {
+    cosmosClient = new CosmosClient(cosmosConnectionString);
+  } else {
+    cosmosClient = new CosmosClient({
+      endpoint: cosmosEndpoint,
+      aadCredentials: new DefaultAzureCredential(),
+    });
+  }
+
   const reader = new SimpleCosmosDBReader(cosmosClient);
   // create a configuration object for the reader
   const simpleCosmosReaderConfig: SimpleCosmosDBReaderLoaderConfig = {
@@ -104,15 +76,16 @@ async function loadVectorData() {
 
   // load objects from cosmos and convert them into LlamaIndex Document objects
   const documents = await reader.loadData(simpleCosmosReaderConfig);
-
-  // use Azure CosmosDB as a vectorStore, docStore, and indexStore
-  const { vectorStore, docStore, indexStore } = await initializeStores();
-  // Store the embeddings in the CosmosDB container
-  const storageContext = await storageContextFromDefaults({
-    vectorStore,
-    docStore,
-    indexStore,
+  // create Azure CosmosDB as a vector store
+  const vectorStore = new AzureCosmosDBNoSqlVectorStore({
+    client: cosmosClient,
+    databaseName,
+    containerName: vectorCollectionName,
+    flatMetadata: false,
   });
+
+  // Store the embeddings in the CosmosDB container
+  const storageContext = await storageContextFromDefaults({ vectorStore });
   await VectorStoreIndex.fromDocuments(documents, { storageContext });
   console.log(
     `Successfully created embeddings in the CosmosDB container ${vectorCollectionName}.`,

examples/cosmosdb/queryVectorData.ts

@@ -3,21 +3,17 @@ import { DefaultAzureCredential } from "@azure/identity";
 import * as dotenv from "dotenv";
 import {
   AzureCosmosDBNoSQLConfig,
+  AzureCosmosDBNoSqlVectorStore,
   OpenAI,
   OpenAIEmbedding,
   Settings,
-  storageContextFromDefaults,
   VectorStoreIndex,
 } from "llamaindex";
-import {
-  createStoresFromConnectionString,
-  createStoresFromManagedIdentity,
-} from "./utils";
 
 // Load environment variables from local .env file
 dotenv.config();
 
-const cosmosEndpoint = process.env.AZURE_COSMOSDB_NOSQL_ACCOUNT_ENDPOINT!;
+const cosmosEndpoint = process.env.AZURE_COSMOSDB_NOSQL_ENDPOINT!;
 const cosmosConnectionString =
   process.env.AZURE_COSMOSDB_NOSQL_CONNECTION_STRING!;
 const databaseName =
@@ -44,27 +40,6 @@ const embedModelInit = {
 Settings.llm = new OpenAI(llmInit);
 Settings.embedModel = new OpenAIEmbedding(embedModelInit);
 
-async function initializeStores() {
-  // Create a configuration object for the Azure CosmosDB NoSQL Vector Store
-  const dbConfig: AzureCosmosDBNoSQLConfig = {
-    databaseName,
-    containerName,
-    flatMetadata: false,
-  };
-
-  if (cosmosConnectionString) {
-    return createStoresFromConnectionString(cosmosConnectionString, dbConfig);
-  } else {
-    // Use managed identity to authenticate with Azure CosmosDB
-    const credential = new DefaultAzureCredential();
-    return createStoresFromManagedIdentity(
-      cosmosEndpoint,
-      credential,
-      dbConfig,
-    );
-  }
-}
-
 async function query() {
   if (!cosmosConnectionString && !cosmosEndpoint) {
     throw new Error(
@@ -90,19 +65,10 @@ async function query() {
     containerName,
     flatMetadata: false,
   };
-
-  // use Azure CosmosDB as a vectorStore, docStore, and indexStore
-  const { vectorStore, docStore, indexStore } = await initializeStores();
-
-  // Store the embeddings in the CosmosDB container
-  const storageContext = await storageContextFromDefaults({
-    vectorStore,
-    docStore,
-    indexStore,
-  });
+  const store = new AzureCosmosDBNoSqlVectorStore(dbConfig);
 
   // create an index from the Azure CosmosDB NoSQL Vector Store
-  const index = await VectorStoreIndex.init({ storageContext });
+  const index = await VectorStoreIndex.fromVectorStore(store);
 
   // create a retriever and a query engine from the index
   const retriever = index.asRetriever({ similarityTopK: 20 });

examples/cosmosdb/utils.ts

@@ -1,51 +0,0 @@
-import { TokenCredential } from "@azure/identity";
-import {
-  AzureCosmosDBNoSQLConfig,
-  AzureCosmosDBNoSqlVectorStore,
-  AzureCosmosNoSqlDocumentStore,
-  AzureCosmosNoSqlIndexStore,
-} from "llamaindex";
-
-/**
- * Util function to create AzureCosmosDB vectorStore, docStore, indexStore from connection string.
- */
-export const createStoresFromConnectionString = (
-  connectionString: string,
-  dbConfig: AzureCosmosDBNoSQLConfig,
-) => {
-  const vectorStore = AzureCosmosDBNoSqlVectorStore.fromConnectionString({
-    connectionString,
-    ...dbConfig,
-  });
-  const docStore = AzureCosmosNoSqlDocumentStore.fromConnectionString({
-    connectionString,
-  });
-  const indexStore = AzureCosmosNoSqlIndexStore.fromConnectionString({
-    connectionString,
-  });
-  return { vectorStore, docStore, indexStore };
-};
-
-/**
- * Util function to create AzureCosmosDB vectorStore, docStore, indexStore from connection string.
- */
-export const createStoresFromManagedIdentity = (
-  endpoint: string,
-  credential: TokenCredential,
-  dbConfig: AzureCosmosDBNoSQLConfig,
-) => {
-  const vectorStore = AzureCosmosDBNoSqlVectorStore.fromUriAndManagedIdentity({
-    endpoint,
-    credential,
-    ...dbConfig,
-  });
-  const docStore = AzureCosmosNoSqlDocumentStore.fromAadToken({
-    endpoint,
-    credential,
-  });
-  const indexStore = AzureCosmosNoSqlIndexStore.fromAadToken({
-    endpoint,
-    credential,
-  });
-  return { vectorStore, docStore, indexStore };
-};

examples/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@llamaindex/examples",
   "private": true,
-  "version": "0.0.16",
+  "version": "0.0.12",
   "dependencies": {
     "@aws-crypto/sha256-js": "^5.2.0",
     "@azure/cosmos": "^4.1.1",
     "@azure/identity": "^4.4.1",
     "@datastax/astra-db-ts": "^1.4.1",
-    "@llamaindex/core": "^0.4.10",
-    "@llamaindex/readers": "^1.0.11",
-    "@llamaindex/workflow": "^0.0.6",
+    "@llamaindex/core": "^0.4.0",
+    "@llamaindex/readers": "^1.0.0",
+    "@llamaindex/workflow": "^0.0.2",
     "@notionhq/client": "^2.2.15",
     "@pinecone-database/pinecone": "^3.0.2",
     "@vercel/postgres": "^0.10.0",
@@ -18,7 +18,7 @@
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
     "js-tiktoken": "^1.0.14",
-    "llamaindex": "^0.8.13",
+    "llamaindex": "^0.8.0",
     "mongodb": "^6.7.0",
     "pathe": "^1.1.2",
     "postgres": "^3.4.4"

examples/vectorIndexLocal.ts

@@ -14,6 +14,7 @@ Settings.llm = new Ollama({
 
 Settings.embedModel = new HuggingFaceEmbedding({
   modelType: "BAAI/bge-small-en-v1.5",
+  quantized: false,
 });
 
 async function main() {

examples/vllm.ts

@@ -1,16 +0,0 @@
-import { VLLM } from "llamaindex";
-
-const llm = new VLLM({
-  model: "NousResearch/Meta-Llama-3-8B-Instruct",
-});
-
-const response = await llm.chat({
-  messages: [
-    {
-      role: "user",
-      content: "Hello?",
-    },
-  ],
-});
-
-console.log(response.message.content);

examples/workflow/app-creator.ts

@@ -1,19 +1,14 @@
 import {
-  HandlerContext,
+  Context,
   StartEvent,
   StopEvent,
   Workflow,
   WorkflowEvent,
-} from "@llamaindex/workflow";
+} from "@llamaindex/core/workflow";
 import { OpenAI } from "llamaindex";
 
 const MAX_REVIEWS = 3;
 
-type Context = {
-  specification: string;
-  numberReviews: number;
-};
-
 // Using the o1-preview model (see https://platform.openai.com/docs/guides/reasoning?reasoning-prompt-examples=coding-planning)
 const llm = new OpenAI({ model: "o1-preview", temperature: 1 });
 
@@ -25,9 +20,7 @@ stores the question/answer pair in the database.`;
 
 // Create custom event types
 export class MessageEvent extends WorkflowEvent<{ msg: string }> {}
-
 export class CodeEvent extends WorkflowEvent<{ code: string }> {}
-
 export class ReviewEvent extends WorkflowEvent<{
   review: string;
   code: string;
@@ -41,13 +34,12 @@ const truncate = (str: string) => {
 };
 
 // the architect is responsible for writing the structure and the initial code based on the specification
-const architect = async (
-  context: HandlerContext<Context>,
-  _: StartEvent<string>,
-) => {
-  const spec = context.data.specification;
+const architect = async (context: Context, ev: StartEvent) => {
+  // get the specification from the start event and save it to context
+  context.set("specification", ev.data.input);
+  const spec = context.get("specification");
   // write a message to send an update to the user
-  context.sendEvent(
+  context.writeEventToStream(
     new MessageEvent({
       msg: `Writing app using this specification: ${truncate(spec)}`,
     }),
@@ -58,13 +50,13 @@ const architect = async (
 };
 
 // the coder is responsible for updating the code based on the review
-const coder = async (context: HandlerContext<Context>, ev: ReviewEvent) => {
+const coder = async (context: Context, ev: ReviewEvent) => {
   // get the specification from the context
-  const spec = context.data.specification;
+  const spec = context.get("specification");
   // get the latest review and code
   const { review, code } = ev.data;
   // write a message to send an update to the user
-  context.sendEvent(
+  context.writeEventToStream(
     new MessageEvent({
       msg: `Update code based on review: ${truncate(review)}`,
     }),
@@ -75,35 +67,32 @@ const coder = async (context: HandlerContext<Context>, ev: ReviewEvent) => {
 };
 
 // the reviewer is responsible for reviewing the code and providing feedback
-const reviewer = async (context: HandlerContext<Context>, ev: CodeEvent) => {
+const reviewer = async (context: Context, ev: CodeEvent) => {
   // get the specification from the context
-  const spec = context.data.specification;
+  const spec = context.get("specification");
   // get latest code from the event
   const { code } = ev.data;
   // update and check the number of reviews
-  context.data.numberReviews++;
-  if (context.data.numberReviews > MAX_REVIEWS) {
+  const numberReviews = context.get("numberReviews", 0) + 1;
+  context.set("numberReviews", numberReviews);
+  if (numberReviews > MAX_REVIEWS) {
     // the we've done this too many times - return the code
-    context.sendEvent(
+    context.writeEventToStream(
       new MessageEvent({
-        msg: `Already reviewed ${
-          context.data.numberReviews - 1
-        } times, stopping!`,
+        msg: `Already reviewed ${numberReviews - 1} times, stopping!`,
       }),
     );
     return new StopEvent({ result: code });
   }
   // write a message to send an update to the user
-  context.sendEvent(
-    new MessageEvent({
-      msg: `Review #${context.data.numberReviews}: ${truncate(code)}`,
-    }),
+  context.writeEventToStream(
+    new MessageEvent({ msg: `Review #${numberReviews}: ${truncate(code)}` }),
   );
   const prompt = `Review this code: <code>${code}</code>. Check if the code quality and whether it correctly implements this specification: <spec>${spec}</spec>. If you're satisfied, just return 'Looks great', nothing else. If not, return a review with a list of changes you'd like to see.`;
   const review = (await llm.complete({ prompt })).text;
   if (review.includes("Looks great")) {
     // the reviewer is satisfied with the code, let's return the review
-    context.sendEvent(
+    context.writeEventToStream(
       new MessageEvent({
         msg: `Reviewer says: ${review}`,
       }),
@@ -114,44 +103,20 @@ const reviewer = async (context: HandlerContext<Context>, ev: CodeEvent) => {
   return new ReviewEvent({ review, code });
 };
 
-const codeAgent = new Workflow<Context, string, string>();
-codeAgent.addStep(
-  {
-    inputs: [StartEvent<string>],
-    outputs: [CodeEvent],
-  },
-  architect,
-);
-codeAgent.addStep(
-  {
-    inputs: [ReviewEvent],
-    outputs: [CodeEvent],
-  },
-  coder,
-);
-codeAgent.addStep(
-  {
-    inputs: [CodeEvent],
-    outputs: [ReviewEvent, StopEvent],
-  },
-  reviewer,
-);
+const codeAgent = new Workflow({ validate: true });
+codeAgent.addStep(StartEvent, architect, { outputs: CodeEvent });
+codeAgent.addStep(ReviewEvent, coder, { outputs: CodeEvent });
+codeAgent.addStep(CodeEvent, reviewer, { outputs: ReviewEvent });
 
 // Usage
 async function main() {
-  const run = codeAgent.run(specification).with({
-    specification,
-    numberReviews: 0,
-  });
-  for await (const event of run) {
-    if (event instanceof MessageEvent) {
-      const msg = (event as MessageEvent).data.msg;
-      console.log(`${msg}\n`);
-    } else if (event instanceof StopEvent) {
-      const result = (event as StopEvent<string>).data;
-      console.log("Final code:\n", result);
-    }
+  const run = codeAgent.run(specification);
+  for await (const event of codeAgent.streamEvents()) {
+    const msg = (event as MessageEvent).data.msg;
+    console.log(`${msg}\n`);
   }
+  const result = await run;
+  console.log("Final code:\n", result.data.result);
 }
 
 main().catch(console.error);

examples/workflow/collect-events.ts

@@ -1,10 +1,10 @@
 import {
-  HandlerContext,
+  Context,
   StartEvent,
   StopEvent,
   Workflow,
   WorkflowEvent,
-} from "@llamaindex/workflow";
+} from "@llamaindex/core/workflow";
 import { OpenAI } from "llamaindex";
 
 // Create LLM instance
@@ -12,77 +12,59 @@ const llm = new OpenAI();
 
 // Create custom event types
 export class JokeEvent extends WorkflowEvent<{ joke: string }> {}
-
 export class CritiqueEvent extends WorkflowEvent<{ critique: string }> {}
-
 export class AnalysisEvent extends WorkflowEvent<{ analysis: string }> {}
 
-const generateJoke = async (_: unknown, ev: StartEvent<string>) => {
-  const prompt = `Write your best joke about ${ev.data}.`;
+const generateJoke = async (_context: Context, ev: StartEvent) => {
+  const prompt = `Write your best joke about ${ev.data.input}.`;
   const response = await llm.complete({ prompt });
   return new JokeEvent({ joke: response.text });
 };
 
-const critiqueJoke = async (_: unknown, ev: JokeEvent) => {
+const critiqueJoke = async (_context: Context, ev: JokeEvent) => {
   const prompt = `Give a thorough critique of the following joke: ${ev.data.joke}`;
   const response = await llm.complete({ prompt });
   return new CritiqueEvent({ critique: response.text });
 };
 
-const analyzeJoke = async (_: unknown, ev: JokeEvent) => {
+const analyzeJoke = async (_context: Context, ev: JokeEvent) => {
   const prompt = `Give a thorough analysis of the following joke: ${ev.data.joke}`;
   const response = await llm.complete({ prompt });
   return new AnalysisEvent({ analysis: response.text });
 };
 
 const reportJoke = async (
-  context: HandlerContext,
-  ev1: AnalysisEvent,
-  ev2: CritiqueEvent,
+  context: Context,
+  ev: AnalysisEvent | CritiqueEvent,
 ) => {
-  const subPrompts = [ev1.data.analysis, ev2.data.critique];
+  const events = context.collectEvents(ev, [AnalysisEvent, CritiqueEvent]);
+  if (!events) {
+    return;
+  }
+  const subPrompts = events.map((event) => {
+    if (event instanceof AnalysisEvent) {
+      return `Analysis: ${event.data.analysis}`;
+    } else if (event instanceof CritiqueEvent) {
+      return `Critique: ${event.data.critique}`;
+    }
+    return "";
+  });
 
-  const prompt = `Based on the following information about a joke:\n${subPrompts.join(
-    "\n",
-  )}\nProvide a comprehensive report on the joke's quality and impact.`;
+  const prompt = `Based on the following information about a joke:\n${subPrompts.join("\n")}\nProvide a comprehensive report on the joke's quality and impact.`;
   const response = await llm.complete({ prompt });
-  return new StopEvent(response.text);
+  return new StopEvent({ result: response.text });
 };
 
-const jokeFlow = new Workflow<unknown, string, string>();
-jokeFlow.addStep(
-  {
-    inputs: [StartEvent<string>],
-    outputs: [JokeEvent],
-  },
-  generateJoke,
-);
-jokeFlow.addStep(
-  {
-    inputs: [JokeEvent],
-    outputs: [CritiqueEvent],
-  },
-  critiqueJoke,
-);
-jokeFlow.addStep(
-  {
-    inputs: [JokeEvent],
-    outputs: [AnalysisEvent],
-  },
-  analyzeJoke,
-);
-jokeFlow.addStep(
-  {
-    inputs: [AnalysisEvent, CritiqueEvent],
-    outputs: [StopEvent<string>],
-  },
-  reportJoke,
-);
+const jokeFlow = new Workflow();
+jokeFlow.addStep(StartEvent, generateJoke);
+jokeFlow.addStep(JokeEvent, critiqueJoke);
+jokeFlow.addStep(JokeEvent, analyzeJoke);
+jokeFlow.addStep([AnalysisEvent, CritiqueEvent], reportJoke);
 
 // Usage
 async function main() {
   const result = await jokeFlow.run("pirates");
-  console.log(result.data);
+  console.log(result.data.result);
 }
 
 main().catch(console.error);

examples/workflow/joke.ts

@@ -1,9 +1,10 @@
 import {
+  Context,
   StartEvent,
   StopEvent,
   Workflow,
   WorkflowEvent,
-} from "@llamaindex/workflow";
+} from "@llamaindex/core/workflow";
 import { OpenAI } from "llamaindex";
 
 // Create LLM instance
@@ -12,38 +13,26 @@ const llm = new OpenAI();
 // Create a custom event type
 export class JokeEvent extends WorkflowEvent<{ joke: string }> {}
 
-const generateJoke = async (_: unknown, ev: StartEvent<string>) => {
-  const prompt = `Write your best joke about ${ev.data}.`;
+const generateJoke = async (_context: Context, ev: StartEvent) => {
+  const prompt = `Write your best joke about ${ev.data.input}.`;
   const response = await llm.complete({ prompt });
   return new JokeEvent({ joke: response.text });
 };
 
-const critiqueJoke = async (_: unknown, ev: JokeEvent) => {
+const critiqueJoke = async (_context: Context, ev: JokeEvent) => {
   const prompt = `Give a thorough critique of the following joke: ${ev.data.joke}`;
   const response = await llm.complete({ prompt });
-  return new StopEvent(response.text);
+  return new StopEvent({ result: response.text });
 };
 
-const jokeFlow = new Workflow<unknown, string, string>();
-jokeFlow.addStep(
-  {
-    inputs: [StartEvent<string>],
-    outputs: [JokeEvent],
-  },
-  generateJoke,
-);
-jokeFlow.addStep(
-  {
-    inputs: [JokeEvent],
-    outputs: [StopEvent<string>],
-  },
-  critiqueJoke,
-);
+const jokeFlow = new Workflow({ verbose: true });
+jokeFlow.addStep(StartEvent, generateJoke);
+jokeFlow.addStep(JokeEvent, critiqueJoke);
 
 // Usage
 async function main() {
   const result = await jokeFlow.run("pirates");
-  console.log(result.data);
+  console.log(result.data.result);
 }
 
 main().catch(console.error);

examples/workflow/stream-events.ts

@@ -1,10 +1,10 @@
 import {
-  HandlerContext,
+  Context,
   StartEvent,
   StopEvent,
   Workflow,
   WorkflowEvent,
-} from "@llamaindex/workflow";
+} from "@llamaindex/core/workflow";
 import { OpenAI } from "llamaindex";
 
 // Create LLM instance
@@ -12,55 +12,38 @@ const llm = new OpenAI();
 
 // Create custom event types
 export class JokeEvent extends WorkflowEvent<{ joke: string }> {}
-
 export class MessageEvent extends WorkflowEvent<{ msg: string }> {}
 
-const generateJoke = async (context: HandlerContext, ev: StartEvent) => {
-  context.sendEvent(
-    new MessageEvent({ msg: `Generating a joke about: ${ev.data}` }),
+const generateJoke = async (context: Context, ev: StartEvent) => {
+  context.writeEventToStream(
+    new MessageEvent({ msg: `Generating a joke about: ${ev.data.input}` }),
   );
-  const prompt = `Write your best joke about ${ev.data}.`;
+  const prompt = `Write your best joke about ${ev.data.input}.`;
   const response = await llm.complete({ prompt });
   return new JokeEvent({ joke: response.text });
 };
 
-const critiqueJoke = async (context: HandlerContext, ev: JokeEvent) => {
-  context.sendEvent(
+const critiqueJoke = async (context: Context, ev: JokeEvent) => {
+  context.writeEventToStream(
     new MessageEvent({ msg: `Write a critique of this joke: ${ev.data.joke}` }),
   );
   const prompt = `Give a thorough critique of the following joke: ${ev.data.joke}`;
   const response = await llm.complete({ prompt });
-  return new StopEvent(response.text);
+  return new StopEvent({ result: response.text });
 };
 
 const jokeFlow = new Workflow();
-jokeFlow.addStep(
-  {
-    inputs: [StartEvent<string>],
-    outputs: [JokeEvent],
-  },
-  generateJoke,
-);
-jokeFlow.addStep(
-  {
-    inputs: [JokeEvent],
-    outputs: [StopEvent<string>],
-  },
-  critiqueJoke,
-);
+jokeFlow.addStep(StartEvent, generateJoke);
+jokeFlow.addStep(JokeEvent, critiqueJoke);
 
 // Usage
 async function main() {
   const run = jokeFlow.run("pirates");
-  for await (const event of run) {
-    if (event instanceof MessageEvent) {
-      console.log("Message:");
-      console.log((event as MessageEvent).data.msg);
-    } else if (event instanceof StopEvent) {
-      console.log("Result:");
-      console.log((event as StopEvent<string>).data);
-    }
+  for await (const event of jokeFlow.streamEvents()) {
+    console.log((event as MessageEvent).data.msg);
   }
+  const result = await run;
+  console.log(result.data.result);
 }
 
 main().catch(console.error);

examples/workflow/timeout.ts

@@ -1,21 +1,19 @@
-import { StartEvent, StopEvent, Workflow } from "@llamaindex/workflow";
+import {
+  Context,
+  StartEvent,
+  StopEvent,
+  Workflow,
+} from "@llamaindex/core/workflow";
 
-const longRunning = async (_: unknown, ev: StartEvent<string>) => {
+const longRunning = async (_context: Context, ev: StartEvent) => {
   await new Promise((resolve) => setTimeout(resolve, 2000)); // Wait for 2 seconds
-  return new StopEvent("We waited 2 seconds");
+  return new StopEvent({ result: "We waited 2 seconds" });
 };
 
 async function timeout() {
-  const workflow = new Workflow<unknown, string, string>({
-    timeout: 1,
-  });
-  workflow.addStep(
-    {
-      inputs: [StartEvent<string>],
-      outputs: [StopEvent<string>],
-    },
-    longRunning,
-  );
+  const workflow = new Workflow({ verbose: true, timeout: 1 });
+  workflow.addStep(StartEvent, longRunning);
+  // This will timeout
   try {
     await workflow.run("Let's start");
   } catch (error) {
@@ -25,23 +23,14 @@ async function timeout() {
 
 async function notimeout() {
   // Increase timeout to 3 seconds - no timeout
-  const workflow = new Workflow<unknown, string, string>({
-    timeout: 3,
-  });
-  workflow.addStep(
-    {
-      inputs: [StartEvent<string>],
-      outputs: [StopEvent<string>],
-    },
-    longRunning,
-  );
+  const workflow = new Workflow({ verbose: true, timeout: 3 });
+  workflow.addStep(StartEvent, longRunning);
   const result = await workflow.run("Let's start");
-  console.log(result.data);
+  console.log(result.data.result);
 }
 
 async function main() {
   await timeout();
-  console.log("---");
   await notimeout();
 }
 

examples/workflow/validation.ts

@@ -1,9 +1,10 @@
 import {
+  Context,
   StartEvent,
   StopEvent,
   Workflow,
   WorkflowEvent,
-} from "@llamaindex/workflow";
+} from "@llamaindex/core/workflow";
 import { OpenAI } from "llamaindex";
 
 // Create LLM instance
@@ -12,66 +13,40 @@ const llm = new OpenAI();
 // Create a custom event type
 export class JokeEvent extends WorkflowEvent<{ joke: string }> {}
 
-const generateJoke = async (_: unknown, ev: StartEvent<string>) => {
-  const prompt = `Write your best joke about ${ev.data}.`;
+const generateJoke = async (_context: Context, ev: StartEvent) => {
+  const prompt = `Write your best joke about ${ev.data.input}.`;
   const response = await llm.complete({ prompt });
   return new JokeEvent({ joke: response.text });
 };
 
-const critiqueJoke = async (_: unknown, ev: JokeEvent) => {
+const critiqueJoke = async (_context: Context, ev: JokeEvent) => {
   const prompt = `Give a thorough critique of the following joke: ${ev.data.joke}`;
   const response = await llm.complete({ prompt });
-  return new StopEvent(response.text);
+  return new StopEvent({ result: response.text });
 };
 
 async function validateFails() {
   try {
-    const jokeFlow = new Workflow();
-    jokeFlow.addStep(
-      {
-        inputs: [StartEvent<string>],
-        outputs: [StopEvent<string>],
-      },
-      // @ts-expect-error outputs should be JokeEvent
-      generateJoke,
-    );
-    jokeFlow.addStep(
-      {
-        inputs: [JokeEvent],
-        outputs: [StopEvent],
-      },
-      critiqueJoke,
-    );
-    await jokeFlow.run("pirates").strict();
+    const jokeFlow = new Workflow({ verbose: true, validate: true });
+    jokeFlow.addStep(StartEvent, generateJoke, { outputs: StopEvent });
+    jokeFlow.addStep(JokeEvent, critiqueJoke, { outputs: StopEvent });
+    await jokeFlow.run("pirates");
   } catch (e) {
     console.error("Validation failed:", e);
   }
 }
 
 async function validate() {
-  const jokeFlow = new Workflow();
-  jokeFlow.addStep(
-    {
-      inputs: [StartEvent<string>],
-      outputs: [JokeEvent],
-    },
-    generateJoke,
-  );
-  jokeFlow.addStep(
-    {
-      inputs: [JokeEvent],
-      outputs: [StopEvent<string>],
-    },
-    critiqueJoke,
-  );
-  const result = await jokeFlow.run("pirates").strict();
-  console.log(result.data);
+  const jokeFlow = new Workflow({ verbose: true, validate: true });
+  jokeFlow.addStep(StartEvent, generateJoke, { outputs: JokeEvent });
+  jokeFlow.addStep(JokeEvent, critiqueJoke, { outputs: StopEvent });
+  const result = await jokeFlow.run("pirates");
+  console.log(result.data.result);
 }
 
 // Usage
 async function main() {
   await validateFails();
-  console.log("---");
   await validate();
 }
 

package.json

@@ -35,6 +35,12 @@
     "typescript-eslint": "^8.13.0"
   },
   "packageManager": "pnpm@9.12.3",
+  "pnpm": {
+    "overrides": {
+      "trim": "1.0.1",
+      "protobufjs": "7.2.6"
+    }
+  },
   "lint-staged": {
     "(!apps/docs/i18n/**/docusaurus-plugin-content-docs/current/api/*).{js,jsx,ts,tsx,md}": "prettier --write"
   }

packages/autotool/CHANGELOG.md

@@ -1,67 +1,5 @@
 # @llamaindex/autotool
 
-## 5.0.13
-
-### Patch Changes
-
-- llamaindex@0.8.13
-
-## 5.0.12
-
-### Patch Changes
-
-- llamaindex@0.8.12
-
-## 5.0.11
-
-### Patch Changes
-
-- llamaindex@0.8.11
-
-## 5.0.10
-
-### Patch Changes
-
-- Updated dependencies [f066e50]
-  - llamaindex@0.8.10
-
-## 5.0.9
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-- Updated dependencies [4d4cd8a]
-  - llamaindex@0.8.9
-
-## 5.0.8
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - llamaindex@0.8.8
-
-## 5.0.7
-
-### Patch Changes
-
-- llamaindex@0.8.7
-
-## 5.0.6
-
-### Patch Changes
-
-- Updated dependencies [95a5cc6]
-  - llamaindex@0.8.6
-
-## 5.0.5
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-- Updated dependencies [a6db5dd]
-- Updated dependencies [396b1e1]
-  - llamaindex@0.8.5
-
 ## 5.0.4
 
 ### Patch Changes

packages/autotool/examples/01_node/CHANGELOG.md

@@ -1,76 +1,5 @@
 # @llamaindex/autotool-01-node-example
 
-## 0.0.56
-
-### Patch Changes
-
-- llamaindex@0.8.13
-- @llamaindex/autotool@5.0.13
-
-## 0.0.55
-
-### Patch Changes
-
-- llamaindex@0.8.12
-- @llamaindex/autotool@5.0.12
-
-## 0.0.54
-
-### Patch Changes
-
-- llamaindex@0.8.11
-- @llamaindex/autotool@5.0.11
-
-## 0.0.53
-
-### Patch Changes
-
-- Updated dependencies [f066e50]
-  - llamaindex@0.8.10
-  - @llamaindex/autotool@5.0.10
-
-## 0.0.52
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-- Updated dependencies [4d4cd8a]
-  - llamaindex@0.8.9
-  - @llamaindex/autotool@5.0.9
-
-## 0.0.51
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - llamaindex@0.8.8
-  - @llamaindex/autotool@5.0.8
-
-## 0.0.50
-
-### Patch Changes
-
-- llamaindex@0.8.7
-- @llamaindex/autotool@5.0.7
-
-## 0.0.49
-
-### Patch Changes
-
-- Updated dependencies [95a5cc6]
-  - llamaindex@0.8.6
-  - @llamaindex/autotool@5.0.6
-
-## 0.0.48
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-- Updated dependencies [a6db5dd]
-- Updated dependencies [396b1e1]
-  - llamaindex@0.8.5
-  - @llamaindex/autotool@5.0.5
-
 ## 0.0.47
 
 ### Patch Changes

packages/autotool/examples/01_node/package.json

@@ -13,5 +13,5 @@
   "scripts": {
     "start": "node --import tsx --import @llamaindex/autotool/node ./src/index.ts"
   },
-  "version": "0.0.56"
+  "version": "0.0.47"
 }

packages/autotool/examples/02_nextjs/CHANGELOG.md

@@ -1,76 +1,5 @@
 # @llamaindex/autotool-02-next-example
 
-## 0.1.100
-
-### Patch Changes
-
-- llamaindex@0.8.13
-- @llamaindex/autotool@5.0.13
-
-## 0.1.99
-
-### Patch Changes
-
-- llamaindex@0.8.12
-- @llamaindex/autotool@5.0.12
-
-## 0.1.98
-
-### Patch Changes
-
-- llamaindex@0.8.11
-- @llamaindex/autotool@5.0.11
-
-## 0.1.97
-
-### Patch Changes
-
-- Updated dependencies [f066e50]
-  - llamaindex@0.8.10
-  - @llamaindex/autotool@5.0.10
-
-## 0.1.96
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-- Updated dependencies [4d4cd8a]
-  - llamaindex@0.8.9
-  - @llamaindex/autotool@5.0.9
-
-## 0.1.95
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - llamaindex@0.8.8
-  - @llamaindex/autotool@5.0.8
-
-## 0.1.94
-
-### Patch Changes
-
-- llamaindex@0.8.7
-- @llamaindex/autotool@5.0.7
-
-## 0.1.93
-
-### Patch Changes
-
-- Updated dependencies [95a5cc6]
-  - llamaindex@0.8.6
-  - @llamaindex/autotool@5.0.6
-
-## 0.1.92
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-- Updated dependencies [a6db5dd]
-- Updated dependencies [396b1e1]
-  - llamaindex@0.8.5
-  - @llamaindex/autotool@5.0.5
-
 ## 0.1.91
 
 ### Patch Changes

packages/autotool/examples/02_nextjs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/autotool-02-next-example",
   "private": true,
-  "version": "0.1.100",
+  "version": "0.1.91",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

packages/autotool/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/autotool",
   "type": "module",
-  "version": "5.0.13",
+  "version": "5.0.4",
   "description": "auto transpile your JS function to LLM Agent compatible",
   "files": [
     "dist",

packages/cloud/CHANGELOG.md

@@ -1,74 +1,5 @@
 # @llamaindex/cloud
 
-## 2.0.10
-
-### Patch Changes
-
-- Updated dependencies [a7b0ac3]
-- Updated dependencies [c69605f]
-  - @llamaindex/core@0.4.10
-
-## 2.0.9
-
-### Patch Changes
-
-- Updated dependencies [7ae6eaa]
-  - @llamaindex/core@0.4.9
-
-## 2.0.8
-
-### Patch Changes
-
-- Updated dependencies [f865c98]
-  - @llamaindex/core@0.4.8
-
-## 2.0.7
-
-### Patch Changes
-
-- Updated dependencies [d89ebe0]
-- Updated dependencies [fd8c882]
-  - @llamaindex/core@0.4.7
-
-## 2.0.6
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-  - @llamaindex/env@0.1.20
-  - @llamaindex/core@0.4.6
-
-## 2.0.5
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - @llamaindex/core@0.4.5
-  - @llamaindex/env@0.1.19
-
-## 2.0.4
-
-### Patch Changes
-
-- Updated dependencies [a8d3fa6]
-  - @llamaindex/env@0.1.18
-  - @llamaindex/core@0.4.4
-
-## 2.0.3
-
-### Patch Changes
-
-- Updated dependencies [95a5cc6]
-  - @llamaindex/core@0.4.3
-
-## 2.0.2
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-  - @llamaindex/env@0.1.17
-  - @llamaindex/core@0.4.2
-
 ## 2.0.1
 
 ### Patch Changes

packages/cloud/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/cloud",
-  "version": "2.0.10",
+  "version": "2.0.1",
   "type": "module",
   "license": "MIT",
   "scripts": {

packages/cloud/tsconfig.json

@@ -8,6 +8,7 @@
     "moduleResolution": "Bundler",
     "skipLibCheck": true,
     "strict": true,
+    "lib": ["DOM", "ESNext"],
     "types": []
   },
   "include": ["./src"],

packages/community/CHANGELOG.md

@@ -1,81 +1,5 @@
 # @llamaindex/community
 
-## 0.0.68
-
-### Patch Changes
-
-- Updated dependencies [a7b0ac3]
-- Updated dependencies [c69605f]
-  - @llamaindex/core@0.4.10
-
-## 0.0.67
-
-### Patch Changes
-
-- Updated dependencies [7ae6eaa]
-  - @llamaindex/core@0.4.9
-
-## 0.0.66
-
-### Patch Changes
-
-- Updated dependencies [f865c98]
-  - @llamaindex/core@0.4.8
-
-## 0.0.65
-
-### Patch Changes
-
-- Updated dependencies [d89ebe0]
-- Updated dependencies [fd8c882]
-  - @llamaindex/core@0.4.7
-
-## 0.0.64
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-  - @llamaindex/env@0.1.20
-  - @llamaindex/core@0.4.6
-
-## 0.0.63
-
-### Patch Changes
-
-- Updated dependencies [ad85bd0]
-  - @llamaindex/core@0.4.5
-  - @llamaindex/env@0.1.19
-
-## 0.0.62
-
-### Patch Changes
-
-- Updated dependencies [a8d3fa6]
-  - @llamaindex/env@0.1.18
-  - @llamaindex/core@0.4.4
-
-## 0.0.61
-
-### Patch Changes
-
-- 487782c: Add missing inference endpoints for Haiku 3.5
-- Updated dependencies [95a5cc6]
-  - @llamaindex/core@0.4.3
-
-## 0.0.60
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-  - @llamaindex/env@0.1.17
-  - @llamaindex/core@0.4.2
-
-## 0.0.59
-
-### Patch Changes
-
-- 47a7c3e: feat: added support for Haiku 3.5 via Bedrock
-
 ## 0.0.58
 
 ### Patch Changes

packages/community/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/community",
   "description": "Community package for LlamaIndexTS",
-  "version": "0.0.68",
+  "version": "0.0.58",
   "type": "module",
   "types": "dist/type/index.d.ts",
   "main": "dist/cjs/index.js",

packages/community/src/llm/bedrock/index.ts

@@ -87,7 +87,6 @@ export type BEDROCK_MODELS =
 
 export const INFERENCE_BEDROCK_MODELS = {
   US_ANTHROPIC_CLAUDE_3_HAIKU: "us.anthropic.claude-3-haiku-20240307-v1:0",
-  US_ANTHROPIC_CLAUDE_3_5_HAIKU: "us.anthropic.claude-3-5-haiku-20241022-v1:0",
   US_ANTHROPIC_CLAUDE_3_OPUS: "us.anthropic.claude-3-opus-20240229-v1:0",
   US_ANTHROPIC_CLAUDE_3_SONNET: "us.anthropic.claude-3-sonnet-20240229-v1:0",
   US_ANTHROPIC_CLAUDE_3_5_SONNET:
@@ -100,7 +99,6 @@ export const INFERENCE_BEDROCK_MODELS = {
   US_META_LLAMA_3_2_90B_INSTRUCT: "us.meta.llama3-2-90b-instruct-v1:0",
 
   EU_ANTHROPIC_CLAUDE_3_HAIKU: "eu.anthropic.claude-3-haiku-20240307-v1:0",
-  EU_ANTHROPIC_CLAUDE_3_5_HAIKU: "eu.anthropic.claude-3-5-haiku-20240307-v1:0",
   EU_ANTHROPIC_CLAUDE_3_SONNET: "eu.anthropic.claude-3-sonnet-20240229-v1:0",
   EU_ANTHROPIC_CLAUDE_3_5_SONNET:
     "eu.anthropic.claude-3-5-sonnet-20240620-v1:0",
@@ -125,8 +123,6 @@ export const INFERENCE_TO_BEDROCK_MAP: Record<
     BEDROCK_MODELS.ANTHROPIC_CLAUDE_3_5_SONNET,
   [INFERENCE_BEDROCK_MODELS.US_ANTHROPIC_CLAUDE_3_5_SONNET_V2]:
     BEDROCK_MODELS.ANTHROPIC_CLAUDE_3_5_SONNET_V2,
-  [INFERENCE_BEDROCK_MODELS.US_ANTHROPIC_CLAUDE_3_5_HAIKU]:
-    BEDROCK_MODELS.ANTHROPIC_CLAUDE_3_5_HAIKU,
   [INFERENCE_BEDROCK_MODELS.US_META_LLAMA_3_2_1B_INSTRUCT]:
     BEDROCK_MODELS.META_LLAMA3_2_1B_INSTRUCT,
   [INFERENCE_BEDROCK_MODELS.US_META_LLAMA_3_2_3B_INSTRUCT]:

packages/core/CHANGELOG.md

@@ -1,67 +1,5 @@
 # @llamaindex/core
 
-## 0.4.10
-
-### Patch Changes
-
-- a7b0ac3: fix: update tool call llm type
-- c69605f: feat: add async support to BaseChatStore and BaseChatStoreMemory
-
-## 0.4.9
-
-### Patch Changes
-
-- 7ae6eaa: feat: allow pass `additionalChatOptions` to agent
-
-## 0.4.8
-
-### Patch Changes
-
-- f865c98: feat: async get message on chat store
-
-## 0.4.7
-
-### Patch Changes
-
-- d89ebe0: feat: better support for zod schema
-- fd8c882: chore: add warning on legacy workflow API
-
-## 0.4.6
-
-### Patch Changes
-
-- Updated dependencies [4fc001c]
-  - @llamaindex/env@0.1.20
-
-## 0.4.5
-
-### Patch Changes
-
-- ad85bd0: - fix agent chat message not saved into the task context when streaming
-  - fix async local storage might use `node:async_hook` in edge-light/workerd condition
-- Updated dependencies [ad85bd0]
-  - @llamaindex/env@0.1.19
-
-## 0.4.4
-
-### Patch Changes
-
-- Updated dependencies [a8d3fa6]
-  - @llamaindex/env@0.1.18
-
-## 0.4.3
-
-### Patch Changes
-
-- 95a5cc6: refactor: move storage into core
-
-## 0.4.2
-
-### Patch Changes
-
-- Updated dependencies [14cc9eb]
-  - @llamaindex/env@0.1.17
-
 ## 0.4.1
 
 ### Patch Changes

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/core",
   "type": "module",
-  "version": "0.4.10",
+  "version": "0.4.1",
   "description": "LlamaIndex Core Module",
   "exports": {
     "./agent": {
@@ -214,48 +214,6 @@
         "default": "./storage/chat-store/dist/index.js"
       }
     },
-    "./storage/doc-store": {
-      "require": {
-        "types": "./storage/doc-store/dist/index.d.cts",
-        "default": "./storage/doc-store/dist/index.cjs"
-      },
-      "import": {
-        "types": "./storage/doc-store/dist/index.d.ts",
-        "default": "./storage/doc-store/dist/index.js"
-      },
-      "default": {
-        "types": "./storage/doc-store/dist/index.d.ts",
-        "default": "./storage/doc-store/dist/index.js"
-      }
-    },
-    "./storage/index-store": {
-      "require": {
-        "types": "./storage/index-store/dist/index.d.cts",
-        "default": "./storage/index-store/dist/index.cjs"
-      },
-      "import": {
-        "types": "./storage/index-store/dist/index.d.ts",
-        "default": "./storage/index-store/dist/index.js"
-      },
-      "default": {
-        "types": "./storage/index-store/dist/index.d.ts",
-        "default": "./storage/index-store/dist/index.js"
-      }
-    },
-    "./storage/kv-store": {
-      "require": {
-        "types": "./storage/kv-store/dist/index.d.cts",
-        "default": "./storage/kv-store/dist/index.cjs"
-      },
-      "import": {
-        "types": "./storage/kv-store/dist/index.d.ts",
-        "default": "./storage/kv-store/dist/index.js"
-      },
-      "default": {
-        "types": "./storage/kv-store/dist/index.d.ts",
-        "default": "./storage/kv-store/dist/index.js"
-      }
-    },
     "./response-synthesizers": {
       "require": {
         "types": "./response-synthesizers/dist/index.d.cts",
@@ -392,7 +350,7 @@
     "@edge-runtime/vm": "^4.0.3",
     "ajv": "^8.17.1",
     "bunchee": "5.6.1",
-    "happy-dom": "^15.11.0",
+    "happy-dom": "^15.10.0",
     "natural": "^8.0.1"
   },
   "dependencies": {

packages/core/src/agent/base.ts

@@ -3,7 +3,7 @@ import {
   BaseChatEngine,
   type NonStreamingChatEngineParams,
   type StreamingChatEngineParams,
-} from "../chat-engine";
+} from "../chat-engine/base";
 import { wrapEventCaller } from "../decorator";
 import { Settings } from "../global";
 import type {
@@ -106,17 +106,11 @@ export type AgentRunnerParams<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > = {
   llm: AI;
   chatHistory: ChatMessage<AdditionalMessageOptions>[];
   systemPrompt: MessageContent | null;
-  runner: AgentWorker<
-    AI,
-    Store,
-    AdditionalMessageOptions,
-    AdditionalChatOptions
-  >;
+  runner: AgentWorker<AI, Store, AdditionalMessageOptions>;
   tools:
     | BaseToolWithCall[]
     | ((query: MessageContent) => Promise<BaseToolWithCall[]>);
@@ -131,7 +125,6 @@ export type AgentParamsBase<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > =
   | {
       llm?: AI;
@@ -139,7 +132,6 @@ export type AgentParamsBase<
       systemPrompt?: MessageContent;
       verbose?: boolean;
       tools: BaseToolWithCall[];
-      additionalChatOptions?: AdditionalChatOptions;
     }
   | {
       llm?: AI;
@@ -147,7 +139,6 @@ export type AgentParamsBase<
       systemPrompt?: MessageContent;
       verbose?: boolean;
       toolRetriever: ObjectRetriever<BaseToolWithCall>;
-      additionalChatOptions?: AdditionalChatOptions;
     };
 
 /**
@@ -162,75 +153,37 @@ export abstract class AgentWorker<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > {
-  #taskSet = new Set<
-    TaskStep<AI, Store, AdditionalMessageOptions, AdditionalChatOptions>
-  >();
-  abstract taskHandler: TaskHandler<
-    AI,
-    Store,
-    AdditionalMessageOptions,
-    AdditionalChatOptions
-  >;
+  #taskSet = new Set<TaskStep<AI, Store, AdditionalMessageOptions>>();
+  abstract taskHandler: TaskHandler<AI, Store, AdditionalMessageOptions>;
 
   public createTask(
     query: MessageContent,
-    context: AgentTaskContext<
-      AI,
-      Store,
-      AdditionalMessageOptions,
-      AdditionalChatOptions
-    >,
-  ): ReadableStream<
-    TaskStepOutput<AI, Store, AdditionalMessageOptions, AdditionalChatOptions>
-  > {
+    context: AgentTaskContext<AI, Store, AdditionalMessageOptions>,
+  ): ReadableStream<TaskStepOutput<AI, Store, AdditionalMessageOptions>> {
     context.store.messages.push({
       role: "user",
       content: query,
     });
     const taskOutputStream = createTaskOutputStream(this.taskHandler, context);
     return new ReadableStream<
-      TaskStepOutput<AI, Store, AdditionalMessageOptions, AdditionalChatOptions>
+      TaskStepOutput<AI, Store, AdditionalMessageOptions>
     >({
       start: async (controller) => {
         for await (const stepOutput of taskOutputStream) {
           this.#taskSet.add(stepOutput.taskStep);
+          controller.enqueue(stepOutput);
           if (stepOutput.isLast) {
             let currentStep: TaskStep<
               AI,
               Store,
-              AdditionalMessageOptions,
-              AdditionalChatOptions
+              AdditionalMessageOptions
             > | null = stepOutput.taskStep;
             while (currentStep) {
               this.#taskSet.delete(currentStep);
               currentStep = currentStep.prevStep;
             }
-            const { output, taskStep } = stepOutput;
-            if (output instanceof ReadableStream) {
-              const [pipStream, finalStream] = output.tee();
-              stepOutput.output = finalStream;
-              const reader = pipStream.getReader();
-              const { value } = await reader.read();
-              reader.releaseLock();
-              let content: string = value!.delta;
-              for await (const chunk of pipStream) {
-                content += chunk.delta;
-              }
-              taskStep.context.store.messages = [
-                ...taskStep.context.store.messages,
-                {
-                  role: "assistant",
-                  content,
-                  options: value!.options,
-                },
-              ];
-            }
-            controller.enqueue(stepOutput);
             controller.close();
-          } else {
-            controller.enqueue(stepOutput);
           }
         }
       },
@@ -252,7 +205,6 @@ export abstract class AgentRunner<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > extends BaseChatEngine {
   readonly #llm: AI;
   readonly #tools:
@@ -260,12 +212,7 @@ export abstract class AgentRunner<
     | ((query: MessageContent) => Promise<BaseToolWithCall[]>);
   readonly #systemPrompt: MessageContent | null = null;
   #chatHistory: ChatMessage<AdditionalMessageOptions>[];
-  readonly #runner: AgentWorker<
-    AI,
-    Store,
-    AdditionalMessageOptions,
-    AdditionalChatOptions
-  >;
+  readonly #runner: AgentWorker<AI, Store, AdditionalMessageOptions>;
   readonly #verbose: boolean;
 
   // create extra store
@@ -276,7 +223,7 @@ export abstract class AgentRunner<
   }
 
   static defaultTaskHandler: TaskHandler<LLM> = async (step, enqueueOutput) => {
-    const { llm, getTools, stream, additionalChatOptions } = step.context;
+    const { llm, getTools, stream } = step.context;
     const lastMessage = step.context.store.messages.at(-1)!.content;
     const tools = await getTools(lastMessage);
     if (!stream) {
@@ -284,9 +231,8 @@ export abstract class AgentRunner<
         stream,
         tools,
         messages: [...step.context.store.messages],
-        additionalChatOptions,
       });
-      await stepTools({
+      await stepTools<LLM>({
         response,
         tools,
         step,
@@ -297,7 +243,6 @@ export abstract class AgentRunner<
         stream,
         tools,
         messages: [...step.context.store.messages],
-        additionalChatOptions,
       });
       await stepToolsStreaming<LLM>({
         response,
@@ -309,12 +254,7 @@ export abstract class AgentRunner<
   };
 
   protected constructor(
-    params: AgentRunnerParams<
-      AI,
-      Store,
-      AdditionalMessageOptions,
-      AdditionalChatOptions
-    >,
+    params: AgentRunnerParams<AI, Store, AdditionalMessageOptions>,
   ) {
     super();
     const { llm, chatHistory, systemPrompt, runner, tools, verbose } = params;
@@ -368,7 +308,6 @@ export abstract class AgentRunner<
     stream: boolean = false,
     verbose: boolean | undefined = undefined,
     chatHistory?: ChatMessage<AdditionalMessageOptions>[],
-    additionalChatOptions?: AdditionalChatOptions,
   ) {
     const initialMessages = [...(chatHistory ?? this.#chatHistory)];
     if (this.#systemPrompt !== null) {
@@ -387,7 +326,6 @@ export abstract class AgentRunner<
       stream,
       toolCallCount: 0,
       llm: this.#llm,
-      additionalChatOptions: additionalChatOptions ?? {},
       getTools: (message) => this.getTools(message),
       store: {
         ...this.createStore(),
@@ -405,29 +343,13 @@ export abstract class AgentRunner<
     });
   }
 
+  async chat(params: NonStreamingChatEngineParams): Promise<EngineResponse>;
   async chat(
-    params: NonStreamingChatEngineParams<
-      AdditionalMessageOptions,
-      AdditionalChatOptions
-    >,
-  ): Promise<EngineResponse>;
-  async chat(
-    params: StreamingChatEngineParams<
-      AdditionalMessageOptions,
-      AdditionalChatOptions
-    >,
+    params: StreamingChatEngineParams,
   ): Promise<ReadableStream<EngineResponse>>;
   @wrapEventCaller
   async chat(
-    params:
-      | NonStreamingChatEngineParams<
-          AdditionalMessageOptions,
-          AdditionalChatOptions
-        >
-      | StreamingChatEngineParams<
-          AdditionalMessageOptions,
-          AdditionalChatOptions
-        >,
+    params: NonStreamingChatEngineParams | StreamingChatEngineParams,
   ): Promise<EngineResponse | ReadableStream<EngineResponse>> {
     let chatHistory: ChatMessage<AdditionalMessageOptions>[] = [];
 
@@ -444,7 +366,6 @@ export abstract class AgentRunner<
       !!params.stream,
       false,
       chatHistory,
-      params.chatOptions,
     );
     for await (const stepOutput of task) {
       // update chat history for each round
@@ -452,15 +373,10 @@ export abstract class AgentRunner<
       if (stepOutput.isLast) {
         const { output } = stepOutput;
         if (output instanceof ReadableStream) {
-          return output.pipeThrough(
-            new TransformStream<EngineResponse>({
+          return output.pipeThrough<EngineResponse>(
+            new TransformStream({
               transform(chunk, controller) {
-                controller.enqueue(
-                  EngineResponse.fromChatResponseChunk(
-                    chunk,
-                    chunk.sourceNodes,
-                  ),
-                );
+                controller.enqueue(EngineResponse.fromChatResponseChunk(chunk));
               },
             }),
           );

packages/core/src/agent/llm.ts

@@ -4,66 +4,24 @@ import { ObjectRetriever } from "../objects";
 import { AgentRunner, AgentWorker, type AgentParamsBase } from "./base.js";
 import { validateAgentParams } from "./utils.js";
 
-type LLMParamsBase<
-  AI extends LLM,
-  AdditionalMessageOptions extends object = AI extends LLM<
-    object,
-    infer AdditionalMessageOptions
-  >
-    ? AdditionalMessageOptions
-    : never,
-  AdditionalChatOptions extends object = object,
-> = AgentParamsBase<AI, AdditionalMessageOptions, AdditionalChatOptions>;
+type LLMParamsBase = AgentParamsBase<LLM>;
 
-type LLMParamsWithTools<
-  AI extends LLM,
-  AdditionalMessageOptions extends object = AI extends LLM<
-    object,
-    infer AdditionalMessageOptions
-  >
-    ? AdditionalMessageOptions
-    : never,
-  AdditionalChatOptions extends object = object,
-> = LLMParamsBase<AI, AdditionalMessageOptions, AdditionalChatOptions> & {
+type LLMParamsWithTools = LLMParamsBase & {
   tools: BaseToolWithCall[];
 };
 
-type LLMParamsWithToolRetriever<
-  AI extends LLM,
-  AdditionalMessageOptions extends object = AI extends LLM<
-    object,
-    infer AdditionalMessageOptions
-  >
-    ? AdditionalMessageOptions
-    : never,
-  AdditionalChatOptions extends object = object,
-> = LLMParamsBase<AI, AdditionalMessageOptions, AdditionalChatOptions> & {
+type LLMParamsWithToolRetriever = LLMParamsBase & {
   toolRetriever: ObjectRetriever<BaseToolWithCall>;
 };
 
-export type LLMAgentParams<
-  AI extends LLM,
-  AdditionalMessageOptions extends object = AI extends LLM<
-    object,
-    infer AdditionalMessageOptions
-  >
-    ? AdditionalMessageOptions
-    : never,
-  AdditionalChatOptions extends object = object,
-> =
-  | LLMParamsWithTools<AI, AdditionalMessageOptions, AdditionalChatOptions>
-  | LLMParamsWithToolRetriever<
-      AI,
-      AdditionalMessageOptions,
-      AdditionalChatOptions
-    >;
+export type LLMAgentParams = LLMParamsWithTools | LLMParamsWithToolRetriever;
 
 export class LLMAgentWorker extends AgentWorker<LLM> {
   taskHandler = AgentRunner.defaultTaskHandler;
 }
 
 export class LLMAgent extends AgentRunner<LLM> {
-  constructor(params: LLMAgentParams<LLM>) {
+  constructor(params: LLMAgentParams) {
     validateAgentParams(params);
     const llm = params.llm ?? (Settings.llm ? (Settings.llm as LLM) : null);
     if (!llm)

packages/core/src/agent/types.ts

@@ -19,7 +19,6 @@ export type AgentTaskContext<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > = {
   readonly stream: boolean;
   readonly toolCallCount: number;
@@ -27,7 +26,6 @@ export type AgentTaskContext<
   readonly getTools: (
     input: MessageContent,
   ) => BaseToolWithCall[] | Promise<BaseToolWithCall[]>;
-  readonly additionalChatOptions: Partial<AdditionalChatOptions>;
   shouldContinue: (
     taskStep: Readonly<TaskStep<Model, Store, AdditionalMessageOptions>>,
   ) => boolean;
@@ -47,26 +45,13 @@ export type TaskStep<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > = {
   id: UUID;
-  context: AgentTaskContext<
-    Model,
-    Store,
-    AdditionalMessageOptions,
-    AdditionalChatOptions
-  >;
+  context: AgentTaskContext<Model, Store, AdditionalMessageOptions>;
 
   // linked list
-  prevStep: TaskStep<
-    Model,
-    Store,
-    AdditionalMessageOptions,
-    AdditionalChatOptions
-  > | null;
-  nextSteps: Set<
-    TaskStep<Model, Store, AdditionalMessageOptions, AdditionalChatOptions>
-  >;
+  prevStep: TaskStep<Model, Store, AdditionalMessageOptions> | null;
+  nextSteps: Set<TaskStep<Model, Store, AdditionalMessageOptions>>;
 };
 
 export type TaskStepOutput<
@@ -78,14 +63,8 @@ export type TaskStepOutput<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > = {
-  taskStep: TaskStep<
-    Model,
-    Store,
-    AdditionalMessageOptions,
-    AdditionalChatOptions
-  >;
+  taskStep: TaskStep<Model, Store, AdditionalMessageOptions>;
   // output shows the response to the user
   output:
     | ChatResponse<AdditionalMessageOptions>
@@ -102,16 +81,10 @@ export type TaskHandler<
   >
     ? AdditionalMessageOptions
     : never,
-  AdditionalChatOptions extends object = object,
 > = (
-  step: TaskStep<Model, Store, AdditionalMessageOptions, AdditionalChatOptions>,
+  step: TaskStep<Model, Store, AdditionalMessageOptions>,
   enqueueOutput: (
-    taskOutput: TaskStepOutput<
-      Model,
-      Store,
-      AdditionalMessageOptions,
-      AdditionalChatOptions
-    >,
+    taskOutput: TaskStepOutput<Model, Store, AdditionalMessageOptions>,
   ) => void,
 ) => Promise<void>;
 

packages/core/src/agent/utils.ts

@@ -79,7 +79,7 @@ export async function stepToolsStreaming<Model extends LLM>({
     for await (const chunk of pipStream) {
       if (chunk.options && "toolCall" in chunk.options) {
         const toolCall = chunk.options.toolCall;
-        toolCall.forEach((toolCall: ToolCall | PartialToolCall) => {
+        toolCall.forEach((toolCall) => {
           toolCalls.set(toolCall.id, toolCall);
         });
       }

packages/core/src/chat-engine/base.ts

@@ -16,18 +16,14 @@ export interface BaseChatEngineParams<
 
 export interface StreamingChatEngineParams<
   AdditionalMessageOptions extends object = object,
-  AdditionalChatOptions extends object = object,
 > extends BaseChatEngineParams<AdditionalMessageOptions> {
   stream: true;
-  chatOptions?: AdditionalChatOptions;
 }
 
 export interface NonStreamingChatEngineParams<
   AdditionalMessageOptions extends object = object,
-  AdditionalChatOptions extends object = object,
 > extends BaseChatEngineParams<AdditionalMessageOptions> {
   stream?: false;
-  chatOptions?: AdditionalChatOptions;
 }
 
 export abstract class BaseChatEngine {

packages/core/src/data-structs/data-structs.ts

@@ -1,6 +1,5 @@
 import { randomUUID } from "@llamaindex/env";
 import type { UUID } from "../global";
-import { BaseNode } from "../schema";
 import { IndexStructType } from "./struct-type";
 
 export abstract class IndexStruct {
@@ -66,48 +65,3 @@ export class KeywordTable extends IndexStruct {
     };
   }
 }
-
-export class IndexDict extends IndexStruct {
-  nodesDict: Record<string, BaseNode> = {};
-  type: IndexStructType = IndexStructType.SIMPLE_DICT;
-
-  addNode(node: BaseNode, textId?: string) {
-    const vectorId = textId ?? node.id_;
-    this.nodesDict[vectorId] = node;
-  }
-
-  toJson(): Record<string, unknown> {
-    const nodesDict: Record<string, unknown> = {};
-
-    for (const [key, node] of Object.entries(this.nodesDict)) {
-      nodesDict[key] = node.toJSON();
-    }
-
-    return {
-      ...super.toJson(),
-      nodesDict,
-      type: this.type,
-    };
-  }
-
-  delete(nodeId: string) {
-    delete this.nodesDict[nodeId];
-  }
-}
-
-export class IndexList extends IndexStruct {
-  nodes: string[] = [];
-  type: IndexStructType = IndexStructType.LIST;
-
-  addNode(node: BaseNode) {
-    this.nodes.push(node.id_);
-  }
-
-  toJson(): Record<string, unknown> {
-    return {
-      ...super.toJson(),
-      nodes: this.nodes,
-      type: this.type,
-    };
-  }
-}

packages/core/src/data-structs/index.ts

@@ -1,8 +1,2 @@
-export {
-  IndexDict,
-  IndexList,
-  IndexStruct,
-  KeywordTable,
-} from "./data-structs";
-export { jsonToIndexStruct } from "./json-to-index-struct";
+export { IndexStruct, KeywordTable } from "./data-structs";
 export { IndexStructType } from "./struct-type";

packages/core/src/data-structs/json-to-index-struct.ts

@@ -1,26 +0,0 @@
-import type { BaseNode } from "../schema";
-import { jsonToNode } from "../schema";
-import { IndexDict, IndexList, IndexStruct } from "./data-structs";
-import { IndexStructType } from "./struct-type";
-
-export function jsonToIndexStruct(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  json: any,
-): IndexStruct {
-  if (json.type === IndexStructType.LIST) {
-    const indexList = new IndexList(json.indexId, json.summary);
-    indexList.nodes = json.nodes;
-    return indexList;
-  } else if (json.type === IndexStructType.SIMPLE_DICT) {
-    const indexDict = new IndexDict(json.indexId, json.summary);
-    indexDict.nodesDict = Object.entries(json.nodesDict).reduce<
-      Record<string, BaseNode>
-    >((acc, [key, value]) => {
-      acc[key] = jsonToNode(value);
-      return acc;
-    }, {});
-    return indexDict;
-  } else {
-    throw new Error(`Unknown index struct type: ${json.type}`);
-  }
-}

packages/core/src/embeddings/base.ts

@@ -1,4 +1,4 @@
-import type { Tokenizers } from "@llamaindex/env/tokenizers";
+import { type Tokenizers } from "@llamaindex/env";
 import type { MessageContentDetail } from "../llms";
 import { BaseNode, MetadataMode, TransformComponent } from "../schema";
 import { extractSingleText } from "../utils";

packages/core/src/embeddings/tokenizer.ts

@@ -1,4 +1,4 @@
-import { Tokenizers, tokenizers } from "@llamaindex/env/tokenizers";
+import { Tokenizers, tokenizers } from "@llamaindex/env";
 
 export function truncateMaxTokens(
   tokenizer: Tokenizers,

packages/core/src/global/settings.ts

@@ -1,5 +1,4 @@
-import { getEnv } from "@llamaindex/env";
-import type { Tokenizer } from "@llamaindex/env/tokenizers";
+import { getEnv, type Tokenizer } from "@llamaindex/env";
 import type { LLM } from "../llms";
 import {
   type CallbackManager,

packages/core/src/global/settings/tokenizer.ts

@@ -1,5 +1,4 @@
-import { AsyncLocalStorage } from "@llamaindex/env";
-import { type Tokenizer, tokenizers } from "@llamaindex/env/tokenizers";
+import { AsyncLocalStorage, type Tokenizer, tokenizers } from "@llamaindex/env";
 
 const chunkSizeAsyncLocalStorage = new AsyncLocalStorage<Tokenizer>();
 let globalTokenizer: Tokenizer = tokenizers.tokenizer();

packages/core/src/indices/prompt-helper.ts

@@ -1,4 +1,4 @@
-import type { Tokenizer } from "@llamaindex/env/tokenizers";
+import { type Tokenizer, tokenizers } from "@llamaindex/env";
 import {
   DEFAULT_CHUNK_OVERLAP_RATIO,
   DEFAULT_CONTEXT_WINDOW,
@@ -64,7 +64,7 @@ export class PromptHelper {
     this.numOutput = numOutput;
     this.chunkOverlapRatio = chunkOverlapRatio;
     this.chunkSizeLimit = chunkSizeLimit;
-    this.tokenizer = tokenizer ?? Settings.tokenizer;
+    this.tokenizer = tokenizer ?? tokenizers.tokenizer();
     this.separator = separator;
   }
 

packages/core/src/llms/base.ts

@@ -1,4 +1,5 @@
-import { extractText, streamConverter } from "../utils";
+import { streamConverter } from "../utils";
+import { extractText } from "../utils/llms";
 import type {
   ChatResponse,
   ChatResponseChunk,
@@ -66,8 +67,6 @@ export abstract class BaseLLM<
 
 export abstract class ToolCallLLM<
   AdditionalChatOptions extends object = object,
-  AdditionalMessageOptions extends
-    ToolCallLLMMessageOptions = ToolCallLLMMessageOptions,
-> extends BaseLLM<AdditionalChatOptions, AdditionalMessageOptions> {
+> extends BaseLLM<AdditionalChatOptions, ToolCallLLMMessageOptions> {
   abstract supportToolCall: boolean;
 }

packages/core/src/llms/type.ts

@@ -1,6 +1,6 @@
-import type { Tokenizers } from "@llamaindex/env/tokenizers";
+import type { Tokenizers } from "@llamaindex/env";
 import type { JSONSchemaType } from "ajv";
-import type { JSONObject, JSONValue } from "../global";
+import type { JSONObject, JSONValue } from "../global/type";
 
 /**
  * @internal

packages/core/src/memory/base.ts

@@ -65,21 +65,19 @@ export abstract class BaseChatStoreMemory<
     super();
   }
 
-  getAllMessages():
-    | ChatMessage<AdditionalMessageOptions>[]
-    | Promise<ChatMessage<AdditionalMessageOptions>[]> {
+  getAllMessages(): ChatMessage<AdditionalMessageOptions>[] {
     return this.chatStore.getMessages(this.chatStoreKey);
   }
 
-  put(messages: ChatMessage<AdditionalMessageOptions>): void | Promise<void> {
+  put(messages: ChatMessage<AdditionalMessageOptions>) {
     this.chatStore.addMessage(this.chatStoreKey, messages);
   }
 
-  set(messages: ChatMessage<AdditionalMessageOptions>[]): void | Promise<void> {
+  set(messages: ChatMessage<AdditionalMessageOptions>[]) {
     this.chatStore.setMessages(this.chatStoreKey, messages);
   }
 
-  reset(): void | Promise<void> {
+  reset() {
     this.chatStore.deleteMessages(this.chatStoreKey);
   }
 }

packages/core/src/memory/chat-memory-buffer.ts

@@ -33,11 +33,11 @@ export class ChatMemoryBuffer<
     }
   }
 
-  async getMessages(
+  getMessages(
     transientMessages?: ChatMessage<AdditionalMessageOptions>[] | undefined,
     initialTokenCount: number = 0,
   ) {
-    const messages = await this.getAllMessages();
+    const messages = this.getAllMessages();
 
     if (initialTokenCount > this.tokenLimit) {
       throw new Error("Initial token count exceeds token limit");

packages/core/src/memory/summary-memory.ts

@@ -1,4 +1,4 @@
-import { type Tokenizer, tokenizers } from "@llamaindex/env/tokenizers";
+import { type Tokenizer, tokenizers } from "@llamaindex/env";
 import { Settings } from "../global";
 import type { ChatMessage, LLM, MessageType } from "../llms";
 import { defaultSummaryPrompt, type SummaryPrompt } from "../prompts";

packages/core/src/node-parser/sentence-splitter.ts

@@ -1,4 +1,4 @@
-import type { Tokenizer } from "@llamaindex/env/tokenizers";
+import type { Tokenizer } from "@llamaindex/env";
 import { z } from "zod";
 import { Settings } from "../global";
 import { sentenceSplitterSchema } from "../schema";

packages/core/src/node-parser/token-text-splitter.ts

@@ -1,4 +1,4 @@
-import type { Tokenizer } from "@llamaindex/env/tokenizers";
+import type { Tokenizer } from "@llamaindex/env";
 import { z } from "zod";
 import { DEFAULT_CHUNK_OVERLAP, DEFAULT_CHUNK_SIZE, Settings } from "../global";
 import { MetadataAwareTextSplitter } from "./base";

packages/core/src/node-parser/type.ts

@@ -1,4 +1,4 @@
-import type { Tokenizer } from "@llamaindex/env/tokenizers";
+import type { Tokenizer } from "@llamaindex/env";
 
 export type SplitterParams = {
   tokenizer?: Tokenizer;

packages/core/src/query-engine/retriever.ts

@@ -1,5 +1,6 @@
 import type { MessageContent } from "../llms";
 import type { BaseNodePostprocessor } from "../postprocessor";
+import { BaseQueryEngine, type QueryType } from "../query-engine";
 import {
   type BaseSynthesizer,
   getResponseSynthesizer,
@@ -7,7 +8,6 @@ import {
 import { BaseRetriever } from "../retriever";
 import type { NodeWithScore } from "../schema";
 import { extractText } from "../utils";
-import { BaseQueryEngine, type QueryType } from "./base";
 
 export class RetrieverQueryEngine extends BaseQueryEngine {
   retriever: BaseRetriever;

packages/core/src/schema/index.ts

@@ -1,10 +1,5 @@
 export * from "./node";
-export {
-  FileReader,
-  TransformComponent,
-  type BaseReader,
-  type StoredValue,
-} from "./type";
+export { FileReader, TransformComponent, type BaseReader } from "./type";
 export type { BaseOutputParser } from "./type/base-output-parser";
 export { EngineResponse } from "./type/engine–response";
 export * from "./zod";

packages/core/src/schema/type.ts

@@ -1,10 +1,6 @@
 import { fs, path, randomUUID } from "@llamaindex/env";
 import type { BaseNode, Document } from "./node";
 
-// fixme: remove any
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type StoredValue = Record<string, any> | null;
-
 interface TransformComponentSignature<
   Result extends BaseNode[] | Promise<BaseNode[]>,
 > {

packages/core/src/storage/chat-store/base-chat-store.ts

@@ -7,11 +7,7 @@ export abstract class BaseChatStore<
     key: string,
     messages: ChatMessage<AdditionalMessageOptions>[],
   ): void;
-  abstract getMessages(
-    key: string,
-  ):
-    | ChatMessage<AdditionalMessageOptions>[]
-    | Promise<ChatMessage<AdditionalMessageOptions>[]>;
+  abstract getMessages(key: string): ChatMessage<AdditionalMessageOptions>[];
   abstract addMessage(
     key: string,
     message: ChatMessage<AdditionalMessageOptions>,
@@ -19,7 +15,5 @@ export abstract class BaseChatStore<
   ): void;
   abstract deleteMessages(key: string): void;
   abstract deleteMessage(key: string, idx: number): void;
-  abstract getKeys():
-    | IterableIterator<string>
-    | Promise<IterableIterator<string>>;
+  abstract getKeys(): IterableIterator<string>;
 }

packages/core/src/storage/doc-store/index.ts

@@ -1,167 +0,0 @@
-import { path } from "@llamaindex/env";
-import {
-  DEFAULT_DOC_STORE_PERSIST_FILENAME,
-  DEFAULT_PERSIST_DIR,
-} from "../../global";
-import type { StoredValue } from "../../schema";
-import { BaseNode, Document, ObjectType, TextNode } from "../../schema";
-
-const TYPE_KEY = "__type__";
-const DATA_KEY = "__data__";
-
-export interface Serializer<T> {
-  toPersistence(data: Record<string, unknown>): T;
-
-  fromPersistence(data: T): Record<string, unknown>;
-}
-
-export const jsonSerializer: Serializer<string> = {
-  toPersistence(data) {
-    return JSON.stringify(data);
-  },
-  fromPersistence(data) {
-    return JSON.parse(data);
-  },
-};
-
-export const noneSerializer: Serializer<Record<string, unknown>> = {
-  toPersistence(data) {
-    return data;
-  },
-  fromPersistence(data) {
-    return data;
-  },
-};
-
-type DocJson<Data> = {
-  [TYPE_KEY]: ObjectType;
-  [DATA_KEY]: Data;
-};
-
-export function isValidDocJson(
-  docJson: StoredValue | null | undefined,
-): docJson is DocJson<unknown> {
-  return (
-    typeof docJson === "object" &&
-    docJson !== null &&
-    docJson[TYPE_KEY] !== undefined &&
-    docJson[DATA_KEY] !== undefined
-  );
-}
-
-export function docToJson(
-  doc: BaseNode,
-  serializer: Serializer<unknown>,
-): DocJson<unknown> {
-  return {
-    [DATA_KEY]: serializer.toPersistence(doc.toJSON()),
-    [TYPE_KEY]: doc.type,
-  };
-}
-
-export function jsonToDoc<Data>(
-  docDict: DocJson<Data>,
-  serializer: Serializer<Data>,
-): BaseNode {
-  const docType = docDict[TYPE_KEY];
-  // fixme: zod type check this
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  const dataDict: any = serializer.fromPersistence(docDict[DATA_KEY]);
-  let doc: BaseNode;
-
-  if (docType === ObjectType.DOCUMENT) {
-    doc = new Document({
-      text: dataDict.text,
-      id_: dataDict.id_,
-      embedding: dataDict.embedding,
-      hash: dataDict.hash,
-      metadata: dataDict.metadata,
-    });
-  } else if (docType === ObjectType.TEXT) {
-    doc = new TextNode({
-      text: dataDict.text,
-      id_: dataDict.id_,
-      hash: dataDict.hash,
-      metadata: dataDict.metadata,
-      relationships: dataDict.relationships,
-    });
-  } else {
-    throw new Error(`Unknown doc type: ${docType}`);
-  }
-
-  return doc;
-}
-
-const DEFAULT_PERSIST_PATH = path.join(
-  DEFAULT_PERSIST_DIR,
-  DEFAULT_DOC_STORE_PERSIST_FILENAME,
-);
-
-export interface RefDocInfo {
-  nodeIds: string[];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  extraInfo: Record<string, any>;
-}
-
-export abstract class BaseDocumentStore {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  serializer: Serializer<any> = jsonSerializer;
-
-  // Save/load
-  persist(persistPath: string = DEFAULT_PERSIST_PATH): void {
-    // Persist the docstore to a file.
-  }
-
-  // Main interface
-  abstract docs(): Promise<Record<string, BaseNode>>;
-
-  abstract addDocuments(docs: BaseNode[], allowUpdate: boolean): Promise<void>;
-
-  abstract getDocument(
-    docId: string,
-    raiseError: boolean,
-  ): Promise<BaseNode | undefined>;
-
-  abstract deleteDocument(docId: string, raiseError: boolean): Promise<void>;
-
-  abstract documentExists(docId: string): Promise<boolean>;
-
-  // Hash
-  abstract setDocumentHash(docId: string, docHash: string): Promise<void>;
-
-  abstract getDocumentHash(docId: string): Promise<string | undefined>;
-
-  abstract getAllDocumentHashes(): Promise<Record<string, string>>;
-
-  // Ref Docs
-  abstract getAllRefDocInfo(): Promise<Record<string, RefDocInfo> | undefined>;
-
-  abstract getRefDocInfo(refDocId: string): Promise<RefDocInfo | undefined>;
-
-  abstract deleteRefDoc(refDocId: string, raiseError: boolean): Promise<void>;
-
-  // Nodes
-  getNodes(nodeIds: string[], raiseError: boolean = true): Promise<BaseNode[]> {
-    return Promise.all(
-      nodeIds.map((nodeId) => this.getNode(nodeId, raiseError)),
-    );
-  }
-
-  async getNode(nodeId: string, raiseError: boolean = true): Promise<BaseNode> {
-    const doc = await this.getDocument(nodeId, raiseError);
-    if (!(doc instanceof BaseNode)) {
-      throw new Error(`Document ${nodeId} is not a Node.`);
-    }
-    return doc;
-  }
-
-  async getNodeDict(nodeIdDict: {
-    [index: number]: string;
-  }): Promise<Record<number, BaseNode>> {
-    const result: Record<number, BaseNode> = {};
-    for (const index in nodeIdDict) {
-      result[index] = await this.getNode(nodeIdDict[index]!);
-    }
-    return result;
-  }
-}

packages/core/src/storage/index-store/index.ts

@@ -1,115 +0,0 @@
-import { path } from "@llamaindex/env";
-import { IndexStruct, jsonToIndexStruct } from "../../data-structs";
-import {
-  DEFAULT_INDEX_STORE_PERSIST_FILENAME,
-  DEFAULT_NAMESPACE,
-  DEFAULT_PERSIST_DIR,
-} from "../../global";
-import {
-  BaseInMemoryKVStore,
-  BaseKVStore,
-  type DataType,
-  SimpleKVStore,
-} from "../kv-store";
-
-export const DEFAULT_PERSIST_PATH = path.join(
-  DEFAULT_PERSIST_DIR,
-  DEFAULT_INDEX_STORE_PERSIST_FILENAME,
-);
-
-export abstract class BaseIndexStore {
-  abstract getIndexStructs(): Promise<IndexStruct[]>;
-
-  abstract addIndexStruct(indexStruct: IndexStruct): Promise<void>;
-
-  abstract deleteIndexStruct(key: string): Promise<void>;
-
-  abstract getIndexStruct(structId?: string): Promise<IndexStruct | undefined>;
-
-  async persist(persistPath: string = DEFAULT_PERSIST_PATH): Promise<void> {
-    // Persist the index store to disk.
-  }
-}
-
-export class KVIndexStore extends BaseIndexStore {
-  private _kvStore: BaseKVStore;
-  private _collection: string;
-
-  constructor(kvStore: BaseKVStore, namespace: string = DEFAULT_NAMESPACE) {
-    super();
-    this._kvStore = kvStore;
-    this._collection = `${namespace}/data`;
-  }
-
-  async addIndexStruct(indexStruct: IndexStruct): Promise<void> {
-    const key = indexStruct.indexId;
-    const data = indexStruct.toJson();
-    await this._kvStore.put(key, data, this._collection);
-  }
-
-  async deleteIndexStruct(key: string): Promise<void> {
-    await this._kvStore.delete(key, this._collection);
-  }
-
-  async getIndexStruct(structId?: string): Promise<IndexStruct | undefined> {
-    if (!structId) {
-      const structs = await this.getIndexStructs();
-      if (structs.length !== 1) {
-        throw new Error("More than one index struct found");
-      }
-      return structs[0];
-    } else {
-      const json = await this._kvStore.get(structId, this._collection);
-      if (json == null) {
-        return;
-      }
-      return jsonToIndexStruct(json);
-    }
-  }
-
-  async getIndexStructs(): Promise<IndexStruct[]> {
-    const jsons = await this._kvStore.getAll(this._collection);
-    return Object.values(jsons).map((json) => jsonToIndexStruct(json));
-  }
-}
-
-export class SimpleIndexStore extends KVIndexStore {
-  private kvStore: BaseInMemoryKVStore;
-
-  constructor(kvStore?: BaseInMemoryKVStore) {
-    kvStore = kvStore || new SimpleKVStore();
-    super(kvStore);
-    this.kvStore = kvStore;
-  }
-
-  static async fromPersistDir(
-    persistDir: string = DEFAULT_PERSIST_DIR,
-  ): Promise<SimpleIndexStore> {
-    const persistPath = path.join(
-      persistDir,
-      DEFAULT_INDEX_STORE_PERSIST_FILENAME,
-    );
-    return this.fromPersistPath(persistPath);
-  }
-
-  static async fromPersistPath(persistPath: string): Promise<SimpleIndexStore> {
-    const simpleKVStore = await SimpleKVStore.fromPersistPath(persistPath);
-    return new SimpleIndexStore(simpleKVStore);
-  }
-
-  async persist(persistPath: string = DEFAULT_PERSIST_DIR): Promise<void> {
-    this.kvStore.persist(persistPath);
-  }
-
-  static fromDict(saveDict: DataType): SimpleIndexStore {
-    const simpleKVStore = SimpleKVStore.fromDict(saveDict);
-    return new SimpleIndexStore(simpleKVStore);
-  }
-
-  toDict(): Record<string, unknown> {
-    if (!(this.kvStore instanceof SimpleKVStore)) {
-      throw new Error("KVStore is not a SimpleKVStore");
-    }
-    return this.kvStore.toDict();
-  }
-}

packages/core/src/tools/function-tool.ts

@@ -4,12 +4,18 @@ import { zodToJsonSchema } from "zod-to-json-schema";
 import type { JSONValue } from "../global";
 import type { BaseTool, ToolMetadata } from "../llms";
 
+const kOriginalFn = Symbol("originalFn");
+
 export class FunctionTool<T, R extends JSONValue | Promise<JSONValue>>
   implements BaseTool<T>
 {
+  [kOriginalFn]?: (input: T) => R;
+
   #fn: (input: T) => R;
-  readonly #metadata: ToolMetadata<JSONSchemaType<T>>;
-  readonly #zodType: z.ZodType<T> | null = null;
+  #metadata: ToolMetadata<JSONSchemaType<T>>;
+  // todo: for the future, we can use zod to validate the input parameters
+  // eslint-disable-next-line no-unused-private-class-members
+  #zodType: z.ZodType<T> | null = null;
   constructor(
     fn: (input: T) => R,
     metadata: ToolMetadata<JSONSchemaType<T>>,
@@ -26,12 +32,6 @@ export class FunctionTool<T, R extends JSONValue | Promise<JSONValue>>
     fn: (input: T) => JSONValue | Promise<JSONValue>,
     schema: ToolMetadata<JSONSchemaType<T>>,
   ): FunctionTool<T, JSONValue | Promise<JSONValue>>;
-  static from<R extends z.ZodType>(
-    fn: (input: z.infer<R>) => JSONValue | Promise<JSONValue>,
-    schema: Omit<ToolMetadata, "parameters"> & {
-      parameters: R;
-    },
-  ): FunctionTool<z.infer<R>, JSONValue | Promise<JSONValue>>;
   static from<T, R extends z.ZodType<T>>(
     fn: (input: T) => JSONValue | Promise<JSONValue>,
     schema: Omit<ToolMetadata, "parameters"> & {
@@ -40,15 +40,15 @@ export class FunctionTool<T, R extends JSONValue | Promise<JSONValue>>
   ): FunctionTool<T, JSONValue>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   static from(fn: any, schema: any): any {
-    if (schema.parameters instanceof z.ZodSchema) {
-      const jsonSchema = zodToJsonSchema(schema.parameters);
+    if (schema.parameter instanceof z.ZodSchema) {
+      const jsonSchema = zodToJsonSchema(schema.parameter);
       return new FunctionTool(
         fn,
         {
           ...schema,
           parameters: jsonSchema,
         },
-        schema.parameters,
+        schema.parameter,
       );
     }
     return new FunctionTool(fn, schema);
@@ -58,15 +58,7 @@ export class FunctionTool<T, R extends JSONValue | Promise<JSONValue>>
     return this.#metadata as BaseTool<T>["metadata"];
   }
 
-  call = (input: T) => {
-    if (this.#zodType) {
-      const result = this.#zodType.safeParse(input);
-      if (result.success) {
-        return this.#fn.call(null, result.data);
-      } else {
-        console.warn(result.error.errors);
-      }
-    }
+  call(input: T) {
     return this.#fn.call(null, input);
-  };
+  }
 }

packages/core/src/workflow/workflow.ts

@@ -13,8 +13,6 @@ export type StepFunction<T extends WorkflowEvent = WorkflowEvent> = (
 
 type EventTypeParam = EventTypes | EventTypes[];
 
-let once = false;
-
 export class Workflow {
   #steps: Map<
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -31,20 +29,8 @@ export class Workflow {
       verbose?: boolean;
       timeout?: number;
       validate?: boolean;
-      ignoreDeprecatedWarning?: boolean;
     } = {},
   ) {
-    if (!once && !params.ignoreDeprecatedWarning) {
-      console.warn(
-        "@llamaindex/core/workflow is going to use the new workflow API in the next major version.",
-        "Please update your imports to @llamaindex/workflow",
-      );
-      console.warn(
-        "See https://ts.llamaindex.ai/docs/llamaindex/guide/workflow for more information",
-      );
-      once = true;
-    }
-
     this.#verbose = params.verbose ?? false;
     this.#timeout = params.timeout ?? null;
     this.#validate = params.validate ?? false;

packages/core/storage/doc-store/package.json

@@ -1,8 +0,0 @@
-{
-  "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": "./dist/index.js",
-  "private": true
-}

packages/core/storage/index-store/package.json

@@ -1,8 +0,0 @@
-{
-  "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": "./dist/index.js",
-  "private": true
-}

packages/core/storage/kv-store/package.json

@@ -1,8 +0,0 @@
-{
-  "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": "./dist/index.js",
-  "private": true
-}

packages/core/tests/embeddings.test.ts

@@ -1,5 +1,5 @@
 import { truncateMaxTokens } from "@llamaindex/core/embeddings";
-import { Tokenizers, tokenizers } from "@llamaindex/env/tokenizers";
+import { Tokenizers, tokenizers } from "@llamaindex/env";
 import { describe, expect, test } from "vitest";
 
 describe("truncateMaxTokens", () => {

packages/core/tests/memory/chat-memory-buffer.test.ts

@@ -19,7 +19,7 @@ describe("ChatMemoryBuffer", () => {
     expect(buffer.tokenLimit).toBe(500);
   });
 
-  test("getMessages returns all messages when under token limit", async () => {
+  test("getMessages returns all messages when under token limit", () => {
     const messages: ChatMessage[] = [
       { role: "user", content: "Hello" },
       { role: "assistant", content: "Hi there!" },
@@ -30,11 +30,11 @@ describe("ChatMemoryBuffer", () => {
       chatHistory: messages,
     });
 
-    const result = await buffer.getMessages();
+    const result = buffer.getMessages();
     expect(result).toEqual(messages);
   });
 
-  test("getMessages truncates messages when over token limit", async () => {
+  test("getMessages truncates messages when over token limit", () => {
     const messages: ChatMessage[] = [
       { role: "user", content: "This is a long message" },
       { role: "assistant", content: "This is also a long reply" },
@@ -45,11 +45,11 @@ describe("ChatMemoryBuffer", () => {
       chatHistory: messages,
     });
 
-    const result = await buffer.getMessages();
+    const result = buffer.getMessages();
     expect(result).toEqual([{ role: "user", content: "Short" }]);
   });
 
-  test("getMessages handles input messages", async () => {
+  test("getMessages handles input messages", () => {
     const storedMessages: ChatMessage[] = [
       { role: "user", content: "Hello" },
       { role: "assistant", content: "Hi there!" },
@@ -62,13 +62,13 @@ describe("ChatMemoryBuffer", () => {
     const inputMessages: ChatMessage[] = [
       { role: "user", content: "New message" },
     ];
-    const result = await buffer.getMessages(inputMessages);
+    const result = buffer.getMessages(inputMessages);
     expect(result).toEqual([...inputMessages, ...storedMessages]);
   });
 
   test("getMessages throws error when initial token count exceeds limit", () => {
     const buffer = new ChatMemoryBuffer({ tokenLimit: 10 });
-    expect(async () => buffer.getMessages(undefined, 20)).rejects.toThrow(
+    expect(() => buffer.getMessages(undefined, 20)).toThrow(
       "Initial token count exceeds token limit",
     );
   });

packages/core/tests/node-parser/sentence-spiller.test.ts

@@ -1,6 +1,6 @@
 import { SentenceSplitter } from "@llamaindex/core/node-parser";
 import { Document } from "@llamaindex/core/schema";
-import { tokenizers } from "@llamaindex/env/tokenizers";
+import { tokenizers } from "@llamaindex/env";
 import { beforeEach, describe, expect, test } from "vitest";
 
 describe("SentenceSplitter", () => {

packages/core/tsconfig.json

@@ -8,6 +8,7 @@
     "moduleResolution": "Bundler",
     "skipLibCheck": true,
     "strict": true,
+    "lib": ["ESNext", "DOM", "DOM.AsyncIterable"],
     "types": ["node"]
   },
   "include": ["./src"],

packages/env/CHANGELOG.md

@@ -1,32 +1,5 @@
 # @llamaindex/env
 
-## 0.1.20
-
-### Patch Changes
-
-- 4fc001c: chore: bump `@huggingface/transformers`
-
-  Upgrade to v3, please read https://github.com/huggingface/transformers.js/releases/tag/3.0.0 for more information.
-
-## 0.1.19
-
-### Patch Changes
-
-- ad85bd0: - fix agent chat message not saved into the task context when streaming
-  - fix async local storage might use `node:async_hook` in edge-light/workerd condition
-
-## 0.1.18
-
-### Patch Changes
-
-- a8d3fa6: fix: exports in package.json
-
-## 0.1.17
-
-### Patch Changes
-
-- 14cc9eb: chore: move multi-model into single sub module
-
 ## 0.1.16
 
 ### Patch Changes

packages/env/multi-model/package.json

@@ -1,12 +0,0 @@
-{
-  "type": "module",
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.js",
-  "types": "./dist/index.d.ts",
-  "exports": {
-    "browser": "./dist/index.browser.js",
-    "edge-light": "./dist/index.edge-light.js",
-    "workerd": "./dist/index.workerd.js"
-  },
-  "private": true
-}

packages/env/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/env",
   "description": "environment wrapper, supports all JS environment including node, deno, bun, edge runtime, and cloudflare worker",
-  "version": "0.1.20",
+  "version": "0.1.16",
   "type": "module",
   "types": "dist/index.d.ts",
   "module": "dist/index.js",
@@ -28,7 +28,7 @@
         "types": "./dist/index.d.ts",
         "import": "./dist/index.js",
         "require": "./dist/index.cjs",
-        "default": "./dist/index.js"
+        "default": "./dist/index.cjs"
       },
       "workerd": {
         "types": "./dist/index.workerd.d.ts",
@@ -50,63 +50,9 @@
         "types": "./dist/index.d.cts",
         "default": "./dist/index.cjs"
       }
-    },
-    "./tokenizers": {
-      "workerd": {
-        "types": "./tokenizers/dist/index.workerd.d.ts",
-        "default": "./tokenizers/dist/index.workerd.js"
-      },
-      "edge-light": {
-        "types": "./tokenizers/dist/index.edge-light.d.ts",
-        "default": "./tokenizers/dist/index.edge-light.js"
-      },
-      "browser": {
-        "types": "./tokenizers/dist/index.browser.d.ts",
-        "default": "./tokenizers/dist/index.browser.js"
-      },
-      "import": {
-        "types": "./tokenizers/dist/index.d.ts",
-        "default": "./tokenizers/dist/index.js"
-      },
-      "require": {
-        "types": "./tokenizers/dist/index.d.cts",
-        "default": "./tokenizers/dist/index.cjs"
-      },
-      "default": {
-        "types": "./tokenizers/dist/index.d.ts",
-        "default": "./tokenizers/dist/index.js"
-      }
-    },
-    "./multi-model": {
-      "workerd": {
-        "types": "./multi-model/dist/index.workerd.d.ts",
-        "default": "./multi-model/dist/index.workerd.js"
-      },
-      "edge-light": {
-        "types": "./multi-model/dist/index.edge-light.d.ts",
-        "default": "./multi-model/dist/index.edge-light.js"
-      },
-      "browser": {
-        "types": "./multi-model/dist/index.browser.d.ts",
-        "default": "./multi-model/dist/index.browser.js"
-      },
-      "import": {
-        "types": "./multi-model/dist/index.d.ts",
-        "default": "./multi-model/dist/index.js"
-      },
-      "require": {
-        "types": "./multi-model/dist/index.d.cts",
-        "default": "./multi-model/dist/index.cjs"
-      },
-      "default": {
-        "types": "./multi-model/dist/index.d.ts",
-        "default": "./multi-model/dist/index.js"
-      }
     }
   },
   "files": [
-    "tokenizers",
-    "multi-model",
     "dist",
     "CHANGELOG.md",
     "!**/*.tsbuildinfo"
@@ -124,7 +70,7 @@
   "devDependencies": {
     "@types/node": "^22.9.0",
     "@types/readable-stream": "^4.0.15",
-    "@huggingface/transformers": "^3.0.2",
+    "@xenova/transformers": "^2.17.2",
     "bunchee": "5.6.1",
     "gpt-tokenizer": "^2.6.0",
     "pathe": "^1.1.2",
@@ -132,7 +78,7 @@
   },
   "peerDependencies": {
     "@aws-crypto/sha256-js": "^5.2.0",
-    "@huggingface/transformers": "^3.0.2",
+    "@xenova/transformers": "^2.17.2",
     "gpt-tokenizer": "^2.5.0",
     "js-tiktoken": "^1.0.12",
     "pathe": "^1.1.2"
@@ -141,7 +87,7 @@
     "@aws-crypto/sha256-js": {
       "optional": true
     },
-    "@huggingface/transformers": {
+    "@xenova/transformers": {
       "optional": true
     },
     "pathe": {

packages/env/src/als/index.node.ts

@@ -1 +0,0 @@
-export { AsyncLocalStorage } from "node:async_hooks";

packages/env/src/als/index.non-node.ts

@@ -1,3 +0,0 @@
-// Async Local Storage is available cross different JS runtimes
-// @ts-expect-error AsyncLocalStorage is not defined in Non Node.js environment
-export const AsyncLocalStorage = globalThis.AsyncLocalStorage;

packages/env/src/als/index.web.ts

@@ -1,32 +0,0 @@
-// Web doesn't have AsyncLocalStorage and there's no alternative way to implement it
-// Wait for https://github.com/tc39/proposal-async-context
-export class AsyncLocalStorage<T> {
-  #store: T = null!;
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static bind<Func extends (...args: any[]) => any>(fn: Func): Func {
-    return fn;
-  }
-
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  static snapshot(): <R, TArgs extends any[]>(
-    fn: (...args: TArgs) => R,
-    ...args: TArgs
-  ) => R {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return (cb: any, ...args: any[]) => cb(...args);
-  }
-
-  getStore() {
-    return this.#store;
-  }
-
-  run<R>(store: T, cb: () => R): R {
-    this.#store = store;
-    if (cb.constructor.name === "AsyncFunction") {
-      console.warn("AsyncLocalStorage is not supported in the web environment");
-      console.warn("Please note that some features may not work as expected");
-    }
-    return cb();
-  }
-}

packages/env/src/index.browser.ts

@@ -5,10 +5,17 @@
  */
 import "./global-check.js";
 
-export * from "./als/index.web.js";
 export { consoleLogger, emptyLogger, type Logger } from "./logger/index.js";
+export {
+  loadTransformers,
+  setTransformers,
+  type LoadTransformerEvent,
+  type OnLoad,
+} from "./multi-model/index.browser.js";
+export { Tokenizers, tokenizers, type Tokenizer } from "./tokenizers/js.js";
 export { NotSupportCurrentRuntimeClass } from "./utils/shared.js";
 export * from "./web-polyfill.js";
+// @ts-expect-error no type
 if (typeof window === "undefined") {
   console.warn(
     "You are not in a browser environment. This module is not supposed to be used in a non-browser environment.",

packages/env/src/index.edge-light.ts

@@ -3,8 +3,14 @@
  *
  * @module
  */
-
-export * from "./als/index.non-node.js";
+import "./global-check.js";
 export { consoleLogger, emptyLogger, type Logger } from "./logger/index.js";
+export {
+  loadTransformers,
+  setTransformers,
+  type LoadTransformerEvent,
+  type OnLoad,
+} from "./multi-model/index.non-nodejs.js";
 export * from "./node-polyfill.js";
+export { Tokenizers, tokenizers, type Tokenizer } from "./tokenizers/js.js";
 export { NotSupportCurrentRuntimeClass } from "./utils/shared.js";

packages/env/src/index.ts

@@ -34,9 +34,20 @@ export function createSHA256(): SHA256 {
   };
 }
 
-export * from "./als/index.node.js";
 export { consoleLogger, emptyLogger, type Logger } from "./logger/index.js";
-export { CustomEvent, getEnv, setEnvs } from "./utils/index.js";
+export {
+  loadTransformers,
+  setTransformers,
+  type LoadTransformerEvent,
+  type OnLoad,
+} from "./multi-model/index.js";
+export { Tokenizers, tokenizers, type Tokenizer } from "./tokenizers/node.js";
+export {
+  AsyncLocalStorage,
+  CustomEvent,
+  getEnv,
+  setEnvs,
+} from "./utils/index.js";
 export { NotSupportCurrentRuntimeClass } from "./utils/shared.js";
 export {
   EOL,

packages/env/src/index.workerd.ts

@@ -7,7 +7,6 @@
  */
 import { INTERNAL_ENV } from "./utils/index.js";
 
-export * from "./als/index.non-node.js";
 export { NotSupportCurrentRuntimeClass } from "./utils/shared.js";
 
 export * from "./node-polyfill.js";
@@ -17,3 +16,10 @@ export function getEnv(name: string): string | undefined {
 }
 
 export { consoleLogger, emptyLogger, type Logger } from "./logger/index.js";
+export {
+  loadTransformers,
+  setTransformers,
+  type LoadTransformerEvent,
+  type OnLoad,
+} from "./multi-model/index.non-nodejs.js";
+export { Tokenizers, tokenizers, type Tokenizer } from "./tokenizers/js.js";

packages/env/src/internal/multi-model/shared.ts

@@ -1,17 +0,0 @@
-let transformer: typeof import("@huggingface/transformers") | null = null;
-
-export function getTransformers() {
-  return transformer;
-}
-
-export function setTransformers(t: typeof import("@huggingface/transformers")) {
-  transformer = t;
-}
-
-export type OnLoad = (
-  transformer: typeof import("@huggingface/transformers"),
-) => void;
-
-export type LoadTransformerEvent = {
-  transformer: typeof import("@huggingface/transformers");
-};

packages/env/src/multi-model.browser.ts

@@ -1,6 +0,0 @@
-export {
-  loadTransformers,
-  setTransformers,
-  type LoadTransformerEvent,
-  type OnLoad,
-} from "./internal/multi-model/browser.js";

packages/env/src/multi-model.edge-light.ts

@@ -1,6 +0,0 @@
-export {
-  loadTransformers,
-  setTransformers,
-  type LoadTransformerEvent,
-  type OnLoad,
-} from "./internal/multi-model/non-node.js";