Merge branch 'main' of https://github.com/SciSharp/BotSharp-UI into features/refactor-knowledge-service

Author: Jicheng Lu

src/lib/common/embedding/EmbeddingPage.svelte

@@ -2,6 +2,7 @@
     import { onMount } from 'svelte';
     import { page } from '$app/stores';
     import { getUserStore, globalMenuStore } from '$lib/helpers/store';
+    import { getCleanUrl } from '$lib/helpers/utils/common';
 
     let {
         htmlTagId = 'embedding-page',
@@ -25,12 +26,12 @@
 
     onMount(() => {
         const menuUnsubscribe = globalMenuStore.subscribe((/** @type {import('$pluginTypes').PluginMenuDefModel[]} */ menu) => {
-            const url = getPathUrl();
-            let found = menu.find(x => x.link === url);
+            const url = getCleanPath(getPathUrl());
+            let found = menu.find(x => getCleanPath(x.link) === url);
             label = found?.label || '';
             if (!found?.embeddingInfo) {
-                const subFound = menu.find(x => !!x.subMenu?.find(y => y.link === url));
-                found = subFound?.subMenu?.find(x => x.link === url);
+                const subFound = menu.find(x => !!x.subMenu?.find(y => getCleanPath(y.link) === url));
+                found = subFound?.subMenu?.find(x => getCleanPath(x.link) === url);
                 label = found?.label || '';
             }
             embed(found?.embeddingInfo || null);
@@ -77,9 +78,13 @@
         }
     }
 
+    /** @param {string} url */
+    const getCleanPath = (url) => {
+        return getCleanUrl((url || '').split('?')[0]);
+    };
+
     const getPathUrl = () => {
-        const path = $page.url.pathname;
-        return path?.startsWith('/') ? path.substring(1) : path;
+        return $page.url.pathname || '';
     };
 </script>
 

src/lib/helpers/types/conversationTypes.js

@@ -207,6 +207,7 @@ IRichContent.prototype.html_tag;
  * @property {boolean} is_dummy
  * @property {boolean} is_appended
  * @property {string} [indication]
+ * @property {any} [thought]
  * @property {any} [meta_data]
  */
 

src/routes/chat/[agentId]/[conversationId]/chat-box.svelte

@@ -582,9 +582,9 @@
 				...message,
 				is_chat_message: false,
 				is_dummy: true,
-				meta_data: {
-					...(message.meta_data || {}),
-					thinking_text: message.meta_data?.thinking_text || ''
+				thought: {
+					...(message.thought || {}),
+					thinking_text: message.thought?.thinking_text || ''
 				}
 			});
 		}
@@ -602,12 +602,12 @@
 				&& lastMsg?.is_dummy
 			) {
 				setTimeout(() => {
-					const thinkingText = message.meta_data?.thinking_text || '';
+					const thinkingText = message.thought?.thinking_text || '';
 					if (thinkingText) {
-						if (!dialogs[dialogs.length - 1].meta_data) {
-							dialogs[dialogs.length - 1].meta_data = { thinking_text: '' };
+						if (!dialogs[dialogs.length - 1].thought) {
+							dialogs[dialogs.length - 1].thought = { thinking_text: '' };
 						}
-						dialogs[dialogs.length - 1].meta_data.thinking_text += thinkingText;
+						dialogs[dialogs.length - 1].thought.thinking_text += thinkingText;
 					}
 					dialogs[dialogs.length - 1].text += message.text;
 					refreshDialogs();
@@ -638,13 +638,13 @@
 			}
 
 			try {
-				const thinkingText = item.meta_data?.thinking_text || '';
+				const thinkingText = item.thought?.thinking_text || '';
 				if (thinkingText) {
-					if (!dialogs[dialogs.length - 1].meta_data) {
-						dialogs[dialogs.length - 1].meta_data = { thinking_text: '' };
+					if (!dialogs[dialogs.length - 1].thought) {
+						dialogs[dialogs.length - 1].thought = { thinking_text: '' };
 					}
 					for (const tt of thinkingText) {
-						dialogs[dialogs.length - 1].meta_data.thinking_text += tt;
+						dialogs[dialogs.length - 1].thought.thinking_text += tt;
 						refreshDialogs();
 						await delay(10);
 					}
@@ -2014,7 +2014,7 @@
 													{#if message.sender.role == UserRole.Client}
 														<img src="images/users/user-dummy.jpg" class="rounded-circle avatar-sm" style="margin-bottom: -15px;" alt="avatar">
 													{:else}
-														{@const isShowIcon = (message?.rich_content?.message?.text || message?.text || message?.meta_data?.thinking_text) || message?.uuid !== lastBotMsg?.uuid}
+														{@const isShowIcon = (message?.rich_content?.message?.text || message?.text || message?.thought?.thinking_text) || message?.uuid !== lastBotMsg?.uuid}
 														<img
 															class="rounded-circle avatar-sm"
 															style={`display: ${isShowIcon ? 'block' : 'none'}; margin-bottom: -15px;`}

src/routes/chat/[agentId]/[conversationId]/rich-content/rc-message.svelte

@@ -25,7 +25,7 @@
     } = $props();
 
     let text = $derived(message?.rich_content?.message?.text || message?.text || '');
-    let thinkingText = $derived(message?.meta_data?.thinking_text || '');
+    let thinkingText = $derived(message?.thought?.thinking_text || '');
     let isThinking = $derived(thinkingText && !text && isStreaming);
     let isStoppedThinking = $derived(thinkingText && !text && !isStreaming);