@sembl/core 0.4.0 → 0.5.0

package/dist/index.cjs

@@ -36,6 +36,7 @@ __export(index_exports, {
   ValuesFrom: () => ValuesFrom,
   budgetSources: () => budgetSources,
   buildPrompt: () => buildPrompt,
+  buildRepairCorrection: () => buildRepairCorrection,
   buildRepairInput: () => buildRepairInput,
   bundleOf: () => bundleOf,
   coerce: () => coerce,
@@ -390,7 +391,7 @@ async function resolveEnumSources(schema, resolver, bundle) {
   await Promise.all(
     [...usages].map(async ([sourceId, usage]) => {
       try {
-        const values = await resolver(sourceId);
+        const values = await resolver(sourceId, { sourceId, schema, ...usage });
         if (!values || values.length === 0) {
           failures.push({ sourceId, reason: "empty", ...usage });
           return;
@@ -828,7 +829,7 @@ function renderReceived(received) {
   return text.length > MAX_RECEIVED_LENGTH ? `${text.slice(0, MAX_RECEIVED_LENGTH)}\u2026 (truncated)` : text;
 }
 function buildRepairInput(originalInput, rejected, issues) {
-  const lines = [
+  return [
     originalInput,
     "",
     "---",
@@ -837,9 +838,11 @@ function buildRepairInput(originalInput, rejected, issues) {
     "",
     JSON.stringify(rejected, null, 2),
     "",
-    "It was rejected because:",
-    ""
-  ];
+    buildRepairCorrection(issues)
+  ].join("\n");
+}
+function buildRepairCorrection(issues) {
+  const lines = ["The output was rejected because:", ""];
   for (const issue of issues) {
     lines.push(`- ${issue.path}: ${issue.message} (received: ${renderReceived(issue.received)})`);
   }
@@ -1633,11 +1636,21 @@ async function runCoercion(input, options, { mode, provenance, traceAttributes }
     let issues = [];
     let run = { data: {}, provenance: {}, issues: [], usage };
     let emptyRetries = 0;
+    const multiTurn = provider.supportsHistory === true;
+    const history = [];
+    const followUp = (rejected, text, folded) => {
+      if (multiTurn) {
+        history.push({ role: "assistant", data: rejected }, { role: "user", text });
+      } else {
+        userInput = folded;
+      }
+    };
     for (let attempt = 0; attempt <= maxRepairAttempts; attempt++) {
-      const llmSpan = tracer.startSpan("llmCall", { attempt }, rootSpan);
+      const llmSpan = tracer.startSpan("llmCall", { attempt, turns: history.length }, rootSpan);
       const response = await provider.complete({
         systemPrompt,
         userInput,
+        ...history.length > 0 ? { history: [...history] } : {},
         jsonSchema,
         schema: prepared.schema,
         bundle: prepared.bundle,
@@ -1650,11 +1663,11 @@ async function runCoercion(input, options, { mode, provenance, traceAttributes }
       if (hasInput && emptyRetries < retryOnEmpty && isEmptyResult(run.data)) {
         emptyRetries += 1;
         tracer.addEvent(rootSpan, "emptyRetry", { retry: emptyRetries });
-        userInput = `${renderedInput}
+        followUp(response.data, EMPTY_RETRY_NOTE, `${renderedInput}
 
 ---
 
-${EMPTY_RETRY_NOTE}`;
+${EMPTY_RETRY_NOTE}`);
         attempt -= 1;
         continue;
       }
@@ -1695,7 +1708,11 @@ ${EMPTY_RETRY_NOTE}`;
           issueCount: issues.length,
           paths: issues.map((issue) => issue.path)
         });
-        userInput = buildRepairInput(renderedInput, run.data, issues);
+        followUp(
+          response.data,
+          buildRepairCorrection(issues),
+          buildRepairInput(renderedInput, run.data, issues)
+        );
       }
     }
     throw new CoerceError(issues);
@@ -2115,6 +2132,7 @@ var ConsoleSink = class {
   ValuesFrom,
   budgetSources,
   buildPrompt,
+  buildRepairCorrection,
   buildRepairInput,
   bundleOf,
   coerce,