Release 0.9.8 (#1711)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: marcusschiesser <17126+marcusschiesser@users.noreply.github.com>

apps/next/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @llamaindex/doc
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies [4b49428]
+- Updated dependencies [bbc8c87]
+  - @llamaindex/workflow@0.0.14
+  - llamaindex@0.9.8
+
 ## 0.1.7
 
 ### Patch Changes

apps/next/package.json

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

apps/next/src/content/docs/llamaindex/modules/embeddings/available_embeddings/jinaai.mdx

@@ -2,10 +2,11 @@
 title: Jina AI
 ---
 
-To use Jina AI embeddings, you need to import `JinaAIEmbedding` from `llamaindex`.
+To use Jina AI embeddings, you need to import `JinaAIEmbedding` from `@llamaindex/jinaai`.
 
 ```ts
-import { JinaAIEmbedding, Settings } from "llamaindex";
+import { Settings } from "llamaindex";
+import { JinaAIEmbedding } from "@llamaindex/jinaai";
 
 Settings.embedModel = new JinaAIEmbedding();
 

apps/next/src/content/docs/llamaindex/modules/embeddings/available_embeddings/together.mdx

@@ -2,10 +2,11 @@
 title: Together
 ---
 
-To use together embeddings, you need to import `TogetherEmbedding` from `llamaindex`.
+To use together embeddings, you need to import `TogetherEmbedding` from `@llamaindex/together`.
 
 ```ts
-import { TogetherEmbedding, Settings } from "llamaindex";
+import { Settings } from "llamaindex";
+import { TogetherEmbedding } from "@llamaindex/together";
 
 Settings.embedModel = new TogetherEmbedding({
   apiKey: "<YOUR_API_KEY>",

apps/next/src/content/docs/llamaindex/modules/llms/available_llms/deepseek.mdx

@@ -7,7 +7,8 @@ title: DeepSeek LLM
 ## Usage
 
 ```ts
-import { DeepSeekLLM, Settings } from "llamaindex";
+import { Settings } from "llamaindex";
+import { DeepSeekLLM } from "@llamaindex/deepseek";
 
 Settings.llm = new DeepSeekLLM({
   apiKey: "<YOUR_API_KEY>",
@@ -18,7 +19,8 @@ Settings.llm = new DeepSeekLLM({
 ## Example
 
 ```ts
-import { DeepSeekLLM, Document, VectorStoreIndex, Settings } from "llamaindex";
+import { Document, VectorStoreIndex, Settings } from "llamaindex";
+import { DeepSeekLLM } from "@llamaindex/deepseek";
 
 const deepseekLlm = new DeepSeekLLM({
   apiKey: "<YOUR_API_KEY>",

apps/next/src/content/docs/llamaindex/modules/llms/available_llms/fireworks.mdx

@@ -7,7 +7,8 @@ title: Fireworks LLM
 ## Usage
 
 ```ts
-import { FireworksLLM, Settings } from "llamaindex";
+import { Settings } from "llamaindex";
+import { FireworksLLM } from "@llamaindex/fireworks";
 
 Settings.llm = new FireworksLLM({
   apiKey: "<YOUR_API_KEY>",

apps/next/src/content/docs/llamaindex/modules/llms/available_llms/together.mdx

@@ -23,7 +23,8 @@ import { Tab, Tabs } from "fumadocs-ui/components/tabs";
 ## Usage
 
 ```ts
-import { Settings, TogetherLLM } from "llamaindex";
+import { Settings } from "llamaindex";
+import { TogetherLLM } from "@llamaindex/together";
 
 Settings.llm = new TogetherLLM({
   apiKey: "<YOUR_API_KEY>",

e2e/examples/cloudflare-worker-agent/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @llamaindex/cloudflare-worker-agent-test
 
+## 0.0.142
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 0.0.141
 
 ### Patch Changes

e2e/examples/cloudflare-worker-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/cloudflare-worker-agent-test",
-  "version": "0.0.141",
+  "version": "0.0.142",
   "type": "module",
   "private": true,
   "scripts": {

e2e/examples/nextjs-agent/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @llamaindex/next-agent-test
 
+## 0.1.142
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 0.1.141
 
 ### Patch Changes

e2e/examples/nextjs-agent/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/next-agent-test",
-  "version": "0.1.141",
+  "version": "0.1.142",
   "private": true,
   "scripts": {
     "dev": "next dev",

e2e/examples/nextjs-edge-runtime/CHANGELOG.md

@@ -1,5 +1,12 @@
 # test-edge-runtime
 
+## 0.1.141
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 0.1.140
 
 ### Patch Changes

e2e/examples/nextjs-edge-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/nextjs-edge-runtime-test",
-  "version": "0.1.140",
+  "version": "0.1.141",
   "private": true,
   "scripts": {
     "dev": "next dev",

e2e/examples/nextjs-node-runtime/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @llamaindex/next-node-runtime
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 0.1.7
 
 ### Patch Changes

e2e/examples/nextjs-node-runtime/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/next-node-runtime-test",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "private": true,
   "scripts": {
     "dev": "next dev",

e2e/examples/vite-import-llamaindex/CHANGELOG.md

@@ -1,5 +1,12 @@
 # vite-import-llamaindex
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 0.0.7
 
 ### Patch Changes

e2e/examples/vite-import-llamaindex/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-import-llamaindex",
   "private": true,
-  "version": "0.0.7",
+  "version": "0.0.8",
   "type": "module",
   "scripts": {
     "build": "vite build",

e2e/examples/waku-query-engine/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @llamaindex/waku-query-engine-test
 
+## 0.0.142
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 0.0.141
 
 ### Patch Changes

e2e/examples/waku-query-engine/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/waku-query-engine-test",
-  "version": "0.0.141",
+  "version": "0.0.142",
   "type": "module",
   "private": true,
   "scripts": {

examples/CHANGELOG.md

@@ -1,5 +1,20 @@
 # examples
 
+## 0.2.7
+
+### Patch Changes
+
+- Updated dependencies [4b49428]
+- Updated dependencies [bbc8c87]
+- Updated dependencies [7ee4968]
+  - @llamaindex/workflow@0.0.14
+  - llamaindex@0.9.8
+  - @llamaindex/deepseek@0.0.2
+  - @llamaindex/fireworks@0.0.2
+  - @llamaindex/together@0.0.2
+  - @llamaindex/jinaai@0.0.2
+  - @llamaindex/google@0.0.14
+
 ## 0.2.6
 
 ### Patch Changes

examples/deepseek.ts

@@ -0,0 +1,46 @@
+import { DeepSeekLLM } from "@llamaindex/deepseek";
+
+// process.env.DEEPSEEK_API_KEY is required
+const deepseek = new DeepSeekLLM({
+  apiKey: process.env.DEEPSEEK_API_KEY,
+  model: "deepseek-coder", // or "deepseek-chat"
+});
+
+(async () => {
+  // Example of non-streaming chat
+  const response = await deepseek.chat({
+    messages: [
+      {
+        role: "system",
+        content: "You are an AI assistant",
+      },
+      {
+        role: "user",
+        content: "Tell me about San Francisco",
+      },
+    ],
+    stream: false,
+  });
+  console.log("Response from DeepSeek AI:");
+  console.log(response);
+
+  // Example of streaming chat
+  const generator = await deepseek.chat({
+    messages: [
+      {
+        role: "system",
+        content: "You are an AI assistant",
+      },
+      {
+        role: "user",
+        content: "Write a short poem about San Francisco",
+      },
+    ],
+    stream: true,
+  });
+  console.log("\nStreaming response from DeepSeek AI...");
+  for await (const message of generator) {
+    process.stdout.write(message.delta);
+  }
+  console.log("\n");
+})();

examples/multimodal/jina.ts

@@ -1,10 +1,6 @@
+import { JinaAIEmbedding } from "@llamaindex/jinaai";
 import { SimpleDirectoryReader } from "@llamaindex/readers/directory";
-import {
+import { ImageDocument, similarity, SimilarityType } from "llamaindex";
-  ImageDocument,
-  JinaAIEmbedding,
-  similarity,
-  SimilarityType,
-} from "llamaindex";
 import path from "path";
 
 async function main() {

examples/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@llamaindex/examples",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "private": true,
   "scripts": {
     "lint": "eslint .",
@@ -22,7 +22,7 @@
     "@llamaindex/deepinfra": "^0.0.42",
     "@llamaindex/env": "^0.1.29",
     "@llamaindex/firestore": "^1.0.4",
-    "@llamaindex/google": "^0.0.13",
+    "@llamaindex/google": "^0.0.14",
     "@llamaindex/groq": "^0.0.57",
     "@llamaindex/huggingface": "^0.0.42",
     "@llamaindex/milvus": "^0.1.6",
@@ -43,7 +43,11 @@
     "@llamaindex/vllm": "^0.0.28",
     "@llamaindex/voyage-ai": "^1.0.3",
     "@llamaindex/weaviate": "^0.0.11",
-    "@llamaindex/workflow": "^0.0.13",
+    "@llamaindex/workflow": "^0.0.14",
+    "@llamaindex/deepseek": "^0.0.2",
+    "@llamaindex/fireworks": "^0.0.2",
+    "@llamaindex/together": "^0.0.2",
+    "@llamaindex/jinaai": "^0.0.2",
     "@notionhq/client": "^2.2.15",
     "@pinecone-database/pinecone": "^4.0.0",
     "@vercel/postgres": "^0.10.0",
@@ -52,7 +56,7 @@
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",
     "js-tiktoken": "^1.0.14",
-    "llamaindex": "^0.9.7",
+    "llamaindex": "^0.9.8",
     "mongodb": "6.7.0",
     "postgres": "^3.4.4",
     "wikipedia": "^2.1.2",

examples/qdrantdb/with-gemini.ts

@@ -0,0 +1,33 @@
+import {
+  GEMINI_EMBEDDING_MODEL,
+  GeminiEmbedding,
+  GeminiSession,
+} from "@llamaindex/google";
+import { QdrantVectorStore } from "@llamaindex/qdrant";
+import {
+  Document,
+  storageContextFromDefaults,
+  VectorStoreIndex,
+} from "llamaindex";
+
+const embedding = new GeminiEmbedding({
+  model: GEMINI_EMBEDDING_MODEL.EMBEDDING_001,
+  session: new GeminiSession({
+    apiKey: process.env.GEMINI_API_KEY,
+  }),
+});
+
+async function main() {
+  const docs = [new Document({ text: "Lorem ipsum dolor sit amet" })];
+  const vectorStore = new QdrantVectorStore({
+    url: process.env.QDRANT_URL,
+    apiKey: process.env.QDRANT_API_KEY,
+    embeddingModel: embedding,
+    collectionName: "gemini_test",
+  });
+  const storageContext = await storageContextFromDefaults({ vectorStore });
+  await VectorStoreIndex.fromDocuments(docs, { storageContext });
+  console.log("Inizialized vector store successfully");
+}
+
+void main().catch((err) => console.error(err));

examples/qdrantdb/with-jina.ts

@@ -0,0 +1,27 @@
+import { JinaAIEmbedding } from "@llamaindex/jinaai";
+import { QdrantVectorStore } from "@llamaindex/qdrant";
+import {
+  Document,
+  storageContextFromDefaults,
+  VectorStoreIndex,
+} from "llamaindex";
+
+const embedding = new JinaAIEmbedding({
+  apiKey: process.env.JINAAI_API_KEY,
+  model: "jina-embeddings-v3",
+});
+
+async function main() {
+  const docs = [new Document({ text: "Lorem ipsum dolor sit amet" })];
+  const vectorStore = new QdrantVectorStore({
+    url: process.env.QDRANT_URL,
+    apiKey: process.env.QDRANT_API_KEY,
+    embeddingModel: embedding,
+    collectionName: "jina_test",
+  });
+  const storageContext = await storageContextFromDefaults({ vectorStore });
+  await VectorStoreIndex.fromDocuments(docs, { storageContext });
+  console.log("Inizialized vector store successfully");
+}
+
+void main().catch((err) => console.error(err));

examples/readers/src/pdf_fw.ts

@@ -1,5 +1,6 @@
+import { FireworksEmbedding, FireworksLLM } from "@llamaindex/fireworks";
 import { PDFReader } from "@llamaindex/readers/pdf";
-import { FireworksEmbedding, FireworksLLM, VectorStoreIndex } from "llamaindex";
+import { VectorStoreIndex } from "llamaindex";
 
 import { Settings } from "llamaindex";
 

examples/together-ai.ts

@@ -1,4 +1,4 @@
-import { TogetherEmbedding, TogetherLLM } from "llamaindex";
+import { TogetherEmbedding, TogetherLLM } from "@llamaindex/together";
 
 // process.env.TOGETHER_API_KEY is required
 const together = new TogetherLLM({

examples/together-ai/vector-index.ts

@@ -1,12 +1,7 @@
 import fs from "node:fs/promises";
 
-import {
+import { TogetherEmbedding, TogetherLLM } from "@llamaindex/together";
-  Document,
+import { Document, Settings, VectorStoreIndex } from "llamaindex";
-  Settings,
-  TogetherEmbedding,
-  TogetherLLM,
-  VectorStoreIndex,
-} from "llamaindex";
 
 // Update llm to use TogetherAI
 Settings.llm = new TogetherLLM({

packages/autotool/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @llamaindex/autotool
 
+## 6.0.8
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 6.0.7
 
 ### Patch Changes

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

@@ -1,5 +1,13 @@
 # @llamaindex/autotool-01-node-example
 
+## 0.0.89
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+  - @llamaindex/autotool@6.0.8
+
 ## 0.0.88
 
 ### 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.88"
+  "version": "0.0.89"
 }

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

@@ -1,5 +1,13 @@
 # @llamaindex/autotool-02-next-example
 
+## 0.1.133
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+  - @llamaindex/autotool@6.0.8
+
 ## 0.1.132
 
 ### Patch Changes

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

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

packages/autotool/package.json

@@ -6,7 +6,7 @@
     "url": "git+https://github.com/run-llama/LlamaIndexTS.git",
     "directory": "packages/autotool"
   },
-  "version": "6.0.7",
+  "version": "6.0.8",
   "description": "auto transpile your JS function to LLM Agent compatible",
   "files": [
     "dist",

packages/experimental/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @llamaindex/experimental
 
+## 0.0.158
+
+### Patch Changes
+
+- Updated dependencies [bbc8c87]
+  - llamaindex@0.9.8
+
 ## 0.0.157
 
 ### Patch Changes

packages/experimental/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/experimental",
   "description": "Experimental package for LlamaIndexTS",
-  "version": "0.0.157",
+  "version": "0.0.158",
   "type": "module",
   "types": "dist/type/index.d.ts",
   "main": "dist/cjs/index.js",

packages/llamaindex/CHANGELOG.md

@@ -1,5 +1,13 @@
 # llamaindex
 
+## 0.9.8
+
+### Patch Changes
+
+- bbc8c87: fix: prefer using embedding model from vector store
+- Updated dependencies [4b49428]
+  - @llamaindex/workflow@0.0.14
+
 ## 0.9.7
 
 ### Patch Changes

packages/llamaindex/package.json

@@ -1,6 +1,6 @@
 {
   "name": "llamaindex",
-  "version": "0.9.7",
+  "version": "0.9.8",
   "license": "MIT",
   "type": "module",
   "keywords": [

packages/llamaindex/src/embeddings/OpenAIEmbedding.ts

@@ -1 +0,0 @@
-export * from "@llamaindex/openai";

packages/llamaindex/src/embeddings/index.ts

@@ -1,5 +0,0 @@
-export * from "@llamaindex/core/embeddings";
-export { FireworksEmbedding } from "./fireworks.js";
-export * from "./JinaAIEmbedding.js";
-export * from "./OpenAIEmbedding.js";
-export { TogetherEmbedding } from "./together.js";

packages/llamaindex/src/index.edge.ts

@@ -22,6 +22,7 @@ export {
 export * from "@llamaindex/core/agent";
 export * from "@llamaindex/core/chat-engine";
 export * from "@llamaindex/core/data-structs";
+export * from "@llamaindex/core/embeddings";
 export {
   CallbackManager,
   DEFAULT_BASE_URL,
@@ -65,10 +66,10 @@ export * from "@llamaindex/core/storage/doc-store";
 export * from "@llamaindex/core/storage/index-store";
 export * from "@llamaindex/core/storage/kv-store";
 export * from "@llamaindex/core/utils";
+export * from "@llamaindex/openai";
 export * from "@llamaindex/workflow/agent";
 export * from "./agent/index.js";
 export * from "./cloud/index.js";
-export * from "./embeddings/index.js";
 export * from "./engines/chat/index.js";
 export * from "./engines/query/index.js";
 export * from "./evaluation/index.js";
@@ -76,7 +77,6 @@ export * from "./extractors/index.js";
 export * from "./indices/index.js";
 export * from "./ingestion/index.js";
 export { imageToDataUrl } from "./internal/utils.js";
-export * from "./llm/index.js";
 export * from "./node-parser.js";
 export * from "./objects/index.js";
 export * from "./OutputParser.js";

packages/llamaindex/src/index.ts

@@ -1,8 +1,5 @@
 export * from "./index.edge.js";
 
-// TODO: clean up, move to jinaai package
-export { JinaAIEmbedding } from "./embeddings/JinaAIEmbedding.js";
-
 // Don't export file-system stores for non-node.js runtime on top level,
 //  as we cannot guarantee that they will work in other environments
 export * from "./storage/index.js";

packages/llamaindex/src/indices/vectorStore/index.ts

@@ -175,7 +175,7 @@ export class VectorStoreIndex extends BaseIndex<IndexDict> {
     for (const type in nodeMap) {
       const nodes = nodeMap[type as ModalityType];
       const embedModel =
-        this.embedModel ?? this.vectorStores[type as ModalityType]?.embedModel;
+        this.vectorStores[type as ModalityType]?.embedModel ?? this.embedModel;
       if (embedModel && nodes) {
         await embedModel(nodes, {
           logProgress: options?.logProgress,

packages/llamaindex/src/llm/index.ts

@@ -1,4 +0,0 @@
-export { DeepSeekLLM } from "./deepseek.js";
-export { FireworksLLM } from "./fireworks.js";
-export * from "./openai.js";
-export { TogetherLLM } from "./together.js";

packages/llamaindex/src/llm/openai.ts

@@ -1 +0,0 @@
-export * from "@llamaindex/openai";

packages/llamaindex/tests/MetadataExtractors.test.ts

@@ -1,13 +1,11 @@
 import { Document } from "@llamaindex/core/schema";
-import { Settings } from "llamaindex";
+import { OpenAI, OpenAIEmbedding, Settings } from "llamaindex";
-import { OpenAIEmbedding } from "llamaindex/embeddings/index";
 import {
   KeywordExtractor,
   QuestionsAnsweredExtractor,
   SummaryExtractor,
   TitleExtractor,
 } from "llamaindex/extractors/index";
-import { OpenAI } from "llamaindex/llm/openai";
 import { SentenceSplitter } from "llamaindex/node-parser";
 import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
 import {

packages/llamaindex/tests/Selectors.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from "vitest";
 // from unittest.mock import patch
 
-import { OpenAI } from "llamaindex/llm/index";
+import { OpenAI } from "llamaindex";
 import { LLMSingleSelector } from "llamaindex/selectors/index";
 import { mocStructuredkLlmGeneration } from "./utility/mockOpenAI.js";
 

packages/llamaindex/tests/indices/SummaryIndex.test.ts

@@ -20,13 +20,13 @@ describe("SummaryIndex", () => {
   let storageContext: StorageContext;
 
   beforeAll(async () => {
-    storageContext = await storageContextFromDefaults({
-      persistDir: testDir,
-    });
-
     const embedModel = new OpenAIEmbedding();
     mockEmbeddingModel(embedModel);
     Settings.embedModel = embedModel;
+
+    storageContext = await storageContextFromDefaults({
+      persistDir: testDir,
+    });
   });
 
   afterAll(() => {

packages/llamaindex/tests/indices/VectorStoreIndex.test.ts

@@ -9,7 +9,7 @@ import { DocStoreStrategy } from "llamaindex/ingestion/strategies/index";
 import { mkdtemp, rm } from "node:fs/promises";
 import { tmpdir } from "node:os";
 import { join } from "node:path";
-import { afterAll, beforeAll, describe, expect, test, vi } from "vitest";
+import { afterAll, beforeAll, describe, expect, it, test, vi } from "vitest";
 
 const testDir = await mkdtemp(join(tmpdir(), "test-"));
 
@@ -24,6 +24,10 @@ describe("VectorStoreIndex", () => {
   ) => Promise<Array<number>>;
 
   beforeAll(async () => {
+    const embedModel = new OpenAIEmbedding();
+    mockEmbeddingModel(embedModel);
+    Settings.embedModel = embedModel;
+
     storageContext = await mockStorageContext(testDir);
     testStrategy = async (
       strategy: DocStoreStrategy,
@@ -41,10 +45,6 @@ describe("VectorStoreIndex", () => {
       }
       return entries;
     };
-
-    const embedModel = new OpenAIEmbedding();
-    mockEmbeddingModel(embedModel);
-    Settings.embedModel = embedModel;
   });
 
   afterAll(() => {
@@ -65,3 +65,28 @@ describe("VectorStoreIndex", () => {
     await rm(testDir, { recursive: true });
   });
 });
+
+describe("[VectorStoreIndex] use embedding model", () => {
+  it("should use embedding model passed in options instead of Settings", async () => {
+    const documents = [new Document({ text: "This needs to be embedded" })];
+
+    // Create mock embedding models
+    const settingsEmbedModel = new OpenAIEmbedding();
+    const customEmbedModel = new OpenAIEmbedding();
+
+    // Mock the embedding models using the utility function
+    mockEmbeddingModel(settingsEmbedModel);
+    mockEmbeddingModel(customEmbedModel);
+
+    // Add spies to track calls
+    const settingsSpy = vi.spyOn(settingsEmbedModel, "getTextEmbeddings");
+    const customSpy = vi.spyOn(customEmbedModel, "getTextEmbeddings");
+
+    Settings.embedModel = settingsEmbedModel;
+
+    const storageContext = await mockStorageContext(testDir, customEmbedModel); // setup custom embedding model
+    await VectorStoreIndex.fromDocuments(documents, { storageContext });
+    expect(customSpy).toHaveBeenCalled();
+    expect(settingsSpy).not.toHaveBeenCalled();
+  });
+});

packages/llamaindex/tests/utility/mockOpenAI.ts

@@ -1,8 +1,6 @@
 import type { CallbackManager } from "@llamaindex/core/global";
-import type { LLMChatParamsBase } from "llamaindex";
+import type { LLMChatParamsBase, OpenAIEmbedding } from "llamaindex";
-import { Settings } from "llamaindex";
+import { OpenAI, Settings } from "llamaindex";
-import type { OpenAIEmbedding } from "llamaindex/embeddings/OpenAIEmbedding";
-import { OpenAI } from "llamaindex/llm/openai";
 import { vi } from "vitest";
 
 export const DEFAULT_LLM_TEXT_OUTPUT = "MOCK_TOKEN_1-MOCK_TOKEN_2";

packages/llamaindex/tests/utility/mockStorageContext.ts

@@ -1,14 +1,27 @@
-import { OpenAIEmbedding, storageContextFromDefaults } from "llamaindex";
+import {
+  BaseEmbedding,
+  OpenAIEmbedding,
+  storageContextFromDefaults,
+} from "llamaindex";
 
 import { mockEmbeddingModel } from "./mockOpenAI.js";
 
-export async function mockStorageContext(testDir: string) {
+export async function mockStorageContext(
+  testDir: string,
+  embeddingModel?: BaseEmbedding,
+) {
   const storageContext = await storageContextFromDefaults({
     persistDir: testDir,
   });
   for (const store of Object.values(storageContext.vectorStores)) {
-    store.embedModel = new OpenAIEmbedding();
+    if (embeddingModel) {
-    mockEmbeddingModel(store.embedModel as OpenAIEmbedding);
+      // use embeddingModel if it is passed in
+      store.embedModel = embeddingModel;
+    } else {
+      // mock an embedding model for testing
+      store.embedModel = new OpenAIEmbedding();
+      mockEmbeddingModel(store.embedModel as OpenAIEmbedding);
+    }
   }
   return storageContext;
 }

packages/providers/deepseek/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @llamaindex/deepseek
+
+## 0.0.2
+
+### Patch Changes
+
+- bbc8c87: fix: prefer using embedding model from vector store

packages/providers/deepseek/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@llamaindex/deepseek",
+  "description": "DeepSeek Adapter for LlamaIndex",
+  "version": "0.0.2",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "exports": {
+    ".": {
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/run-llama/LlamaIndexTS.git",
+    "directory": "packages/providers/deepseek"
+  },
+  "scripts": {
+    "build": "bunchee",
+    "dev": "bunchee --watch"
+  },
+  "devDependencies": {
+    "bunchee": "6.3.4"
+  },
+  "dependencies": {
+    "@llamaindex/env": "workspace:*",
+    "@llamaindex/openai": "workspace:*"
+  }
+}

packages/providers/deepseek/src/index.ts

@@ -0,0 +1 @@
+export * from "./llm";

packages/providers/deepseek/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "./lib",
+    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+  },
+  "include": ["./src"],
+  "references": [
+    {
+      "path": "../openai/tsconfig.json"
+    },
+    {
+      "path": "../../env/tsconfig.json"
+    }
+  ]
+}

packages/providers/fireworks/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @llamaindex/fireworks
+
+## 0.0.2
+
+### Patch Changes
+
+- bbc8c87: fix: prefer using embedding model from vector store

packages/providers/fireworks/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@llamaindex/fireworks",
+  "description": "Fireworks Adapter for LlamaIndex",
+  "version": "0.0.2",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "exports": {
+    ".": {
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/run-llama/LlamaIndexTS.git",
+    "directory": "packages/providers/fireworks"
+  },
+  "scripts": {
+    "build": "bunchee",
+    "dev": "bunchee --watch"
+  },
+  "devDependencies": {
+    "bunchee": "6.3.4"
+  },
+  "dependencies": {
+    "@llamaindex/env": "workspace:*",
+    "@llamaindex/openai": "workspace:*"
+  }
+}

packages/providers/fireworks/src/index.ts

@@ -0,0 +1,2 @@
+export * from "./embedding";
+export * from "./llm";

packages/providers/fireworks/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "./lib",
+    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+  },
+  "include": ["./src"],
+  "references": [
+    {
+      "path": "../openai/tsconfig.json"
+    },
+    {
+      "path": "../../env/tsconfig.json"
+    }
+  ]
+}

packages/providers/google/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @llamaindex/google
 
+## 0.0.14
+
+### Patch Changes
+
+- 7ee4968: Add Gemini 2.0 Pro Experimental
+
 ## 0.0.13
 
 ### Patch Changes

packages/providers/google/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/google",
   "description": "Google Adapter for LlamaIndex",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",

packages/providers/google/src/base.ts

@@ -57,6 +57,7 @@ export const GEMINI_MODEL_INFO_MAP: Record<GEMINI_MODEL, GeminiModelInfo> = {
   [GEMINI_MODEL.GEMINI_2_0_FLASH]: { contextWindow: 10 ** 6 },
   [GEMINI_MODEL.GEMINI_2_0_FLASH_LITE_PREVIEW]: { contextWindow: 10 ** 6 },
   [GEMINI_MODEL.GEMINI_2_0_FLASH_THINKING_EXP]: { contextWindow: 32768 },
+  [GEMINI_MODEL.GEMINI_2_0_PRO_EXPERIMENTAL]: { contextWindow: 2 * 10 ** 6 },
 };
 
 const SUPPORT_TOOL_CALL_MODELS: GEMINI_MODEL[] = [
@@ -72,6 +73,7 @@ const SUPPORT_TOOL_CALL_MODELS: GEMINI_MODEL[] = [
   GEMINI_MODEL.GEMINI_PRO_1_5_FLASH_LATEST,
   GEMINI_MODEL.GEMINI_2_0_FLASH_EXPERIMENTAL,
   GEMINI_MODEL.GEMINI_2_0_FLASH,
+  GEMINI_MODEL.GEMINI_2_0_PRO_EXPERIMENTAL,
 ];
 
 const DEFAULT_GEMINI_PARAMS = {

packages/providers/google/src/types.ts

@@ -68,6 +68,7 @@ export enum GEMINI_MODEL {
   GEMINI_2_0_FLASH = "gemini-2.0-flash-001",
   GEMINI_2_0_FLASH_LITE_PREVIEW = "gemini-2.0-flash-lite-preview-02-05",
   GEMINI_2_0_FLASH_THINKING_EXP = "gemini-2.0-flash-thinking-exp-01-21",
+  GEMINI_2_0_PRO_EXPERIMENTAL = "gemini-2.0-pro-exp-02-05",
 }
 
 export interface GeminiModelInfo {

packages/providers/jinaai/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @llamaindex/jinaai
+
+## 0.0.2
+
+### Patch Changes
+
+- bbc8c87: fix: prefer using embedding model from vector store

packages/providers/jinaai/package.json

@@ -0,0 +1,40 @@
+{
+  "name": "@llamaindex/jinaai",
+  "description": "JinaAI Adapter for LlamaIndex",
+  "version": "0.0.2",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "exports": {
+    ".": {
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/run-llama/LlamaIndexTS.git",
+    "directory": "packages/providers/jinaai"
+  },
+  "scripts": {
+    "build": "bunchee",
+    "dev": "bunchee --watch"
+  },
+  "devDependencies": {
+    "bunchee": "6.3.4"
+  },
+  "dependencies": {
+    "@llamaindex/core": "workspace:*",
+    "@llamaindex/env": "workspace:*",
+    "@llamaindex/openai": "workspace:*"
+  }
+}

packages/providers/jinaai/src/embedding.ts

@@ -1,7 +1,7 @@
 import { MultiModalEmbedding } from "@llamaindex/core/embeddings";
+import type { ImageType } from "@llamaindex/core/schema";
+import { imageToDataUrl } from "@llamaindex/core/utils";
 import { getEnv } from "@llamaindex/env";
-import { imageToDataUrl } from "../internal/utils.js";
-import type { ImageType } from "../Node.js";
 
 function isLocal(url: ImageType): boolean {
   if (url instanceof Blob) return true;

packages/providers/jinaai/src/index.ts

@@ -0,0 +1 @@
+export * from "./embedding";

packages/providers/jinaai/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "./lib",
+    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+  },
+  "include": ["./src"],
+  "references": [
+    {
+      "path": "../openai/tsconfig.json"
+    },
+    {
+      "path": "../../env/tsconfig.json"
+    }
+  ]
+}

packages/providers/together/CHANGELOG.md

@@ -0,0 +1,7 @@
+# @llamaindex/together
+
+## 0.0.2
+
+### Patch Changes
+
+- bbc8c87: fix: prefer using embedding model from vector store

packages/providers/together/package.json

@@ -0,0 +1,39 @@
+{
+  "name": "@llamaindex/together",
+  "description": "Together Adapter for LlamaIndex",
+  "version": "0.0.2",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.js",
+  "exports": {
+    ".": {
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      },
+      "import": {
+        "types": "./dist/index.d.ts",
+        "default": "./dist/index.js"
+      }
+    }
+  },
+  "files": [
+    "dist"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/run-llama/LlamaIndexTS.git",
+    "directory": "packages/providers/together"
+  },
+  "scripts": {
+    "build": "bunchee",
+    "dev": "bunchee --watch"
+  },
+  "devDependencies": {
+    "bunchee": "6.3.4"
+  },
+  "dependencies": {
+    "@llamaindex/env": "workspace:*",
+    "@llamaindex/openai": "workspace:*"
+  }
+}

packages/providers/together/src/index.ts

@@ -0,0 +1,2 @@
+export * from "./embedding";
+export * from "./llm";

packages/providers/together/tsconfig.json

@@ -0,0 +1,19 @@
+{
+  "extends": "../../../tsconfig.json",
+  "compilerOptions": {
+    "target": "ESNext",
+    "module": "ESNext",
+    "moduleResolution": "bundler",
+    "outDir": "./lib",
+    "tsBuildInfoFile": "./lib/.tsbuildinfo"
+  },
+  "include": ["./src"],
+  "references": [
+    {
+      "path": "../../core/tsconfig.json"
+    },
+    {
+      "path": "../../env/tsconfig.json"
+    }
+  ]
+}

packages/workflow/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @llamaindex/workflow
 
+## 0.0.14
+
+### Patch Changes
+
+- 4b49428: fix agent workflow tool calls for Ollama
+
 ## 0.0.13
 
 ### Patch Changes

packages/workflow/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/workflow",
   "description": "Workflow API",
-  "version": "0.0.13",
+  "version": "0.0.14",
   "type": "module",
   "types": "dist/index.d.ts",
   "module": "dist/index.js",

packages/workflow/src/agent/function-agent.ts

@@ -96,6 +96,7 @@ export class FunctionAgent implements BaseWorkflowAgent {
     });
     let response = "";
     let lastChunk: ChatResponseChunk | undefined;
+    const toolCalls: Map<string, AgentToolCall> = new Map();
     for await (const chunk of responseStream) {
       response += chunk.delta;
       ctx.sendEvent(
@@ -106,7 +107,13 @@ export class FunctionAgent implements BaseWorkflowAgent {
           raw: chunk.raw,
         }),
       );
-      lastChunk = chunk;
+      const toolCallsInChunk = this.getToolCallFromResponseChunk(chunk);
+      if (toolCallsInChunk.length > 0) {
+        // Just upsert the tool calls with the latest one if they exist
+        toolCallsInChunk.forEach((toolCall) => {
+          toolCalls.set(toolCall.data.toolId, toolCall);
+        });
+      }
     }
 
     const message: ChatMessage = {
@@ -114,12 +121,9 @@ export class FunctionAgent implements BaseWorkflowAgent {
       content: response,
     };
 
-    const toolCalls = lastChunk
+    if (toolCalls.size > 0) {
-      ? this.getToolCallFromResponseChunk(lastChunk)
-      : [];
-    if (toolCalls.length > 0) {
       message.options = {
-        toolCall: toolCalls.map((toolCall) => ({
+        toolCall: Array.from(toolCalls.values()).map((toolCall) => ({
           name: toolCall.data.toolName,
           input: toolCall.data.toolKwargs,
           id: toolCall.data.toolId,
@@ -130,7 +134,7 @@ export class FunctionAgent implements BaseWorkflowAgent {
     ctx.data.scratchpad = scratchpad;
     return new AgentOutput({
       response: message,
-      toolCalls,
+      toolCalls: Array.from(toolCalls.values()),
       raw: lastChunk?.raw,
       currentAgentName: this.name,
     });

pnpm-lock.yaml

@@ -622,14 +622,20 @@ importers:
       '@llamaindex/deepinfra':
         specifier: ^0.0.42
         version: link:../packages/providers/deepinfra
+      '@llamaindex/deepseek':
+        specifier: ^0.0.2
+        version: link:../packages/providers/deepseek
       '@llamaindex/env':
         specifier: ^0.1.29
         version: link:../packages/env
       '@llamaindex/firestore':
         specifier: ^1.0.4
         version: link:../packages/providers/storage/firestore
+      '@llamaindex/fireworks':
+        specifier: ^0.0.2
+        version: link:../packages/providers/fireworks
       '@llamaindex/google':
-        specifier: ^0.0.13
+        specifier: ^0.0.14
         version: link:../packages/providers/google
       '@llamaindex/groq':
         specifier: ^0.0.57
@@ -637,6 +643,9 @@ importers:
       '@llamaindex/huggingface':
         specifier: ^0.0.42
         version: link:../packages/providers/huggingface
+      '@llamaindex/jinaai':
+        specifier: ^0.0.2
+        version: link:../packages/providers/jinaai
       '@llamaindex/milvus':
         specifier: ^0.1.6
         version: link:../packages/providers/storage/milvus
@@ -676,6 +685,9 @@ importers:
       '@llamaindex/replicate':
         specifier: ^0.0.39
         version: link:../packages/providers/replicate
+      '@llamaindex/together':
+        specifier: ^0.0.2
+        version: link:../packages/providers/together
       '@llamaindex/upstash':
         specifier: ^0.0.11
         version: link:../packages/providers/storage/upstash
@@ -692,7 +704,7 @@ importers:
         specifier: ^0.0.11
         version: link:../packages/providers/storage/weaviate
       '@llamaindex/workflow':
-        specifier: ^0.0.13
+        specifier: ^0.0.14
         version: link:../packages/workflow
       '@notionhq/client':
         specifier: ^2.2.15
@@ -719,7 +731,7 @@ importers:
         specifier: ^1.0.14
         version: 1.0.18
       llamaindex:
-        specifier: ^0.9.7
+        specifier: ^0.9.8
         version: link:../packages/llamaindex
       mongodb:
         specifier: 6.7.0
@@ -1218,6 +1230,32 @@ importers:
         specifier: 6.3.4
         version: 6.3.4(patch_hash=pavboztthlgni7m5gzw7643oru)(typescript@5.7.3)
 
+  packages/providers/deepseek:
+    dependencies:
+      '@llamaindex/env':
+        specifier: workspace:*
+        version: link:../../env
+      '@llamaindex/openai':
+        specifier: workspace:*
+        version: link:../openai
+    devDependencies:
+      bunchee:
+        specifier: 6.3.4
+        version: 6.3.4(patch_hash=pavboztthlgni7m5gzw7643oru)(typescript@5.7.3)
+
+  packages/providers/fireworks:
+    dependencies:
+      '@llamaindex/env':
+        specifier: workspace:*
+        version: link:../../env
+      '@llamaindex/openai':
+        specifier: workspace:*
+        version: link:../openai
+    devDependencies:
+      bunchee:
+        specifier: 6.3.4
+        version: 6.3.4(patch_hash=pavboztthlgni7m5gzw7643oru)(typescript@5.7.3)
+
   packages/providers/google:
     dependencies:
       '@google-cloud/vertexai':
@@ -1275,6 +1313,22 @@ importers:
         specifier: 6.3.4
         version: 6.3.4(patch_hash=pavboztthlgni7m5gzw7643oru)(typescript@5.7.3)
 
+  packages/providers/jinaai:
+    dependencies:
+      '@llamaindex/core':
+        specifier: workspace:*
+        version: link:../../core
+      '@llamaindex/env':
+        specifier: workspace:*
+        version: link:../../env
+      '@llamaindex/openai':
+        specifier: workspace:*
+        version: link:../openai
+    devDependencies:
+      bunchee:
+        specifier: 6.3.4
+        version: 6.3.4(patch_hash=pavboztthlgni7m5gzw7643oru)(typescript@5.7.3)
+
   packages/providers/mistral:
     dependencies:
       '@llamaindex/core':
@@ -1607,6 +1661,19 @@ importers:
         specifier: 6.3.4
         version: 6.3.4(patch_hash=pavboztthlgni7m5gzw7643oru)(typescript@5.7.3)
 
+  packages/providers/together:
+    dependencies:
+      '@llamaindex/env':
+        specifier: workspace:*
+        version: link:../../env
+      '@llamaindex/openai':
+        specifier: workspace:*
+        version: link:../openai
+    devDependencies:
+      bunchee:
+        specifier: 6.3.4
+        version: 6.3.4(patch_hash=pavboztthlgni7m5gzw7643oru)(typescript@5.7.3)
+
   packages/providers/vercel:
     dependencies:
       '@llamaindex/core':

tsconfig.json

@@ -175,6 +175,18 @@
     },
     {
       "path": "./packages/providers/voyage-ai/tsconfig.json"
+    },
+    {
+      "path": "./packages/providers/deepseek/tsconfig.json"
+    },
+    {
+      "path": "./packages/providers/fireworks/tsconfig.json"
+    },
+    {
+      "path": "./packages/providers/together/tsconfig.json"
+    },
+    {
+      "path": "./packages/providers/jinaai/tsconfig.json"
     }
   ]
 }

unit/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @llamaindex/unit-test
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies [4b49428]
+- Updated dependencies [bbc8c87]
+  - @llamaindex/workflow@0.0.14
+  - llamaindex@0.9.8
+
 ## 0.1.7
 
 ### Patch Changes

unit/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@llamaindex/unit-test",
   "private": true,
-  "version": "0.1.7",
+  "version": "0.1.8",
   "type": "module",
   "scripts": {
     "test": "vitest run"