@saltcorn/large-language-model 0.7.3 → 0.7.4

package/generate.js

@@ -274,7 +274,7 @@ const initOAuth2Client = async (config) => {
 
 const convertChatToVertex = (chat) => {
   const history = [];
-  for (const message of chat) {
+  for (const message of chat || []) {
     const role = message.role === "user" ? "user" : "model";
     if (message.content) {
       const parts = [{ text: message.content }];
@@ -320,15 +320,20 @@ const getCompletionGoogleVertex = async (config, opts, oauth2Client) => {
   const generativeModel = vertexAI.getGenerativeModel({
     model: config.model,
   });
-  const chat = generativeModel.startChat({
-    tools: [
+  const chatParams = {
+    history: convertChatToVertex(opts.chat),
+    systemPrompt: opts.systemPrompt || "You are a helpful assistant.",
+  };
+  if (opts?.tools?.length > 0) {
+    chatParams.tools = [
       {
-        functionDeclarations: opts.tools.map((t) => t.function),
+        functionDeclarations: opts.tools.map((t) =>
+          prepFuncArgsForChat(t.function)
+        ),
       },
-    ],
-    history: convertChatToVertex(opts.chat),
-    systemInstructions: opts.systemPrompt || "You are a helpful assistant.",
-  });
+    ];
+  }
+  const chat = generativeModel.startChat(chatParams);
   const { response } = await chat.sendMessage([{ text: opts.prompt }]);
   const parts = response?.candidates?.[0]?.content?.parts;
   if (!parts) return "";

package/index.js

@@ -316,6 +316,7 @@ const routes = (config) => {
         const authUrl = oauth2Client.generateAuthUrl({
           access_type: "offline",
           scope: "https://www.googleapis.com/auth/cloud-platform",
+          prompt: "consent",
         });
         res.redirect(authUrl);
       },
@@ -355,6 +356,10 @@ const routes = (config) => {
             const newConfig = { ...(plugin.configuration || {}), tokens };
             plugin.configuration = newConfig;
             await plugin.upsert();
+            getState().processSend({
+              refresh_plugin_cfg: plugin.name,
+              tenant: db.getTenantSchema(),
+            });
             req.flash(
               "success",
               req.__("Authentication successful! You can now use Vertex AI.")

package/package.json

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