Merge branch 'main' into Batch

run-llama · May 22, 2024 · c8ddbc2 · c8ddbc2
2 parents 128bd26 + b963782
commit c8ddbc2
Show file tree

Hide file tree

Showing 26 changed files with 115 additions and 38 deletions.
diff --git a/.changeset/dry-queens-dream.md b/.changeset/dry-queens-dream.md
diff --git a/.changeset/fuzzy-coins-breathe.md b/.changeset/fuzzy-coins-breathe.md
diff --git a/.changeset/heavy-files-compare.md b/.changeset/heavy-files-compare.md
diff --git a/apps/docs/CHANGELOG.md b/apps/docs/CHANGELOG.md
@@ -1,5 +1,15 @@
 # docs
 
+## 0.0.21
+
+### Patch Changes
+
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+
 ## 0.0.20
 
 ### Patch Changes

diff --git a/apps/docs/docs/getting_started/starter_tutorial/retrieval_augmented_generation.mdx b/apps/docs/docs/getting_started/starter_tutorial/retrieval_augmented_generation.mdx
@@ -10,21 +10,19 @@ import TSConfigSource from "!!raw-loader!../../../../../examples/tsconfig.json";
 
 One of the most common use-cases for LlamaIndex is Retrieval-Augmented Generation or RAG, in which your data is indexed and selectively retrieved to be given to an LLM as source material for responding to a query. You can learn more about the [concepts behind RAG](../concepts).
 
-## Before you start
+## Set up the project
 
-Make sure you have installed LlamaIndex.TS and have an OpenAI key. If you haven't, check out the [installation](../installation) steps.
-
-You can use [other LLMs](../examples/other_llms) via their APIs; if you would prefer to use local models check out our [local LLM example](../../examples/local_llm).
-
-## Set up
-
-In a new folder:
+In a new folder, run:
 
 ```bash npm2yarn
 npm init
 npm install -D typescript @types/node
 ```
 
+Then, check out the [installation](../installation) steps to install LlamaIndex.TS and prepare an OpenAI key.
+
+You can use [other LLMs](../examples/other_llms) via their APIs; if you would prefer to use local models check out our [local LLM example](../../examples/local_llm).
+
 ## Run queries
 
 Create the file `example.ts`. This code will

diff --git a/apps/docs/package.json b/apps/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docs",
-  "version": "0.0.20",
+  "version": "0.0.21",
   "private": true,
   "scripts": {
     "docusaurus": "docusaurus",

diff --git a/packages/autotool/examples/01_node/CHANGELOG.md b/packages/autotool/examples/01_node/CHANGELOG.md
@@ -4,6 +4,17 @@
 
 ### Patch Changes
 
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+  - @llamaindex/autotool@0.0.1
+
+## null
+
+### Patch Changes
+
 - Updated dependencies [34fb1d8]
   - llamaindex@0.3.12
   - @llamaindex/autotool@0.0.1

diff --git a/packages/autotool/examples/02_nextjs/CHANGELOG.md b/packages/autotool/examples/02_nextjs/CHANGELOG.md
@@ -1,5 +1,16 @@
 # @llamaindex/autotool-02-next-example
 
+## 0.1.5
+
+### Patch Changes
+
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+  - @llamaindex/autotool@0.0.1
+
 ## 0.1.4
 
 ### Patch Changes

diff --git a/packages/autotool/examples/02_nextjs/package.json b/packages/autotool/examples/02_nextjs/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/autotool-02-next-example",
   "private": true,
-  "version": "0.1.4",
+  "version": "0.1.5",
   "scripts": {
     "dev": "next dev",
     "build": "next build",

diff --git a/packages/autotool/package.json b/packages/autotool/package.json
@@ -51,7 +51,7 @@
     "unplugin": "^1.10.1"
   },
   "peerDependencies": {
-    "llamaindex": "^0.3.12",
+    "llamaindex": "^0.3.13",
     "openai": "^4",
     "typescript": "^4"
   },

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,14 @@
 # llamaindex
 
+## 0.3.13
+
+### Patch Changes
+
+- 1b1081b: Add vectorStores to storage context to define vector store per modality
+- 37525df: Added support for accessing Gemini via Vertex AI
+- 660a2b3: Fix text before heading in markdown reader
+- a1f2475: Add system prompt to ContextChatEngine
+
 ## 0.3.12
 
 ### Patch Changes

diff --git a/packages/core/e2e/examples/cloudflare-worker-agent/CHANGELOG.md b/packages/core/e2e/examples/cloudflare-worker-agent/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @llamaindex/cloudflare-worker-agent-test
 
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+
 ## 0.0.13
 
 ### Patch Changes

diff --git a/packages/core/e2e/examples/cloudflare-worker-agent/package.json b/packages/core/e2e/examples/cloudflare-worker-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/cloudflare-worker-agent-test",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "type": "module",
   "private": true,
   "scripts": {

diff --git a/packages/core/e2e/examples/nextjs-agent/CHANGELOG.md b/packages/core/e2e/examples/nextjs-agent/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @llamaindex/next-agent-test
 
+## 0.1.14
+
+### Patch Changes
+
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+
 ## 0.1.13
 
 ### Patch Changes

diff --git a/packages/core/e2e/examples/nextjs-agent/package.json b/packages/core/e2e/examples/nextjs-agent/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/next-agent-test",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/packages/core/e2e/examples/nextjs-edge-runtime/CHANGELOG.md b/packages/core/e2e/examples/nextjs-edge-runtime/CHANGELOG.md
@@ -1,5 +1,15 @@
 # test-edge-runtime
 
+## 0.1.13
+
+### Patch Changes
+
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+
 ## 0.1.12
 
 ### Patch Changes

diff --git a/packages/core/e2e/examples/nextjs-edge-runtime/package.json b/packages/core/e2e/examples/nextjs-edge-runtime/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/nextjs-edge-runtime-test",
-  "version": "0.1.12",
+  "version": "0.1.13",
   "private": true,
   "scripts": {
     "dev": "next dev",

diff --git a/packages/core/e2e/examples/waku-query-engine/CHANGELOG.md b/packages/core/e2e/examples/waku-query-engine/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @llamaindex/waku-query-engine-test
 
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+
 ## 0.0.13
 
 ### Patch Changes

diff --git a/packages/core/e2e/examples/waku-query-engine/package.json b/packages/core/e2e/examples/waku-query-engine/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/waku-query-engine-test",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "type": "module",
   "private": true,
   "scripts": {

diff --git a/packages/core/jsr.json b/packages/core/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/core",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "exports": "./src/index.ts",
   "imports": {
     "@llamaindex/env": "jsr:@llamaindex/env@0.1.3"

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "llamaindex",
-  "version": "0.3.12",
+  "version": "0.3.13",
   "expectedMinorVersion": "3",
   "license": "MIT",
   "type": "module",

diff --git a/packages/core/src/agent/anthropic.ts b/packages/core/src/agent/anthropic.ts
@@ -39,9 +39,10 @@ export class AnthropicAgent extends AgentRunner<Anthropic> {
   constructor(params: AnthropicAgentParams) {
     super({
       llm:
-        params.llm ?? Settings.llm instanceof Anthropic
+        params.llm ??
+        (Settings.llm instanceof Anthropic
           ? (Settings.llm as Anthropic)
-          : new Anthropic(),
+          : new Anthropic()),
       chatHistory: params.chatHistory ?? [],
       systemPrompt: params.systemPrompt ?? null,
       runner: new AnthropicAgentWorker(),

diff --git a/packages/core/src/agent/openai.ts b/packages/core/src/agent/openai.ts
@@ -36,9 +36,10 @@ export class OpenAIAgent extends AgentRunner<OpenAI> {
   constructor(params: OpenAIAgentParams) {
     super({
       llm:
-        params.llm ?? Settings.llm instanceof OpenAI
+        params.llm ??
+        (Settings.llm instanceof OpenAI
           ? (Settings.llm as OpenAI)
-          : new OpenAI(),
+          : new OpenAI()),
       chatHistory: params.chatHistory ?? [],
       runner: new OpenAIAgentWorker(),
       systemPrompt: params.systemPrompt ?? null,

diff --git a/packages/core/src/readers/MarkdownReader.ts b/packages/core/src/readers/MarkdownReader.ts
@@ -43,6 +43,8 @@ export class MarkdownReader implements FileReader {
             continue;
           }
           markdownTups.push([currentHeader, currentText]);
+        } else if (currentText) {
+          markdownTups.push([null, currentText]);
         }
 
         currentHeader = line;

diff --git a/packages/experimental/CHANGELOG.md b/packages/experimental/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @llamaindex/experimental
 
+## 0.0.30
+
+### Patch Changes
+
+- Updated dependencies [1b1081b]
+- Updated dependencies [37525df]
+- Updated dependencies [660a2b3]
+- Updated dependencies [a1f2475]
+  - llamaindex@0.3.13
+
 ## 0.0.29
 
 ### Patch Changes

diff --git a/packages/experimental/package.json b/packages/experimental/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/experimental",
   "description": "Experimental package for LlamaIndexTS",
-  "version": "0.0.29",
+  "version": "0.0.30",
   "type": "module",
   "types": "dist/type/index.d.ts",
   "main": "dist/cjs/index.js",