@saltcorn/large-language-model 0.7.3 → 0.7.5

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 }];
@@ -319,16 +319,27 @@ const getCompletionGoogleVertex = async (config, opts, oauth2Client) => {
   });
   const generativeModel = vertexAI.getGenerativeModel({
     model: config.model,
+    systemInstruction: {
+      role: "system",
+      parts: [{ text: opts.systemPrompt || "You are a helpful assistant." }],
+    },
+    generationCon0fig: {
+      temperature: config.temperature || 0.7,
+    },
   });
-  const chat = generativeModel.startChat({
-    tools: [
+  const chatParams = {
+    history: convertChatToVertex(opts.chat),
+  };
+  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 "";
@@ -339,6 +350,7 @@ const getCompletionGoogleVertex = async (config, opts, oauth2Client) => {
       if (part.functionCall) {
         const toolCall = {
           function: prepFuncArgsForChat(part.functionCall),
+          id: Math.floor(Math.random() * 1000000),
         };
         if (!result.tool_calls) result.tool_calls = [toolCall];
         else result.tool_calls.push(toolCall);

package/index.js

@@ -95,10 +95,28 @@ ${domReady(`
                 type: "String",
                 showIf: { backend: "Google Vertex AI" },
                 attributes: {
-                  options: ["gemini-1.5-pro", "gemini-1.5-flash"],
+                  options: [
+                    "gemini-1.5-pro",
+                    "gemini-1.5-flash",
+                    "gemini-2.0-flash",
+                  ],
                 },
                 required: true,
               },
+              {
+                name: "temperature",
+                label: "Temperature",
+                type: "Float",
+                sublabel:
+                  "Controls the randomness of predictions. Higher values make the output more random.",
+                showIf: { backend: "Google Vertex AI" },
+                default: 0.7,
+                attributes: {
+                  min: 0,
+                  max: 1,
+                  decimal_places: 1,
+                },
+              },
               {
                 name: "embed_model",
                 label: "Embedding model",
@@ -303,6 +321,11 @@ const routes = (config) => {
       url: "/large-language-model/vertex/authorize",
       method: "get",
       callback: async (req, res) => {
+        const role = req?.user?.role_id || 100;
+        if (role > 1) {
+          req.flash("error", req.__("Not authorized"));
+          return res.redirect("/");
+        }
         const { client_id, client_secret } = config || {};
         const baseUrl = (
           getState().getConfig("base_url") || "http://localhost:3000"
@@ -316,6 +339,7 @@ const routes = (config) => {
         const authUrl = oauth2Client.generateAuthUrl({
           access_type: "offline",
           scope: "https://www.googleapis.com/auth/cloud-platform",
+          prompt: "consent",
         });
         res.redirect(authUrl);
       },
@@ -324,6 +348,11 @@ const routes = (config) => {
       url: "/large-language-model/vertex/callback",
       method: "get",
       callback: async (req, res) => {
+        const role = req?.user?.role_id || 100;
+        if (role > 1) {
+          req.flash("error", req.__("Not authorized"));
+          return res.redirect("/");
+        }
         const { client_id, client_secret } = config || {};
         const baseUrl = (
           getState().getConfig("base_url") || "http://localhost:3000"
@@ -355,6 +384,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.5",
   "description": "Large language models and functionality for Saltcorn",
   "main": "index.js",
   "dependencies": {