From d9648a70dbadad47d227f3c4385cf9e42de6cb49 Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Sat, 21 Dec 2024 09:48:43 +0100 Subject: [PATCH 01/17] bots table template --- chat_client/static/js/sio.js | 5 +++ chat_client/static/js/submind_utils.js | 41 +++++++++++++++++++ chat_client/templates/base.html | 1 + .../components/conversation_skins/base.html | 13 ++++-- 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 chat_client/static/js/submind_utils.js diff --git a/chat_client/static/js/sio.js b/chat_client/static/js/sio.js index 8d2059a0..ea412306 100644 --- a/chat_client/static/js/sio.js +++ b/chat_client/static/js/sio.js @@ -93,6 +93,11 @@ function initSIO(){ await applyTranslations(data); }); + socket.on('subminds_state', async (data) => { + //console.log('subminds_state: ', data) + await parseSubmindsState(data); + }); + socket.on('incoming_tts', (data)=> { console.log('received incoming stt audio'); playTTS(data['cid'], data['lang'], data['audio_data']); diff --git a/chat_client/static/js/submind_utils.js b/chat_client/static/js/submind_utils.js new file mode 100644 index 00000000..2de64d9f --- /dev/null +++ b/chat_client/static/js/submind_utils.js @@ -0,0 +1,41 @@ + +let submindsPerCid; + + + + +function renderActiveSubminds(cid) { + const table = document.getElementById(`${cid}-subminds-state-table`); + table.innerHTML = ''; + + (submindsPerCid?.[cid] || []).forEach(submind => { + const row = document.createElement('tr'); + + const checkboxCell = document.createElement('td'); + const checkbox = document.createElement('input'); + checkbox.type = 'checkbox'; + checkbox.className = 'form-check-input bot-checkbox'; + checkbox.value = submind.name; + checkbox.checked = submind.status === 'active'; + checkbox.id = `bot-${submind.submind_id}-${cid}`; + checkboxCell.appendChild(checkbox); + + + const nameCell = document.createElement('td'); + const label = document.createElement('label'); + label.className = 'form-check-label'; + label.htmlFor = `bot-${submind.submind_id}-${cid}`; + label.textContent = submind.submind_id.slice(0, submind.submind_id.lastIndexOf('-')); + nameCell.appendChild(label); + + row.appendChild(checkboxCell); + row.appendChild(nameCell); + + table.appendChild(row); + }); +} + + +async function parseSubmindsState(data){ + submindsPerCid = data['subminds_per_cid']; +} \ No newline at end of file diff --git a/chat_client/templates/base.html b/chat_client/templates/base.html index 20ab4752..090ea69c 100644 --- a/chat_client/templates/base.html +++ b/chat_client/templates/base.html @@ -53,6 +53,7 @@ 'date_utils.js', 'file_utils.js', 'language_utils.js', + 'submind_utils.js', 'user_settings.js' ] %} diff --git a/chat_client/templates/components/conversation_skins/base.html b/chat_client/templates/components/conversation_skins/base.html index cc32d0f8..1d97e287 100644 --- a/chat_client/templates/components/conversation_skins/base.html +++ b/chat_client/templates/components/conversation_skins/base.html @@ -3,9 +3,16 @@ {% block skin_body %}
{conversation_name_shrunk} - - 0 - +
+
+ Select Bots +
+
+
+
+
+
+ + Loading... +
+ + + + + + + + + + + +
+
`; + + const checkbox = row.querySelector(`#toggle-${cid}-${submind.submind_id}`); + checkbox.addEventListener('change', () => { + currentState[index].active = checkbox.checked; + updateButtonVisibility(); + }); entriesContainer.appendChild(row); }); + + resetButton.onclick = () => { + currentState = structuredClone(initialState); + currentState.forEach((submind, index) => { + const checkbox = document.getElementById(`toggle-${cid}-${submind.id}`); + if (checkbox) checkbox.checked = submind.active; + }); + updateButtonVisibility(); + }; + + submitButton.onclick = () => { + + // function to apply changes for chat + + socket.emit('update_subminds', {cid: currentState}); + + const dropdownToggle = document.getElementById(`dropdownToggle-${cid}`); + if (dropdownToggle) dropdownToggle.click(); + + buttonsContainer.style.display = 'none'; + }; } async function parseSubmindsState(data){ submindsPerCid = data['subminds_per_cid']; + + for (const cid of Object.keys(submindsPerCid)){ + refreshSubmindsCount(cid); + } } + diff --git a/chat_client/templates/components/conversation_skins/prompts.html b/chat_client/templates/components/conversation_skins/prompts.html index a75e07d6..427fd00e 100644 --- a/chat_client/templates/components/conversation_skins/prompts.html +++ b/chat_client/templates/components/conversation_skins/prompts.html @@ -3,8 +3,8 @@ {% block skin_body %}
{conversation_name_shrunk} -
From ab8df095e6f4bed043770af24073fbc08d4337e6 Mon Sep 17 00:00:00 2001 From: NeonKirill <74428618+NeonKirill@users.noreply.github.com> Date: Tue, 31 Dec 2024 11:33:40 +0100 Subject: [PATCH 05/17] Preprocessing message text in Klat Observer (#124) * Added filtering out bot mentions on parsing messages in pyklatchat observer * Preventing bots to recursively trigger itself --- services/klatchat_observer/controller.py | 58 ++++++++++++++++-------- 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/services/klatchat_observer/controller.py b/services/klatchat_observer/controller.py index 1e5117fa..e4990a25 100644 --- a/services/klatchat_observer/controller.py +++ b/services/klatchat_observer/controller.py @@ -227,14 +227,13 @@ def get_recipient_from_body(self, message: str) -> dict: :param message: user's message :returns extracted recipient - - Example: - >>> assert self.get_recipient_from_body('@Proctor hello dsfdsfsfds @Prompter') == {'recipient': Recipients.CHATBOT_CONTROLLER, 'context': {'requested_participants': {'proctor', 'prompter'}} """ - message = " " + message - bot_mentioning_regexp = r"[\s]+@[a-zA-Z]+[\w]+" - bots = re.findall(bot_mentioning_regexp, message) - bots = set([bot.strip().replace("@", "").lower() for bot in bots]) + bots = set( + [ + bot.strip().replace("@", "").lower() + for bot in re.findall(r"@[\w-]+", message) + ] + ) if len(bots) > 0: recipient = Recipients.CHATBOT_CONTROLLER else: @@ -505,42 +504,65 @@ def __handle_chatbot_recipient(self, recipient_data: dict, msg_data: dict): def handle_get_stt(self, data): """Handler for get STT request from Socket IO channel""" data["recipient"] = Recipients.NEON - data["skip_recipient_detection"] = True data["requested_skill"] = "stt" self.handle_message(data=data) def handle_get_tts(self, data): """Handler for get TTS request from Socket IO channel""" data["recipient"] = Recipients.NEON - data["skip_recipient_detection"] = True data["requested_skill"] = "tts" self.handle_message(data=data) def handle_message(self, data: dict): """ - Handles input requests from MQ to Neon API + Handles input requests from Klatchat Server to External MQ Services - :param data: Received user data + :param data: Received message data """ if data and isinstance(data, dict): recipient_data = {} - if not data.get("skip_recipient_detection"): + + if not self._should_skip_recipient_detection(data=data): recipient_data = self.get_recipient_from_bound_service( data.get("bound_service", "") ) or self.get_recipient_from_message( - message=data.get("messageText", data.get("message_body")) + message=data.get("messageText") or data.get("message_body") ) - recipient = ( - recipient_data.get("recipient") - or data.get("recipient") - or Recipients.UNRESOLVED - ) + data["recipient"] = recipient_data.pop("recipient", None) + + recipient = data.get("recipient") or Recipients.UNRESOLVED + + data = self._preprocess_message_data(data) + handler_method = self.recipient_to_handler_method.get(recipient) if handler_method: handler_method(recipient_data=recipient_data, msg_data=data) else: raise TypeError(f"Malformed data received: {data}") + @staticmethod + def _should_skip_recipient_detection(data: dict) -> bool: + """ + Checks if recipient detection should be skipped based on incoming data + :param data: the incoming data object to check + :return: True if recipient detection should be skipped, False otherwise + """ + # Skipping recipient detection for bot shouts to prevent recursive scenarios + return data.get("recipient") or bool(data.get("is_bot")) + + @staticmethod + def _preprocess_message_data(data: dict) -> dict: + """ + Preprocess message data received from the klat chat + :param data: data object to preprocess + :return: updated data object + """ + if "messageText" in data: + data["messageText"] = re.sub( + r"^\s*(@[\w-]+[^\w@]*)+", "", data["messageText"] + ).strip() + return data + def forward_prompt_data(self, data: dict): """Forwards received prompt data to the destination observer""" requested_nick = data.pop("receiver", None) From d66d0f2d33bd4daaf17710c8f4a82a5252757777 Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Tue, 31 Dec 2024 10:33:59 +0000 Subject: [PATCH 06/17] Updated Version and Dynamic Dependencies --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 7e172377..f46e1b0f 100644 --- a/version.py +++ b/version.py @@ -27,4 +27,4 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.4.7a25" +__version__ = "0.4.7a26" From aa9ae6694a744e3a8c4e87e62d437c09e5975b0a Mon Sep 17 00:00:00 2001 From: NeonKirill <74428618+NeonKirill@users.noreply.github.com> Date: Tue, 31 Dec 2024 12:23:10 +0100 Subject: [PATCH 07/17] Fixed issues with chatbot recipient handling (#125) --- services/klatchat_observer/controller.py | 40 +++++++++++++----------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/services/klatchat_observer/controller.py b/services/klatchat_observer/controller.py index e4990a25..3c38bb37 100644 --- a/services/klatchat_observer/controller.py +++ b/services/klatchat_observer/controller.py @@ -94,8 +94,8 @@ def __init__( self.neon_service_refresh_interval = 60 # seconds self.mention_separator = "," self.recipient_to_handler_method = { - Recipients.NEON: self.__handle_neon_recipient, - Recipients.CHATBOT_CONTROLLER: self.__handle_chatbot_recipient, + Recipients.NEON: self._handle_neon_recipient, + Recipients.CHATBOT_CONTROLLER: self._handle_chatbot_recipient, } self.sio_url = config["SIO_URL"] @@ -444,7 +444,7 @@ def get_neon_request_structure(msg_data: dict): # TODO: any specific structure per wolfram/duckduckgo, etc... return request_dict - def __handle_neon_recipient(self, recipient_data: dict, msg_data: dict): + def _handle_neon_recipient(self, recipient_data: dict, msg_data: dict): msg_data.setdefault("message_body", msg_data.pop("messageText", "")) msg_data.setdefault("message_id", msg_data.pop("messageID", "")) recipient_data.setdefault("context", {}) @@ -484,22 +484,24 @@ def __handle_neon_recipient(self, recipient_data: dict, msg_data: dict): queue=input_queue, ) - def __handle_chatbot_recipient(self, recipient_data: dict, msg_data: dict): + def _handle_chatbot_recipient(self, recipient_data: dict, msg_data: dict): LOG.info(f"Emitting message to Chatbot Controller: {recipient_data}") queue = "external_shout" - msg_data["requested_participants"] = json.dumps( - list( - recipient_data.setdefault("context", {}).setdefault( - "requested_participants", [] - ) + if requested_participants := recipient_data.get("context", {}).get( + "requested_participants" + ): + msg_data["requested_participants"] = json.dumps(requested_participants) + self.send_message( + request_data=msg_data, + vhost=self.get_vhost("chatbots"), + queue=queue, + expiration=3000, + ) + else: + LOG.warning( + f"Failed to emit message to chatbot controller - no requested participants detected. " + f"{recipient_data=}" ) - ) - self.send_message( - request_data=msg_data, - vhost=self.get_vhost("chatbots"), - queue=queue, - expiration=3000, - ) def handle_get_stt(self, data): """Handler for get STT request from Socket IO channel""" @@ -530,7 +532,7 @@ def handle_message(self, data: dict): ) data["recipient"] = recipient_data.pop("recipient", None) - recipient = data.get("recipient") or Recipients.UNRESOLVED + recipient = data.pop("recipient", None) or Recipients.UNRESOLVED data = self._preprocess_message_data(data) @@ -548,7 +550,7 @@ def _should_skip_recipient_detection(data: dict) -> bool: :return: True if recipient detection should be skipped, False otherwise """ # Skipping recipient detection for bot shouts to prevent recursive scenarios - return data.get("recipient") or bool(data.get("is_bot")) + return data.get("recipient") or data.get("is_bot") == "1" @staticmethod def _preprocess_message_data(data: dict) -> dict: @@ -561,6 +563,8 @@ def _preprocess_message_data(data: dict) -> dict: data["messageText"] = re.sub( r"^\s*(@[\w-]+[^\w@]*)+", "", data["messageText"] ).strip() + if not data["messageText"]: + data["messageText"] = "hello" return data def forward_prompt_data(self, data: dict): From d31c84fa85e656f6b3bd66fbf360b0dc7a1e20e0 Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Tue, 31 Dec 2024 11:23:30 +0000 Subject: [PATCH 08/17] Updated Version and Dynamic Dependencies --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index f46e1b0f..15cb3c2a 100644 --- a/version.py +++ b/version.py @@ -27,4 +27,4 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.4.7a26" +__version__ = "0.4.7a27" From 6611346ca3ea58fb51d02896b2f265d0b5c67de8 Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Fri, 3 Jan 2025 15:31:03 +0100 Subject: [PATCH 09/17] chat-observer redirect on mq + fixed table view --- chat_client/static/js/chat_utils.js | 9 ++- chat_client/static/js/submind_utils.js | 94 ++++++++++++++++-------- services/klatchat_observer/controller.py | 22 ++++++ 3 files changed, 92 insertions(+), 33 deletions(-) diff --git a/chat_client/static/js/chat_utils.js b/chat_client/static/js/chat_utils.js index 89adb73b..100d1c6c 100644 --- a/chat_client/static/js/chat_utils.js +++ b/chat_client/static/js/chat_utils.js @@ -20,6 +20,13 @@ let conversationState = {}; const clearStateCache = (cid) => { delete conversationState[cid]; } +/** + * Sets all participants counters to zero + */ +const setAllCountersToZero = () => { + const countNodes = document.querySelectorAll('[id^="participants-count-"]'); + countNodes.forEach(node => node.innerText = 0); +} /** @@ -28,7 +35,7 @@ const clearStateCache = (cid) => { */ const refreshSubmindsCount = (cid) => { const participantsCountNode = document.getElementById(`participants-count-${cid}`); - if (participantsCountNode && submindsPerCid) participantsCountNode.innerText = submindsPerCid[cid].length; + if (participantsCountNode && subminds_state) participantsCountNode.innerText = subminds_state["subminds_per_cid"][cid].length; } diff --git a/chat_client/static/js/submind_utils.js b/chat_client/static/js/submind_utils.js index 2af7e8c3..8f5da67f 100644 --- a/chat_client/static/js/submind_utils.js +++ b/chat_client/static/js/submind_utils.js @@ -1,14 +1,7 @@ -let submindsPerCid; - -// submindsPerCid = { -// 1: [ -// {submind_id: "wiz-1bbbd8af178a455eb65c669e72c89490", status: "active"}, -// {submind_id: "wolfram-b5003bfc25d7461e9888cfc344c04a85", status: "active"}, -// ] -// } +let subminds_state; function renderActiveSubminds(cid) { - if (!submindsPerCid) { + if (!subminds_state) { console.log(`Subminds for CID ${cid} not yet loaded.`); return; } @@ -26,58 +19,90 @@ function renderActiveSubminds(cid) { const table = document.getElementById(`${cid}-subminds-state-table`); const entriesContainer = document.getElementById(`${cid}-subminds-state-entries`); const buttonsContainer = document.getElementById(`${cid}-subminds-buttons`); - const resetButton = document.getElementById(`${cid}-reset-button`); + buttonsContainer.style.display = 'none'; + const cancelButton = document.getElementById(`${cid}-reset-button`); const submitButton = document.getElementById(`${cid}-submit-button`); - let initialState = (submindsPerCid?.[cid] || []).map(submind => ({ - id: submind.submind_id, - active: submind.status === 'active', - })); + const active_subminds = subminds_state["subminds_per_cid"]?.[cid]?.filter(submind => submind.status === 'active') || []; + const activeSubmindIds = new Set(active_subminds.map(submind => submind.submind_id)); + + const banned_subminds = subminds_state["subminds_per_cid"]?.[cid]?.filter(submind => submind.status === 'banned') || []; + const bannedSubmindIds = new Set(banned_subminds.map(submind => submind.submind_id)); + + const initialSubmindsState = Object.entries(subminds_state?.["connected_subminds"] || {}) + .filter(([submind_id, submind]) => { + return submind["bot_type"] === "submind" && !bannedSubmindIds.has(submind_id); + }) + .map(([submind_id, submind]) => ({ + id: submind_id, + is_active: activeSubmindIds.has(submind_id), + })) + .sort((a, b) => { + return b.is_active - a.is_active; + }); - let currentState = structuredClone(initialState); + let currentState = structuredClone(initialSubmindsState); const updateButtonVisibility = () => { - const hasChanges = initialState.some((submind, index) => submind.active !== currentState[index].active); + const hasChanges = initialSubmindsState.some((submind, index) => submind.is_active !== currentState[index].is_active); buttonsContainer.style.display = hasChanges ? 'block' : 'none'; }; table.style.display = ''; entriesContainer.innerHTML = ''; - (submindsPerCid?.[cid] || []).forEach((submind, index) => { + initialSubmindsState.forEach((submind, index) => { const row = document.createElement('tr'); row.innerHTML = ` - ${submind.submind_id.slice(0, submind.submind_id.lastIndexOf('-'))} + ${submind.id.slice(0, submind.id.lastIndexOf('-'))}
- - + +
`; - const checkbox = row.querySelector(`#toggle-${cid}-${submind.submind_id}`); + const checkbox = row.querySelector(`#toggle-${cid}-${submind.id}`); checkbox.addEventListener('change', () => { - currentState[index].active = checkbox.checked; + currentState[index].is_active = checkbox.checked; updateButtonVisibility(); }); entriesContainer.appendChild(row); }); - resetButton.onclick = () => { - currentState = structuredClone(initialState); + cancelButton.onclick = () => { + currentState = structuredClone(initialSubmindsState); currentState.forEach((submind, index) => { const checkbox = document.getElementById(`toggle-${cid}-${submind.id}`); - if (checkbox) checkbox.checked = submind.active; + checkbox.checked = (submind.is_active)? "checked" : ''; }); updateButtonVisibility(); }; submitButton.onclick = () => { + const modifiedSubminds = currentState.filter((current, index) => { + return current.is_active !== initialSubmindsState[index].is_active; + }); - // function to apply changes for chat - - socket.emit('update_subminds', {cid: currentState}); + let subminds_to_remove = modifiedSubminds.filter(submind => !submind.is_active).map(submind => submind.id); + let subminds_to_add = modifiedSubminds.filter(submind => submind.is_active).map(submind => submind.id); + + if (subminds_to_add.length !== 0){ + socket.emit('broadcast', { + msg_type: "invite_subminds", + "cid": cid, + "requested_participants": subminds_to_add, + }); + } + + if (subminds_to_remove.length !== 0) { + socket.emit('broadcast', { + msg_type: "remove_subminds", + "cid": cid, + "requested_participants": subminds_to_remove, + }); + } const dropdownToggle = document.getElementById(`dropdownToggle-${cid}`); if (dropdownToggle) dropdownToggle.click(); @@ -88,10 +113,15 @@ function renderActiveSubminds(cid) { async function parseSubmindsState(data){ - submindsPerCid = data['subminds_per_cid']; - - for (const cid of Object.keys(submindsPerCid)){ - refreshSubmindsCount(cid); + subminds_state = data; + + const cids = Object.keys(subminds_state["subminds_per_cid"]) + if (cids.length === 0){ + setAllCountersToZero(); + } else { + for (const cid of cids){ + refreshSubmindsCount(cid); + } } } diff --git a/services/klatchat_observer/controller.py b/services/klatchat_observer/controller.py index 1e5117fa..12a6d9a1 100644 --- a/services/klatchat_observer/controller.py +++ b/services/klatchat_observer/controller.py @@ -338,6 +338,8 @@ def register_sio_handlers(self): "revoke_submind_ban_from_conversation", handler=self.request_revoke_submind_ban_from_conversation, ) + self._sio.on("invite_subminds", handler=self.request_invite_subminds) + self._sio.on("remove_subminds", handler=self.request_remove_subminds) self._sio.on("auth_expired", handler=self._handle_auth_expired) def connect_sio(self): @@ -904,6 +906,26 @@ def request_revoke_submind_ban_from_conversation(self, data: dict): expiration=3000, ) + def request_invite_subminds(self, data: dict): + LOG.info(f"Inviting subminds: {data}") + self.send_message( + request_data=data, + vhost=self.get_vhost("chatbots"), + exchange="invitation", + exchange_type='fanout', + expiration=3000, + ) + + def request_remove_subminds(self, data: dict): + LOG.info(f"Removing subminds: {data}") + self.send_message( + request_data=data, + vhost=self.get_vhost("chatbots"), + exchange="elimination", + expiration=3000, + exchange_type='fanout', + ) + def _sio_emit(self, event: str, data: dict): """ Emit events to the Socket.IO server, ensuring reliability. From 8eb76203ac6d68f84805eec19163e15821e49f01 Mon Sep 17 00:00:00 2001 From: NeonKirill <74428618+NeonKirill@users.noreply.github.com> Date: Fri, 3 Jan 2025 22:50:23 +0100 Subject: [PATCH 10/17] Small fix for automator handling (#127) --- services/klatchat_observer/controller.py | 1 + 1 file changed, 1 insertion(+) diff --git a/services/klatchat_observer/controller.py b/services/klatchat_observer/controller.py index 3c38bb37..73dcc36a 100644 --- a/services/klatchat_observer/controller.py +++ b/services/klatchat_observer/controller.py @@ -212,6 +212,7 @@ def get_recipient_from_prefix(cls, message: str) -> dict: ) ): callback["recipient"] = Recipients.CHATBOT_CONTROLLER + callback["context"] = dict(requested_participants=["automator"]) else: for recipient, recipient_prefixes in cls.recipient_prefixes.items(): if any( From fd5cdc150b78e71a940615a3d29f1fb2b1f12dbd Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Fri, 3 Jan 2025 21:50:43 +0000 Subject: [PATCH 11/17] Updated Version and Dynamic Dependencies --- version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.py b/version.py index 15cb3c2a..fb699ef7 100644 --- a/version.py +++ b/version.py @@ -27,4 +27,4 @@ # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -__version__ = "0.4.7a27" +__version__ = "0.4.7a28" From 856b506e86be3abf6c744670bb5225f3955817ec Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Sat, 21 Dec 2024 09:48:43 +0100 Subject: [PATCH 12/17] bots table template --- chat_client/static/js/sio.js | 5 +++ chat_client/static/js/submind_utils.js | 41 +++++++++++++++++++ chat_client/templates/base.html | 1 + .../components/conversation_skins/base.html | 13 ++++-- 4 files changed, 57 insertions(+), 3 deletions(-) create mode 100644 chat_client/static/js/submind_utils.js diff --git a/chat_client/static/js/sio.js b/chat_client/static/js/sio.js index 8d2059a0..ea412306 100644 --- a/chat_client/static/js/sio.js +++ b/chat_client/static/js/sio.js @@ -93,6 +93,11 @@ function initSIO(){ await applyTranslations(data); }); + socket.on('subminds_state', async (data) => { + //console.log('subminds_state: ', data) + await parseSubmindsState(data); + }); + socket.on('incoming_tts', (data)=> { console.log('received incoming stt audio'); playTTS(data['cid'], data['lang'], data['audio_data']); diff --git a/chat_client/static/js/submind_utils.js b/chat_client/static/js/submind_utils.js new file mode 100644 index 00000000..2de64d9f --- /dev/null +++ b/chat_client/static/js/submind_utils.js @@ -0,0 +1,41 @@ + +let submindsPerCid; + + + + +function renderActiveSubminds(cid) { + const table = document.getElementById(`${cid}-subminds-state-table`); + table.innerHTML = ''; + + (submindsPerCid?.[cid] || []).forEach(submind => { + const row = document.createElement('tr'); + + const checkboxCell = document.createElement('td'); + const checkbox = document.createElement('input'); + checkbox.type = 'checkbox'; + checkbox.className = 'form-check-input bot-checkbox'; + checkbox.value = submind.name; + checkbox.checked = submind.status === 'active'; + checkbox.id = `bot-${submind.submind_id}-${cid}`; + checkboxCell.appendChild(checkbox); + + + const nameCell = document.createElement('td'); + const label = document.createElement('label'); + label.className = 'form-check-label'; + label.htmlFor = `bot-${submind.submind_id}-${cid}`; + label.textContent = submind.submind_id.slice(0, submind.submind_id.lastIndexOf('-')); + nameCell.appendChild(label); + + row.appendChild(checkboxCell); + row.appendChild(nameCell); + + table.appendChild(row); + }); +} + + +async function parseSubmindsState(data){ + submindsPerCid = data['subminds_per_cid']; +} \ No newline at end of file diff --git a/chat_client/templates/base.html b/chat_client/templates/base.html index 20ab4752..090ea69c 100644 --- a/chat_client/templates/base.html +++ b/chat_client/templates/base.html @@ -53,6 +53,7 @@ 'date_utils.js', 'file_utils.js', 'language_utils.js', + 'submind_utils.js', 'user_settings.js' ] %} diff --git a/chat_client/templates/components/conversation_skins/base.html b/chat_client/templates/components/conversation_skins/base.html index cc32d0f8..1d97e287 100644 --- a/chat_client/templates/components/conversation_skins/base.html +++ b/chat_client/templates/components/conversation_skins/base.html @@ -3,9 +3,16 @@ {% block skin_body %}
{conversation_name_shrunk} - - 0 - +
+
+
+ + Loading... +
+ + + + + + + + + + + +
+
`; + + const checkbox = row.querySelector(`#toggle-${cid}-${submind.submind_id}`); + checkbox.addEventListener('change', () => { + currentState[index].active = checkbox.checked; + updateButtonVisibility(); + }); entriesContainer.appendChild(row); }); + + resetButton.onclick = () => { + currentState = structuredClone(initialState); + currentState.forEach((submind, index) => { + const checkbox = document.getElementById(`toggle-${cid}-${submind.id}`); + if (checkbox) checkbox.checked = submind.active; + }); + updateButtonVisibility(); + }; + + submitButton.onclick = () => { + + // function to apply changes for chat + + socket.emit('update_subminds', {cid: currentState}); + + const dropdownToggle = document.getElementById(`dropdownToggle-${cid}`); + if (dropdownToggle) dropdownToggle.click(); + + buttonsContainer.style.display = 'none'; + }; } async function parseSubmindsState(data){ submindsPerCid = data['subminds_per_cid']; + + for (const cid of Object.keys(submindsPerCid)){ + refreshSubmindsCount(cid); + } } + diff --git a/chat_client/templates/components/conversation_skins/prompts.html b/chat_client/templates/components/conversation_skins/prompts.html index a75e07d6..427fd00e 100644 --- a/chat_client/templates/components/conversation_skins/prompts.html +++ b/chat_client/templates/components/conversation_skins/prompts.html @@ -3,8 +3,8 @@ {% block skin_body %}
{conversation_name_shrunk} -
From a61c05728a361fe79d16b244277ea874653f0676 Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Fri, 3 Jan 2025 15:31:03 +0100 Subject: [PATCH 15/17] chat-observer redirect on mq + fixed table view --- chat_client/static/js/chat_utils.js | 9 ++- chat_client/static/js/submind_utils.js | 94 ++++++++++++++++-------- services/klatchat_observer/controller.py | 22 ++++++ 3 files changed, 92 insertions(+), 33 deletions(-) diff --git a/chat_client/static/js/chat_utils.js b/chat_client/static/js/chat_utils.js index 89adb73b..100d1c6c 100644 --- a/chat_client/static/js/chat_utils.js +++ b/chat_client/static/js/chat_utils.js @@ -20,6 +20,13 @@ let conversationState = {}; const clearStateCache = (cid) => { delete conversationState[cid]; } +/** + * Sets all participants counters to zero + */ +const setAllCountersToZero = () => { + const countNodes = document.querySelectorAll('[id^="participants-count-"]'); + countNodes.forEach(node => node.innerText = 0); +} /** @@ -28,7 +35,7 @@ const clearStateCache = (cid) => { */ const refreshSubmindsCount = (cid) => { const participantsCountNode = document.getElementById(`participants-count-${cid}`); - if (participantsCountNode && submindsPerCid) participantsCountNode.innerText = submindsPerCid[cid].length; + if (participantsCountNode && subminds_state) participantsCountNode.innerText = subminds_state["subminds_per_cid"][cid].length; } diff --git a/chat_client/static/js/submind_utils.js b/chat_client/static/js/submind_utils.js index 2af7e8c3..8f5da67f 100644 --- a/chat_client/static/js/submind_utils.js +++ b/chat_client/static/js/submind_utils.js @@ -1,14 +1,7 @@ -let submindsPerCid; - -// submindsPerCid = { -// 1: [ -// {submind_id: "wiz-1bbbd8af178a455eb65c669e72c89490", status: "active"}, -// {submind_id: "wolfram-b5003bfc25d7461e9888cfc344c04a85", status: "active"}, -// ] -// } +let subminds_state; function renderActiveSubminds(cid) { - if (!submindsPerCid) { + if (!subminds_state) { console.log(`Subminds for CID ${cid} not yet loaded.`); return; } @@ -26,58 +19,90 @@ function renderActiveSubminds(cid) { const table = document.getElementById(`${cid}-subminds-state-table`); const entriesContainer = document.getElementById(`${cid}-subminds-state-entries`); const buttonsContainer = document.getElementById(`${cid}-subminds-buttons`); - const resetButton = document.getElementById(`${cid}-reset-button`); + buttonsContainer.style.display = 'none'; + const cancelButton = document.getElementById(`${cid}-reset-button`); const submitButton = document.getElementById(`${cid}-submit-button`); - let initialState = (submindsPerCid?.[cid] || []).map(submind => ({ - id: submind.submind_id, - active: submind.status === 'active', - })); + const active_subminds = subminds_state["subminds_per_cid"]?.[cid]?.filter(submind => submind.status === 'active') || []; + const activeSubmindIds = new Set(active_subminds.map(submind => submind.submind_id)); + + const banned_subminds = subminds_state["subminds_per_cid"]?.[cid]?.filter(submind => submind.status === 'banned') || []; + const bannedSubmindIds = new Set(banned_subminds.map(submind => submind.submind_id)); + + const initialSubmindsState = Object.entries(subminds_state?.["connected_subminds"] || {}) + .filter(([submind_id, submind]) => { + return submind["bot_type"] === "submind" && !bannedSubmindIds.has(submind_id); + }) + .map(([submind_id, submind]) => ({ + id: submind_id, + is_active: activeSubmindIds.has(submind_id), + })) + .sort((a, b) => { + return b.is_active - a.is_active; + }); - let currentState = structuredClone(initialState); + let currentState = structuredClone(initialSubmindsState); const updateButtonVisibility = () => { - const hasChanges = initialState.some((submind, index) => submind.active !== currentState[index].active); + const hasChanges = initialSubmindsState.some((submind, index) => submind.is_active !== currentState[index].is_active); buttonsContainer.style.display = hasChanges ? 'block' : 'none'; }; table.style.display = ''; entriesContainer.innerHTML = ''; - (submindsPerCid?.[cid] || []).forEach((submind, index) => { + initialSubmindsState.forEach((submind, index) => { const row = document.createElement('tr'); row.innerHTML = ` - ${submind.submind_id.slice(0, submind.submind_id.lastIndexOf('-'))} + ${submind.id.slice(0, submind.id.lastIndexOf('-'))}
- - + +
`; - const checkbox = row.querySelector(`#toggle-${cid}-${submind.submind_id}`); + const checkbox = row.querySelector(`#toggle-${cid}-${submind.id}`); checkbox.addEventListener('change', () => { - currentState[index].active = checkbox.checked; + currentState[index].is_active = checkbox.checked; updateButtonVisibility(); }); entriesContainer.appendChild(row); }); - resetButton.onclick = () => { - currentState = structuredClone(initialState); + cancelButton.onclick = () => { + currentState = structuredClone(initialSubmindsState); currentState.forEach((submind, index) => { const checkbox = document.getElementById(`toggle-${cid}-${submind.id}`); - if (checkbox) checkbox.checked = submind.active; + checkbox.checked = (submind.is_active)? "checked" : ''; }); updateButtonVisibility(); }; submitButton.onclick = () => { + const modifiedSubminds = currentState.filter((current, index) => { + return current.is_active !== initialSubmindsState[index].is_active; + }); - // function to apply changes for chat - - socket.emit('update_subminds', {cid: currentState}); + let subminds_to_remove = modifiedSubminds.filter(submind => !submind.is_active).map(submind => submind.id); + let subminds_to_add = modifiedSubminds.filter(submind => submind.is_active).map(submind => submind.id); + + if (subminds_to_add.length !== 0){ + socket.emit('broadcast', { + msg_type: "invite_subminds", + "cid": cid, + "requested_participants": subminds_to_add, + }); + } + + if (subminds_to_remove.length !== 0) { + socket.emit('broadcast', { + msg_type: "remove_subminds", + "cid": cid, + "requested_participants": subminds_to_remove, + }); + } const dropdownToggle = document.getElementById(`dropdownToggle-${cid}`); if (dropdownToggle) dropdownToggle.click(); @@ -88,10 +113,15 @@ function renderActiveSubminds(cid) { async function parseSubmindsState(data){ - submindsPerCid = data['subminds_per_cid']; - - for (const cid of Object.keys(submindsPerCid)){ - refreshSubmindsCount(cid); + subminds_state = data; + + const cids = Object.keys(subminds_state["subminds_per_cid"]) + if (cids.length === 0){ + setAllCountersToZero(); + } else { + for (const cid of cids){ + refreshSubmindsCount(cid); + } } } diff --git a/services/klatchat_observer/controller.py b/services/klatchat_observer/controller.py index 73dcc36a..59c2c293 100644 --- a/services/klatchat_observer/controller.py +++ b/services/klatchat_observer/controller.py @@ -338,6 +338,8 @@ def register_sio_handlers(self): "revoke_submind_ban_from_conversation", handler=self.request_revoke_submind_ban_from_conversation, ) + self._sio.on("invite_subminds", handler=self.request_invite_subminds) + self._sio.on("remove_subminds", handler=self.request_remove_subminds) self._sio.on("auth_expired", handler=self._handle_auth_expired) def connect_sio(self): @@ -931,6 +933,26 @@ def request_revoke_submind_ban_from_conversation(self, data: dict): expiration=3000, ) + def request_invite_subminds(self, data: dict): + LOG.info(f"Inviting subminds: {data}") + self.send_message( + request_data=data, + vhost=self.get_vhost("chatbots"), + exchange="invitation", + exchange_type='fanout', + expiration=3000, + ) + + def request_remove_subminds(self, data: dict): + LOG.info(f"Removing subminds: {data}") + self.send_message( + request_data=data, + vhost=self.get_vhost("chatbots"), + exchange="elimination", + expiration=3000, + exchange_type='fanout', + ) + def _sio_emit(self, event: str, data: dict): """ Emit events to the Socket.IO server, ensuring reliability. From 3a3e0295e8eec3e88cfcdbff21483c36461fcf14 Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Sat, 4 Jan 2025 22:05:02 +0100 Subject: [PATCH 16/17] Updated subminds state changing logic to use single SIO event --- chat_client/static/js/base_utils.js | 15 +++++ chat_client/static/js/chat_utils.js | 3 +- chat_client/static/js/sio.js | 10 ++-- chat_client/static/js/submind_utils.js | 75 ++++++++++++------------ services/klatchat_observer/controller.py | 32 ++++------ 5 files changed, 71 insertions(+), 64 deletions(-) diff --git a/chat_client/static/js/base_utils.js b/chat_client/static/js/base_utils.js index 6ba06307..e902f587 100644 --- a/chat_client/static/js/base_utils.js +++ b/chat_client/static/js/base_utils.js @@ -178,6 +178,21 @@ function deleteElement(elem){ if (elem && elem?.parentElement) return elem.parentElement.removeChild(elem); } +/** + * Generic checker for value emptiness + * @param value - provided data to check + */ +function isEmpty(value){ + return ( + // null or undefined + value == null || + // has length and it's zero + (value.hasOwnProperty('length') && value.length === 0) || + // is an Object and has no keys + (value.constructor === Object && Object.keys(value).length === 0) + ); +} + const MIMES = [ ["xml","application/xml"], ["bin","application/vnd.ms-excel.sheet.binary.macroEnabled.main"], diff --git a/chat_client/static/js/chat_utils.js b/chat_client/static/js/chat_utils.js index 100d1c6c..ecab158d 100644 --- a/chat_client/static/js/chat_utils.js +++ b/chat_client/static/js/chat_utils.js @@ -35,7 +35,7 @@ const setAllCountersToZero = () => { */ const refreshSubmindsCount = (cid) => { const participantsCountNode = document.getElementById(`participants-count-${cid}`); - if (participantsCountNode && subminds_state) participantsCountNode.innerText = subminds_state["subminds_per_cid"][cid].length; + if (participantsCountNode && !isEmpty(submindsState)) participantsCountNode.innerText = submindsState["subminds_per_cid"][cid].length; } @@ -288,7 +288,6 @@ async function buildConversation(conversationData, skin, remember=true,conversat } }); await addRecorder(conversationData); - refreshSubmindsCount(conversationData['_id']); await initLanguageSelectors(conversationData['_id']); if (skin === CONVERSATION_SKINS.BASE) { diff --git a/chat_client/static/js/sio.js b/chat_client/static/js/sio.js index b45df025..b12374c3 100644 --- a/chat_client/static/js/sio.js +++ b/chat_client/static/js/sio.js @@ -89,22 +89,22 @@ function initSIO(){ }); socket.on('translation_response', async (data) => { - console.log('translation_response: ', data) + console.debug('translation_response: ', data) await applyTranslations(data); }); socket.on('subminds_state', async (data) => { - console.log('subminds_state: ', data) - await parseSubmindsState(data); + console.debug('subminds_state: ', data) + parseSubmindsState(data); }); socket.on('incoming_tts', (data)=> { - console.log('received incoming stt audio'); + console.debug('received incoming stt audio'); playTTS(data['cid'], data['lang'], data['audio_data']); }); socket.on('incoming_stt', (data)=>{ - console.log('received incoming stt response'); + console.debug('received incoming stt response'); showSTT(data['message_id'], data['lang'], data['message_text']); }); diff --git a/chat_client/static/js/submind_utils.js b/chat_client/static/js/submind_utils.js index 8f5da67f..4380c32c 100644 --- a/chat_client/static/js/submind_utils.js +++ b/chat_client/static/js/submind_utils.js @@ -1,7 +1,7 @@ -let subminds_state; +let submindsState; function renderActiveSubminds(cid) { - if (!subminds_state) { + if (!submindsState) { console.log(`Subminds for CID ${cid} not yet loaded.`); return; } @@ -23,23 +23,32 @@ function renderActiveSubminds(cid) { const cancelButton = document.getElementById(`${cid}-reset-button`); const submitButton = document.getElementById(`${cid}-submit-button`); - const active_subminds = subminds_state["subminds_per_cid"]?.[cid]?.filter(submind => submind.status === 'active') || []; - const activeSubmindIds = new Set(active_subminds.map(submind => submind.submind_id)); + const { subminds_per_cid: submindsPerCID, connected_subminds: connectedSubminds } = submindsState; - const banned_subminds = subminds_state["subminds_per_cid"]?.[cid]?.filter(submind => submind.status === 'banned') || []; + const activeSubminds = submindsPerCID?.[cid]?.filter(submind => submind.status === 'active') || []; + const activeSubmindServices = new Set(activeSubminds.map(submind => submind.submind_id.slice(0, submind.submind_id.lastIndexOf('-')))) + + const banned_subminds = submindsPerCID?.[cid]?.filter(submind => submind.status === 'banned') || []; const bannedSubmindIds = new Set(banned_subminds.map(submind => submind.submind_id)); - const initialSubmindsState = Object.entries(subminds_state?.["connected_subminds"] || {}) - .filter(([submind_id, submind]) => { - return submind["bot_type"] === "submind" && !bannedSubmindIds.has(submind_id); - }) - .map(([submind_id, submind]) => ({ - id: submind_id, - is_active: activeSubmindIds.has(submind_id), - })) - .sort((a, b) => { + const initialSubmindsState = []; + const processedServiceNames = []; + for (let [submindID, submindData] of Object.entries(connectedSubminds || {})){ + const serviceName = submindData.service_name; + const botType = submindData.bot_type; + if (botType === "submind" && !bannedSubmindIds.has(submindID) && !processedServiceNames.includes(serviceName)){ + processedServiceNames.push(serviceName) + initialSubmindsState.push( + { + service_name: serviceName, + is_active: activeSubmindServices.has(serviceName) + } + ) + } + } + initialSubmindsState.sort((a, b) => { return b.is_active - a.is_active; - }); + }) let currentState = structuredClone(initialSubmindsState); @@ -54,16 +63,16 @@ function renderActiveSubminds(cid) { initialSubmindsState.forEach((submind, index) => { const row = document.createElement('tr'); row.innerHTML = ` - ${submind.id.slice(0, submind.id.lastIndexOf('-'))} + ${submind.service_name}
- - + +
`; - const checkbox = row.querySelector(`#toggle-${cid}-${submind.id}`); + const checkbox = row.querySelector(`#toggle-${cid}-${submind.service_name}`); checkbox.addEventListener('change', () => { currentState[index].is_active = checkbox.checked; updateButtonVisibility(); @@ -74,7 +83,7 @@ function renderActiveSubminds(cid) { cancelButton.onclick = () => { currentState = structuredClone(initialSubmindsState); currentState.forEach((submind, index) => { - const checkbox = document.getElementById(`toggle-${cid}-${submind.id}`); + const checkbox = document.getElementById(`toggle-${cid}-${submind.service_name}`); checkbox.checked = (submind.is_active)? "checked" : ''; }); updateButtonVisibility(); @@ -85,22 +94,15 @@ function renderActiveSubminds(cid) { return current.is_active !== initialSubmindsState[index].is_active; }); - let subminds_to_remove = modifiedSubminds.filter(submind => !submind.is_active).map(submind => submind.id); - let subminds_to_add = modifiedSubminds.filter(submind => submind.is_active).map(submind => submind.id); - - if (subminds_to_add.length !== 0){ - socket.emit('broadcast', { - msg_type: "invite_subminds", - "cid": cid, - "requested_participants": subminds_to_add, - }); - } + let subminds_to_remove = modifiedSubminds.filter(submind => !submind.is_active).map(submind => submind.service_name); + let subminds_to_add = modifiedSubminds.filter(submind => submind.is_active).map(submind => submind.service_name); - if (subminds_to_remove.length !== 0) { + if (subminds_to_add.length !== 0 || subminds_to_remove.length !== 0){ socket.emit('broadcast', { - msg_type: "remove_subminds", + msg_type: "update_participating_subminds", "cid": cid, - "requested_participants": subminds_to_remove, + "subminds_to_invite": subminds_to_add, + "subminds_to_kick": subminds_to_remove, }); } @@ -112,10 +114,10 @@ function renderActiveSubminds(cid) { } -async function parseSubmindsState(data){ - subminds_state = data; +function parseSubmindsState(data){ + submindsState = data; - const cids = Object.keys(subminds_state["subminds_per_cid"]) + const cids = Object.keys(submindsState["subminds_per_cid"]) if (cids.length === 0){ setAllCountersToZero(); } else { @@ -124,4 +126,3 @@ async function parseSubmindsState(data){ } } } - diff --git a/services/klatchat_observer/controller.py b/services/klatchat_observer/controller.py index 59c2c293..3b54f34e 100644 --- a/services/klatchat_observer/controller.py +++ b/services/klatchat_observer/controller.py @@ -37,6 +37,7 @@ import requests import socketio +from pika.exchange_type import ExchangeType from socketio.exceptions import SocketIOError from enum import Enum @@ -338,8 +339,10 @@ def register_sio_handlers(self): "revoke_submind_ban_from_conversation", handler=self.request_revoke_submind_ban_from_conversation, ) - self._sio.on("invite_subminds", handler=self.request_invite_subminds) - self._sio.on("remove_subminds", handler=self.request_remove_subminds) + self._sio.on( + "update_participating_subminds", + handler=self.request_update_participating_subminds, + ) self._sio.on("auth_expired", handler=self._handle_auth_expired) def connect_sio(self): @@ -488,12 +491,12 @@ def _handle_neon_recipient(self, recipient_data: dict, msg_data: dict): ) def _handle_chatbot_recipient(self, recipient_data: dict, msg_data: dict): - LOG.info(f"Emitting message to Chatbot Controller: {recipient_data}") - queue = "external_shout" + LOG.debug(f"Emitting message to Chatbot Controller: {recipient_data}") + queue = "klat_shout" if requested_participants := recipient_data.get("context", {}).get( "requested_participants" ): - msg_data["requested_participants"] = json.dumps(requested_participants) + msg_data["requested_participants"] = requested_participants self.send_message( request_data=msg_data, vhost=self.get_vhost("chatbots"), @@ -933,24 +936,13 @@ def request_revoke_submind_ban_from_conversation(self, data: dict): expiration=3000, ) - def request_invite_subminds(self, data: dict): - LOG.info(f"Inviting subminds: {data}") + def request_update_participating_subminds(self, data: dict): + LOG.info(f"Updating participating subminds: {data}") self.send_message( request_data=data, vhost=self.get_vhost("chatbots"), - exchange="invitation", - exchange_type='fanout', - expiration=3000, - ) - - def request_remove_subminds(self, data: dict): - LOG.info(f"Removing subminds: {data}") - self.send_message( - request_data=data, - vhost=self.get_vhost("chatbots"), - exchange="elimination", - expiration=3000, - exchange_type='fanout', + exchange="update_participating_subminds", + exchange_type=ExchangeType.fanout.value, ) def _sio_emit(self, event: str, data: dict): From 5dd2d0ec7605183f7093ef2208a98b3ad64ed219 Mon Sep 17 00:00:00 2001 From: NeonKirill Date: Sat, 4 Jan 2025 22:09:18 +0100 Subject: [PATCH 17/17] Small UI fix --- .../templates/components/conversation_skins/prompts.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/chat_client/templates/components/conversation_skins/prompts.html b/chat_client/templates/components/conversation_skins/prompts.html index 427fd00e..dff054df 100644 --- a/chat_client/templates/components/conversation_skins/prompts.html +++ b/chat_client/templates/components/conversation_skins/prompts.html @@ -3,9 +3,9 @@ {% block skin_body %}
{conversation_name_shrunk} -