Merge pull request #104 from huggingface/fix/jobs-uv-command

fix uv run image

Author: evalstate

packages/mcp/src/jobs/commands/run.ts

@@ -2,6 +2,7 @@ import type { RunArgs, UvArgs } from '../types.js';
 import type { JobsApiClient } from '../api-client.js';
 import { createJobSpec } from './utils.js';
 import { fetchJobLogs } from '../sse-handler.js';
+import { buildUvCommand, UV_DEFAULT_IMAGE, wrapInlineScript } from './uv-utils.js';
 
 /**
  * Execute the 'run' command
@@ -64,26 +65,18 @@ To inspect: \`hf_jobs("inspect", {"job_id": "${job.id}"})\``;
  */
 export async function uvCommand(args: UvArgs, client: JobsApiClient, token?: string): Promise<string> {
 	// UV jobs use a standard UV image unless overridden
-	const image = 'ghcr.io/astral-sh/uv:latest'; // Standard UV image
+	const image = UV_DEFAULT_IMAGE;
 
 	// Detect script source and build command
 	const scriptSource = args.script;
 	let command: string | string[];
 
-	// Check if script is a URL
 	if (scriptSource.startsWith('http://') || scriptSource.startsWith('https://')) {
 		// URL - download and run
 		command = buildUvCommand(scriptSource, args);
 	} else if (scriptSource.includes('\n')) {
 		// Inline multi-line script - encode it
-		const encoded = Buffer.from(scriptSource).toString('base64');
-		const depsPart =
-			args.with_deps && args.with_deps.length > 0
-				? args.with_deps.map(dep => `--with ${dep}`).join(' ')
-				: '';
-		const pythonPart = args.python ? `-p ${args.python}` : '';
-		const uvArgs = [depsPart, pythonPart].filter(Boolean).join(' ');
-		const shellSnippet = `echo "${encoded}" | base64 -d | uv run${uvArgs ? ` ${uvArgs}` : ''} -`;
+		const shellSnippet = wrapInlineScript(scriptSource, args);
 		command = ['/bin/sh', '-lc', shellSnippet];
 	} else {
 		// Assume it's a URL or path - UV will handle it
@@ -104,32 +97,3 @@ export async function uvCommand(args: UvArgs, client: JobsApiClient, token?: str
 
 	return runCommand(runArgs, client, token);
 }
-
-/**
- * Build UV command with options
- */
-function buildUvCommand(script: string, args: UvArgs): string {
-	const parts: string[] = ['uv', 'run'];
-
-	// Add dependencies
-	if (args.with_deps && args.with_deps.length > 0) {
-		for (const dep of args.with_deps) {
-			parts.push('--with', dep);
-		}
-	}
-
-	// Add Python version
-	if (args.python) {
-		parts.push('-p', args.python);
-	}
-
-	// Add script
-	parts.push(script);
-
-	// Add script arguments
-	if (args.script_args && args.script_args.length > 0) {
-		parts.push(...args.script_args);
-	}
-
-	return parts.join(' ');
-}

packages/mcp/src/jobs/commands/scheduled.ts

@@ -8,6 +8,7 @@ import type {
 import type { JobsApiClient } from '../api-client.js';
 import { formatScheduledJobsTable, formatScheduledJobDetails } from '../formatters.js';
 import { createJobSpec } from './utils.js';
+import { buildUvCommand, UV_DEFAULT_IMAGE, wrapInlineScript } from './uv-utils.js';
 
 /**
  * Execute 'scheduled run' command
@@ -60,7 +61,7 @@ export async function scheduledUvCommand(
 	token?: string
 ): Promise<string> {
 	// For UV, use standard UV image
-	const image = 'ghcr.io/astral-sh/uv:python3.12-bookworm';
+	const image = UV_DEFAULT_IMAGE;
 
 	// Build UV command (similar to regular uv command)
 	const scriptSource = args.script;
@@ -69,10 +70,7 @@ export async function scheduledUvCommand(
 	if (scriptSource.startsWith('http://') || scriptSource.startsWith('https://')) {
 		command = buildUvCommand(scriptSource, args);
 	} else if (scriptSource.includes('\n')) {
-		const encoded = Buffer.from(scriptSource).toString('base64');
-		const deps =
-			args.with_deps && args.with_deps.length > 0 ? args.with_deps.map((dep) => `--with ${dep}`).join(' ') + ' ' : '';
-		command = `echo "${encoded}" | base64 -d | uv run ${deps}${args.python ? `-p ${args.python}` : ''} -`;
+		command = wrapInlineScript(scriptSource, args);
 	} else {
 		command = buildUvCommand(scriptSource, args);
 	}
@@ -94,34 +92,6 @@ export async function scheduledUvCommand(
 	return scheduledRunCommand(scheduledRunArgs, client, token);
 }
 
-/**
- * Build UV command with options
- */
-function buildUvCommand(
-	script: string,
-	args: { with_deps?: string[]; python?: string; script_args?: string[] }
-): string {
-	const parts: string[] = ['uv', 'run'];
-
-	if (args.with_deps && args.with_deps.length > 0) {
-		for (const dep of args.with_deps) {
-			parts.push('--with', dep);
-		}
-	}
-
-	if (args.python) {
-		parts.push('-p', args.python);
-	}
-
-	parts.push(script);
-
-	if (args.script_args && args.script_args.length > 0) {
-		parts.push(...args.script_args);
-	}
-
-	return parts.join(' ');
-}
-
 /**
  * Execute 'scheduled ps' command
  * Lists scheduled jobs

packages/mcp/src/jobs/commands/uv-utils.ts

@@ -0,0 +1,33 @@
+import type { UvArgs } from '../types.js';
+
+export const UV_DEFAULT_IMAGE = 'ghcr.io/astral-sh/uv:python3.12-bookworm';
+
+type UvCommandOptions = Pick<UvArgs, 'with_deps' | 'python' | 'script_args'>;
+
+export function buildUvCommand(script: string, args: UvCommandOptions): string {
+	const parts: string[] = ['uv', 'run'];
+
+	if (args.with_deps && args.with_deps.length > 0) {
+		for (const dep of args.with_deps) {
+			parts.push('--with', dep);
+		}
+	}
+
+	if (args.python) {
+		parts.push('-p', args.python);
+	}
+
+	parts.push(script);
+
+	if (args.script_args && args.script_args.length > 0) {
+		parts.push(...args.script_args);
+	}
+
+	return parts.join(' ');
+}
+
+export function wrapInlineScript(script: string, args: UvCommandOptions): string {
+	const encoded = Buffer.from(script).toString('base64');
+	const baseCommand = buildUvCommand('-', args);
+	return `echo "${encoded}" | base64 -d | ${baseCommand}`;
+}