From e45a49d965b3aae53d6795d4fbb2ef04e5dc52fc Mon Sep 17 00:00:00 2001 From: Garrett Gu Date: Tue, 15 Oct 2024 14:25:23 -0500 Subject: [PATCH] Attempt to fix e2e test failure --- packages/wrangler/e2e/dev-with-resources.test.ts | 4 ++++ packages/wrangler/src/dev/miniflare.ts | 6 +++--- packages/wrangler/src/vectorize/fetcher.ts | 12 +++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/packages/wrangler/e2e/dev-with-resources.test.ts b/packages/wrangler/e2e/dev-with-resources.test.ts index b71894685e07..fbb4bac15312 100644 --- a/packages/wrangler/e2e/dev-with-resources.test.ts +++ b/packages/wrangler/e2e/dev-with-resources.test.ts @@ -496,6 +496,10 @@ describe.sequential.each(RUNTIMES)("Bindings: $flags", ({ runtime, flags }) => { }); it("exposes Vectorize bindings", async () => { + if (isLocal) return; // local mode is not supported yet for vectorize + // TODO: remove this testing code + await helper.d1(isLocal); + const name = await helper.vectorize(32, "euclidean"); await helper.seed({ diff --git a/packages/wrangler/src/dev/miniflare.ts b/packages/wrangler/src/dev/miniflare.ts index c9b6d6106720..546b31b66170 100644 --- a/packages/wrangler/src/dev/miniflare.ts +++ b/packages/wrangler/src/dev/miniflare.ts @@ -283,12 +283,12 @@ async function buildSourceOptions( ? { entrypointSource: config.bundle.entrypointSource, modules: config.bundle.modules, - } + } : withSourceURLs( scriptPath, config.bundle.entrypointSource, config.bundle.modules - ); + ); const entrypointNames = isPython ? [] @@ -620,7 +620,7 @@ export function buildMiniflareBindingOptions(config: MiniflareBindingsConfig): { }, ], serviceBindings: { - FETCHER: MakeVectorizeFetcher(indexName, indexVersion), + FETCHER: MakeVectorizeFetcher(indexName), }, bindings: { INDEX_ID: indexName, diff --git a/packages/wrangler/src/vectorize/fetcher.ts b/packages/wrangler/src/vectorize/fetcher.ts index 9f2d94b79d6c..d57d399f9312 100644 --- a/packages/wrangler/src/vectorize/fetcher.ts +++ b/packages/wrangler/src/vectorize/fetcher.ts @@ -33,11 +33,13 @@ const URL_SUBSTITUTIONS = new Map([ ["deleteByIds", "delete_by_ids"], ]); -function toNdJson(arr: object[]): string { - return arr.reduce((acc, o) => acc + JSON.stringify(o) + "\n", "").trim(); -} +export function MakeVectorizeFetcher(indexId: string) { + if (indexId !== "v2") { + throw new Error( + "Only v2 indexes are supported in local dev mode at the moment." + ); + } -export function MakeVectorizeFetcher(indexId: string, indexVersion: string) { return async function (request: Request): Promise { const accountId = await getAccountId(); @@ -68,7 +70,7 @@ export function MakeVectorizeFetcher(indexId: string, indexVersion: string) { : { error: apiResponse.errors[0].message, code: apiResponse.errors[0].code, - }; + }; return new Response(JSON.stringify(newResponse), { status: res.status,