feat(tools): specify either space namespace or huggingface.co URL (#1435)

src/lib/server/tools/index.ts

@@ -70,7 +70,14 @@ const toolInputSchema = toolInputBaseSchema.and(
 export const editableToolSchema = z
 	.object({
 		name: z.string().min(1).max(40),
-		baseUrl: z.string().min(1).max(100),
+		// only allow huggingface spaces either through namespace or direct URLs
+		baseUrl: z.union([
+			z.string().regex(/^[a-zA-Z0-9-]+\/[a-zA-Z0-9-]+$/),
+			z
+				.string()
+				.regex(/^https:\/\/huggingface\.co\/spaces\/[a-zA-Z0-9-]+\/[a-zA-Z0-9-]+$/)
+				.transform((url) => url.split("/").slice(-2).join("/")),
+		]),
 		endpoint: z.string().min(1).max(100),
 		inputs: z.array(toolInputSchema),
 		outputComponent: z.string().min(1).max(100),
@@ -85,7 +92,6 @@ export const editableToolSchema = z
 		outputComponentIdx: parseInt(tool.outputComponent.split(";")[0]),
 		outputComponent: ToolOutputComponents.parse(tool.outputComponent.split(";")[1]),
 	}));
-
 export const configTools = z
 	.array(
 		z

src/lib/utils/getGradioApi.ts

@@ -4,8 +4,13 @@ import type { Client } from "@gradio/client";
 export type ApiReturnType = Awaited<ReturnType<typeof Client.prototype.view_api>>;
 
 export async function getGradioApi(space: string) {
-	const api: ApiReturnType = await fetch(`${base}/api/spaces-config?space=${space}`).then((res) =>
-		res.json()
+	const api: ApiReturnType = await fetch(`${base}/api/spaces-config?space=${space}`).then(
+		async (res) => {
+			if (!res.ok) {
+				throw new Error(await res.text());
+			}
+			return res.json();
+		}
 	);
 	return api;
 }

src/routes/api/spaces-config/+server.ts

@@ -11,9 +11,23 @@ export async function GET({ url, locals }) {
 	if (!space) {
 		return new Response("Missing space", { status: 400 });
 	}
+	// Extract namespace from space URL or use as-is if it's already in namespace format
+	let namespace = null;
+	if (space.startsWith("https://huggingface.co/spaces/")) {
+		namespace = space.split("/").slice(-2).join("/");
+	} else if (space.match(/^[a-zA-Z0-9-]+\/[a-zA-Z0-9-]+$/)) {
+		namespace = space;
+	}
+
+	if (!namespace) {
+		return new Response(
+			"Invalid space name. Specify a namespace or a full URL on huggingface.co.",
+			{ status: 400 }
+		);
+	}
 
 	try {
-		const api = await (await Client.connect(space)).view_api();
+		const api = await (await Client.connect(namespace)).view_api();
 		return new Response(JSON.stringify(api), {
 			status: 200,
 			headers: {
@@ -21,7 +35,7 @@ export async function GET({ url, locals }) {
 			},
 		});
 	} catch (e) {
-		return new Response(JSON.stringify({ error: true, message: "Failed to get space API" }), {
+		return new Response("Error fetching space API. Is the name correct?", {
 			status: 400,
 			headers: {
 				"Content-Type": "application/json",