@saltcorn/large-language-model 0.7.8 → 0.7.10

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

@@ -171,7 +171,7 @@ const getCompletionOpenAICompatible = async (
         content: systemPrompt || "You are a helpful assistant.",
       },
       ...chat,
-      { role: "user", content: prompt },
+      ...(prompt ? [{ role: "user", content: prompt }] : []),
     ],
     temperature: temperature || 0.7,
     ...rest,
@@ -185,6 +185,13 @@ const getCompletionOpenAICompatible = async (
       "headers",
       JSON.stringify(headers)
     );
+  else
+    getState().log(
+      6,
+      `OpenAI request ${JSON.stringify(
+        body
+      )} to ${chatCompleteEndpoint} headers ${JSON.stringify(headers)}`
+    );
   const rawResponse = await fetch(chatCompleteEndpoint, {
     method: "POST",
     headers,
@@ -193,6 +200,7 @@ const getCompletionOpenAICompatible = async (
   const results = await rawResponse.json();
   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

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",
@@ -462,6 +462,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 +513,7 @@ module.exports = {
           answer_field,
           override_config,
           chat_history_field,
+          model,
         },
       }) => {
         let prompt;
@@ -530,6 +537,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.8",
+  "version": "0.7.10",
   "description": "Large language models and functionality for Saltcorn",
   "main": "index.js",
   "dependencies": {