fix: Fix Vectorize JSON payloads (#6548)

* VS-269: Add content-type header to Vectorize POST operations * VS-271: Fix Vectorize getVectors, deleteVectors payload in Wrangler Client
cloudflare · Aug 23, 2024 · 439e63a · 439e63a
1 parent 669ec1c
commit 439e63a
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 5 deletions.
diff --git a/.changeset/big-deers-visit.md b/.changeset/big-deers-visit.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+fix: Fix Vectorize getVectors, deleteVectors payload in Wrangler Client; VS-271
diff --git a/.changeset/rare-cooks-marry.md b/.changeset/rare-cooks-marry.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+fix: Add content-type header to Vectorize POST operations; #6516/VS-269
diff --git a/packages/wrangler/src/vectorize/client.ts b/packages/wrangler/src/vectorize/client.ts
@@ -12,6 +12,7 @@ import type {
 	VectorizeMetadataIndexPropertyName,
 	VectorizeQueryOptions,
 	VectorizeVector,
+	VectorizeVectorIds,
 	VectorizeVectorMutation,
 } from "./types";
 import type { FormData } from "undici";
@@ -141,7 +142,9 @@ export async function queryIndex(
 		`/accounts/${accountId}/vectorize/v2/indexes/${indexName}/query`,
 		{
 			method: "POST",
-			headers: { "Content-Type": "application/json" },
+			headers: {
+				"content-type": jsonContentType,
+			},
 			body: JSON.stringify({
 				...options,
 				vector: Array.isArray(vector) ? vector : Array.from(vector),
@@ -153,14 +156,17 @@ export async function queryIndex(
 export async function getByIds(
 	config: Config,
 	indexName: string,
-	ids: Array<string>
+	ids: VectorizeVectorIds
 ): Promise<VectorizeVector[]> {
 	const accountId = await requireAuth(config);
 
 	return await fetchResult(
 		`/accounts/${accountId}/vectorize/v2/indexes/${indexName}/get_by_ids`,
 		{
 			method: "POST",
+			headers: {
+				"content-type": jsonContentType,
+			},
 			body: JSON.stringify(ids),
 		}
 	);
@@ -169,14 +175,17 @@ export async function getByIds(
 export async function deleteByIds(
 	config: Config,
 	indexName: string,
-	ids: Array<string>
+	ids: VectorizeVectorIds
 ): Promise<VectorizeAsyncMutation> {
 	const accountId = await requireAuth(config);
 
 	return await fetchResult(
 		`/accounts/${accountId}/vectorize/v2/indexes/${indexName}/delete_by_ids`,
 		{
 			method: "POST",
+			headers: {
+				"content-type": jsonContentType,
+			},
 			body: JSON.stringify(ids),
 		}
 	);
@@ -207,6 +216,9 @@ export async function createMetadataIndex(
 		`/accounts/${accountId}/vectorize/v2/indexes/${indexName}/metadata_index/create`,
 		{
 			method: "POST",
+			headers: {
+				"content-type": jsonContentType,
+			},
 			body: JSON.stringify(payload),
 		}
 	);
@@ -237,6 +249,9 @@ export async function deleteMetadataIndex(
 		`/accounts/${accountId}/vectorize/v2/indexes/${indexName}/metadata_index/delete`,
 		{
 			method: "POST",
+			headers: {
+				"content-type": jsonContentType,
+			},
 			body: JSON.stringify(payload),
 		}
 	);

diff --git a/packages/wrangler/src/vectorize/deleteByIds.ts b/packages/wrangler/src/vectorize/deleteByIds.ts
@@ -6,6 +6,7 @@ import type {
 	CommonYargsArgv,
 	StrictYargsOptionsToInterface,
 } from "../yargs-types";
+import type { VectorizeVectorIds } from "./types";
 
 export function options(yargs: CommonYargsArgv) {
 	return yargs
@@ -37,7 +38,12 @@ export async function handler(
 	}
 
 	logger.log(`📋 Deleting vectors...`);
-	const mutation = await deleteByIds(config, args.name, args.ids);
+
+	const ids: VectorizeVectorIds = {
+		ids: args.ids,
+	};
+
+	const mutation = await deleteByIds(config, args.name, ids);
 
 	logger.log(
 		`✅ Successfully enqueued ${args.ids.length} vectors into index '${args.name}' for deletion. Mutation changeset identifier: ${mutation.mutationId}.`

diff --git a/packages/wrangler/src/vectorize/getByIds.ts b/packages/wrangler/src/vectorize/getByIds.ts
@@ -6,6 +6,7 @@ import type {
 	CommonYargsArgv,
 	StrictYargsOptionsToInterface,
 } from "../yargs-types";
+import type { VectorizeVectorIds } from "./types";
 
 export function options(yargs: CommonYargsArgv) {
 	return yargs
@@ -37,7 +38,12 @@ export async function handler(
 	}
 
 	logger.log(`📋 Fetching vectors...`);
-	const vectors = await getByIds(config, args.name, args.ids);
+
+	const ids: VectorizeVectorIds = {
+		ids: args.ids,
+	};
+
+	const vectors = await getByIds(config, args.name, ids);
 
 	if (vectors.length === 0) {
 		logger.warn(

diff --git a/packages/wrangler/src/vectorize/types.ts b/packages/wrangler/src/vectorize/types.ts
@@ -138,6 +138,14 @@ export interface VectorizeVectorMutation {
 	count: number;
 }
 
+/**
+ * Request type used to pass vector ids to fetch or delete.
+ */
+export interface VectorizeVectorIds {
+	/* List of vector ids that are fetched or deleted. */
+	ids: string[];
+}
+
 /**
  * Result type indicating a mutation on the Vectorize Index.
  * Actual mutations are processed async where the `mutationId` is the unique identifier for the operation.