batchwork 1.2.0 → 1.3.0

package/dist/{chunk-h2he3d16.js → chunk-gwa0dkhj.js}

@@ -23,6 +23,7 @@ class MissingDependencyError extends BatchworkError {
 }
 
 // src/job.ts
+var WAIT_ABORTED_MESSAGE = "batchwork: wait aborted.";
 var DEFAULT_POLL_INTERVAL_MS = 15000;
 var TERMINAL_STATUSES = new Set([
   "completed",
@@ -33,13 +34,13 @@ var TERMINAL_STATUSES = new Set([
 var isTerminalStatus = (status) => TERMINAL_STATUSES.has(status);
 var delay = (ms, signal) => new Promise((resolve, reject) => {
   if (signal?.aborted) {
-    reject(new BatchworkError("batchwork: wait aborted."));
+    reject(new BatchworkError(WAIT_ABORTED_MESSAGE));
     return;
   }
   let timer;
   const onAbort = () => {
     clearTimeout(timer);
-    reject(new BatchworkError("batchwork: wait aborted."));
+    reject(new BatchworkError(WAIT_ABORTED_MESSAGE));
   };
   timer = setTimeout(() => {
     signal?.removeEventListener("abort", onAbort);
@@ -81,7 +82,7 @@ class BatchJob {
     options.onPoll?.(snapshot);
     while (!isTerminalStatus(snapshot.status)) {
       if (options.signal?.aborted) {
-        throw new BatchworkError("batchwork: wait aborted.");
+        throw new BatchworkError(WAIT_ABORTED_MESSAGE);
       }
       if (deadline !== undefined && Date.now() > deadline) {
         throw new BatchworkError(`batchwork: timed out waiting for batch "${this.id}".`);
@@ -429,7 +430,13 @@ var normalizeSnapshot = (raw) => {
   };
 };
 var textFromMessage = (message) => {
-  const text = asArray(asRecord(message).content).map((block) => asRecord(block)).filter((block) => block.type === "text").map((block) => asString(block.text) ?? "").join("");
+  let text = "";
+  for (const item of asArray(asRecord(message).content)) {
+    const block = asRecord(item);
+    if (block.type === "text") {
+      text += asString(block.text) ?? "";
+    }
+  }
   return text.length > 0 ? text : undefined;
 };
 var usageFromMessage = (message) => {
@@ -534,6 +541,7 @@ var anthropicAdapter = {
 
 // src/providers/google.ts
 var GOOGLE_BASE = "https://generativelanguage.googleapis.com/v1beta";
+var OPERATION_ID_LABEL = "Google operation id";
 var GOOGLE_BATCH_PREFIX = "batches";
 var apiKey2 = (credentials) => {
   const key = credentials.apiKey ?? process.env.GOOGLE_GENERATIVE_AI_API_KEY ?? process.env.GEMINI_API_KEY;
@@ -594,7 +602,7 @@ var normalizeSnapshot2 = (raw) => {
   const failed = items.filter((item) => asRecord(item).error).length;
   const id = asString(obj.name) ?? "";
   return {
-    id: id ? assertPrefixedProviderId("Google operation id", id, GOOGLE_BATCH_PREFIX) : "",
+    id: id ? assertPrefixedProviderId(OPERATION_ID_LABEL, id, GOOGLE_BATCH_PREFIX) : "",
     provider: "google",
     raw,
     requestCounts: {
@@ -711,18 +719,19 @@ var submit2 = async (input) => {
   return normalizeSnapshot2(raw);
 };
 var retrieve2 = async (id, credentials) => {
-  const operationId = assertPrefixedProviderId("Google operation id", id, GOOGLE_BATCH_PREFIX);
+  const operationId = assertPrefixedProviderId(OPERATION_ID_LABEL, id, GOOGLE_BATCH_PREFIX);
   const raw = await requestJson(`${baseUrl2(credentials)}/${operationId}`, {
     headers: headers2(credentials)
   });
   return normalizeSnapshot2(raw);
 };
+var fileNameFrom = (value) => asString(asRecord(value).name) ?? asString(value);
 async function* results2(id, credentials) {
   const snapshot = await retrieve2(id, credentials);
   const raw = asRecord(snapshot.raw);
   const response = asRecord(raw.response);
   const dest = asRecord(raw.dest);
-  const responsesFile = asString(asRecord(response.responsesFile).name) ?? asString(response.responsesFile) ?? asString(asRecord(response.responses_file).name) ?? asString(response.responses_file) ?? asString(dest.fileName) ?? asString(dest.file_name);
+  const responsesFile = fileNameFrom(response.responsesFile) ?? fileNameFrom(response.responses_file) ?? asString(dest.fileName) ?? asString(dest.file_name);
   if (responsesFile) {
     throw new BatchworkError(`batchwork: batch "${id}" returned file-mode results, which are not supported yet.`);
   }
@@ -735,7 +744,7 @@ async function* results2(id, credentials) {
   }
 }
 var cancel2 = async (id, credentials) => {
-  const operationId = assertPrefixedProviderId("Google operation id", id, GOOGLE_BATCH_PREFIX);
+  const operationId = assertPrefixedProviderId(OPERATION_ID_LABEL, id, GOOGLE_BATCH_PREFIX);
   await requestJson(`${baseUrl2(credentials)}/${operationId}:cancel`, {
     headers: headers2(credentials),
     method: "POST"
@@ -768,7 +777,26 @@ var textFromBody = (body) => {
       return content;
     }
   }
-  return asString(obj.output_text);
+  return asString(obj.output_text) ?? asString(obj.text);
+};
+var segmentsFromBody = (body) => {
+  const obj = asRecord(body);
+  if (asString(obj.text) === undefined) {
+    return;
+  }
+  const segments = [];
+  for (const item of asArray(obj.segments)) {
+    const segment = asRecord(item);
+    const text = asString(segment.text);
+    if (text !== undefined) {
+      segments.push({
+        endSecond: asNumber(segment.end),
+        startSecond: asNumber(segment.start),
+        text
+      });
+    }
+  }
+  return segments.length > 0 ? segments : undefined;
 };
 var embeddingFromBody = (body) => {
   const data = asArray(asRecord(body).data);
@@ -789,6 +817,31 @@ var imagesFromBody = (body) => {
   }
   return images.length > 0 ? images : undefined;
 };
+var moderationFromBody = (body) => {
+  const results3 = asArray(asRecord(body).results);
+  if (results3.length === 0) {
+    return;
+  }
+  const first = asRecord(results3[0]);
+  const categories = {};
+  for (const [key, value] of Object.entries(asRecord(first.categories))) {
+    if (typeof value === "boolean") {
+      categories[key] = value;
+    }
+  }
+  if (Object.keys(categories).length === 0) {
+    return;
+  }
+  const categoryScores = {};
+  for (const [key, value] of Object.entries(asRecord(first.category_scores))) {
+    const score = asNumber(value);
+    if (score !== undefined) {
+      categoryScores[key] = score;
+    }
+  }
+  const flagged = typeof first.flagged === "boolean" ? first.flagged : Object.values(categories).some(Boolean);
+  return { categories, categoryScores, flagged };
+};
 var usageFromBody = (body) => {
   const usage = asRecord(asRecord(body).usage);
   const inputTokens = asNumber(usage.prompt_tokens) ?? asNumber(usage.input_tokens);
@@ -831,7 +884,9 @@ var normalizeOpenAIResult = (line) => {
       customId,
       embedding: embeddingFromBody(response.body),
       images: imagesFromBody(response.body),
+      moderation: moderationFromBody(response.body),
       response: response.body,
+      segments: segmentsFromBody(response.body),
       status: "succeeded",
       text: textFromBody(response.body),
       usage: usageFromBody(response.body)
@@ -923,7 +978,11 @@ var createOpenAICompatibleAdapter = (config) => {
     const jsonl = encodeJsonl(input.built.map((item) => {
       const body = omit(item.body, "stream");
       if (lineFormat === "body-only") {
-        return { body, custom_id: item.customId };
+        return {
+          body,
+          custom_id: item.customId,
+          ...config.lineExtras?.(endpoint)
+        };
       }
       return {
         body,
@@ -993,6 +1052,7 @@ var groqAdapter = createOpenAICompatibleAdapter({
 
 // src/providers/mistral.ts
 var MISTRAL_BASE = "https://api.mistral.ai/v1";
+var JOB_ID_LABEL = "Mistral job id";
 var apiKey3 = (credentials) => resolveApiKey(credentials, "MISTRAL_API_KEY", "Mistral");
 var baseUrl3 = (credentials) => credentials.baseURL ?? MISTRAL_BASE;
 var authHeaders = (credentials) => ({
@@ -1032,7 +1092,7 @@ var normalizeSnapshot4 = (raw) => {
   return {
     completedAt: toDate(obj.completed_at),
     createdAt: toDate(obj.created_at),
-    id: id ? assertSimpleProviderId("Mistral job id", id) : "",
+    id: id ? assertSimpleProviderId(JOB_ID_LABEL, id) : "",
     provider: "mistral",
     raw,
     requestCounts: {
@@ -1066,7 +1126,7 @@ var submit3 = async (input) => {
   return normalizeSnapshot4(raw);
 };
 var retrieve3 = async (id, credentials) => {
-  const jobId = assertSimpleProviderId("Mistral job id", id);
+  const jobId = assertSimpleProviderId(JOB_ID_LABEL, id);
   const raw = await requestJson(`${baseUrl3(credentials)}/batch/jobs/${jobId}`, {
     headers: authHeaders(credentials)
   });
@@ -1089,7 +1149,7 @@ async function* results3(id, credentials) {
   }
 }
 var cancel3 = async (id, credentials) => {
-  const jobId = assertSimpleProviderId("Mistral job id", id);
+  const jobId = assertSimpleProviderId(JOB_ID_LABEL, id);
   await requestJson(`${baseUrl3(credentials)}/batch/jobs/${jobId}/cancel`, {
     headers: authHeaders(credentials),
     method: "POST"
@@ -1125,14 +1185,46 @@ var parseIpv4 = (host) => {
 };
 var isPrivateIpv4 = (parts) => {
   const [a = 0, b = 0] = parts;
-  return a === 0 || a === 10 || a === 127 || a === 100 && b >= 64 && b <= 127 || a === 169 && b === 254 || a === 172 && b >= 16 && b <= 31 || a === 192 && b === 168 || a === 198 && (b === 18 || b === 19) || a >= 224;
+  if (a === 0 || a === 10 || a === 127 || a >= 224) {
+    return true;
+  }
+  switch (a) {
+    case 100: {
+      return b >= 64 && b <= 127;
+    }
+    case 169: {
+      return b === 254;
+    }
+    case 172: {
+      return b >= 16 && b <= 31;
+    }
+    case 192: {
+      return b === 168;
+    }
+    case 198: {
+      return b === 18 || b === 19;
+    }
+    default: {
+      return false;
+    }
+  }
 };
 var isPrivateIpv6 = (host) => {
   const normalized = host.replace(/^\[/u, "").replace(/\]$/u, "").toLowerCase();
   if (!normalized.includes(":")) {
     return false;
   }
-  return normalized === "::" || normalized === "::1" || normalized.startsWith("fc") || normalized.startsWith("fd") || normalized.startsWith("fe80:");
+  if (normalized === "::" || normalized === "::1") {
+    return true;
+  }
+  return normalized.startsWith("fc") || normalized.startsWith("fd") || normalized.startsWith("fe80:");
+};
+var isPrivateHost = (host) => {
+  if (host === "localhost" || host.endsWith(".localhost") || host.endsWith(".local")) {
+    return true;
+  }
+  const ipv4 = parseIpv4(host);
+  return (ipv4 ? isPrivateIpv4(ipv4) : false) || isPrivateIpv6(host);
 };
 var validateUploadLocation = (location) => {
   let url;
@@ -1147,9 +1239,7 @@ var validateUploadLocation = (location) => {
   if (url.username || url.password) {
     throw new BatchworkError("batchwork: Together upload Location must not include credentials.");
   }
-  const host = url.hostname.toLowerCase();
-  const ipv4 = parseIpv4(host);
-  if (host === "localhost" || host.endsWith(".localhost") || host.endsWith(".local") || ipv4 && isPrivateIpv4(ipv4) || isPrivateIpv6(host)) {
+  if (isPrivateHost(url.hostname.toLowerCase())) {
     throw new BatchworkError("batchwork: Together upload Location must not target localhost or private networks.");
   }
   return url.toString();
@@ -1192,12 +1282,14 @@ var togetherAdapter = createOpenAICompatibleAdapter({
   baseUrl: "https://api.together.xyz/v1",
   filePurpose: "batch-api",
   id: "together",
+  lineExtras: (endpoint) => endpoint.startsWith("/v1/audio/") ? { method: "FILE" } : undefined,
   lineFormat: "body-only",
   uploadFile: uploadTogetherFile
 });
 
 // src/providers/xai.ts
 var XAI_BASE = "https://api.x.ai/v1";
+var BATCH_ID_LABEL = "xAI batch id";
 var RESULTS_PAGE_SIZE = 100;
 var apiKey4 = (credentials) => resolveApiKey(credentials, "XAI_API_KEY", "xAI");
 var baseUrl4 = (credentials) => credentials.baseURL ?? XAI_BASE;
@@ -1231,7 +1323,7 @@ var normalizeSnapshot5 = (raw) => {
     completedAt: toDate(obj.finish_time ?? obj.completed_at),
     createdAt: toDate(obj.create_time),
     expiresAt: toDate(obj.expire_time ?? obj.expires_at),
-    id: id ? assertSimpleProviderId("xAI batch id", id) : "",
+    id: id ? assertSimpleProviderId(BATCH_ID_LABEL, id) : "",
     provider: "xai",
     raw,
     requestCounts: {
@@ -1262,6 +1354,25 @@ var imagesFromXaiCompletion = (completion) => {
   }
   return images.length > 0 ? images : undefined;
 };
+var videosFromXaiCompletion = (completion) => {
+  const obj = asRecord(completion);
+  const entries = asArray(obj.data);
+  const sources = entries.length > 0 ? entries : [obj];
+  const videos = [];
+  for (const source of sources) {
+    const record = asRecord(source);
+    const video = asRecord(record.video);
+    const url = asString(video.url) ?? asString(record.url);
+    if (url) {
+      const duration = asNumber(video.duration) ?? asNumber(record.duration);
+      videos.push({
+        ...duration === undefined ? {} : { durationSeconds: duration },
+        url
+      });
+    }
+  }
+  return videos.length > 0 ? videos : undefined;
+};
 var normalizeResult3 = (item) => {
   const obj = asRecord(item);
   const customId = asString(obj.batch_request_id) ?? "";
@@ -1280,10 +1391,12 @@ var normalizeResult3 = (item) => {
     };
   }
   const response = asRecord(batchResult.response);
+  const [opKey] = Object.keys(response);
   const completion = response.chat_get_completion ?? Object.values(response)[0];
+  const isVideo = response.chat_get_completion === undefined && opKey !== undefined && opKey.includes("video");
   return {
     customId,
-    images: imagesFromXaiCompletion(completion),
+    ...isVideo ? { videos: videosFromXaiCompletion(completion) } : { images: imagesFromXaiCompletion(completion) },
     response: completion,
     status: "succeeded",
     text: textFromBody(completion),
@@ -1296,7 +1409,7 @@ var submit4 = async (input) => {
     body: omit(item.body, "stream"),
     custom_id: item.customId,
     method: "POST",
-    url: input.endpoint
+    url: item.endpoint || input.endpoint
   })), { label: "batch upload JSONL", maxBytes: limits.maxUploadBytes });
   const inputFileId = await uploadInputFile(jsonl, baseUrl4(input.credentials), authHeaders2(input.credentials), { purpose: null });
   const raw = await requestJson(`${baseUrl4(input.credentials)}/batches`, {
@@ -1310,14 +1423,14 @@ var submit4 = async (input) => {
   return normalizeSnapshot5(raw);
 };
 var retrieve4 = async (id, credentials) => {
-  const batchId = assertSimpleProviderId("xAI batch id", id);
+  const batchId = assertSimpleProviderId(BATCH_ID_LABEL, id);
   const raw = await requestJson(`${baseUrl4(credentials)}/batches/${batchId}`, {
     headers: authHeaders2(credentials)
   });
   return normalizeSnapshot5(raw);
 };
 async function* results4(id, credentials) {
-  const batchId = assertSimpleProviderId("xAI batch id", id);
+  const batchId = assertSimpleProviderId(BATCH_ID_LABEL, id);
   const headers3 = authHeaders2(credentials);
   let token;
   do {
@@ -1334,7 +1447,7 @@ async function* results4(id, credentials) {
   } while (token);
 }
 var cancel4 = async (id, credentials) => {
-  const batchId = assertSimpleProviderId("xAI batch id", id);
+  const batchId = assertSimpleProviderId(BATCH_ID_LABEL, id);
   await requestJson(`${baseUrl4(credentials)}/batches/${batchId}:cancel`, {
     headers: authHeaders2(credentials),
     method: "POST"
@@ -1362,5 +1475,5 @@ var getAdapter = (provider) => adapters[provider];
 
 export { BatchworkError, UnsupportedProviderError, MissingDependencyError, resolveBatchLimits, assertByteLength, mapWithConcurrency, isTerminalStatus, BatchJob, getAdapter };
 
-//# debugId=308C7FBEE03E10E564756E2164756E21
-//# sourceMappingURL=chunk-h2he3d16.js.map
+//# debugId=4C939B96519322C164756E2164756E21
+//# sourceMappingURL=chunk-gwa0dkhj.js.map