refactor ai commands

packages/wrangler/src/ai/commands.ts

@@ -0,0 +1,22 @@
+import { defineNamespace } from "../core";
+import "./listCatalog";
+import "./createFinetune";
+import "./listFinetune";
+
+defineNamespace({
+	command: "wrangler ai",
+	metadata: {
+		description: "🤖 Manage AI models\n", // TODO: remove \n when yargs --help hack is replaced with full reimplementation
+		status: "stable",
+		owner: "Product: AI",
+	},
+});
+
+defineNamespace({
+	command: "wrangler ai finetune",
+	metadata: {
+		description: "Interact with finetune files",
+		status: "stable",
+		owner: "Product: AI",
+	},
+});

packages/wrangler/src/ai/createFinetune.tsx

@@ -2,42 +2,44 @@ import fs from "fs";
 import path from "path";
 import { FormData } from "undici";
 import { fetchResult } from "../cfetch";
-import { withConfig } from "../config";
+import { defineCommand } from "../core";
 import { logger } from "../logger";
 import { requireAuth } from "../user";
 import { getErrorMessage } from "./utils";
 import type { Message } from "../parse";
-import type {
-	CommonYargsArgv,
-	StrictYargsOptionsToInterface,
-} from "../yargs-types";
 import type { Finetune } from "./types";
 
 const requiredAssets = ["adapter_config.json", "adapter_model.safetensors"];
 
-type HandlerOptions = StrictYargsOptionsToInterface<typeof options>;
+defineCommand({
+	command: "wrangler ai finetune create",
 
-export function options(yargs: CommonYargsArgv) {
-	return yargs
-		.positional("model_name", {
+	metadata: {
+		description: "Create finetune and upload assets",
+		status: "stable",
+		owner: "Product: AI",
+	},
+
+	args: {
+		model_name: {
 			describe: "The catalog model name",
 			type: "string",
 			demandOption: true,
-		})
-		.positional("finetune_name", {
+		},
+		finetune_name: {
 			describe: "The finetune name",
 			type: "string",
 			demandOption: true,
-		})
-		.positional("folder_path", {
+		},
+		folder_path: {
 			describe: "The folder path containing the finetune assets",
 			type: "string",
 			demandOption: true,
-		});
-}
+		},
+	},
+	positionalArgs: ["model_name", "finetune_name", "folder_path"],
 
-export const handler = withConfig<HandlerOptions>(
-	async ({ finetune_name, model_name, folder_path, config }): Promise<void> => {
+	async handler({ finetune_name, model_name, folder_path }, { config }) {
 		const accountId = await requireAuth(config);
 
 		logger.log(
@@ -113,5 +115,5 @@ export const handler = withConfig<HandlerOptions>(
 				`🚨 Folder does not exist: ${getErrorMessage(e as Message)}`
 			);
 		}
-	}
-);
+	},
+});

packages/wrangler/src/ai/listCatalog.tsx

@@ -1,20 +1,22 @@
-import { withConfig } from "../config";
+import { defineCommand, SharedArgs } from "../core";
 import { logger } from "../logger";
 import { requireAuth } from "../user";
-import { asJson } from "../yargs-types";
 import { listCatalogEntries, truncateDescription } from "./utils";
-import type {
-	CommonYargsArgv,
-	StrictYargsOptionsToInterface,
-} from "../yargs-types";
 
-export function options(yargs: CommonYargsArgv) {
-	return asJson(yargs);
-}
+defineCommand({
+	command: "wrangler ai models",
 
-type HandlerOptions = StrictYargsOptionsToInterface<typeof options>;
-export const handler = withConfig<HandlerOptions>(
-	async ({ json, config }): Promise<void> => {
+	metadata: {
+		description: "List catalog models",
+		status: "stable",
+		owner: "Product: AI",
+	},
+
+	args: {
+		...SharedArgs.json,
+	},
+
+	async handler({ json }, { config }): Promise<void> {
 		const accountId = await requireAuth(config);
 		const entries = await listCatalogEntries(accountId);
 
@@ -40,5 +42,5 @@ export const handler = withConfig<HandlerOptions>(
 				);
 			}
 		}
-	}
-);
+	},
+});

packages/wrangler/src/ai/listFinetune.tsx

@@ -1,21 +1,23 @@
-import { withConfig } from "../config";
+import { defineCommand, SharedArgs } from "../core";
 import { logger } from "../logger";
 import { requireAuth } from "../user";
-import { asJson } from "../yargs-types";
 import { listFinetuneEntries, truncateDescription } from "./utils";
-import type {
-	CommonYargsArgv,
-	StrictYargsOptionsToInterface,
-} from "../yargs-types";
 import type { Finetune } from "./types";
 
-export function options(yargs: CommonYargsArgv) {
-	return asJson(yargs);
-}
+defineCommand({
+	command: "wrangler ai finetune list",
 
-type HandlerOptions = StrictYargsOptionsToInterface<typeof options>;
-export const handler = withConfig<HandlerOptions>(
-	async ({ json, config }): Promise<void> => {
+	metadata: {
+		description: "List catalog models",
+		status: "stable",
+		owner: "Product: AI",
+	},
+
+	args: {
+		...SharedArgs.json,
+	},
+
+	async handler({ json }, { config }): Promise<void> {
 		const accountId = await requireAuth(config);
 		const entries = await listFinetuneEntries(accountId);
 
@@ -37,5 +39,5 @@ export const handler = withConfig<HandlerOptions>(
 				);
 			}
 		}
-	}
-);
+	},
+});

packages/wrangler/src/commands.ts

@@ -1,2 +1,3 @@
 import "./auth/commands";
 import "./kv/index";
+import "./ai/commands";

packages/wrangler/src/core/index.ts

@@ -0,0 +1,2 @@
+export { defineAlias, defineCommand, defineNamespace } from "./define-command";
+export * as SharedArgs from "./shared-args";

packages/wrangler/src/core/shared-args.ts

@@ -0,0 +1,9 @@
+import { ArgDefinition } from "./define-command";
+
+export const json: Record<string, ArgDefinition> = {
+	json: {
+		describe: "Return output as clean JSON",
+		type: "boolean",
+		default: false,
+	},
+};

packages/wrangler/src/index.ts

@@ -5,7 +5,6 @@ import chalk from "chalk";
 import { ProxyAgent, setGlobalDispatcher } from "undici";
 import makeCLI from "yargs";
 import { version as wranglerVersion } from "../package.json";
-import { ai } from "./ai";
 import { cloudchamber } from "./cloudchamber";
 import { loadDotEnv } from "./config";
 import { createCommandRegister } from "./core/register-commands";
@@ -593,9 +592,7 @@ export function createCLIParser(argv: string[]) {
 	);
 
 	// ai
-	wrangler.command("ai", "🤖 Manage AI models\n", (aiYargs) => {
-		return ai(aiYargs.command(subHelp));
-	});
+	register.registerNamespace("ai");
 
 	/******************** CMD GROUP ***********************/
 	// login