@neta-art/generation 0.1.10 → 0.1.12

package/dist/{export-config-DolxdQdi.js → export-config-BXD4Adwb.js}

@@ -1,8 +1,7 @@
-import { a as compactArray, c as slugifyFileName, i as cloneJson, l as MODEL_SCHEMA, n as getBuiltinGenerationModel, o as compactObject, r as listBuiltinGenerationModels, s as getBlockMeta, t as builtinGenerationModels } from "./builtins-CcT0Ufp2.js";
+import { a as cloneJson, c as getBlockMeta, l as slugifyFileName, n as getBuiltinGenerationModel, o as compactArray, r as listBuiltinGenerationModels, s as compactObject, t as builtinGenerationModels } from "./builtins-BvtiQicj.js";
 import { mkdir, readFile, readdir, writeFile } from "node:fs/promises";
 import { extname, join } from "node:path";
 import { parse, stringify } from "yaml";
-
 //#region src/errors.ts
 var GenerationError = class extends Error {
 	constructor(message) {
@@ -46,7 +45,6 @@ var GenerationTimeoutError = class extends GenerationProviderError {
 		this.name = "GenerationTimeoutError";
 	}
 };
-
 //#endregion
 //#region src/http.ts
 function headersToRecord(headers) {
@@ -134,7 +132,6 @@ async function fetchWithTimeout(fetchFn, url, init, timeoutMs) {
 function joinUrl(baseUrl, path) {
 	return `${baseUrl.replace(/\/+$/, "")}/${path.replace(/^\/+/, "")}`;
 }
-
 //#endregion
 //#region src/validation.ts
 function specsByType(specs) {
@@ -256,7 +253,6 @@ function mergeTextBlocks(declaration, content) {
 	const separator = textSpec?.merge === "space" ? " " : textSpec?.merge === "concat" ? "" : "\n";
 	return content.filter((block) => block.type === "text").map((block) => block.text).join(separator).trim();
 }
-
 //#endregion
 //#region src/adapters/ark-video-generations.ts
 const REQUEST_TIMEOUT_MS$5 = 186e4;
@@ -498,7 +494,6 @@ async function arkVideoGenerationsAdapter(input) {
 	}
 	throw new GenerationTimeoutError("Timed out waiting for video generation", { taskId });
 }
-
 //#endregion
 //#region src/adapters/gemini-generate-content.ts
 const REQUEST_TIMEOUT_MS$4 = 3e5;
@@ -630,7 +625,6 @@ async function geminiGenerateContentAdapter(input) {
 	if (output.length === 0) throw new GenerationProviderError("Gemini generation returned no output", { details: collectGeminiNoOutputDetails(raw) });
 	return output;
 }
-
 //#endregion
 //#region src/adapters/kling-video-generations.ts
 const REQUEST_TIMEOUT_MS$3 = 186e4;
@@ -671,7 +665,7 @@ function asInteger$1(value, fallback) {
 function asNumber(value) {
 	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
 }
-function isRecord$2(value) {
+function isRecord$3(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function providerMeta(input) {
@@ -813,7 +807,7 @@ async function requestJson$1(input, path, init) {
 		});
 	}
 	if (!response.ok) {
-		const details = isRecord$2(parsed) ? { details: parsed } : {};
+		const details = isRecord$3(parsed) ? { details: parsed } : {};
 		throw new GenerationProviderError("Kling video provider request failed", {
 			status: response.status,
 			body,
@@ -869,7 +863,6 @@ async function klingVideoGenerationsAdapter(input) {
 	}
 	throw new GenerationTimeoutError("Timed out waiting for Kling video generation", { taskId });
 }
-
 //#endregion
 //#region src/adapters/openai-image-edits.ts
 const REQUEST_TIMEOUT_MS$2 = 3e5;
@@ -939,7 +932,6 @@ async function openAiImageEditsAdapter(input) {
 	if (output.length === 0) throw new GenerationProviderError("Image edit returned no output", { details: collectOpenAiImageEditsNoOutputDetails(raw) });
 	return output;
 }
-
 //#endregion
 //#region src/adapters/openai-images.ts
 const REQUEST_TIMEOUT_MS$1 = 3e5;
@@ -1016,7 +1008,6 @@ async function openAiImagesAdapter(input) {
 	if (output.length === 0) throw new GenerationProviderError("Image generation returned no output", { details: collectOpenAiImagesNoOutputDetails(raw) });
 	return output;
 }
-
 //#endregion
 //#region src/adapters/suno-tasks.ts
 const REQUEST_TIMEOUT_MS = 6e4;
@@ -1051,12 +1042,12 @@ const OPERATION_PATHS = {
 		poll: true
 	}
 };
-const FINAL_SUCCESS_STATUSES = new Set([
+const FINAL_SUCCESS_STATUSES = /* @__PURE__ */ new Set([
 	"success",
 	"succeeded",
 	"completed"
 ]);
-const FINAL_FAILURE_STATUSES = new Set([
+const FINAL_FAILURE_STATUSES = /* @__PURE__ */ new Set([
 	"failure",
 	"failed",
 	"error",
@@ -1067,7 +1058,7 @@ const FINAL_FAILURE_STATUSES = new Set([
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
-function isRecord$1(value) {
+function isRecord$2(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function asString(value) {
@@ -1077,7 +1068,7 @@ function asInteger(value, fallback) {
 	return typeof value === "number" && Number.isInteger(value) ? value : fallback;
 }
 function asRecord(value) {
-	return isRecord$1(value) ? value : {};
+	return isRecord$2(value) ? value : {};
 }
 function successCode(value) {
 	const code = String(value ?? "").trim().toLowerCase();
@@ -1093,7 +1084,7 @@ function requireSuccess(response, fallbackMessage) {
 }
 function extractTaskId(value) {
 	if (typeof value === "string" && value.trim()) return value.trim();
-	if (!isRecord$1(value)) return void 0;
+	if (!isRecord$2(value)) return void 0;
 	for (const key of [
 		"task_id",
 		"id",
@@ -1111,7 +1102,7 @@ function normalizeStatus(value) {
 }
 function normalizeTask(operation, data) {
 	if (Array.isArray(data)) return data.length > 0 ? normalizeTask(operation, data[0]) : null;
-	if (!isRecord$1(data)) return null;
+	if (!isRecord$2(data)) return null;
 	if ("status" in data || "taskStatus" in data || "task_status" in data || "task_id" in data || "taskBatchId" in data) {
 		const hasProviderEnvelope = "taskStatus" in data || "task_status" in data || "taskBatchId" in data || "task_batch_id" in data;
 		return {
@@ -1182,7 +1173,7 @@ function applyFixedPayload(input, payload, fixed) {
 	}
 }
 function setMetadataParam(payload, key, value) {
-	const metadataParams = isRecord$1(payload.metadata_params) ? payload.metadata_params : {};
+	const metadataParams = isRecord$2(payload.metadata_params) ? payload.metadata_params : {};
 	if (metadataParams[key] === void 0) metadataParams[key] = value;
 	payload.metadata_params = metadataParams;
 }
@@ -1252,8 +1243,8 @@ function appendSunoContent(output, value, meta = {}) {
 		for (const item of value) appendSunoContent(output, item, meta);
 		return;
 	}
-	if (!isRecord$1(value)) return;
-	if (isRecord$1(value.clips)) for (const clip of Object.values(value.clips)) appendSunoContent(output, clip, meta);
+	if (!isRecord$2(value)) return;
+	if (isRecord$2(value.clips)) for (const clip of Object.values(value.clips)) appendSunoContent(output, clip, meta);
 	if (Array.isArray(value.items)) for (const item of value.items) appendSunoContent(output, item, meta);
 	const itemMeta = compactObject({
 		...meta,
@@ -1263,9 +1254,9 @@ function appendSunoContent(output, value, meta = {}) {
 		title: value.title,
 		status: value.status ?? meta.status,
 		model: value.model_name ?? value.modelName,
-		duration: value.duration ?? (isRecord$1(value.metadata) ? value.metadata.duration : void 0),
-		tags: value.tags ?? (isRecord$1(value.metadata) ? value.metadata.tags : void 0),
-		prompt: value.prompt ?? (isRecord$1(value.metadata) ? value.metadata.prompt : void 0),
+		duration: value.duration ?? (isRecord$2(value.metadata) ? value.metadata.duration : void 0),
+		tags: value.tags ?? (isRecord$2(value.metadata) ? value.metadata.tags : void 0),
+		prompt: value.prompt ?? (isRecord$2(value.metadata) ? value.metadata.prompt : void 0),
 		progress: value.progress ?? meta.progress,
 		progress_message: value.progressMsg ?? value.progress_msg,
 		task_batch_id: value.taskBatchId ?? value.task_batch_id,
@@ -1286,7 +1277,7 @@ function appendSunoContent(output, value, meta = {}) {
 		text,
 		meta: itemMeta
 	});
-	if (isRecord$1(value.data)) appendSunoContent(output, value.data, itemMeta);
+	if (isRecord$2(value.data)) appendSunoContent(output, value.data, itemMeta);
 }
 function buildImmediateResult(operation, data, raw) {
 	const output = [];
@@ -1375,7 +1366,6 @@ async function sunoTasksAdapter(input) {
 	if (!taskId) return buildImmediateResult(operation, data, raw);
 	return pollSunoTask(input, operation, taskId, asInteger(input.parameters.poll_interval, DEFAULT_POLL_INTERVAL_SEC), asInteger(input.parameters.max_wait, DEFAULT_MAX_WAIT_SEC));
 }
-
 //#endregion
 //#region src/adapters/index.ts
 const builtinGenerationAdapters = {
@@ -1391,19 +1381,18 @@ function getGenerationAdapter(type, adapters = {}) {
 	if (!adapter) throw new GenerationUnsupportedAdapterError(type);
 	return adapter;
 }
-
 //#endregion
 //#region src/config.ts
-const DECLARATION_EXTENSIONS = new Set([
+const DECLARATION_EXTENSIONS = /* @__PURE__ */ new Set([
 	".yaml",
 	".yml",
 	".json"
 ]);
-function isRecord(value) {
+function isRecord$1(value) {
 	return !!value && typeof value === "object" && !Array.isArray(value);
 }
 function isParameterSpec(value) {
-	if (!isRecord(value)) return false;
+	if (!isRecord$1(value)) return false;
 	return [
 		"string",
 		"number",
@@ -1412,25 +1401,25 @@ function isParameterSpec(value) {
 	].includes(String(value.type));
 }
 function isMetaFieldSpec(value) {
-	if (!isRecord(value)) return false;
+	if (!isRecord$1(value)) return false;
 	return isParameterSpec(value) || String(value.type) === "object";
 }
 function isMetaTaskVariantSpec(value) {
-	if (!isRecord(value)) return false;
+	if (!isRecord$1(value)) return false;
 	return (value.description === void 0 || typeof value.description === "string") && (value.required === void 0 || Array.isArray(value.required) && value.required.every((item) => typeof item === "string")) && (value.requiredContent === void 0 || Array.isArray(value.requiredContent) && value.requiredContent.every((item) => typeof item === "string")) && (value.sendTask === void 0 || typeof value.sendTask === "boolean");
 }
 function isMetaSpec(value) {
-	if (!isRecord(value)) return false;
-	return (value.fields === void 0 || isRecord(value.fields) && Object.values(value.fields).every((field) => isMetaFieldSpec(field))) && (value.taskField === void 0 || typeof value.taskField === "string") && (value.taskVariants === void 0 || isRecord(value.taskVariants) && Object.values(value.taskVariants).every((variant) => isMetaTaskVariantSpec(variant)));
+	if (!isRecord$1(value)) return false;
+	return (value.fields === void 0 || isRecord$1(value.fields) && Object.values(value.fields).every((field) => isMetaFieldSpec(field))) && (value.taskField === void 0 || typeof value.taskField === "string") && (value.taskVariants === void 0 || isRecord$1(value.taskVariants) && Object.values(value.taskVariants).every((variant) => isMetaTaskVariantSpec(variant)));
 }
 function isGenerationModelDeclaration(value) {
-	if (!isRecord(value)) return false;
+	if (!isRecord$1(value)) return false;
 	const adapter = value.adapter;
 	const content = value.content;
 	const parameters = value.parameters;
 	const meta = value.meta;
 	const examples = value.examples;
-	return value.schema === MODEL_SCHEMA && typeof value.model === "string" && value.model.trim().length > 0 && (value.allowUnknownParameters === void 0 || typeof value.allowUnknownParameters === "boolean") && isRecord(adapter) && typeof adapter.type === "string" && isRecord(content) && Array.isArray(content.input) && (parameters === void 0 || isRecord(parameters) && Object.values(parameters).every(isParameterSpec)) && (meta === void 0 || isMetaSpec(meta)) && (examples === void 0 || Array.isArray(examples));
+	return value.schema === "neta.generation.model.v1" && typeof value.model === "string" && value.model.trim().length > 0 && (value.allowUnknownParameters === void 0 || typeof value.allowUnknownParameters === "boolean") && isRecord$1(adapter) && typeof adapter.type === "string" && isRecord$1(content) && Array.isArray(content.input) && (parameters === void 0 || isRecord$1(parameters) && Object.values(parameters).every(isParameterSpec)) && (meta === void 0 || isMetaSpec(meta)) && (examples === void 0 || Array.isArray(examples));
 }
 function parseGenerationModelDeclaration(rawText, filePath = "model.yaml") {
 	const parsed = extname(filePath) === ".json" ? JSON.parse(rawText) : parse(rawText);
@@ -1464,7 +1453,27 @@ async function writeGenerationModelDeclarations(declarations, directory, options
 	const ext = options.format === "json" ? "json" : "yaml";
 	await Promise.all(declarations.map((declaration) => writeGenerationModelDeclaration(declaration, join(directory, `${slugifyFileName(declaration.model)}.${ext}`), options)));
 }
-
+//#endregion
+//#region src/response-fields.ts
+function numberValue(value) {
+	return typeof value === "number" && Number.isFinite(value) ? value : void 0;
+}
+function stringValue(value) {
+	return typeof value === "string" && value ? value : void 0;
+}
+function isRecord(value) {
+	return !!value && typeof value === "object" && !Array.isArray(value);
+}
+function extractGenerationResultFields(raw) {
+	if (!isRecord(raw)) return void 0;
+	const usage = isRecord(raw.usage) ? raw.usage : void 0;
+	const fields = {};
+	const requestId = stringValue(raw.request_id);
+	const cost = usage ? numberValue(usage.cost) : void 0;
+	if (requestId !== void 0) fields.requestId = requestId;
+	if (cost !== void 0) fields.cost = cost;
+	return Object.keys(fields).length > 0 ? fields : void 0;
+}
 //#endregion
 //#region src/source.ts
 const defaultGenerationSourceResolver = (source) => {
@@ -1473,14 +1482,13 @@ const defaultGenerationSourceResolver = (source) => {
 		case "base64": return `data:${source.mediaType};base64,${source.data}`;
 	}
 };
-
 //#endregion
 //#region src/client.ts
 const DEFAULT_BASE_URL = "https://router.neta.art";
 const REDACTED = "[REDACTED]";
 const SECRET_DEBUG_KEY_PATTERN = /^(authorization|api[-_]?key|token|thoughtSignature)$/i;
 const BASE64_DEBUG_KEY_PATTERN = /^(b64_json|data)$/i;
-const MEDIA_PAYLOAD_KEYS = new Set([
+const MEDIA_PAYLOAD_KEYS = /* @__PURE__ */ new Set([
 	"audio",
 	"audio_url",
 	"image",
@@ -1546,6 +1554,17 @@ function resolveModels(options) {
 	for (const model of models) byModel.set(model.model, cloneJson(model));
 	return [...byModel.values()].sort((a, b) => a.model.localeCompare(b.model));
 }
+function createResultFieldCaptureFetch(fetchFn, onFields) {
+	return (async (input, init) => {
+		const response = await fetchFn(input, init);
+		const contentType = response.headers.get("content-type") ?? "";
+		if (contentType.includes("application/json") || contentType.includes("+json")) try {
+			const fields = extractGenerationResultFields(await response.clone().json());
+			if (fields) onFields(fields);
+		} catch {}
+		return response;
+	});
+}
 function createGenerationClient(options = {}) {
 	const models = resolveModels(options);
 	const byModel = new Map(models.map((declaration) => [declaration.model, declaration]));
@@ -1558,35 +1577,53 @@ function createGenerationClient(options = {}) {
 		if (!declaration) throw new GenerationConfigError(`Generation model is unavailable: ${model}`);
 		return declaration;
 	}
+	function validateRequest(request) {
+		const declaration = requireModel(request.model);
+		validateGenerationContent(declaration, request.content);
+		const parameters = resolveGenerationParameters(declaration, request.parameters);
+		const meta = resolveGenerationMeta(declaration, mergeGenerationMeta({
+			...request.metadata ?? {},
+			...request.meta ?? {}
+		}, request.content), request.content);
+		return {
+			declaration: cloneJson(declaration),
+			request: cloneJson(request),
+			parameters,
+			meta
+		};
+	}
+	async function runAdapter(request, fetch) {
+		const resolved = validateRequest(request);
+		const apiKey = request.apiKey ?? options.apiKey;
+		if (!apiKey) throw new GenerationConfigError("apiKey is required");
+		return getGenerationAdapter(resolved.declaration.adapter.type, options.adapters)({
+			...resolved,
+			context: {
+				apiKey,
+				baseUrl: request.baseUrl ?? options.baseUrl ?? DEFAULT_BASE_URL,
+				fetch,
+				resolveSource: options.sourceResolver ?? defaultGenerationSourceResolver
+			}
+		});
+	}
 	return {
 		validate(request) {
-			const declaration = requireModel(request.model);
-			validateGenerationContent(declaration, request.content);
-			const parameters = resolveGenerationParameters(declaration, request.parameters);
-			const meta = resolveGenerationMeta(declaration, mergeGenerationMeta({
-				...request.metadata ?? {},
-				...request.meta ?? {}
-			}, request.content), request.content);
-			return {
-				declaration: cloneJson(declaration),
-				request: cloneJson(request),
-				parameters,
-				meta
-			};
+			return validateRequest(request);
 		},
 		async generate(request) {
-			const resolved = this.validate(request);
-			const apiKey = request.apiKey ?? options.apiKey;
-			if (!apiKey) throw new GenerationConfigError("apiKey is required");
-			return getGenerationAdapter(resolved.declaration.adapter.type, options.adapters)({
-				...resolved,
-				context: {
-					apiKey,
-					baseUrl: request.baseUrl ?? options.baseUrl ?? DEFAULT_BASE_URL,
-					fetch: adapterFetch,
-					resolveSource: options.sourceResolver ?? defaultGenerationSourceResolver
-				}
-			});
+			return runAdapter(request, adapterFetch);
+		},
+		async generateResult(request) {
+			let capturedFields;
+			return {
+				content: await runAdapter(request, createResultFieldCaptureFetch(adapterFetch, (fields) => {
+					capturedFields = {
+						...capturedFields,
+						...fields
+					};
+				})),
+				...capturedFields ?? {}
+			};
 		},
 		listModels() {
 			return cloneJson(models);
@@ -1625,7 +1662,6 @@ async function createGenerationClientFromDirectory(directory, options = {}) {
 async function createGenerationClientFromFile(filePath, options = {}) {
 	return createGenerationClientFromFiles([filePath], options);
 }
-
 //#endregion
 //#region src/export-config.ts
 function stringifyBuiltinModelConfig(model, options = {}) {
@@ -1641,7 +1677,7 @@ async function exportBuiltinModelConfig(model, filePath) {
 async function exportBuiltinModelConfigs(directory) {
 	await writeGenerationModelDeclarations(listBuiltinGenerationModels(), directory);
 }
-
 //#endregion
 export { validateGenerationContent as A, klingVideoGenerationsAdapter as C, mergeTextBlocks as D, mergeGenerationMeta as E, GenerationUnsupportedAdapterError as F, GenerationValidationError as I, GenerationError as M, GenerationProviderError as N, resolveGenerationMeta as O, GenerationTimeoutError as P, openAiImageEditsAdapter as S, arkVideoGenerationsAdapter as T, writeGenerationModelDeclarations as _, createGenerationClientFromDirectory as a, sunoTasksAdapter as b, defaultGenerationSourceResolver as c, parseGenerationModelDeclaration as d, readGenerationModelDeclaration as f, writeGenerationModelDeclaration as g, stringifyGenerationModelDeclaration as h, createGenerationClient as i, GenerationConfigError as j, resolveGenerationParameters as k, isGenerationModelDeclaration as l, readGenerationModelDeclarationsFromFiles as m, exportBuiltinModelConfigs as n, createGenerationClientFromFile as o, readGenerationModelDeclarationsFromDirectory as p, stringifyBuiltinModelConfig as r, createGenerationClientFromFiles as s, exportBuiltinModelConfig as t, mergeGenerationModelDeclarations as u, builtinGenerationAdapters as v, geminiGenerateContentAdapter as w, openAiImagesAdapter as x, getGenerationAdapter as y };
-//# sourceMappingURL=export-config-DolxdQdi.js.map
+
+//# sourceMappingURL=export-config-BXD4Adwb.js.map