Merge branch 'main' into patch-1

run-llama · May 7, 2024 · 34a0edd · 34a0edd
2 parents b32fd2d + 97e4ecd
commit 34a0edd
Show file tree

Hide file tree

Showing 28 changed files with 250 additions and 123 deletions.
diff --git a/apps/docs/CHANGELOG.md b/apps/docs/CHANGELOG.md
@@ -1,5 +1,20 @@
 # docs
 
+## 0.0.15
+
+### Patch Changes
+
+- Updated dependencies [b6a6606]
+- Updated dependencies [b6a6606]
+  - llamaindex@0.3.7
+
+## 0.0.14
+
+### Patch Changes
+
+- Updated dependencies [efa326a]
+  - llamaindex@0.3.6
+
 ## 0.0.13
 
 ### Patch Changes

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

diff --git a/examples/ollama.ts b/examples/ollama.ts
@@ -2,7 +2,12 @@ import { OllamaEmbedding } from "llamaindex";
 import { Ollama } from "llamaindex/llm/ollama";
 
 (async () => {
-  const llm = new Ollama({ model: "llama3" });
+  const llm = new Ollama({
+    model: "llama3",
+    config: {
+      host: "http://localhost:11434",
+    },
+  });
   const embedModel = new OllamaEmbedding({ model: "nomic-embed-text" });
   {
     const response = await llm.chat({

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,21 @@
 # llamaindex
 
+## 0.3.7
+
+### Patch Changes
+
+- b6a6606: feat: allow change host of ollama
+- b6a6606: chore: export ollama in default js runtime
+
+## 0.3.6
+
+### Patch Changes
+
+- efa326a: chore: update package.json
+- Updated dependencies [efa326a]
+- Updated dependencies [efa326a]
+  - @llamaindex/env@0.1.2
+
 ## 0.3.5
 
 ### 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,20 @@
 # @llamaindex/cloudflare-worker-agent-test
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies [b6a6606]
+- Updated dependencies [b6a6606]
+  - llamaindex@0.3.7
+
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies [efa326a]
+  - llamaindex@0.3.6
+
 ## 0.0.6
 
 ### 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.6",
+  "version": "0.0.8",
   "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,20 @@
 # @llamaindex/next-agent-test
 
+## 0.1.8
+
+### Patch Changes
+
+- Updated dependencies [b6a6606]
+- Updated dependencies [b6a6606]
+  - llamaindex@0.3.7
+
+## 0.1.7
+
+### Patch Changes
+
+- Updated dependencies [efa326a]
+  - llamaindex@0.3.6
+
 ## 0.1.6
 
 ### 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.6",
+  "version": "0.1.8",
   "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,11 @@
 # test-edge-runtime
 
+## 0.1.8
+
+### Patch Changes
+
+- @llamaindex/edge@0.3.6
+
 ## 0.1.7
 
 ### 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.7",
+  "version": "0.1.8",
   "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,20 @@
 # @llamaindex/waku-query-engine-test
 
+## 0.0.8
+
+### Patch Changes
+
+- Updated dependencies [b6a6606]
+- Updated dependencies [b6a6606]
+  - llamaindex@0.3.7
+
+## 0.0.7
+
+### Patch Changes
+
+- Updated dependencies [efa326a]
+  - llamaindex@0.3.6
+
 ## 0.0.6
 
 ### 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.6",
+  "version": "0.0.8",
   "type": "module",
   "private": true,
   "scripts": {

diff --git a/packages/core/jsr.json b/packages/core/jsr.json
@@ -1,9 +1,9 @@
 {
   "name": "@llamaindex/core",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "exports": "./src/index.ts",
   "imports": {
-    "@llamaindex/env": "jsr:@llamaindex/env@0.1.1"
+    "@llamaindex/env": "jsr:@llamaindex/env@0.1.2"
   },
   "publish": {
     "include": ["LICENSE", "README.md", "src/**/*", "jsr.json"]

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,9 +1,25 @@
 {
   "name": "llamaindex",
-  "version": "0.3.5",
+  "version": "0.3.7",
   "expectedMinorVersion": "3",
   "license": "MIT",
   "type": "module",
+  "keywords": [
+    "llm",
+    "llama",
+    "openai",
+    "gpt",
+    "data science",
+    "prompt",
+    "prompt engineering",
+    "chatgpt",
+    "machine learning",
+    "ml",
+    "embedding",
+    "vectorstore",
+    "data framework",
+    "llamaindex"
+  ],
   "dependencies": {
     "@anthropic-ai/sdk": "^0.20.6",
     "@aws-crypto/sha256-js": "^5.2.0",

diff --git a/packages/core/src/embeddings/index.ts b/packages/core/src/embeddings/index.ts
@@ -2,6 +2,7 @@ export * from "./GeminiEmbedding.js";
 export * from "./JinaAIEmbedding.js";
 export * from "./MistralAIEmbedding.js";
 export * from "./MultiModalEmbedding.js";
+export { OllamaEmbedding } from "./OllamaEmbedding.js";
 export * from "./OpenAIEmbedding.js";
 export { FireworksEmbedding } from "./fireworks.js";
 export { TogetherEmbedding } from "./together.js";

diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
@@ -10,5 +10,3 @@ export {
   HuggingFaceEmbedding,
   HuggingFaceEmbeddingModelType,
 } from "./embeddings/HuggingFaceEmbedding.js";
-export { OllamaEmbedding } from "./embeddings/OllamaEmbedding.js";
-export { Ollama, type OllamaParams } from "./llm/ollama.js";
diff --git a/packages/core/src/llm/index.ts b/packages/core/src/llm/index.ts
@@ -17,6 +17,7 @@ export * from "./openai.js";
 export { Portkey } from "./portkey.js";
 export * from "./replicate_ai.js";
 // Note: The type aliases for replicate are to simplify usage for Llama 2 (we're using replicate for Llama 2 support)
+export { Ollama, type OllamaParams } from "./ollama.js";
 export {
   ALL_AVAILABLE_REPLICATE_MODELS,
   DeuceChatStrategy,