@eeacms/volto-eea-chatbot 2.0.5 → 3.0.1

package/src/ChatBlock/services/messageProcessor.ts

@@ -33,6 +33,7 @@ export class MessageProcessor {
   private _errorContent: string = '';
   private _documents: OnyxDocument[] = [];
   private _citations = new Map<number, string>();
+  private _citationsAreFallback: boolean = false;
   private _isComplete: boolean = false;
   private _isFinalMessageComing: boolean = false;
 
@@ -208,20 +209,28 @@ export class MessageProcessor {
 
     if (newDocuments) {
       this._documents = Array.from(this.documentMap.values());
+    }
 
-      // If we have final_documents and no citations yet, create a fallback mapping
-      // This ensures the Sources tab shows up in v3 when citation_info is missing
-      if (
-        packet.obj.type === PacketType.MESSAGE_START &&
-        data.final_documents &&
-        this._citations.size === 0
-      ) {
-        data.final_documents.forEach((doc: OnyxDocument, index: number) => {
-          if (doc.document_id) {
-            this._citations.set(index + 1, doc.document_id);
-          }
-        });
-      }
+    // If we have final_documents and no citations yet, create a fallback mapping
+    // This ensures the Sources tab shows up in v3 when citation_info is missing
+    if (
+      packet.obj.type === PacketType.MESSAGE_START &&
+      data.final_documents &&
+      this._citations.size === 0
+    ) {
+      data.final_documents.forEach((doc: OnyxDocument, index: number) => {
+        if (doc.document_id) {
+          this._citations.set(index + 1, doc.document_id);
+        }
+      });
+      this._citationsAreFallback = this._citations.size > 0;
+    }
+  }
+
+  private clearFallbackCitations(): void {
+    if (this._citationsAreFallback) {
+      this._citations.clear();
+      this._citationsAreFallback = false;
     }
   }
 
@@ -233,6 +242,7 @@ export class MessageProcessor {
     if (packet.obj.type === PacketType.CITATION_INFO) {
       const citationInfo = packet.obj as any;
       if (citationInfo.citation_number && citationInfo.document_id) {
+        this.clearFallbackCitations();
         this._citations.set(
           citationInfo.citation_number,
           citationInfo.document_id,
@@ -244,7 +254,14 @@ export class MessageProcessor {
       return;
     }
     const citationDelta = packet.obj as CitationDelta;
-    citationDelta.citations?.forEach((citation: StreamingCitation) => {
+    const explicitCitations = (citationDelta.citations || []).filter(
+      (citation: StreamingCitation) =>
+        citation.citation_num != null && Boolean(citation.document_id),
+    );
+    if (explicitCitations.length > 0) {
+      this.clearFallbackCitations();
+    }
+    explicitCitations.forEach((citation: StreamingCitation) => {
       if (!this._citations.has(citation.citation_num)) {
         this._citations.set(citation.citation_num, citation.document_id);
       }
@@ -397,6 +414,7 @@ export class MessageProcessor {
     this._errorContent = '';
     this._documents = [];
     this._citations.clear();
+    this._citationsAreFallback = false;
     this._isComplete = false;
     this._isFinalMessageComing = false;
   }

package/src/ChatBlock/style.less

@@ -1604,14 +1604,6 @@ mark {
     }
   }
 
-  .tool-icon-default {
-    display: inline-block;
-    width: 0.5rem;
-    height: 0.5rem;
-    border-radius: 50%;
-    background-color: currentColor;
-  }
-
   // Content column
   .tool-content {
     flex: 1;
@@ -1625,17 +1617,6 @@ mark {
     display: flex;
   }
 
-  .tool-status {
-    display: flex;
-    align-items: center;
-    border-radius: 12px;
-    margin-bottom: 0.25rem;
-    color: @teal;
-    font-size: 0.875rem;
-    font-weight: 500;
-    gap: 0.25rem;
-  }
-
   .tool-text {
     color: #6b7280;
     font-size: 0.75rem;
@@ -1651,6 +1632,47 @@ mark {
 .multi-tool-renderer {
   margin-bottom: 1em;
 
+  // Shared tool state styles
+  .tool-icon-dot {
+    display: inline-block;
+    width: 0.5rem;
+    height: 0.5rem;
+    border-radius: 50%;
+    background-color: currentColor;
+  }
+
+  .tool-status {
+    display: flex;
+    align-items: center;
+    border-radius: 12px;
+    margin-bottom: 0.25rem;
+    color: @teal;
+    font-size: 0.875rem;
+    font-weight: 500;
+    gap: 0.25rem;
+  }
+
+  .tool-item-expanded.active .tool-icon-circle,
+  .tool-item-collapsed.active .tool-collapsed-icon {
+    color: @teal;
+  }
+
+  .active .tool-status {
+    animation: shimmer 2.5s linear infinite;
+    background: linear-gradient(
+      90deg,
+      @teal 0%,
+      @teal 40%,
+      rgba(0, 179, 174, 0.5) 50%,
+      @teal 60%,
+      @teal 100%
+    );
+    -webkit-background-clip: text;
+    background-clip: text;
+    background-size: 200% 100%;
+    -webkit-text-fill-color: transparent;
+  }
+
   // Common header styles for both collapsed and summary headers
   .tools-collapsed-header,
   .tools-summary-header {
@@ -1766,29 +1788,6 @@ mark {
       }
     }
 
-    &.active {
-      .tool-collapsed-icon {
-        position: relative;
-        color: @teal;
-      }
-
-      .tool-collapsed-status {
-        animation: shimmer 2.5s linear infinite;
-        background: linear-gradient(
-          90deg,
-          @teal 0%,
-          @teal 40%,
-          rgba(0, 179, 174, 0.5) 50%,
-          @teal 60%,
-          @teal 100%
-        );
-        -webkit-background-clip: text;
-        background-clip: text;
-        background-size: 200% 100%;
-        -webkit-text-fill-color: transparent;
-      }
-    }
-
     .tool-collapsed-icon {
       display: flex;
       width: 1rem;
@@ -1798,17 +1797,8 @@ mark {
       justify-content: center;
     }
 
-    .tool-icon-dot {
-      display: inline-block;
-      width: 6px;
-      height: 6px;
-      border-radius: 50%;
-      background-color: currentColor;
-    }
-
     .tool-collapsed-status {
       flex: 1;
-      font-weight: 500;
     }
   }
 

package/src/halloumi/filtering.js

@@ -4,13 +4,13 @@ import fetch from 'node-fetch';
 const log = debug('halloumi');
 
 const LLMGW_URL = process.env.LLMGW_URL;
-const LLMGW_API_KEY = process.env.LLMGW_TOKEN;
+const LLMGW_API_KEY = process.env.LLMGW_TOKEN; //betterleaks:allow
 const MIN_CONTEXT_SENTENCES_FOR_FILTERING = 75;
 
 const filterModel = {
   name: 'Inhouse-LLM/gpt-oss-120b',
   apiUrl: `${LLMGW_URL}/chat/completions`,
-  apiKey: LLMGW_API_KEY,
+  apiKey: LLMGW_API_KEY, //betterleaks:allow
 };
 
 export async function callLLM(apiUrl, apiKey, requestBody, { ip } = {}) {

package/src/halloumi/generative.test.js

@@ -196,7 +196,7 @@ describe('halloumiGenerativeAPI via real fetch', () => {
     const model = {
       name: 'test-model',
       apiUrl: 'http://test.com/api',
-      apiKey: 'test-key',
+      apiKey: 'test-key', //betterleaks:allow
     };
     const prompt = {
       prompt: 'test prompt',

package/src/halloumi/middleware.js

@@ -15,7 +15,7 @@ const ALLOWED_HALLOUMI_PATHS = [
 ];
 
 const LLMGW_URL = process.env.LLMGW_URL;
-const LLMGW_TOKEN = process.env.LLMGW_TOKEN;
+const LLMGW_TOKEN = process.env.LLMGW_TOKEN; //betterleaks:allow
 
 const generativeModel = {
   name: 'Inhouse-LLM/HallOumi-8B',
@@ -57,7 +57,7 @@ export default async function middleware(req, res, next) {
 
   const model = {
     ...(path === '/classify' ? classifyModel : generativeModel),
-    apiKey: LLMGW_TOKEN,
+    apiKey: LLMGW_TOKEN, //betterleaks:allow
   };
   const body = req.body;
 

package/src/halloumi/middleware.test.js

@@ -42,7 +42,7 @@ describe('halloumi middleware', () => {
       error: 'Invalid configuration: missing LLMGW_TOKEN or LLMGW_URL',
     });
 
-    process.env.LLMGW_TOKEN = origToken;
+    process.env.LLMGW_TOKEN = origToken; //betterleaks:allow
     process.env.LLMGW_URL = origUrl;
   });
 
@@ -92,7 +92,7 @@ describe('halloumi middleware - dynamic import', () => {
   it('sends response on successful getVerifyClaimResponse', async () => {
     const origToken = process.env.LLMGW_TOKEN;
     const origUrl = process.env.LLMGW_URL;
-    process.env.LLMGW_TOKEN = 'test-token';
+    process.env.LLMGW_TOKEN = 'test-token'; //betterleaks:allow
     process.env.LLMGW_URL = 'http://test-url';
 
     jest.resetModules();
@@ -116,14 +116,14 @@ describe('halloumi middleware - dynamic import', () => {
     expect(res.set).toHaveBeenCalledWith('Content-Type', 'application/json');
     expect(res.send).toHaveBeenCalledWith({ claims: [], segments: {} });
 
-    process.env.LLMGW_TOKEN = origToken;
+    process.env.LLMGW_TOKEN = origToken; //betterleaks:allow
     process.env.LLMGW_URL = origUrl;
   });
 
   it('handles errors from getVerifyClaimResponse', async () => {
     const origToken = process.env.LLMGW_TOKEN;
     const origUrl = process.env.LLMGW_URL;
-    process.env.LLMGW_TOKEN = 'test-token';
+    process.env.LLMGW_TOKEN = 'test-token'; //betterleaks:allow
     process.env.LLMGW_URL = 'http://test-url';
 
     jest.resetModules();
@@ -148,7 +148,7 @@ describe('halloumi middleware - dynamic import', () => {
       expect.objectContaining({ error: expect.stringContaining('LLM error') }),
     );
 
-    process.env.LLMGW_TOKEN = origToken;
+    process.env.LLMGW_TOKEN = origToken; //betterleaks:allow
     process.env.LLMGW_URL = origUrl;
   });
 });

package/src/icons/sparkle.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
+  <path d="m12 3-1.912 5.813a2 2 0 0 1-1.275 1.275L3 12l5.813 1.912a2 2 0 0 1 1.275 1.275L12 21l1.912-5.813a2 2 0 0 1 1.275-1.275L21 12l-5.813-1.912a2 2 0 0 1-1.275-1.275L12 3Z"/>
+</svg>

package/src/index.js

@@ -1,4 +1,5 @@
 import installChatBlock from './ChatBlock';
+import installAISearchInputBlock from './AISearchInput';
 import loadable from '@loadable/component';
 
 const applyConfig = (config) => {
@@ -40,6 +41,7 @@ const applyConfig = (config) => {
   };
 
   installChatBlock(config);
+  installAISearchInputBlock(config);
 
   return config;
 };

package/src/middleware.js

@@ -289,7 +289,7 @@ export default async function middleware(req, res, next) {
 
   const reqUrl = `${process.env.ONYX_URL || ''}/api${path}`;
 
-  const api_key = process.env.ONYX_API_KEY;
+  const api_key = process.env.ONYX_API_KEY; //betterleaks:allow
   if (!api_key) {
     res.statusCode = 500;
     res.statusMessage = MSG_INVALID_CONFIGURATION;
@@ -300,7 +300,7 @@ export default async function middleware(req, res, next) {
   try {
     await send_onyx_request(req, res, {
       url: reqUrl,
-      api_key: api_key,
+      api_key: api_key, //betterleaks:allow
       is_related_question,
     });
   } catch (error) {

package/src/middleware.test.js

@@ -89,7 +89,7 @@ describe('src/middleware', () => {
   });
 
   it('proxies POST request with api_key and pipes response', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
 
     await middleware(req, res, next);
@@ -110,7 +110,7 @@ describe('src/middleware', () => {
   });
 
   it('handles related question paths', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     req.url = '/_rq/chat/send-message';
 
@@ -124,7 +124,7 @@ describe('src/middleware', () => {
   });
 
   it('sends error response when fetch throws', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
 
     nodeFetch.mockRejectedValueOnce(
@@ -145,7 +145,7 @@ describe('src/middleware', () => {
   });
 
   it('handles error without response text', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
 
     nodeFetch.mockRejectedValueOnce(new Error('No response'));
@@ -162,7 +162,7 @@ describe('src/middleware', () => {
   });
 
   it('handles GET requests without body', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     req.method = 'GET';
     req.url = '/_da/persona/1';
@@ -175,7 +175,7 @@ describe('src/middleware', () => {
   });
 
   it('uses mock create-chat-session when MOCK_LLM_FILE_PATH is set', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     process.env.MOCK_LLM_FILE_PATH = '/tmp/mock.jsonl';
     req.url = '/_da/chat/create-chat-session';
@@ -189,7 +189,7 @@ describe('src/middleware', () => {
   });
 
   it('uses mock send-message with stream when MOCK_LLM_FILE_PATH is set', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     process.env.MOCK_LLM_FILE_PATH = '/tmp/mock.jsonl';
     req.url = '/_da/chat/send-message';
@@ -223,7 +223,7 @@ describe('src/middleware', () => {
   });
 
   it('dumps LLM response when DUMP_LLM_FILE_PATH is set', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     process.env.DUMP_LLM_FILE_PATH = '/tmp/dumped_response.jsonl';
 
@@ -236,7 +236,7 @@ describe('src/middleware', () => {
   });
 
   it('rejects disallowed paths with 404', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     req.url = '/_da/admin/users/delete';
     req.method = 'POST';
@@ -249,7 +249,7 @@ describe('src/middleware', () => {
   });
 
   it('rejects allowed path with wrong HTTP method', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     req.url = '/_da/persona';
     req.method = 'DELETE';
@@ -262,7 +262,7 @@ describe('src/middleware', () => {
   });
 
   it('rejects path traversal attempts', async () => {
-    process.env.ONYX_API_KEY = 'test-key';
+    process.env.ONYX_API_KEY = 'test-key'; //betterleaks:allow
     process.env.ONYX_URL = 'http://localhost:3000';
     req.url = '/_da/../../etc/passwd';
     req.method = 'GET';