@saltcorn/large-language-model 0.7.9 → 0.8.0

package/function-insert-action.js

@@ -11,7 +11,7 @@ const { eval_expression } = require("@saltcorn/data/models/expression");
 const noSpaces = (s) => s.replaceAll(" ", "");
 module.exports = (config) => ({
   description: "Use LLM function call to insert rows in tables",
-  requireRow: true,
+  //requireRow: true,
   disableInList: true,
   disableInBuilder: true,
   configFields: async ({ table }) => {
@@ -22,7 +22,9 @@ module.exports = (config) => ({
         label: "Prompt",
         type: "String",
         fieldview: "textarea",
-        sublabel: `Use interpolations {{ }} to access variables in ${table.name} table.`,
+        sublabel: table
+          ? `Use interpolations {{ }} to access variables in ${table.name} table.`
+          : undefined,
       },
       {
         name: "function_name",
@@ -55,6 +57,7 @@ module.exports = (config) => ({
             name: "cardinality",
             label: "Cardinality",
             type: "String",
+            sublabel: "How many rows to generate",
             required: true,
             attributes: {
               options: ["One", /*"Zero or one",*/ "Zero to many"],
@@ -78,6 +81,9 @@ module.exports = (config) => ({
     const prompt = interpolate(prompt_template, row, user);
     let args = {};
     const json_type = (ty) => {
+      if (ty?.name === "Date") return "string";
+      //console.log("getting type of ", ty);
+
       if (ty?.js_type) return ty?.js_type;
     };
 
@@ -95,7 +101,7 @@ module.exports = (config) => ({
         if (typeof fixed[field.name] !== "undefined") continue;
         tableArgs[field.name] = {
           type: json_type(field.type),
-          description: field.description,
+          description: field.description || field.label,
         };
       }
       const argObj = { type: "object", properties: tableArgs };
@@ -116,6 +122,7 @@ module.exports = (config) => ({
         },
       },
     };
+
     const toolargs = {
       tools: [expert_function],
       tool_choice: { type: "function", function: { name: function_name } },
@@ -125,10 +132,11 @@ module.exports = (config) => ({
     getState().log(6, `llm_function_call completion: ${JSON.stringify(compl)}`);
     const response = JSON.parse(compl.tool_calls[0].function.arguments);
     //console.log("response: ", JSON.stringify(response, null, 2));
+    const retval = {};
     for (const col of columns) {
       const target_table = Table.findOne({ name: col.target_table });
       const fixed = eval_expression(
-        col.fixed_values,
+        col.fixed_values || {},
         row,
         user,
         "llm_function_call fixed values"
@@ -139,14 +147,17 @@ module.exports = (config) => ({
           ...(response[noSpaces(target_table.name)] || {}),
           ...fixed,
         };
+        retval[noSpaces(target_table.name)] = row;
         await target_table.insertRow(row, user);
       } else {
+        retval[noSpaces(target_table.name)] = [];
         for (const resp of response[noSpaces(target_table.name)] || []) {
           const row = { ...resp, ...fixed };
+          retval[noSpaces(target_table.name)].push(row);
           await target_table.insertRow(row, user);
         }
       }
     }
-    return {};
+    return retval;
   },
 });

package/generate.js

@@ -83,9 +83,12 @@ const getCompletion = async (config, opts) => {
     case "OpenAI":
       return await getCompletionOpenAICompatible(
         {
-          chatCompleteEndpoint: "https://api.openai.com/v1/chat/completions",
+          chatCompleteEndpoint: config.responses_api
+            ? "https://api.openai.com/v1/responses"
+            : "https://api.openai.com/v1/chat/completions",
           bearer: opts?.api_key || opts?.bearer || config.api_key,
           model: opts?.model || config.model,
+          responses_api: config.responses_api,
         },
         opts
       );
@@ -144,7 +147,7 @@ const getCompletion = async (config, opts) => {
 };
 
 const getCompletionOpenAICompatible = async (
-  { chatCompleteEndpoint, bearer, apiKey, model },
+  { chatCompleteEndpoint, bearer, apiKey, model, responses_api },
   {
     systemPrompt,
     prompt,
@@ -165,17 +168,79 @@ const getCompletionOpenAICompatible = async (
   const body = {
     //prompt: "How are you?",
     model: rest.model || model,
-    messages: [
+    temperature: temperature || 0.7,
+    ...rest,
+  };
+  if (responses_api) {
+    for (const tool of body.tools || []) {
+      if (tool.type !== "function") continue;
+      tool.name = tool.function.name;
+      tool.description = tool.function.description;
+      tool.parameters = tool.function.parameters;
+      if (tool.function.required) tool.required = tool.function.required;
+      delete tool.function;
+    }
+    const newChat = [];
+    (chat || []).forEach((c) => {
+      if (c.tool_calls) {
+        c.tool_calls.forEach((tc) => {
+          newChat.push({
+            id: tc.id,
+            type: "function_call",
+            call_id: tc.call_id,
+            name: tc.name,
+            arguments: tc.arguments,
+          });
+        });
+      } else if (c.content?.image_calls) {
+        c.content.image_calls.forEach((ic) => {
+          newChat.push({
+            ...ic,
+            result: undefined,
+            filename: undefined,
+          });
+        });
+      } else if (c.role === "tool") {
+        newChat.push({
+          type: "function_call_output",
+          call_id: c.call_id,
+          output: c.content,
+        });
+      } else {
+        const fcontent = (c) => {
+          if (c.type === "image_url")
+            return {
+              type: "input_image",
+              image_url: c.image_url.url,
+            };
+          else return c;
+        };
+        newChat.push({
+          ...c,
+          content: Array.isArray(c.content)
+            ? c.content.map(fcontent)
+            : c.content,
+        });
+      }
+    });
+    body.input = [
+      {
+        role: "system",
+        content: systemPrompt || "You are a helpful assistant.",
+      },
+      ...newChat,
+      ...(prompt ? [{ role: "user", content: prompt }] : []),
+    ];
+  } else {
+    body.messages = [
       {
         role: "system",
         content: systemPrompt || "You are a helpful assistant.",
       },
       ...chat,
       ...(prompt ? [{ role: "user", content: prompt }] : []),
-    ],
-    temperature: temperature || 0.7,
-    ...rest,
-  };
+    ];
+  }
   if (debugResult)
     console.log(
       "OpenAI request",
@@ -198,19 +263,45 @@ const getCompletionOpenAICompatible = async (
     body: JSON.stringify(body),
   });
   const results = await rawResponse.json();
+  //console.log("results", results);
   if (debugResult)
     console.log("OpenAI response", JSON.stringify(results, null, 2));
   else getState().log(6, `OpenAI response ${JSON.stringify(results)}`);
   if (results.error) throw new Error(`OpenAI error: ${results.error.message}`);
-
-  return results?.choices?.[0]?.message?.tool_calls
-    ? {
-        tool_calls: results?.choices?.[0]?.message?.tool_calls,
-        content: results?.choices?.[0]?.message?.content || null,
-      }
-    : results?.choices?.[0]?.message?.content || null;
+  if (responses_api) {
+    const textOutput = results.output
+      .filter((o) => o.type === "message")
+      .map((o) => o.content.map((c) => c.text).join(""))
+      .join("");
+    return results.output.some(
+      (o) => o.type === "function_call" || o.type === "image_generation_call"
+    )
+      ? {
+          tool_calls: emptyToUndefined(
+            results.output
+              .filter((o) => o.type === "function_call")
+              .map((o) => ({
+                function: { name: o.name, arguments: o.arguments },
+                ...o,
+              }))
+          ),
+          image_calls: emptyToUndefined(
+            results.output.filter((o) => o.type === "image_generation_call")
+          ),
+          content: textOutput || null,
+        }
+      : textOutput || null;
+  } else
+    return results?.choices?.[0]?.message?.tool_calls
+      ? {
+          tool_calls: results?.choices?.[0]?.message?.tool_calls,
+          content: results?.choices?.[0]?.message?.content || null,
+        }
+      : results?.choices?.[0]?.message?.content || null;
 };
 
+const emptyToUndefined = (xs) => (xs.length ? xs : undefined);
+
 const getEmbeddingOpenAICompatible = async (
   config,
   { prompt, model, debugResult }

package/index.js

@@ -69,9 +69,9 @@ ${domReady(`
                 name: "ollama_host",
                 label: "Host",
                 sublabel: "Optional, for remote ollama server",
-                type: "String",                
+                type: "String",
                 showIf: { backend: "Local Ollama" },
-              },              
+              },
               {
                 name: "client_id",
                 label: "Client ID",
@@ -172,7 +172,16 @@ ${domReady(`
                 sublabel: "From your OpenAI account",
                 type: "String",
                 required: true,
+                fieldview: "password",
+                showIf: { backend: "OpenAI" },
+              },
+              {
+                name: "responses_api",
+                label: "Response API", //gpt-3.5-turbo
+                type: "Bool",
+                sublabel: "Use the newer Responses API",
                 showIf: { backend: "OpenAI" },
+                
               },
               {
                 name: "llama_dir",
@@ -462,6 +471,12 @@ module.exports = {
               type: "String",
             },
             ...override_fields,
+            {
+              name: "model",
+              label: "Model",
+              sublabel: "Override default model name",
+              type: "String",
+            },
           ];
         } else if (table) {
           const textFields = table.fields
@@ -507,6 +522,7 @@ module.exports = {
           answer_field,
           override_config,
           chat_history_field,
+          model,
         },
       }) => {
         let prompt;
@@ -530,6 +546,7 @@ module.exports = {
           opts.api_key = altcfg.api_key;
           opts.bearer = altcfg.bearer;
         }
+        if (model) opts.model = model;
         let history = [];
         if (chat_history_field && row[chat_history_field]) {
           history = row[chat_history_field];

package/package.json

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