@saltcorn/large-language-model 1.0.9 → 1.0.11

package/generate.js

@@ -198,6 +198,31 @@ const getAudioTranscription = async (
 
 const last = (xs) => xs[xs.length - 1];
 
+const genericResponse = async (
+  { backend, apiKey, api_key, provider, ai_sdk_provider, responses_api },
+  role,
+  prompt,
+  opts,
+) => {
+  let chat = opts.chat;
+  let result = opts.prompt;
+  //console.log("chat", JSON.stringify(chat, null, 2));
+  switch (opts.backend || backend) {
+    case "AI SDK":
+      if (role === "assistant" && typeof prompt === "string")
+        opts.chat.push({
+          role,
+          content: [{
+            type: "text",
+            text: prompt,
+          }],
+        });
+      break;
+    default:
+      opts.chat.push({ role, content: prompt });
+  }
+};
+
 const toolResponse = async (
   { backend, apiKey, api_key, provider, ai_sdk_provider, responses_api },
   opts,
@@ -553,7 +578,12 @@ const getCompletionAISDK = async (
   const debugRequest = { ...body, model: use_model_name };
   if (debugResult)
     console.log("AI SDK request", JSON.stringify(debugRequest, null, 2));
-  getState().log(6, `AI SDK request ${JSON.stringify(debugRequest)} `);
+  getState().log(
+    6,
+    `AI SDK request`,
+    { tools: Object.keys(debugRequest.tools || {}), model: debugRequest.model },
+    JSON.stringify(debugRequest.messages, null, 2),
+  );
   if (debugCollector) debugCollector.request = debugRequest;
   const reqTimeStart = Date.now();
 
@@ -575,15 +605,18 @@ const getCompletionAISDK = async (
     chat.push(...results.response.messages);
   }
 
-  if (debugResult)
-    console.log("AI SDK response", JSON.stringify(results, null, 2));
-  else getState().log(6, `AI SDK response ${JSON.stringify(results)}`);
   if (debugCollector) {
     debugCollector.response = results;
     debugCollector.response_time_ms = Date.now() - reqTimeStart;
   }
   const allToolCalls = (await results.steps).flatMap((step) => step.toolCalls);
-
+  if (debugResult)
+    console.log("AI SDK response", JSON.stringify(results, null, 2));
+  else
+    getState().log(6, `AI SDK response`, {
+      text: results.text,
+      tool_calls: allToolCalls,
+    });
   if (allToolCalls.length) {
     return {
       tool_calls: allToolCalls,
@@ -838,10 +871,29 @@ const getCompletionOpenAICompatible = async (
       if (streamToolCalls) debugCollector.response = streamToolCalls;
       debugCollector.response_time_ms = Date.now() - reqTimeStart;
     }
+    if (appendToChat && chat && streamToolCalls) {
+      chat.push({
+        role: "assistant",
+        content: streamParts.join("") || null,
+        tool_calls: streamToolCalls.tool_calls,
+      });
+    } else if (appendToChat && chat && streamParts.length > 0) {
+      chat.push({ role: "assistant", content: streamParts.join("") });
+    }
     return streamToolCalls
       ? {
           content: streamParts.join(""),
           tool_calls: streamToolCalls.tool_calls,
+          hasToolCalls: streamToolCalls.tool_calls?.length,
+          getToolCalls() {
+            return streamToolCalls.tool_calls.map((tc) => ({
+              tool_name: tc.function.name,
+              input: tc.function.arguments
+                ? JSON.parse(tc.function.arguments)
+                : {},
+              tool_call_id: tc.id,
+            }));
+          },
         }
       : streamParts.join("");
   }
@@ -895,7 +947,9 @@ const getCompletionOpenAICompatible = async (
           getToolCalls() {
             return tool_calls.map((tc) => ({
               tool_name: tc.function.name,
-              input: JSON.parse(tc.function.arguments),
+              input: tc.function.arguments
+                ? JSON.parse(tc.function.arguments)
+                : {},
               tool_call_id: tc.call_id,
             }));
           },
@@ -910,7 +964,9 @@ const getCompletionOpenAICompatible = async (
           getToolCalls() {
             return results?.choices?.[0]?.message?.tool_calls.map((tc) => ({
               tool_name: tc.function.name,
-              input: JSON.parse(tc.function.arguments),
+              input: tc.function.arguments
+                ? JSON.parse(tc.function.arguments)
+                : {},
               tool_call_id: tc.id,
             }));
           },
@@ -1293,5 +1349,6 @@ module.exports = {
   getImageGeneration,
   getAudioTranscription,
   toolResponse,
+  genericResponse,
   addImageMesssage,
 };

package/index.js

@@ -13,6 +13,7 @@ const {
   getAudioTranscription,
   toolResponse,
   addImageMesssage,
+  genericResponse,
 } = require("./generate");
 const { OPENAI_MODELS } = require("./constants.js");
 const { eval_expression } = require("@saltcorn/data/models/expression");
@@ -525,6 +526,7 @@ const functions = (config) => {
           case "image":
             return await addImageMesssage(config, { prompt, ...opts });
           default:
+            return genericResponse(config, what, prompt, opts);
             break;
         }
       },
@@ -658,6 +660,7 @@ module.exports = {
   functions,
   modelpatterns: require("./model.js"),
   routes,
+  ready_for_mobile: false,
   actions: (config) => ({
     llm_function_call: require("./function-insert-action.js")(config),
     llm_generate: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@saltcorn/large-language-model",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Large language models and functionality for Saltcorn",
   "main": "index.js",
   "dependencies": {