chromadb 1.10.4 → 1.10.5

package/dist/chromadb.d.ts

@@ -2,6 +2,7 @@ import * as openai from 'openai';
 import * as _xenova_transformers from '@xenova/transformers';
 import * as chromadb_default_embed from 'chromadb-default-embed';
 import * as _google_generative_ai from '@google/generative-ai';
+import * as ollama from 'ollama';
 
 interface IEmbeddingFunction {
     generate(texts: string[]): Promise<number[][]>;
@@ -1846,13 +1847,19 @@ declare class GoogleGenerativeAiEmbeddingFunction implements IEmbeddingFunction
 }
 
 declare class OllamaEmbeddingFunction implements IEmbeddingFunction {
-    private readonly url;
+    private readonly url?;
     private readonly model;
-    constructor({ url, model }: {
-        url: string;
-        model: string;
+    private ollamaClient;
+    constructor({ url, model, }?: {
+        url?: string;
+        model?: string;
     });
-    generate(texts: string[]): Promise<number[][]>;
+    private initClient;
+    /** @ignore */
+    static import(): Promise<{
+        ollama: typeof ollama;
+    }>;
+    generate(texts: string[]): Promise<any>;
 }
 
 /**

package/dist/chromadb.legacy-esm.js

@@ -3386,15 +3386,15 @@ var ApiApi = class extends BaseAPI {
 // src/generated/models.ts
 var Api;
 ((Api2) => {
-  let IncludeEnum;
-  ((IncludeEnum2) => {
-    IncludeEnum2["Documents"] = "documents";
-    IncludeEnum2["Embeddings"] = "embeddings";
-    IncludeEnum2["Metadatas"] = "metadatas";
-    IncludeEnum2["Distances"] = "distances";
-    IncludeEnum2["Uris"] = "uris";
-    IncludeEnum2["Data"] = "data";
-  })(IncludeEnum = Api2.IncludeEnum || (Api2.IncludeEnum = {}));
+  let IncludeEnum2;
+  ((IncludeEnum3) => {
+    IncludeEnum3["Documents"] = "documents";
+    IncludeEnum3["Embeddings"] = "embeddings";
+    IncludeEnum3["Metadatas"] = "metadatas";
+    IncludeEnum3["Distances"] = "distances";
+    IncludeEnum3["Uris"] = "uris";
+    IncludeEnum3["Data"] = "data";
+  })(IncludeEnum2 = Api2.IncludeEnum || (Api2.IncludeEnum = {}));
 })(Api || (Api = {}));
 
 // src/generated/configuration.ts
@@ -4381,9 +4381,8 @@ var DefaultEmbeddingFunction = class _DefaultEmbeddingFunction {
       let importResult;
       if (isBrowser()) {
         importResult = await import(
-          // todo: we can't import chromadb-default-embed here yet because the `build` script was not run before publishing our fork to NPM, so the entrypoint in our forked package points to a non-existent file.
           // @ts-expect-error
-          "https://unpkg.com/@xenova/transformers@2.13.2"
+          "https://unpkg.com/chromadb-default-embed@2.14.0"
         );
       } else {
         importResult = await import("chromadb-default-embed");
@@ -5157,32 +5156,68 @@ var GoogleGenerativeAiEmbeddingFunction = class _GoogleGenerativeAiEmbeddingFunc
 };
 
 // src/embeddings/OllamaEmbeddingFunction.ts
-var OllamaEmbeddingFunction = class {
-  constructor({ url, model }) {
-    this.url = url;
-    this.model = model;
+var DEFAULT_MODEL = "chroma/all-minilm-l6-v2-f32";
+var DEFAULT_LOCAL_URL = "http://localhost:11434";
+var OllamaEmbeddingFunction = class _OllamaEmbeddingFunction {
+  constructor({
+    url = DEFAULT_LOCAL_URL,
+    model = DEFAULT_MODEL
+  } = {
+    url: DEFAULT_LOCAL_URL,
+    model: DEFAULT_MODEL
+  }) {
+    if (url && url.endsWith("/api/embeddings")) {
+      this.url = url.slice(0, -"/api/embeddings".length);
+    } else {
+      this.url = url || DEFAULT_LOCAL_URL;
+    }
+    this.model = model || DEFAULT_MODEL;
   }
-  async generate(texts) {
-    let embeddings = [];
-    for (let text of texts) {
-      const response = await fetch(this.url, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ model: this.model, prompt: text })
-      });
-      if (!response.ok) {
+  async initClient() {
+    if (this.ollamaClient)
+      return;
+    try {
+      const { ollama } = await _OllamaEmbeddingFunction.import();
+      this.ollamaClient = new ollama.Ollama({ host: this.url });
+    } catch (e) {
+      if (e.code === "MODULE_NOT_FOUND") {
         throw new Error(
-          `Failed to generate embeddings: ${response.status} (${response.statusText})`
+          "Please install the ollama package to use the OllamaEmbeddingFunction, `npm install -S ollama`"
         );
       }
-      let finalResponse = await response.json();
-      embeddings.push(finalResponse["embedding"]);
+      throw e;
     }
-    return embeddings;
+  }
+  /** @ignore */
+  static async import() {
+    try {
+      const { ollama } = await import("ollama").then((m) => ({ ollama: m }));
+      return { ollama };
+    } catch (e) {
+      throw new Error(
+        "Please install Ollama as a dependency with, e.g. `npm install ollama`"
+      );
+    }
+  }
+  async generate(texts) {
+    await this.initClient();
+    return await this.ollamaClient.embed({
+      model: this.model,
+      input: texts
+    }).then((response) => {
+      return response.embeddings;
+    });
   }
 };
+
+// src/types.ts
+var IncludeEnum = /* @__PURE__ */ ((IncludeEnum2) => {
+  IncludeEnum2["Documents"] = "documents";
+  IncludeEnum2["Embeddings"] = "embeddings";
+  IncludeEnum2["Metadatas"] = "metadatas";
+  IncludeEnum2["Distances"] = "distances";
+  return IncludeEnum2;
+})(IncludeEnum || {});
 export {
   AdminClient,
   ChromaClient,
@@ -5201,6 +5236,7 @@ export {
   DefaultEmbeddingFunction,
   GoogleGenerativeAiEmbeddingFunction,
   HuggingFaceEmbeddingServerFunction,
+  IncludeEnum,
   InvalidArgumentError,
   InvalidCollectionError,
   JinaEmbeddingFunction,

package/dist/chromadb.mjs

@@ -3386,15 +3386,15 @@ var ApiApi = class extends BaseAPI {
 // src/generated/models.ts
 var Api;
 ((Api2) => {
-  let IncludeEnum;
-  ((IncludeEnum2) => {
-    IncludeEnum2["Documents"] = "documents";
-    IncludeEnum2["Embeddings"] = "embeddings";
-    IncludeEnum2["Metadatas"] = "metadatas";
-    IncludeEnum2["Distances"] = "distances";
-    IncludeEnum2["Uris"] = "uris";
-    IncludeEnum2["Data"] = "data";
-  })(IncludeEnum = Api2.IncludeEnum || (Api2.IncludeEnum = {}));
+  let IncludeEnum2;
+  ((IncludeEnum3) => {
+    IncludeEnum3["Documents"] = "documents";
+    IncludeEnum3["Embeddings"] = "embeddings";
+    IncludeEnum3["Metadatas"] = "metadatas";
+    IncludeEnum3["Distances"] = "distances";
+    IncludeEnum3["Uris"] = "uris";
+    IncludeEnum3["Data"] = "data";
+  })(IncludeEnum2 = Api2.IncludeEnum || (Api2.IncludeEnum = {}));
 })(Api || (Api = {}));
 
 // src/generated/configuration.ts
@@ -4381,9 +4381,8 @@ var DefaultEmbeddingFunction = class _DefaultEmbeddingFunction {
       let importResult;
       if (isBrowser()) {
         importResult = await import(
-          // todo: we can't import chromadb-default-embed here yet because the `build` script was not run before publishing our fork to NPM, so the entrypoint in our forked package points to a non-existent file.
           // @ts-expect-error
-          "https://unpkg.com/@xenova/transformers@2.13.2"
+          "https://unpkg.com/chromadb-default-embed@2.14.0"
         );
       } else {
         importResult = await import("chromadb-default-embed");
@@ -5157,32 +5156,68 @@ var GoogleGenerativeAiEmbeddingFunction = class _GoogleGenerativeAiEmbeddingFunc
 };
 
 // src/embeddings/OllamaEmbeddingFunction.ts
-var OllamaEmbeddingFunction = class {
-  constructor({ url, model }) {
-    this.url = url;
-    this.model = model;
+var DEFAULT_MODEL = "chroma/all-minilm-l6-v2-f32";
+var DEFAULT_LOCAL_URL = "http://localhost:11434";
+var OllamaEmbeddingFunction = class _OllamaEmbeddingFunction {
+  constructor({
+    url = DEFAULT_LOCAL_URL,
+    model = DEFAULT_MODEL
+  } = {
+    url: DEFAULT_LOCAL_URL,
+    model: DEFAULT_MODEL
+  }) {
+    if (url && url.endsWith("/api/embeddings")) {
+      this.url = url.slice(0, -"/api/embeddings".length);
+    } else {
+      this.url = url || DEFAULT_LOCAL_URL;
+    }
+    this.model = model || DEFAULT_MODEL;
   }
-  async generate(texts) {
-    let embeddings = [];
-    for (let text of texts) {
-      const response = await fetch(this.url, {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify({ model: this.model, prompt: text })
-      });
-      if (!response.ok) {
+  async initClient() {
+    if (this.ollamaClient)
+      return;
+    try {
+      const { ollama } = await _OllamaEmbeddingFunction.import();
+      this.ollamaClient = new ollama.Ollama({ host: this.url });
+    } catch (e) {
+      if (e.code === "MODULE_NOT_FOUND") {
         throw new Error(
-          `Failed to generate embeddings: ${response.status} (${response.statusText})`
+          "Please install the ollama package to use the OllamaEmbeddingFunction, `npm install -S ollama`"
         );
       }
-      let finalResponse = await response.json();
-      embeddings.push(finalResponse["embedding"]);
+      throw e;
     }
-    return embeddings;
+  }
+  /** @ignore */
+  static async import() {
+    try {
+      const { ollama } = await import("ollama").then((m) => ({ ollama: m }));
+      return { ollama };
+    } catch (e) {
+      throw new Error(
+        "Please install Ollama as a dependency with, e.g. `npm install ollama`"
+      );
+    }
+  }
+  async generate(texts) {
+    await this.initClient();
+    return await this.ollamaClient.embed({
+      model: this.model,
+      input: texts
+    }).then((response) => {
+      return response.embeddings;
+    });
   }
 };
+
+// src/types.ts
+var IncludeEnum = /* @__PURE__ */ ((IncludeEnum2) => {
+  IncludeEnum2["Documents"] = "documents";
+  IncludeEnum2["Embeddings"] = "embeddings";
+  IncludeEnum2["Metadatas"] = "metadatas";
+  IncludeEnum2["Distances"] = "distances";
+  return IncludeEnum2;
+})(IncludeEnum || {});
 export {
   AdminClient,
   ChromaClient,
@@ -5201,6 +5236,7 @@ export {
   DefaultEmbeddingFunction,
   GoogleGenerativeAiEmbeddingFunction,
   HuggingFaceEmbeddingServerFunction,
+  IncludeEnum,
   InvalidArgumentError,
   InvalidCollectionError,
   JinaEmbeddingFunction,