@saltcorn/large-language-model 0.6.4 → 0.6.6

package/generate.js

@@ -174,12 +174,12 @@ const getCompletionOpenAICompatible = async (
     console.log("OpenAI response", JSON.stringify(results, null, 2));
   if (results.error) throw new Error(`OpenAI error: ${results.error.message}`);
 
-  return (
-    results?.choices?.[0]?.message?.content ||
-    (results?.choices?.[0]?.message?.tool_calls
-      ? { tool_calls: results?.choices?.[0]?.message?.tool_calls }
-      : null)
-  );
+  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 getEmbeddingOpenAICompatible = async (

package/index.js

@@ -194,6 +194,7 @@ module.exports = {
   actions: (config) => ({
     llm_function_call: require("./function-insert-action.js")(config),
     llm_generate: {
+      description: "Generate text with AI based on a text prompt",
       requireRow: true,
       configFields: ({ table, mode }) => {
         const override_fields =
@@ -236,8 +237,7 @@ module.exports = {
             },
             ...override_fields,
           ];
-        }
-        if (table) {
+        } else if (table) {
           const textFields = table.fields
             .filter((f) => f.type?.sql_name === "text")
             .map((f) => f.name);
@@ -318,7 +318,203 @@ module.exports = {
           upd[chat_history_field] = [
             ...history,
             { role: "user", content: prompt },
-            { role: "system", content: ans },
+            { role: "assistant", content: ans },
+          ];
+        }
+        if (mode === "workflow") return upd;
+        else await table.updateRow(upd, row[table.pk_name]);
+      },
+    },
+    llm_generate_json: {
+      description: "Generate JSON with AI based on a text prompt. You must sppecify the JSON fields in the configuration.",
+      requireRow: true,
+      configFields: ({ table, mode }) => {
+        const override_fields =
+          config.backend === "OpenAI-compatible API" &&
+          (config.altconfigs || []).filter((c) => c.name).length
+            ? [
+                {
+                  name: "override_config",
+                  label: "Alternative LLM configuration",
+                  type: "String",
+                  attributes: { options: config.altconfigs.map((c) => c.name) },
+                },
+              ]
+            : [];
+        const cfgFields = [];
+        const fieldsField = new FieldRepeat({
+          name: "fields",
+          fields: [
+            {
+              name: "name",
+              label: "Name",
+              sublabel: "The field name, as a valid JavaScript identifier",
+              type: "String",
+              required: true,
+            },
+            {
+              label: "Description",
+              name: "description",
+              sublabel: "A description of the field.",
+              type: "String",
+            },
+            {
+              name: "type",
+              label: "Type",
+              type: "String",
+              required: true,
+              attributes: {
+                options: ["string", "integer", "number", "boolean"],
+              },
+            },
+          ],
+        });
+
+        if (mode === "workflow") {
+          cfgFields.push(
+            {
+              name: "prompt_template",
+              label: "Prompt",
+              sublabel:
+                "Prompt text. Use interpolations {{ }} to access variables in the context",
+              type: "String",
+              fieldview: "textarea",
+              required: true,
+            },
+            {
+              name: "answer_field",
+              label: "Answer variable",
+              sublabel: "Set the generated answer to this context variable",
+              type: "String",
+              required: true,
+            },
+            {
+              name: "chat_history_field",
+              label: "Chat history variable",
+              sublabel:
+                "Use this context variable to store the chat history for subsequent prompts",
+              type: "String",
+            }
+          );
+        } else if (table) {
+          const jsonFields = table.fields
+            .filter((f) => f.type?.name === "JSON")
+            .map((f) => f.name);
+
+          cfgFields.push(
+            {
+              name: "prompt_template",
+              label: "Prompt",
+              sublabel:
+                "Prompt text. Use interpolations {{ }} to access variables in the row",
+              type: "String",
+              fieldview: "textarea",
+              required: true,
+            },
+            {
+              name: "answer_field",
+              label: "Answer field",
+              sublabel: "Output field will be set to the generated data",
+              type: "String",
+              required: true,
+              attributes: { options: jsonFields },
+            }
+          );
+        }
+
+        cfgFields.push(
+          ...override_fields,
+          {
+            name: "multiple",
+            label: "Multiple",
+            type: "Bool",
+            sublabel:
+              "Select (true) to generate an array of objects. Unselect (false) for a single object",
+          },
+          {
+            name: "gen_description",
+            label: "Description",
+            sublabel: "A short description of what you want to generate.",
+            type: "String",
+          },
+          {
+            input_type: "section_header",
+            label: "JSON fields to generate",
+          },
+          fieldsField
+        );
+        return cfgFields;
+      },
+      run: async ({
+        row,
+        table,
+        user,
+        mode,
+        configuration: {
+          prompt_template,
+          fields,
+          mulitple,
+          gen_description,
+          answer_field,
+          override_config,
+          chat_history_field,
+        },
+      }) => {
+        let prompt = interpolate(prompt_template, row, user);
+
+        const opts = {};
+        if (override_config) {
+          const altcfg = config.altconfigs.find(
+            (c) => c.name === override_config
+          );
+          opts.endpoint = altcfg.endpoint;
+          opts.model = altcfg.model;
+          opts.api_key = altcfg.api_key;
+          opts.bearer = altcfg.bearer;
+        }
+        let history = [];
+        if (chat_history_field && row[chat_history_field]) {
+          history = row[chat_history_field];
+        }
+        const fieldArgs = {};
+        (fields || []).forEach((field) => {
+          fieldArgs[field.name] = {
+            type: field.type,
+            description: field.description,
+          };
+        });
+        const argObj = { type: "object", properties: fieldArgs };
+        const args = {
+          [answer_field]: mulitple ? { type: "array", items: argObj } : argObj,
+        };
+        const expert_function = {
+          type: "function",
+          function: {
+            name: answer_field,
+            description: gen_description || undefined,
+            parameters: {
+              type: "object",
+              properties: args,
+            },
+          },
+        };
+        const toolargs = {
+          tools: [expert_function],
+          tool_choice: { type: "function", function: { name: answer_field } },
+        };
+        const compl = await getCompletion(config, {
+          prompt,
+          chat: history,
+          ...opts,
+          ...toolargs,
+        });
+        const ans = JSON.parse(compl.tool_calls[0].function.arguments)[answer_field];
+        const upd = { [answer_field]: ans };
+        if (chat_history_field) {
+          upd[chat_history_field] = [
+            ...history,
+            { role: "user", content: prompt },
+            { role: "assistant", content: ans },
           ];
         }
         if (mode === "workflow") return upd;

package/package.json

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