@absolutejs/ai 0.0.27 → 0.0.29

package/dist/ai/index.js

@@ -1601,9 +1601,11 @@ var cacheLastContentBlock = (msg) => {
   };
   return { content: blocks, role: msg.role };
 };
-var buildRequestBody4 = (params, configuredMax, promptCaching) => {
+var buildRequestBody4 = (params, configuredMax, configCaching) => {
+  const caching = params.promptCaching ?? configCaching;
+  const cacheSystem = params.cacheSystemPrompt ?? caching;
   const messages = params.messages.filter((msg) => msg.role !== "system").map(mapMessage);
-  if (promptCaching && messages.length > 1) {
+  if (caching && messages.length > 1) {
     const last = messages[messages.length - 1];
     if (last) {
       messages[messages.length - 1] = cacheLastContentBlock(last);
@@ -1617,7 +1619,7 @@ var buildRequestBody4 = (params, configuredMax, promptCaching) => {
     stream: true
   };
   if (params.systemPrompt) {
-    body.system = promptCaching || params.cacheSystemPrompt ? [
+    body.system = cacheSystem ? [
       {
         cache_control: { type: "ephemeral" },
         text: params.systemPrompt,
@@ -1627,7 +1629,7 @@ var buildRequestBody4 = (params, configuredMax, promptCaching) => {
   }
   if (params.tools && params.tools.length > 0) {
     const tools = params.tools.map(mapToolDefinition2);
-    if (promptCaching) {
+    if (caching) {
       tools[tools.length - 1] = {
         ...tools[tools.length - 1],
         cache_control: { type: "ephemeral" }
@@ -2521,8 +2523,10 @@ var processToolTurn = async (socket, options, state, messageId, conversationId,
   });
   const toolDefs = options.tools ? buildToolDefinitions(options.tools) : undefined;
   const stream = options.provider.stream({
+    cacheSystemPrompt: options.cacheSystemPrompt,
     messages: state.currentMessages,
     model: options.model,
+    promptCaching: options.promptCaching,
     reasoning: options.reasoning,
     signal,
     systemPrompt: options.systemPrompt,
@@ -2605,8 +2609,10 @@ var processStreamTextChunk = async (chunk, options, socket, messageId, conversat
 var processStream = async (socket, options, messages, messageId, conversationId, signal, startTime) => {
   const toolDefs = options.tools ? buildToolDefinitions(options.tools) : undefined;
   const stream = options.provider.stream({
+    cacheSystemPrompt: options.cacheSystemPrompt,
     messages,
     model: options.model,
+    promptCaching: options.promptCaching,
     reasoning: options.reasoning,
     signal,
     systemPrompt: options.systemPrompt,
@@ -2954,9 +2960,11 @@ var streamTurns = async function* (options, renderers, messages, signal, startTi
       usage: undefined
     };
     const stream = options.provider.stream({
+      cacheSystemPrompt: options.cacheSystemPrompt,
       maxTokens: options.maxTokens,
       messages: turnState.currentMessages,
       model: options.model,
+      promptCaching: options.promptCaching,
       reasoning: options.reasoning,
       signal,
       systemPrompt: options.systemPrompt,
@@ -3331,6 +3339,7 @@ var generateAI = async (options) => {
     maxTokens: options.maxTokens,
     messages: options.messages,
     model: options.model,
+    promptCaching: options.promptCaching,
     reasoning: options.reasoning,
     responseFormat: options.responseFormat,
     signal: options.signal,
@@ -3423,6 +3432,7 @@ var generateAIWithTools = async (options) => {
   };
   return runTurn(options.messages, maxTurns);
 };
+var DEFAULT_OBJECT_REPAIR_ATTEMPTS = 1;
 var generateObjectAI = async (options) => {
   const toolName = options.toolName ?? DEFAULT_OBJECT_TOOL_NAME;
   const tool = {
@@ -3430,25 +3440,66 @@ var generateObjectAI = async (options) => {
     input_schema: options.schema,
     name: toolName
   };
-  const { toolCalls, usage } = await generateAI({
-    cacheSystemPrompt: options.cacheSystemPrompt,
-    maxTokens: options.maxTokens,
-    messages: options.messages,
-    model: options.model,
-    provider: options.provider,
-    reasoning: options.reasoning,
-    signal: options.signal,
-    systemPrompt: options.systemPrompt,
-    temperature: options.temperature,
-    toolChoice: { name: toolName },
-    tools: [tool]
-  });
-  const call = toolCalls.find((toolCall) => toolCall.name === toolName);
-  if (!call) {
-    throw new Error(`generateObjectAI: model did not call the "${toolName}" tool`);
+  const maxRepairAttempts = Math.max(0, options.maxRepairAttempts ?? DEFAULT_OBJECT_REPAIR_ATTEMPTS);
+  const messages = [...options.messages];
+  let usage;
+  let lastError;
+  for (let attempt = 0;attempt <= maxRepairAttempts; attempt += 1) {
+    const result = await generateAI({
+      cacheSystemPrompt: options.cacheSystemPrompt,
+      maxTokens: options.maxTokens,
+      messages,
+      model: options.model,
+      promptCaching: options.promptCaching,
+      provider: options.provider,
+      reasoning: options.reasoning,
+      signal: options.signal,
+      systemPrompt: options.systemPrompt,
+      temperature: options.temperature,
+      toolChoice: { name: toolName },
+      tools: [tool]
+    });
+    usage = mergeUsage(usage, result.usage);
+    const call = result.toolCalls.find((toolCall) => toolCall.name === toolName);
+    let failure;
+    let object;
+    if (!call) {
+      lastError = new Error(`generateObjectAI: model did not call the "${toolName}" tool`);
+      failure = `You did not call the "${toolName}" tool. Call it exactly once with the structured result.`;
+    } else {
+      try {
+        object = options.validate ? options.validate(call.input) : call.input;
+      } catch (error) {
+        lastError = error;
+        failure = `Your "${toolName}" output failed validation: ${error instanceof Error ? error.message : String(error)}. Call "${toolName}" again with corrected output that satisfies the schema.`;
+      }
+    }
+    if (failure === undefined)
+      return { object, usage };
+    if (attempt >= maxRepairAttempts)
+      break;
+    if (call) {
+      messages.push({
+        content: [
+          {
+            id: call.id,
+            input: call.input && typeof call.input === "object" ? call.input : {},
+            name: toolName,
+            type: "tool_use"
+          }
+        ],
+        role: "assistant"
+      }, {
+        content: [
+          { content: failure, tool_use_id: call.id, type: "tool_result" }
+        ],
+        role: "user"
+      });
+    } else {
+      messages.push({ content: failure, role: "user" });
+    }
   }
-  const object = options.validate ? options.validate(call.input) : call.input;
-  return { object, usage };
+  throw lastError instanceof Error ? lastError : new Error(`generateObjectAI: failed to produce valid output`);
 };
 // src/ai/conversationManager.ts
 var NOT_FOUND3 = -1;
@@ -4410,5 +4461,5 @@ export {
   PROVIDER_STATUS_PAGES
 };
 
-//# debugId=4EA405589A58240564756E2164756E21
+//# debugId=AAB25EB53BF9BE9064756E2164756E21
 //# sourceMappingURL=index.js.map