Merge pull request #1201 from buerokratt/dev

jaX10bt · web-flow · commit b354aa2fc594 · 2025-03-06T10:10:16.000+02:00
Merging dev to test
diff --git a/DSL/Resql/get-llm-chat-messages.sql b/DSL/Resql/get-llm-chat-messages.sql
@@ -0,0 +1,62 @@
+WITH RECURSIVE MessageChain AS (
+    SELECT 
+        m.*
+    FROM message m
+    WHERE m.chat_base_id = :chatId
+    UNION ALL
+    SELECT 
+        m.*
+    FROM message m
+    INNER JOIN MessageChain mc ON m.original_base_id = mc.base_id
+),
+FilteredMessages AS (
+    SELECT DISTINCT ON (mc.base_id) mc.*
+    FROM MessageChain mc
+    LEFT JOIN MessageChain mc2 ON mc.base_id = mc2.original_base_id
+    WHERE mc2.base_id IS NULL
+),
+LatestActiveUser AS (
+  SELECT
+    u.id_code, u.created, u.csa_title
+  FROM
+    "user" u INNER JOIN (
+        SELECT iu.id_code, max(created) AS MaxCreated
+        FROM "user" iu
+        WHERE iu.status = 'active'
+        GROUP BY iu.id_code
+    ) iju ON iju.id_code = u.id_code AND iju.MaxCreated = u.created
+),
+LatestMessages AS (
+    SELECT
+        fm.base_id      AS id,
+        fm.chat_base_id AS chat_id,
+        fm.content,
+        fm.buttons,
+        fm.options,
+        fm.event,
+        fm.author_id,
+        fm.author_timestamp,
+        fm.author_first_name,
+        fm.author_last_name,
+        fm.author_role,
+        fm.forwarded_by_user,
+        fm.forwarded_from_csa,
+        fm.forwarded_to_csa,
+        fm.original_base_id,
+        fm.rating,
+        fm.created,
+        fm.updated,
+        u.csa_title
+    FROM FilteredMessages fm
+    LEFT JOIN LatestActiveUser u ON fm.author_id = u.id_code
+    WHERE EVENT <> 'greeting' OR EVENT IS NULL
+)
+SELECT *
+FROM (
+    SELECT *
+    FROM LatestMessages
+    ORDER BY created DESC
+    LIMIT 10
+    OFFSET 1
+) AS LimitedMessages
+ORDER BY created ASC
diff --git a/DSL/Ruuter.private/DSL/GET/cron-tasks/delete-conversations.yml b/DSL/Ruuter.private/DSL/GET/cron-tasks/delete-conversations.yml
@@ -11,29 +11,49 @@ declaration:
       - field: isAuth
         type: boolean
         description: "Body field 'isAuth'"
+    headers:
+      - field: x-ruuter-nonce
+        type: string
+        description: "Nonce field"
 
 assignValue:
   assign:
     isAuth: ${incoming.params.isAuth}
 
+getNewNonce:
+  call: http.post
+  args:
+    url: "[#CHATBOT_RESQL]/get-new-nonce"
+  result: newNonce
+
 backupConversations:
   call: http.post
   args:
     url: "[#CHATBOT_RUUTER_PRIVATE]/chats/back-up-removable-chats"
+    headers:
+      x-ruuter-nonce: ${newNonce.response.body[0].nonce}
     body:
       isAuth: ${isAuth}
   result: chats
 
 validateResponse:
   switch:
     - condition: ${chats.response.body.response.length > 0}
-      next: emptyMessages
+      next: getNewNonceToEmpty
   next: return_not_found
 
+getNewNonceToEmpty:
+  call: http.post
+  args:
+    url: "[#CHATBOT_RESQL]/get-new-nonce"
+  result: newNonceToEmpty
+
 emptyMessages:
   call: http.post
   args:
     url: "[#CHATBOT_RUUTER_PRIVATE]/chats/empty-conversations-by-chat-ids"
+    headers:
+      x-ruuter-nonce: ${newNonceToEmpty.response.body[0].nonce}
     body:
       chatIds: ${chats.response.body.response}
   result: res
diff --git a/DSL/Ruuter.private/DSL/POST/chats/back-up-removable-chats.yml b/DSL/Ruuter.private/DSL/POST/chats/back-up-removable-chats.yml
@@ -11,11 +11,23 @@ declaration:
       - field: isAuth
         type: boolean
         description: "Body field 'isAuth'"
+    headers:
+      - field: x-ruuter-nonce
+        type: string
+        description: "Nonce field"
+
+getNewNonce:
+  call: http.post
+  args:
+    url: "[#CHATBOT_RESQL]/get-new-nonce"
+  result: newNonce
 
 getRemovableConversations:
   call: http.post
   args:
     url: "[#CHATBOT_RUUTER_PRIVATE]/chats/chat-to-remove"
+    headers:
+      x-ruuter-nonce: ${newNonce.response.body[0].nonce}
     body:
       isAuth: ${incoming.body.isAuth}
   result: res
diff --git a/DSL/Ruuter.private/DSL/POST/chats/chat-to-remove.yml b/DSL/Ruuter.private/DSL/POST/chats/chat-to-remove.yml
@@ -11,11 +11,23 @@ declaration:
       - field: isAuth
         type: boolean
         description: "Body field 'isAuth'"
+    headers:
+      - field: x-ruuter-nonce
+        type: string
+        description: "Nonce field"
+
+getNewNonce:
+  call: http.post
+  args:
+    url: "[#CHATBOT_RESQL]/get-new-nonce"
+  result: newNonce
 
 getConfigurations:
   call: http.get
   args:
     url: "[#CHATBOT_RUUTER_PRIVATE_INTERNAL]/configs/delete-conversation-config?skipAuth=true"
+    headers:
+      x-ruuter-nonce: ${newNonce.response.body[0].nonce}
   result: configs
 
 splitCall:
diff --git a/DSL/Ruuter.public/DSL/POST/internal/external-bot.yml b/DSL/Ruuter.public/DSL/POST/internal/external-bot.yml
@@ -75,7 +75,7 @@ logstepAZUREDS:
 get_chat_messages:
   call: http.post
   args:
-    url: "[#CHATBOT_RESQL]/get-chat-messages"
+    url: "[#CHATBOT_RESQL]/get-llm-chat-messages"
     body:
       chatId: ${sender}
   result: chat_messages_res
@@ -87,7 +87,7 @@ prepare_messages:
     headers:
       type: json
     body:
-      prompt_message: ${skm_config.systemMessage}
+      prompt_message: "${skm_config.systemMessage} The current date is ${currentDate}"
       messages: ${chat_messages_res.response.body}
       new_message: ${incoming.body.message ?? ''}
   result: prepare_messages_res
@@ -123,7 +123,7 @@ assign_value:
   assign:
     correct_value:
       - recipient_id: ${sender}
-        text: ${test.response.body.choices[0].message.content.replace(/\n/g,"\\n").replace(/%/g," protsenti").replace(" \. ", ". ")}
+        text: ${test.response.body.choices[0].message.content.replace(/\n/g,"\\n").replace(" \. ", ". ")}
         context: ${test.response.body.choices[0].message.context}
   next: check_value
 
diff --git a/GUI/package.json b/GUI/package.json
@@ -11,10 +11,10 @@
     "prettier": "prettier --write \"{,!(node_modules)/**/}*.{ts,tsx,js,json,css,less,scss}\""
   },
   "dependencies": {
-    "@buerokratt-ria/header": "^0.1.21",
+    "@buerokratt-ria/header": "^0.1.22",
     "@buerokratt-ria/menu": "^0.2.6",
     "@buerokratt-ria/styles": "^0.0.1",
-    "@buerokratt-ria/common-gui-components": "^0.0.4",
+    "@buerokratt-ria/common-gui-components": "^0.0.5",
     "@fontsource/roboto": "^4.5.8",
     "@formkit/auto-animate": "^1.0.0-beta.5",
     "@fortaine/fetch-event-source": "^3.0.6",
diff --git a/GUI/src/components/Chat/Markdownify.tsx b/GUI/src/components/Chat/Markdownify.tsx
@@ -41,7 +41,7 @@ const Markdownify: React.FC<MarkdownifyProps> = ({ message }) => (
         disableParsingRawHTML: true,
       }}
     >
-      {message ?? ''}
+      {message?.replace(/&#x([0-9A-Fa-f]+);/g, (_, hex) => { return String.fromCharCode(parseInt(hex, 16)); }) ?? ""}
     </Markdown>
   </div>
 );
diff --git a/GUI/src/components/Chat/index.tsx b/GUI/src/components/Chat/index.tsx
@@ -1,4 +1,11 @@
-import { ChangeEvent, FC, useEffect, useRef, useState } from 'react';
+import {
+  ChangeEvent,
+  FC,
+  useEffect,
+  useLayoutEffect,
+  useRef,
+  useState,
+} from 'react';
 import { useTranslation } from 'react-i18next';
 import { format } from 'date-fns';
 import { et } from 'date-fns/locale';
@@ -141,6 +148,27 @@ const Chat: FC<ChatProps> = ({
       : null
   );
 
+  const onVisibilityChange = () => {
+    if (document.visibilityState === 'visible') {
+      localStorage.setItem('focused_chat', chat.id);
+    } else if (document.visibilityState === 'hidden') {
+      localStorage.removeItem('focused_chat');
+    }
+  };
+
+  useEffect(() => {
+    localStorage.setItem('focused_chat', chat.id);
+    return () => {
+      localStorage.removeItem('focused_chat');
+    };
+  }, []);
+
+  useLayoutEffect(() => {
+    document.addEventListener('visibilitychange', onVisibilityChange);
+    return () =>
+      document.removeEventListener('visibilitychange', onVisibilityChange);
+  }, []);
+
   useEffect(() => {
     getMessages();
   }, []);
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -48,7 +48,7 @@ services:
       - application.logging.printStackTrace=true
       - application.internalRequests.disabled=true
       - server.port=8088
-      - application.externalAuthAllowed=/cron-tasks/delete-conversations
+      - application.externalAuthAllowed=/cron-tasks/delete-conversations,chats/back-up-removable-chats,chats/chat-to-remove,chats/empty-conversations-by-chat-ids
     volumes:
       - ./DSL/Ruuter.private/DSL:/DSL
       - ./constants.ini:/app/constants.ini
diff --git a/notification-server/src/server.js b/notification-server/src/server.js
@@ -65,19 +65,21 @@ app.post("/dequeue", async (req, res) => {
   }
 });
 
-app.post("/add-chat-to-termination-queue", (req, res) => {
-  try{
+app.post("/add-chat-to-termination-queue", express.json(), express.text(), (req, res) => {
+  try {
+    const body = typeof req.body === "string" ? JSON.parse(req.body) : req.body;
+    
     addToTerminationQueue(
-      req.body.chatId,
+      body.chatId,
       () => fetch(`${process.env.RUUTER_URL}/chats/end`, {
         method: 'POST',
         headers: {
           'content-type': 'application/json',
-          'cookie': req.body.cookie || req.headers.cookie,
+          'cookie': body.cookie || req.headers.cookie,
         },
         body: JSON.stringify({
           message: {
-            chatId: req.body.chatId,
+            chatId: body.chatId,
             authorRole: 'end-user',
             event: 'CLIENT_LEFT_FOR_UNKNOWN_REASONS',
             authorTimestamp: new Date().toISOString(),
@@ -87,7 +89,7 @@ app.post("/add-chat-to-termination-queue", (req, res) => {
     );
 
     res.status(200).json({ response: 'Chat will be terminated soon' });
-  } catch {
+  } catch (error) {
     res.status(500).json({ response: 'error' });
   }
 });

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ const Markdownify: React.FC<MarkdownifyProps> = ({ message }) => (`
`41`	`41`	`disableParsingRawHTML: true,`
`42`	`42`	`}}`
`43`	`43`	`>`
`44`		`- {message ?? ''}`
	`44`	`+ {message?.replace(/&#x([0-9A-Fa-f]+);/g, (_, hex) => { return String.fromCharCode(parseInt(hex, 16)); }) ?? ""}`
`45`	`45`	`</Markdown>`
`46`	`46`	`</div>`
`47`	`47`	`);`