goblin-agents 2.1.0 → 2.1.1

package/lib/llm/aiAgent.js

@@ -129,6 +129,17 @@ function vectorToSqlLiteralInt8(vec) {
   return hex;
 }
 
+function cleanText(text) {
+  if (typeof text !== 'string') {
+    return text;
+  }
+  const {thinks, cleanText} = splitThinkTags(text);
+  for (const think of thinks) {
+    this.log.dbg(`🧐 ${think}`);
+  }
+  return cleanText;
+}
+
 class AiAgentShape {
   id = id('aiAgent');
   version = number;
@@ -294,7 +305,7 @@ class AiAgent extends Elf {
 
   _provider;
   _conf;
-  _batchLock = getMutex;
+  _mutex = getMutex;
 
   /**
    * @param {string} id
@@ -368,26 +379,30 @@ class AiAgent extends Elf {
   }
 
   async gen(prompt) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
 
     let options;
     if (this.state.options) {
       options = this.state.options.toJS();
     }
-    const res = await this._provider.gen({
+    const format = this.state.format
+      ? typeof this.state.format === 'string'
+        ? this.state.format
+        : this.state.format.toJS()
+      : undefined;
+    let res = await this._provider.gen({
       model: this.state.model,
       reasoning: this.state.reasoning,
       prompt,
       system: this.state.prompt,
-      format: this.state.format?.toJS(),
+      format,
       options,
       stream: false,
     });
-    const {thinks, cleanText} = splitThinkTags(res);
-    for (const think of thinks) {
-      this.log.dbg(`🧐 ${think}`);
-    }
-    return cleanText;
+    return cleanText(res);
   }
 
   async reset(contextId, save = false) {
@@ -404,6 +419,9 @@ class AiAgent extends Elf {
   }
 
   async readPDFpages(pdfPath) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
 
     const images = await getPDFImages(pdfPath);
@@ -440,6 +458,10 @@ class AiAgent extends Elf {
     if (!rawText) {
       return null;
     }
+
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const vectors = await this._provider.embed({
       model: this.state.model,
@@ -457,8 +479,8 @@ class AiAgent extends Elf {
       return [];
     }
 
-    await this._batchLock.lock(this.id);
-    this.quest.defer(() => this._batchLock.unlock(this.id));
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
 
     await this._loadProvider();
     const res = await this._provider.embedInBatch({
@@ -477,6 +499,9 @@ class AiAgent extends Elf {
   }
 
   async chat(contextId, question, userDesktopId) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const contextMessages = this.state.messages[contextId] || [];
     const messages = [
@@ -522,23 +547,22 @@ class AiAgent extends Elf {
       }
     }
 
-    //keep agent response
-    const {thinks, cleanText} = splitThinkTags(result.message.content);
-    this.logic.chat(contextId, 'assistant', cleanText);
-    for (const think of thinks) {
-      this.log.dbg(`🧐 ${think}`);
+    const res = cleanText(result.message.content);
+    if (typeof res === 'string') {
+      //keep agent response
+      this.logic.chat(contextId, 'assistant', cleanText);
     }
-    this.log.dbg(`🐈 Chat session ended : ${contextId}`);
 
-    return cleanText;
+    this.log.dbg(`🐈 Chat session ended : ${contextId}`);
+    return res;
   }
 
   async callTools(contextId, message, userDesktopId) {
-    const {tool_calls, content} = message;
+    const {tool_calls} = message;
     if (!tool_calls || !userDesktopId) {
       return false;
     }
-    this.logic.callTools(contextId, content, tool_calls);
+    this.logic.callTools(contextId, tool_calls);
     for (const tool of tool_calls) {
       const {
         id,
@@ -585,6 +609,10 @@ class AiAgent extends Elf {
     if (this.state.provider !== 'ollama') {
       throw new Error('Streaming API not impl.');
     }
+
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
 
     const contextMessages = this.state.messages[contextId] || [];
@@ -619,6 +647,9 @@ class AiAgent extends Elf {
   }
 
   async resumeExchange(resumePrompt, contextId) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const contextMessages = this.state.messages[contextId] || [];
 
@@ -643,6 +674,9 @@ class AiAgent extends Elf {
   }
 
   async react(reactPrompt, contextId, question) {
+    await this._mutex.lock(this.id);
+    this.quest.defer(() => this._mutex.unlock(this.id));
+
     await this._loadProvider();
     const feedId = await this.newQuestFeed();
     const contextMessages = this.state.messages[contextId] || [];

package/lib/llm/utils.js

@@ -236,8 +236,23 @@ function groupSentences(text, maxSize) {
   return chunks;
 }
 
+/**
+ * Construit un prompt à partir d'une liste d'articles, avec gestion du format et de la limite de tokens.
+ *
+ * @param {ArticleShape[]} articles - Liste des articles sources utilisés pour générer le prompt.
+ * @param {"text"|"json"} [format="text"] - Format de sortie attendu :
+ *   - `"text"` → prompt en texte brut
+ *   - `"json"` → prompt structuré en JSON
+ * @param {number} [maxTotalTokens] - Nombre maximal de tokens autorisés dans le prompt.
+ *   Si non défini, aucun contrôle n'est appliqué.
+ * @param {function} [dbg=() => null] - Fonction de débogage optionnelle appelée
+ *   avec des informations intermédiaires (signature `(info: any) => void`).
+ * @returns {string} - Le prompt généré, soit en texte brut (string),
+ *   soit en objet JSON stringifié selon le format choisi.
+ */
 function buildPromptFromArticlesMulti(
   articles,
+  format = 'text',
   maxTotalTokens,
   dbg = () => null
 ) {
@@ -247,15 +262,23 @@ function buildPromptFromArticlesMulti(
   let sections = [];
   let sectionTokenCount = 0;
   for (const article of articles) {
-    const {kind, title, sourceId, distance, combinedScore, chunk} = article;
-    const articleBlock = JSON.stringify({
-      kind,
-      title,
-      url: sourceId.startsWith('http') ? sourceId : null,
-      distance,
-      combinedScore,
-      chunk,
-    });
+    const {kind, title, sourceId, description, finalScore} = article;
+
+    let articleBlock = '';
+    if (format === 'json') {
+      articleBlock = JSON.stringify({
+        kind,
+        title,
+        url: sourceId.startsWith('http') ? sourceId : null,
+        finalScore,
+        description,
+      });
+    } else {
+      articleBlock += `# ${title}\n\n`;
+      articleBlock += `**score :** ${finalScore}\n\n`;
+      articleBlock += `\`\`\`html\n${description}\n\`\`\`\n\n`;
+    }
+
     dbg(articleBlock);
     const tokensForArticle = estimateTokenCount(articleBlock);
 
@@ -268,7 +291,10 @@ function buildPromptFromArticlesMulti(
     sectionTokenCount += tokensForArticle;
   }
 
-  return `[${sections.join(',')}]`;
+  if (format === 'json') {
+    return `[${sections.join(',')}]`;
+  }
+  return sections.join('---\n\n');
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "goblin-agents",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "AI Agents framework",
   "author": "Epsitec SA",
   "contributors": [