diff --git a/packages/llamaindex/src/embeddings/CloudflareWorkerEmbedding.ts b/packages/llamaindex/src/embeddings/CloudflareWorkerEmbedding.ts deleted file mode 100644 index 76c0fec6f5e00f8183735570f771e2bb6f90ee31..0000000000000000000000000000000000000000 --- a/packages/llamaindex/src/embeddings/CloudflareWorkerEmbedding.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { MultiModalEmbedding } from "@llamaindex/core/embeddings"; -import type { ImageType } from "@llamaindex/core/schema"; - -/** - * Cloudflare worker doesn't support image embeddings for now - */ -export class CloudflareWorkerMultiModalEmbedding extends MultiModalEmbedding { - constructor() { - super(); - } - getImageEmbedding(images: ImageType): Promise<number[]> { - throw new Error("Method not implemented."); - } - getTextEmbedding(text: string): Promise<number[]> { - throw new Error("Method not implemented."); - } -} diff --git a/packages/llamaindex/src/internal/settings/image-embed-model.ts b/packages/llamaindex/src/internal/settings/image-embed-model.ts deleted file mode 100644 index a8244055731bf66fd479747f4c6fe38d8a53859c..0000000000000000000000000000000000000000 --- a/packages/llamaindex/src/internal/settings/image-embed-model.ts +++ /dev/null @@ -1,8 +0,0 @@ -export async function getImageEmbedModel() { - if (globalThis.navigator?.userAgent === "Cloudflare-Workers") { - return (await import("../../embeddings/CloudflareWorkerEmbedding.js")) - .CloudflareWorkerMultiModalEmbedding; - } else { - return (await import("../../embeddings/ClipEmbedding.js")).ClipEmbedding; - } -} diff --git a/packages/llamaindex/src/storage/StorageContext.ts b/packages/llamaindex/src/storage/StorageContext.ts index ad94692d186e2840875f0ccefe0d30dfa6b114fe..bba1acb12e99314b34e06fde46287d2272d7230b 100644 --- a/packages/llamaindex/src/storage/StorageContext.ts +++ b/packages/llamaindex/src/storage/StorageContext.ts @@ -1,10 +1,10 @@ +import { ClipEmbedding } from "@llamaindex/clip"; import { DEFAULT_IMAGE_VECTOR_NAMESPACE, DEFAULT_NAMESPACE, } from "@llamaindex/core/global"; import { ModalityType, ObjectType } from "@llamaindex/core/schema"; import { path } from "@llamaindex/env"; -import { getImageEmbedModel } from "../internal/settings/image-embed-model.js"; import type { ServiceContext } from "../ServiceContext.js"; import { SimpleVectorStore } from "../vector-store/SimpleVectorStore.js"; import type { @@ -53,7 +53,7 @@ export async function storageContextFromDefaults({ } if (storeImages && !(ModalityType.IMAGE in vectorStores)) { vectorStores[ModalityType.IMAGE] = new SimpleVectorStore({ - embeddingModel: new (await getImageEmbedModel())(), + embeddingModel: new ClipEmbedding(), }); } } else { @@ -71,7 +71,7 @@ export async function storageContextFromDefaults({ if (storeImages && !(ObjectType.IMAGE in vectorStores)) { vectorStores[ModalityType.IMAGE] = await SimpleVectorStore.fromPersistDir( path.join(persistDir, DEFAULT_IMAGE_VECTOR_NAMESPACE), - new (await getImageEmbedModel())(), + new ClipEmbedding(), ); } }