@semiont/jobs 0.5.27 → 0.5.28

package/dist/worker-main.js

@@ -9390,9 +9390,9 @@ async function withTimeout(work, label, onHeartbeat) {
     if (heartbeat) clearInterval(heartbeat);
   }
 }
-function boundedGenerate(client, prompt, maxTokens, temperature, onHeartbeat) {
+function boundedGenerateWithMetadata(client, prompt, maxTokens, temperature, onHeartbeat) {
   return spanned(client, "text", maxTokens, () => withTimeout(
-    client.generateText(prompt, maxTokens, temperature),
+    client.generateTextWithMetadata(prompt, maxTokens, temperature),
     `${client.type}:${client.modelId}`,
     onHeartbeat
   ));
@@ -10175,6 +10175,7 @@ var SEMANTIC_MATCH_CHARS = 240;
 function idLabel(resourceId, annotationId) {
   return `[${resourceId}${annotationId ? `/${annotationId}` : ""}]`;
 }
+var DEFAULT_MAX_TOKENS = 500;
 async function generateResourceFromTopic(topic, entityTypes, client, logger2, userPrompt, locale, context, temperature, maxTokens, sourceLanguage, outputMediaType = "text/markdown", task = "resource", structure, cite = false, repair) {
   logger2.debug("Generating resource from topic", {
     topicPreview: topic.substring(0, 100),
@@ -10190,7 +10191,7 @@ async function generateResourceFromTopic(topic, entityTypes, client, logger2, us
     structure
   });
   const finalTemperature = temperature ?? 0.7;
-  const finalMaxTokens = maxTokens ?? 500;
+  const finalMaxTokens = maxTokens ?? DEFAULT_MAX_TOKENS;
   const languageInstruction = locale && locale !== "en" ? `
 
 IMPORTANT: Write the entire resource in ${getLanguageName(locale)}.` : "";
@@ -10217,6 +10218,9 @@ The source resource and embedded context are in ${getLanguageName(sourceLanguage
           parts.push(`- ${label}: ${bodyItem.value}`);
         }
       }
+      if (focus.userHint) {
+        parts.push(`- User hint (steers what to generate): ${focus.userHint}`);
+      }
       annotationSection = `
 
 Annotation context:
@@ -10375,16 +10379,16 @@ ${formatRequirements}`;
     temperature: finalTemperature,
     maxTokens: finalMaxTokens
   });
-  const response = await boundedGenerate(client, prompt, finalMaxTokens, finalTemperature);
-  logger2.debug("Got response from inference", { responseLength: response.length });
-  const result = parseResponse(response);
+  const response = await boundedGenerateWithMetadata(client, prompt, finalMaxTokens, finalTemperature);
+  logger2.debug("Got response from inference", { responseLength: response.text.length, stopReason: response.stopReason });
+  const result = parseResponse(response.text);
   logger2.debug("Parsed response", {
     hasTitle: !!result.title,
     titleLength: result.title?.length,
     hasContent: !!result.content,
     contentLength: result.content?.length
   });
-  return result;
+  return { ...result, truncated: response.stopReason === "max_tokens" };
 }
 var PINNED_CREATION_TIMESTAMP = 17e8;
 var MAX_COMPILE_REPAIRS = 2;
@@ -10616,7 +10620,7 @@ async function processHighlightJob(content, inferenceClient, params, buildAnnota
   onProgress(100, { code: "complete-created", count: annotations.length, kind: "highlight" }, echo);
   return {
     annotations,
-    result: { highlightsFound: highlights.length, highlightsCreated: annotations.length }
+    result: { kind: "highlight-annotation", highlightsFound: highlights.length, highlightsCreated: annotations.length }
   };
 }
 function detectionEcho(p) {
@@ -10656,7 +10660,7 @@ async function processCommentJob(content, inferenceClient, params, buildAnnotati
   onProgress(100, { code: "complete-created", count: annotations.length, kind: "comment" }, echo);
   return {
     annotations,
-    result: { commentsFound: comments.length, commentsCreated: annotations.length }
+    result: { kind: "comment-annotation", commentsFound: comments.length, commentsCreated: annotations.length }
   };
 }
 async function processAssessmentJob(content, inferenceClient, params, buildAnnotation, onProgress) {
@@ -10696,7 +10700,7 @@ async function processAssessmentJob(content, inferenceClient, params, buildAnnot
   onProgress(100, { code: "complete-created", count: annotations.length, kind: "assessment" }, echo);
   return {
     annotations,
-    result: { assessmentsFound: assessments.length, assessmentsCreated: annotations.length }
+    result: { kind: "assessment-annotation", assessmentsFound: assessments.length, assessmentsCreated: annotations.length }
   };
 }
 async function processReferenceJob(content, inferenceClient, params, buildAnnotation, onProgress, logger2) {
@@ -10786,7 +10790,7 @@ async function processReferenceJob(content, inferenceClient, params, buildAnnota
   onProgress(100, { code: "complete-created", count: annotations.length, kind: "reference" }, { requestParams });
   return {
     annotations,
-    result: { totalFound, totalEmitted: annotations.length, errors }
+    result: { kind: "reference-annotation", totalFound, totalEmitted: annotations.length, errors }
   };
 }
 async function processTagJob(content, inferenceClient, params, buildAnnotation, onProgress) {
@@ -10843,7 +10847,7 @@ async function processTagJob(content, inferenceClient, params, buildAnnotation,
   onProgress(100, { code: "complete-created", count: annotations.length, kind: "tag" });
   return {
     annotations,
-    result: { tagsFound: tags.length, tagsCreated: annotations.length, byCategory }
+    result: { kind: "tag-annotation", tagsFound: tags.length, tagsCreated: annotations.length, byCategory }
   };
 }
 function assertWithinOutputBudget(byteLength) {
@@ -10890,7 +10894,17 @@ async function processGenerationJob(inferenceClient, params, onProgress, logger2
     }
     let compiled = compileTypst(source);
     let repairs = 0;
-    while ("error" in compiled && repairs < MAX_COMPILE_REPAIRS) {
+    while ("error" in compiled) {
+      if (generated2.truncated) {
+        throw new Error(
+          `Generation stopped at the maxTokens ceiling (${params.maxTokens ?? DEFAULT_MAX_TOKENS} tokens) and the cut-off Typst source does not compile \u2014 repair cannot help; raise maxTokens. Compile error: ${compiled.error}`
+        );
+      }
+      if (repairs >= MAX_COMPILE_REPAIRS) {
+        throw new Error(
+          `Typst compilation failed after ${MAX_COMPILE_REPAIRS} repair attempts: ${compiled.error}`
+        );
+      }
       repairs++;
       logger2.warn("Typst compile failed \u2014 feeding the error back for repair", {
         attempt: repairs,
@@ -10922,21 +10936,19 @@ async function processGenerationJob(inferenceClient, params, onProgress, logger2
       }
       compiled = compileTypst(source);
     }
-    if ("error" in compiled) {
-      throw new Error(
-        `Typst compilation failed after ${MAX_COMPILE_REPAIRS} repair attempts: ${compiled.error}`
-      );
-    }
     assertWithinOutputBudget(compiled.pdf.byteLength);
     onProgress(95, { code: "creating-resource" });
+    onProgress(100, { code: "complete-generated", truncated: generated2.truncated });
     return {
       content: compiled.pdf,
-      title: generated2.title ?? title,
+      title,
       format: outputMediaType,
       citations: citations2,
       result: {
+        kind: "generation",
         resourceId: "",
-        resourceName: generated2.title ?? title
+        resourceName: title,
+        truncated: generated2.truncated
       }
     };
   }
@@ -10967,14 +10979,17 @@ async function processGenerationJob(inferenceClient, params, onProgress, logger2
   onProgress(95, { code: "creating-resource" });
   const artifact = new TextEncoder().encode(content);
   assertWithinOutputBudget(artifact.byteLength);
+  onProgress(100, { code: "complete-generated", truncated: generated.truncated });
   return {
     content: artifact,
-    title: generated.title ?? title,
+    title,
     format: outputMediaType,
     citations,
     result: {
+      kind: "generation",
       resourceId: "",
-      resourceName: generated.title ?? title
+      resourceName: title,
+      truncated: generated.truncated
     }
   };
 }
@@ -10989,7 +11004,7 @@ async function prepareDetection(mediaType, session, resourceId, userId, generato
     key: calculateChecksum(bytes),
     store
   });
-  if ("declined" in extracted) return extracted;
+  if (extracted.kind === "declined") return extracted;
   if (!extracted.text.trim()) return { declined: "empty" };
   const items = extracted.items;
   if (items && items.length > 0) {
@@ -11109,6 +11124,7 @@ async function handleJobInner(adapter, config, job) {
       await emitEvent(session, "job:complete", {
         ...lifecycleBase,
         result: {
+          kind: "declined",
           declined: true,
           reason: source.declined
         }
@@ -11304,7 +11320,7 @@ async function handleJobInner(adapter, config, job) {
     }
     await emitEvent(session, "job:complete", {
       ...lifecycleBase,
-      result: { resourceId: newResourceId, resourceName: genResult.title }
+      result: { kind: "generation", resourceId: newResourceId, resourceName: genResult.title, truncated: genResult.result.truncated }
     });
     adapter.completeJob();
   } else {