@saltcorn/large-language-model 0.9.5 → 0.9.7

package/generate.js

@@ -213,6 +213,7 @@ const getCompletionAISDK = async (
   }
 
   const body = {
+    ...rest,
     model: model_obj,
     messages: [
       {
@@ -222,7 +223,6 @@ const getCompletionAISDK = async (
       ...chat,
       ...(prompt ? [{ role: "user", content: prompt }] : []),
     ],
-    ...rest,
   };
   if (rest.temperature || temperature) {
     const str_or_num = rest.temperature || temperature;
@@ -257,7 +257,7 @@ 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, `OpenAI request ${JSON.stringify(debugRequest)} `);
+  getState().log(6, `AI SDK request ${JSON.stringify(debugRequest)} `);
   if (debugCollector) debugCollector.request = debugRequest;
   const reqTimeStart = Date.now();
 
@@ -270,8 +270,8 @@ const getCompletionAISDK = async (
     }
   } else results = await generateText(body);
   if (debugResult)
-    console.log("OpenAI response", JSON.stringify(results, null, 2));
-  else getState().log(6, `OpenAI response ${JSON.stringify(results)}`);
+    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;
@@ -669,11 +669,11 @@ const getEmbeddingAISDK = async (config, { prompt, model, debugResult }) => {
     providerOptions,
   };
   if (Array.isArray(prompt)) {
-    body.values = prompt
+    body.values = prompt;
     const { embeddings } = await embedMany(body);
     return embeddings;
   } else {
-    body.value = prompt
+    body.value = prompt;
     const { embedding } = await embed(body);
     return embedding;
   }

package/index.js

@@ -809,6 +809,7 @@ module.exports = {
             {
               name: "name",
               label: "Name",
+              class: "validate-identifier",
               sublabel: "The field name, as a valid JavaScript identifier",
               type: "String",
               required: true,
@@ -828,6 +829,13 @@ module.exports = {
                 options: ["string", "integer", "number", "boolean"],
               },
             },
+            {
+              name: "options",
+              label: "Options",
+              type: "String",
+              sublabel: "Optional. Comma-separated list of values",
+              showIf: { type: "string" },
+            },
           ],
         });
 
@@ -898,6 +906,12 @@ module.exports = {
             sublabel: "A short description of what you want to generate.",
             type: "String",
           },
+          {
+            name: "model",
+            label: "Model",
+            sublabel: "Override default model name",
+            type: "String",
+          },
           {
             input_type: "section_header",
             label: "JSON fields to generate",
@@ -914,16 +928,18 @@ module.exports = {
         configuration: {
           prompt_template,
           fields,
-          mulitple,
+          multiple,
           gen_description,
           answer_field,
           override_config,
           chat_history_field,
+          model,
         },
       }) => {
         let prompt = interpolate(prompt_template, row, user);
 
         const opts = {};
+        if (model) opts.model = model;
         if (override_config) {
           const altcfg = config.altconfigs.find(
             (c) => c.name === override_config
@@ -943,10 +959,14 @@ module.exports = {
             type: field.type,
             description: field.description,
           };
+          if (field.type === "string" && field.options)
+            fieldArgs[field.name].enum = field.options
+              .split(",")
+              .map((s) => s.trim());
         });
         const argObj = { type: "object", properties: fieldArgs };
         const args = {
-          [answer_field]: mulitple ? { type: "array", items: argObj } : argObj,
+          [answer_field]: multiple ? { type: "array", items: argObj } : argObj,
         };
         const expert_function = {
           type: "function",
@@ -969,9 +989,11 @@ module.exports = {
           ...opts,
           ...toolargs,
         });
-        const ans = JSON.parse(compl.tool_calls[0].function.arguments)[
-          answer_field
-        ];
+        console.log(JSON.stringify(compl, null, 2));
+
+        const ans = compl.tool_calls[0].input
+          ? compl.tool_calls[0].input[answer_field]
+          : JSON.parse(compl.tool_calls[0].function.arguments)[answer_field];
         const upd = { [answer_field]: ans };
         if (chat_history_field) {
           upd[chat_history_field] = [

package/package.json

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