@exulu/backend 1.51.1 → 1.52.0

package/dist/index.cjs

@@ -11331,12 +11331,16 @@ Mood: friendly and intelligent.
           message = req.body.message;
         }
         const approvedTools = req.body.approvedTools ? typeof req.body.approvedTools === "string" ? JSON.parse(req.body.approvedTools) : req.body.approvedTools : [];
+        const customInstructions = req.body.customInstructions ? typeof req.body.customInstructions === "string" ? req.body.customInstructions : JSON.stringify(req.body.customInstructions) : "";
+        const instructions = customInstructions ? `${agent.instructions}
+
+${customInstructions}` : agent.instructions;
         const result = await provider.generateStream({
           contexts,
           rerankers: rerankers || [],
           agent,
           user,
-          instructions: agent.instructions,
+          instructions,
           session: headers.session,
           message,
           previousMessages,
@@ -11437,6 +11441,10 @@ Mood: friendly and intelligent.
         });
         return;
       } else {
+        const customInstructions = req.body.customInstructions ? typeof req.body.customInstructions === "string" ? req.body.customInstructions : JSON.stringify(req.body.customInstructions) : "";
+        const instructions = customInstructions ? `${agent.instructions}
+
+${customInstructions}` : agent.instructions;
         const response = await provider.generateSync({
           contexts,
           rerankers: rerankers || [],
@@ -11444,7 +11452,7 @@ Mood: friendly and intelligent.
           agent,
           user,
           req,
-          instructions: agent.instructions,
+          instructions,
           session: headers.session,
           inputMessages: [req.body.message],
           currentTools: enabledTools,
@@ -11589,6 +11597,10 @@ Mood: friendly and intelligent.
           providers,
           user
         );
+        const customInstructions = req.body.customInstructions ? typeof req.body.customInstructions === "string" ? req.body.customInstructions : JSON.stringify(req.body.customInstructions) : "";
+        const agentInstructions = customInstructions ? `${agent?.instructions}
+
+${customInstructions}` : agent?.instructions;
         let system = req.body.system;
         if (Array.isArray(req.body.system)) {
           system = [
@@ -11598,7 +11610,7 @@ Mood: friendly and intelligent.
                 type: "text",
                 text: `
                             You are an agent named: ${agent?.name}
-                            Here are some additional instructions for you: ${agent?.instructions}`
+                            Here are some additional instructions for you: ${agentInstructions}`
               }
             ] : [],
             ...project ? [
@@ -11616,7 +11628,7 @@ Mood: friendly and intelligent.
 
 
                 ${agent ? `You are an agent named: ${agent?.name}
-                Here are some additional instructions for you: ${agent?.instructions}` : ""}
+                Here are some additional instructions for you: ${agentInstructions}` : ""}
 
                 ${project?.id ? `Additional information:
 
@@ -15954,6 +15966,7 @@ var MarkdownChunker = class {
       if (currentSlice.length === 0) {
         currentPosition++;
         targetPosition = currentPosition + chunkSize * this._CHARS_PER_TOKEN;
+        contentLeft = text.length - currentPosition;
       }
     }
     const mergedChunks = [];
@@ -16701,7 +16714,8 @@ var getMistralApiKey = async () => {
   if (process.env.MISTRAL_API_KEY) {
     return process.env.MISTRAL_API_KEY;
   } else {
-    return await ExuluVariables.get("MISTRAL_API_KEY");
+    const variable = await ExuluVariables.get("MISTRAL_API_KEY");
+    return variable;
   }
 };
 async function processPdf(buffer, paths, config, verbose = false) {
@@ -16760,7 +16774,7 @@ ${setupResult.output || ""}`);
       }];
     } else if (config?.processor.name === "mistral") {
       const MISTRAL_API_KEY = await getMistralApiKey();
-      if (MISTRAL_API_KEY) {
+      if (!MISTRAL_API_KEY) {
         throw new Error('[EXULU] MISTRAL_API_KEY is not set, please set it in the environment variable via process.env or via an Exulu variable named "MISTRAL_API_KEY".');
       }
       await new Promise((resolve3) => setTimeout(resolve3, Math.floor(Math.random() * 4e3) + 1e3));

package/dist/index.js

@@ -11297,12 +11297,16 @@ Mood: friendly and intelligent.
           message = req.body.message;
         }
         const approvedTools = req.body.approvedTools ? typeof req.body.approvedTools === "string" ? JSON.parse(req.body.approvedTools) : req.body.approvedTools : [];
+        const customInstructions = req.body.customInstructions ? typeof req.body.customInstructions === "string" ? req.body.customInstructions : JSON.stringify(req.body.customInstructions) : "";
+        const instructions = customInstructions ? `${agent.instructions}
+
+${customInstructions}` : agent.instructions;
         const result = await provider.generateStream({
           contexts,
           rerankers: rerankers || [],
           agent,
           user,
-          instructions: agent.instructions,
+          instructions,
           session: headers.session,
           message,
           previousMessages,
@@ -11403,6 +11407,10 @@ Mood: friendly and intelligent.
         });
         return;
       } else {
+        const customInstructions = req.body.customInstructions ? typeof req.body.customInstructions === "string" ? req.body.customInstructions : JSON.stringify(req.body.customInstructions) : "";
+        const instructions = customInstructions ? `${agent.instructions}
+
+${customInstructions}` : agent.instructions;
         const response = await provider.generateSync({
           contexts,
           rerankers: rerankers || [],
@@ -11410,7 +11418,7 @@ Mood: friendly and intelligent.
           agent,
           user,
           req,
-          instructions: agent.instructions,
+          instructions,
           session: headers.session,
           inputMessages: [req.body.message],
           currentTools: enabledTools,
@@ -11555,6 +11563,10 @@ Mood: friendly and intelligent.
           providers,
           user
         );
+        const customInstructions = req.body.customInstructions ? typeof req.body.customInstructions === "string" ? req.body.customInstructions : JSON.stringify(req.body.customInstructions) : "";
+        const agentInstructions = customInstructions ? `${agent?.instructions}
+
+${customInstructions}` : agent?.instructions;
         let system = req.body.system;
         if (Array.isArray(req.body.system)) {
           system = [
@@ -11564,7 +11576,7 @@ Mood: friendly and intelligent.
                 type: "text",
                 text: `
                             You are an agent named: ${agent?.name}
-                            Here are some additional instructions for you: ${agent?.instructions}`
+                            Here are some additional instructions for you: ${agentInstructions}`
               }
             ] : [],
             ...project ? [
@@ -11582,7 +11594,7 @@ Mood: friendly and intelligent.
 
 
                 ${agent ? `You are an agent named: ${agent?.name}
-                Here are some additional instructions for you: ${agent?.instructions}` : ""}
+                Here are some additional instructions for you: ${agentInstructions}` : ""}
 
                 ${project?.id ? `Additional information:
 
@@ -15920,6 +15932,7 @@ var MarkdownChunker = class {
       if (currentSlice.length === 0) {
         currentPosition++;
         targetPosition = currentPosition + chunkSize * this._CHARS_PER_TOKEN;
+        contentLeft = text.length - currentPosition;
       }
     }
     const mergedChunks = [];
@@ -16667,7 +16680,8 @@ var getMistralApiKey = async () => {
   if (process.env.MISTRAL_API_KEY) {
     return process.env.MISTRAL_API_KEY;
   } else {
-    return await ExuluVariables.get("MISTRAL_API_KEY");
+    const variable = await ExuluVariables.get("MISTRAL_API_KEY");
+    return variable;
   }
 };
 async function processPdf(buffer, paths, config, verbose = false) {
@@ -16726,7 +16740,7 @@ ${setupResult.output || ""}`);
       }];
     } else if (config?.processor.name === "mistral") {
       const MISTRAL_API_KEY = await getMistralApiKey();
-      if (MISTRAL_API_KEY) {
+      if (!MISTRAL_API_KEY) {
         throw new Error('[EXULU] MISTRAL_API_KEY is not set, please set it in the environment variable via process.env or via an Exulu variable named "MISTRAL_API_KEY".');
       }
       await new Promise((resolve3) => setTimeout(resolve3, Math.floor(Math.random() * 4e3) + 1e3));

package/ee/chunking/markdown.ts

@@ -715,6 +715,7 @@ export class MarkdownChunker {
             if (currentSlice.length === 0) {
                 currentPosition++;
                 targetPosition = currentPosition + (chunkSize * this._CHARS_PER_TOKEN);
+                contentLeft = text.length - currentPosition;
             }
         }
 

package/ee/python/documents/processing/doc_processor.ts

@@ -591,7 +591,8 @@ const getMistralApiKey = async () => {
   if (process.env.MISTRAL_API_KEY) {
     return process.env.MISTRAL_API_KEY;
   } else {
-    return await ExuluVariables.get("MISTRAL_API_KEY");
+    const variable = await ExuluVariables.get("MISTRAL_API_KEY");
+    return variable;
   }
 }
 
@@ -667,7 +668,7 @@ async function processPdf(
     } else if (config?.processor.name === "mistral") {
 
       const MISTRAL_API_KEY = await getMistralApiKey();
-      if (MISTRAL_API_KEY) {
+      if (!MISTRAL_API_KEY) {
         throw new Error('[EXULU] MISTRAL_API_KEY is not set, please set it in the environment variable via process.env or via an Exulu variable named "MISTRAL_API_KEY".');
       }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@exulu/backend",
   "author": "Qventu Bv.",
-  "version": "1.51.1",
+  "version": "1.52.0",
   "main": "./dist/index.js",
   "private": false,
   "publishConfig": {