{`${data?.name}`} {#if !!data?.source} From a1d074b7789754aaf8bae8d4061af547499e9628 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Sat, 22 Jun 2024 21:46:53 -0500 Subject: [PATCH 36/70] minor change --- src/lib/scss/custom/pages/_chat.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/lib/scss/custom/pages/_chat.scss b/src/lib/scss/custom/pages/_chat.scss index d420a9b5..78b7b4dd 100644 --- a/src/lib/scss/custom/pages/_chat.scss +++ b/src/lib/scss/custom/pages/_chat.scss @@ -385,7 +385,10 @@ font-size: 20px; color: red; padding: 0 5px; - cursor: pointer; + + i { + cursor: pointer; + } } } } From ad6a0cd27d3aaf2936f7658746ebbba6b6851c08 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Mon, 24 Jun 2024 09:52:24 -0500 Subject: [PATCH 37/70] minor change instant log style --- src/lib/scss/custom/pages/_chat.scss | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/lib/scss/custom/pages/_chat.scss b/src/lib/scss/custom/pages/_chat.scss index 78b7b4dd..f02c45b7 100644 --- a/src/lib/scss/custom/pages/_chat.scss +++ b/src/lib/scss/custom/pages/_chat.scss @@ -375,11 +375,11 @@ border-radius: 10px; background-color: var(--bs-primary) !important; margin: 0px 60px; - flex: 0 0 500px; + flex: 0 0 400px; display: flex; flex-direction: column; - height: 500px; - min-height: 500px; + height: 400px; + min-height: 400px; .close-icon { font-size: 20px; From 3226cb7ed4943c93fe1e963448b7d0a29707de49 Mon Sep 17 00:00:00 2001 From: Jicheng Lu Date: Mon, 24 Jun 2024 22:45:15 -0500 Subject: [PATCH 38/70] add agent tools --- src/lib/helpers/types.js | 1 + src/lib/scss/custom/pages/_agent.scss | 38 +++++++- src/routes/page/agent/[agentId]/+page.svelte | 5 +- .../agent/[agentId]/agent-overview.svelte | 87 ++++++++++++++++--- 4 files changed, 115 insertions(+), 16 deletions(-) diff --git a/src/lib/helpers/types.js b/src/lib/helpers/types.js index 27cf521c..7cbb0651 100644 --- a/src/lib/helpers/types.js +++ b/src/lib/helpers/types.js @@ -122,6 +122,7 @@ * @property {boolean} allow_routing * @property {string} icon_url - Icon * @property {string[]} profiles - The agent profiles. + * @property {string[]} tools - The agent tools. * @property {Date} created_datetime * @property {Date} updated_datetime * @property {AgentLlmConfig} llm_config - LLM settings. diff --git a/src/lib/scss/custom/pages/_agent.scss b/src/lib/scss/custom/pages/_agent.scss index 6e9417e1..ef8db8e4 100644 --- a/src/lib/scss/custom/pages/_agent.scss +++ b/src/lib/scss/custom/pages/_agent.scss @@ -2,11 +2,41 @@ width: 45%; } -.agent-profile-container { - width: fit-content; +.agent-prop-list-container { + width: 85%; max-width: 100%; - .profile-name { - font-size: 1.1em; + + .edit-wrapper { + display: flex; + flex-wrap: wrap; + gap: 5px; + margin-bottom: 5px; + margin-left: -0.75rem; + + .edit-text-box { + flex: 0.9; + border: none; + } + + .delete-icon { + flex: 0.1; + display: flex; + align-items: center; + + i { + cursor: pointer; + font-size: 18px; + color: red; + } + } + } + + .list-add { + font-size: 20px; + + i { + cursor: pointer; + } } } diff --git a/src/routes/page/agent/[agentId]/+page.svelte b/src/routes/page/agent/[agentId]/+page.svelte index 784b38da..61640f8f 100644 --- a/src/routes/page/agent/[agentId]/+page.svelte +++ b/src/routes/page/agent/[agentId]/+page.svelte @@ -62,7 +62,8 @@ ...agent, description: agent.description || '', instruction: agent.instruction || '', - profiles: agent.profiles?.filter(x => x?.trim()?.length > 0) || [] + profiles: agent.profiles?.filter((x, idx, self) => x?.trim()?.length > 0 && self.indexOf(x) === idx) || [], + tools: agent.tools?.filter((x, idx, self) => x?.trim()?.length > 0 && self.indexOf(x) === idx) || [] }; saveAgent(agent).then(res => { isLoading = false; @@ -123,7 +124,7 @@ {#if agent} - + {#if agent.routing_rules?.length > 0} diff --git a/src/routes/page/agent/[agentId]/agent-overview.svelte b/src/routes/page/agent/[agentId]/agent-overview.svelte index df4ba8c5..e8b79259 100644 --- a/src/routes/page/agent/[agentId]/agent-overview.svelte +++ b/src/routes/page/agent/[agentId]/agent-overview.svelte @@ -1,7 +1,8 @@ + +

+ {agent?.name || ''} +

+ {agent?.description || ''} +

+ {agent?.llm_config?.provider || ''}{','} {agent?.llm_config?.model || ''} +

+ + {agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? `profiles` : `profile`}{', '} + {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? `functions` : `function`}{', '} + {agent?.templates?.length || 0} {agent?.templates?.length > 1 ? `templates` : `template`} + +

\ No newline at end of file diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte index b2ac5c12..f784dd4e 100644 --- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte @@ -891,6 +891,7 @@

+ +

Date: Thu, 27 Jun 2024 16:01:58 -0500 Subject: [PATCH 44/70] minor change --- .../[conversationId]/agent-info/chat-agent-info.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte index 74eabc3d..47ebc092 100644 --- a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte @@ -22,9 +22,9 @@

- {agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? `profiles` : `profile`}{', '} - {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? `functions` : `function`}{', '} - {agent?.templates?.length || 0} {agent?.templates?.length > 1 ? `templates` : `template`} + {agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? 'profiles' : 'profile'}{', '} + {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? 'functions' : 'function'}{', '} + {agent?.templates?.length || 0} {agent?.templates?.length > 1 ? 'templates' : 'template'}

From 2dd4e76df3fcbef9394201502c7f9b4b2a930a94 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Thu, 27 Jun 2024 16:05:43 -0500 Subject: [PATCH 45/70] change style --- src/lib/scss/custom/pages/_chat.scss | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/scss/custom/pages/_chat.scss b/src/lib/scss/custom/pages/_chat.scss index 28bb4ddf..1c6ae30e 100644 --- a/src/lib/scss/custom/pages/_chat.scss +++ b/src/lib/scss/custom/pages/_chat.scss @@ -513,8 +513,7 @@ } .queue-change-container { - margin-top: 10px; - margin-bottom: 10px; + margin: 5px 0px; padding: 0px 10px; .log-content { From 1b82139661a8a1f1436cc0b6d964eb8981800ab0 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Thu, 27 Jun 2024 17:19:48 -0500 Subject: [PATCH 46/70] refine delimiter --- .../[conversationId]/agent-info/chat-agent-info.svelte | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte index 47ebc092..9e870123 100644 --- a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte @@ -16,14 +16,14 @@

- {agent?.llm_config?.provider || ''}{','} {agent?.llm_config?.model || ''} + {agent?.llm_config?.provider || ''}{!!agent?.llm_config?.provider ? ',': ''} {agent?.llm_config?.model || ''}

- {agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? 'profiles' : 'profile'}{', '} - {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? 'functions' : 'function'}{', '} + {agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? 'profiles' : 'profile'}{!!agent?.profiles ? ', ' : ''} + {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? 'functions' : 'function'}{!!agent?.functions > 0 ? ', ' : ''} {agent?.templates?.length || 0} {agent?.templates?.length > 1 ? 'templates' : 'template'}

From 0efe7317ecaa32ce1d9bc0414ca621cee369feb4 Mon Sep 17 00:00:00 2001 From: geffzhang Date: Fri, 28 Jun 2024 13:49:08 +0800 Subject: [PATCH 47/70] Update package.json --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index ed4b893e..b939de55 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "node": ">=18.0.0" }, "scripts": { + "start": "npm run open-browser && vite", "dev": "npm run open-browser && vite dev", "open-browser": "start http://localhost:5015/", "build": "vite build", From be4bce31bc4776e401c3309dafba69765e28ae5c Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Fri, 28 Jun 2024 10:43:47 -0500 Subject: [PATCH 48/70] minor change --- .../[conversationId]/agent-info/chat-agent-info.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte index 9e870123..6a5c44b0 100644 --- a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte @@ -23,7 +23,7 @@

{agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? 'profiles' : 'profile'}{!!agent?.profiles ? ', ' : ''} - {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? 'functions' : 'function'}{!!agent?.functions > 0 ? ', ' : ''} + {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? 'functions' : 'function'}{!!agent?.functions ? ', ' : ''} {agent?.templates?.length || 0} {agent?.templates?.length > 1 ? 'templates' : 'template'}

From 007c83c13499a60c3c942f0d24e0b018723b5d47 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Fri, 28 Jun 2024 11:48:10 -0500 Subject: [PATCH 49/70] refine agent page loading --- src/routes/page/agent/+page.svelte | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/routes/page/agent/+page.svelte b/src/routes/page/agent/+page.svelte index 9d724b32..ac144be3 100644 --- a/src/routes/page/agent/+page.svelte +++ b/src/routes/page/agent/+page.svelte @@ -1,21 +1,25 @@

- {agent?.name || ''} + + +

directToAgentPage(agent?.id)} + > + {agent?.name || ''}

- {agent?.description || ''} + {agent?.description || ''}

- {agent?.llm_config?.provider || ''}{!!agent?.llm_config?.provider ? ',': ''} {agent?.llm_config?.model || ''} + {agent?.llm_config?.provider || ''}{!!agent?.llm_config?.provider ? ',': ''} {agent?.llm_config?.model || ''}

diff --git a/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte b/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte index c3370511..64808920 100644 --- a/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte @@ -4,6 +4,7 @@ import Markdown from "$lib/common/Markdown.svelte"; import { ContentLogSource } from '$lib/helpers/enums'; import { utcToLocal } from '$lib/helpers/datetime'; + import { directToAgentPage } from '$lib/helpers/utils/common'; /** @type {import('$types').ConversationContentLogModel} */ export let data; @@ -33,11 +34,6 @@ e.preventDefault(); is_collapsed = !is_collapsed; } - - /** @param {string} agentId */ - function directToAgentDetailPage(agentId) { - window.open(`/page/agent/${agentId}`); - }

@@ -46,7 +42,7 @@ {#if data?.name?.length > 0} {#if data?.agent_id?.length > 0} - directToAgentDetailPage(data.agent_id)}> + directToAgentPage(data.agent_id)}> {data.name} {:else} diff --git a/src/routes/page/agent/[agentId]/agent-routing.svelte b/src/routes/page/agent/[agentId]/agent-routing.svelte index e3ba88d2..6ccd49e1 100644 --- a/src/routes/page/agent/[agentId]/agent-routing.svelte +++ b/src/routes/page/agent/[agentId]/agent-routing.svelte @@ -1,15 +1,10 @@ @@ -53,7 +48,7 @@ {#if !!rule.redirectTo} Redirect to Agent - redirectToAgent(rule.redirectTo)}> + directToAgentPage(rule.redirectTo)}> {rule.redirect_to_agent || ''} From 4804d25689adeeae4ac0c2b16e42c44b0fb41cdd Mon Sep 17 00:00:00 2001 From: Jicheng Lu Date: Tue, 2 Jul 2024 22:45:19 -0500 Subject: [PATCH 58/70] use class --- .../[conversationId]/agent-info/chat-agent-info.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte index 3a7af4b3..58f41fb3 100644 --- a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte @@ -13,7 +13,7 @@ class="text-primary fw-bold" on:click={() => directToAgentPage(agent?.id)} > - {agent?.name || ''} + {agent?.name || ''}

From 35ee008e9980b9f7a4ca3cff426b8892a4da1284 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Wed, 3 Jul 2024 10:11:07 -0500 Subject: [PATCH 59/70] refine list --- .../agent-info/chat-agent-info.svelte | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte index 58f41fb3..80e0f5a5 100644 --- a/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/agent-info/chat-agent-info.svelte @@ -28,12 +28,15 @@

- - {agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? 'profiles' : 'profile'}{!!agent?.profiles ? ', ' : ''} - {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? 'functions' : 'function'}{!!agent?.functions ? ', ' : ''} - {agent?.templates?.length || 0} {agent?.templates?.length > 1 ? 'templates' : 'template'}{!!agent?.templates ? ', ' : ''} - {agent?.utilities?.length || 0} {agent?.utilities?.length > 1 ? 'utilities' : 'utility'} - + {#if !!agent?.profiles} + {agent?.profiles?.length || 0} {agent?.profiles?.length > 1 ? 'profiles' : 'profile'}{', '} + {/if} + {#if !!agent?.functions} + {agent?.functions?.length || 0} {agent?.functions?.length > 1 ? 'functions' : 'function'}{', '} + {/if} + {#if !!agent?.utilities} + {agent?.utilities?.length || 0} {agent?.utilities?.length > 1 ? 'utilities' : 'utility'} + {/if}

\ No newline at end of file From 088480813eef3bd9609010110020b48fa5f09fb2 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Mon, 8 Jul 2024 17:35:36 -0500 Subject: [PATCH 60/70] refine message file loading --- src/lib/helpers/types.js | 2 + src/lib/services/agent-service.js | 8 ++- .../[conversationId]/chat-box.svelte | 35 +++++++---- src/routes/page/agent/+page.svelte | 2 +- .../page/agent/router/routing-flow.svelte | 6 +- src/routes/page/conversation/+page.svelte | 63 ++++++++++++------- .../[conversationId]/conv-dialogs.svelte | 29 ++------- 7 files changed, 81 insertions(+), 64 deletions(-) diff --git a/src/lib/helpers/types.js b/src/lib/helpers/types.js index 0042fc50..fab78da0 100644 --- a/src/lib/helpers/types.js +++ b/src/lib/helpers/types.js @@ -318,6 +318,8 @@ IRichContent.prototype.quick_replies; * @property {string} post_action_disclaimer - The message disclaimer. * @property {string} data - The message data. * @property {Date} created_at - The message sent time. + * @property {boolean} has_message_files + * @property {boolean} is_chat_message */ /** diff --git a/src/lib/services/agent-service.js b/src/lib/services/agent-service.js index 591b8402..6264f966 100644 --- a/src/lib/services/agent-service.js +++ b/src/lib/services/agent-service.js @@ -14,12 +14,16 @@ export async function getSettings() { /** * Get agent list * @param {import('$types').AgentFilter} filter + * @param {boolean} useHook * @returns {Promise>} */ -export async function getAgents(filter) { +export async function getAgents(filter, useHook = false) { let url = endpoints.agentListUrl; const response = await axios.get(url, { - params: filter, + params: { + ...filter, + useHook: useHook || false + }, paramsSerializer: { dots: true, indexes: null, diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte index 28181e1e..eacfdb74 100644 --- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte @@ -312,21 +312,30 @@ /** @param {import('$types').ChatResponseModel} message */ function onMessageReceivedFromClient(message) { - dialogs.push(message); + dialogs.push({ + ...message, + is_chat_message: true + }); refresh(); text = ""; } /** @param {import('$types').ChatResponseModel} message */ function onMessageReceivedFromCsr(message) { - dialogs.push(message); + dialogs.push({ + ...message, + is_chat_message: true + }); refresh(); } /** @param {import('$types').ChatResponseModel} message */ function onMessageReceivedFromAssistant(message) { // webSpeech.utter(message.text); - dialogs.push(message); + dialogs.push({ + ...message, + is_chat_message: true + }); refresh(); } @@ -997,10 +1006,12 @@ {#if !!message.post_action_disclaimer} {/if} - getConversationFiles(params.conversationId, message.message_id, FileSourceType.User)} - /> + {#if !!message.is_chat_message || !!message.has_message_files} + getConversationFiles(params.conversationId, message.message_id, FileSourceType.User)} + /> + {/if}

{#if !isLite} @@ -1024,10 +1035,12 @@

- getConversationFiles(params.conversationId, message.message_id, FileSourceType.Bot)} - /> + {#if !!message.is_chat_message || !!message.has_message_files} + getConversationFiles(params.conversationId, message.message_id, FileSourceType.Bot)} + /> + {/if}

{/if}

diff --git a/src/routes/page/agent/+page.svelte b/src/routes/page/agent/+page.svelte index ac144be3..d1972e04 100644 --- a/src/routes/page/agent/+page.svelte +++ b/src/routes/page/agent/+page.svelte @@ -44,7 +44,7 @@ function getPagedAgents() { isLoading = true; - getAgents(filter).then(data => { + getAgents(filter, true).then(data => { agents = data; }).catch(() => { agents = { items: [], count: 0 }; diff --git a/src/routes/page/agent/router/routing-flow.svelte b/src/routes/page/agent/router/routing-flow.svelte index 0ae11790..df0eff4a 100644 --- a/src/routes/page/agent/router/routing-flow.svelte +++ b/src/routes/page/agent/router/routing-flow.svelte @@ -30,7 +30,7 @@ const dispatch = createEventDispatcher(); onMount(async () => { - const response = await getAgents(filter); + const response = await getAgents(filter, true); agents = response?.items || []; const container = document.getElementById("drawflow"); @@ -185,7 +185,7 @@ includeTaskAgent = !includeTaskAgent; filter.type = includeTaskAgent ? "task" : "none"; filter.type += includeStaticAgent ? ",static" : ",none"; - const response = await getAgents(filter); + const response = await getAgents(filter, true); agents = response?.items || []; renderRoutingFlow(); } @@ -194,7 +194,7 @@ includeStaticAgent = !includeStaticAgent; filter.type = includeTaskAgent ? "task" : "none"; filter.type += includeStaticAgent ? ",static" : ",none"; - const response = await getAgents(filter); + const response = await getAgents(filter, true); agents = response?.items || []; renderRoutingFlow(); } diff --git a/src/routes/page/conversation/+page.svelte b/src/routes/page/conversation/+page.svelte index d5ac4a66..21452b1a 100644 --- a/src/routes/page/conversation/+page.svelte +++ b/src/routes/page/conversation/+page.svelte @@ -70,18 +70,23 @@ }; onMount(async () => { - await loadAgentOptions(); - loadSearchOption(); - loadConversations(); + isLoading = true; + Promise.all([ + loadAgentOptions(), + loadSearchOption(), + loadConversations()]) + .finally(() => { + isLoading = false + }); }); function loadConversations() { - isLoading = true; - getPagedConversations().then(res => { - isLoading = false; - }).catch(error => { - isLoading = false; - isError = true; + return new Promise((resolve, reject) => { + getPagedConversations().then(res => { + resolve(res); + }).catch((error) => { + reject(error); + }); }); } @@ -90,14 +95,21 @@ refresh(); } - async function loadAgentOptions() { - const agents = await getAgents({ pager: { page: 1, size: 100, count: 0 } }); - agentOptions = agents?.items?.map(x => { - return { - id: x.id, - name: x.name - }; - })?.sort((a, b) => a.name.localeCompare(b.name)) || []; + function loadAgentOptions() { + return new Promise((resolve, reject) => { + getAgents({ pager: { page: 1, size: 100, count: 0 } }).then(res => { + agentOptions = res?.items?.map(x => { + return { + id: x.id, + name: x.name + }; + })?.sort((a, b) => a.name.localeCompare(b.name)) || []; + resolve(agentOptions); + }).catch((error) => { + agentOptions = []; + reject(error); + }); + }); } function refresh() { @@ -209,13 +221,16 @@ } function loadSearchOption() { - const savedOption = conversationSearchOptionStore.get(); - searchOption = { - ...searchOption, - ...savedOption - }; - refreshFilter(); - handleSearchStates(); + return new Promise((resolve, reject) => { + const savedOption = conversationSearchOptionStore.get(); + searchOption = { + ...searchOption, + ...savedOption + }; + refreshFilter(); + handleSearchStates(); + resolve(searchOption); + }); } function refreshFilter() { diff --git a/src/routes/page/conversation/[conversationId]/conv-dialogs.svelte b/src/routes/page/conversation/[conversationId]/conv-dialogs.svelte index 45edb42c..d97823b2 100644 --- a/src/routes/page/conversation/[conversationId]/conv-dialogs.svelte +++ b/src/routes/page/conversation/[conversationId]/conv-dialogs.svelte @@ -19,27 +19,8 @@ onMount(async () => { dialogs = await GetDialogs(conversation.id); - loadMessageImages(dialogs); }); - /** @param {import('$types').ChatResponseModel[]} dialogs */ - function loadMessageImages(dialogs) { - if (!!!dialogs) return; - - for (let idx = 0; idx < dialogs.length; idx++) { - const curMsg = dialogs[idx]; - if (!USER_SENDERS.includes(curMsg?.sender?.role || '')) { - continue; - } - - const prevMsg = dialogs[idx-1]; - if (!!!prevMsg || BOT_SENDERS.includes(prevMsg?.sender?.role || '') - && loadFileGallery(prevMsg)) { - curMsg.is_load_images = true; - } - } - } - /** * @param {import('$types').ChatResponseModel} dialog * @returns {boolean} @@ -89,10 +70,12 @@

- getConversationFiles(conversation.id, dialog.message_id, showInRight(dialog) ? FileSourceType.User : FileSourceType.Bot)} - /> + {#if !!dialog.has_message_files} + getConversationFiles(conversation.id, dialog.message_id, showInRight(dialog) ? FileSourceType.User : FileSourceType.Bot)} + /> + {/if}

{#if dialog.message_id}

From cd9de0691d9e7a3293f007f322369c623d183f04 Mon Sep 17 00:00:00 2001 From: Haiping Chen Date: Wed, 10 Jul 2024 21:53:51 -0500 Subject: [PATCH 61/70] fix token query param issue --- src/lib/services/auth-service.js | 3 ++- src/routes/chat/[agentId]/+page.svelte | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/lib/services/auth-service.js b/src/lib/services/auth-service.js index af350b44..90e046c4 100644 --- a/src/lib/services/auth-service.js +++ b/src/lib/services/auth-service.js @@ -44,9 +44,10 @@ export async function getToken(email, password, onSucceed, onError) { * Set token from exteranl * @param {string} token */ -export function setToken(token) { +export async function setToken(token) { let user = getUserStore(); user.token = token; + userStore.set(user); } /** diff --git a/src/routes/chat/[agentId]/+page.svelte b/src/routes/chat/[agentId]/+page.svelte index 4c3f84ed..1c36f097 100644 --- a/src/routes/chat/[agentId]/+page.svelte +++ b/src/routes/chat/[agentId]/+page.svelte @@ -23,7 +23,7 @@ console.log("login as existing account."); } else if($page.url.searchParams.has('token')) { let token = $page.url.searchParams.get('token'); - setToken(token); + await setToken(token); } else { await getToken("guest@gmail.com", "123456", () => { console.log("login as guest."); From 35fa381902235f956d7c76d0d7255027e23a20ec Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Mon, 15 Jul 2024 13:43:10 -0500 Subject: [PATCH 62/70] fix option payload --- .../[conversationId]/rich-content/rc-complex-options.svelte | 4 ++-- .../[conversationId]/rich-content/rc-plain-options.svelte | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-complex-options.svelte b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-complex-options.svelte index bfcb56c5..95da79c5 100644 --- a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-complex-options.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-complex-options.svelte @@ -28,7 +28,7 @@ function collectOptions(options) { cards = options?.filter(op => !!op.title || !!op.subtitle)?.map(op => { // @ts-ignore - const options = op.buttons?.filter(x => !!x.title && !!x.payload)?.map(x => { + const options = op.buttons?.filter(x => !!x.title)?.map(x => { return { title: x.title, payload: x.payload, @@ -46,7 +46,7 @@ buttons = options?.filter(op => !!!op.title && !!!op.subtitle)?.flatMap(op => { // @ts-ignore - return op.buttons?.filter(x => !!x.title && !!x.payload)?.map(x => { + return op.buttons?.filter(x => !!x.title)?.map(x => { return { title: x.title, payload: x.payload, diff --git a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-plain-options.svelte b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-plain-options.svelte index 5ff6c69f..15e42c5b 100644 --- a/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-plain-options.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/rich-content/rc-plain-options.svelte @@ -47,7 +47,7 @@ /** @param {any[]} options */ function collectOptions(options) { - const innerOptions = options?.filter(op => !!op.title && !!op.payload) || []; + const innerOptions = options?.filter(op => !!op.title) || []; videoOptions = innerOptions?.filter(op => op.type == ElementType.Video); fileOption = innerOptions?.find(op => op.type == ElementType.File); @@ -78,7 +78,9 @@ op.isClicked = !op.isClicked; if (op.isClicked) { titleAnswers = [...titleAnswers, op.title]; - payloadAnswers = [...payloadAnswers, op.payload]; + if (!!op.payload) { + payloadAnswers = [...payloadAnswers, op.payload]; + } } else { const targetIdx = titleAnswers.findIndex(a => a == op.title); titleAnswers = titleAnswers.filter((x, index) => index != targetIdx); From 159b2c7fa1098490aa72d6d0512caf627117c024 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 16 Jul 2024 10:18:14 -0500 Subject: [PATCH 63/70] refine content log --- .../persist-log/content-log-element.svelte | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte b/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte index 64808920..53df2a2a 100644 --- a/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/persist-log/content-log-element.svelte @@ -11,6 +11,7 @@ let logDisplayStyle = ''; let is_collapsed = true; + const unknownAgent = "Uknown"; const includedSources = [ ContentLogSource.Prompt ]; @@ -39,19 +40,17 @@

- {#if data?.name?.length > 0} - {#if data?.agent_id?.length > 0} + {#if data?.agent_id?.length > 0} directToAgentPage(data.agent_id)}> - {data.name} + {data.name || unknownAgent} - {:else} + {:else} - {data.name} + {data.name || unknownAgent} - {/if} - {/if} + {`${utcToLocal(data?.created_at, 'hh:mm:ss.SSS A, MMM DD YYYY')} `}

From d3d132cdb1a21b9e6d9aa509790b040924a3d7ae Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 16 Jul 2024 10:29:54 -0500 Subject: [PATCH 64/70] minor change --- .../[agentId]/[conversationId]/instant-log/instant-log.svelte | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/routes/chat/[agentId]/[conversationId]/instant-log/instant-log.svelte b/src/routes/chat/[agentId]/[conversationId]/instant-log/instant-log.svelte index c78d9dc0..5b037903 100644 --- a/src/routes/chat/[agentId]/[conversationId]/instant-log/instant-log.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/instant-log/instant-log.svelte @@ -105,11 +105,13 @@

+ {#if !!agent}

+ {/if}

Date: Tue, 16 Jul 2024 14:32:37 -0500 Subject: [PATCH 65/70] add agent type --- src/lib/helpers/enums.js | 10 +++++++++- src/lib/helpers/types.js | 1 - src/routes/page/agent/[agentId]/agent-overview.svelte | 11 +++++++++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/lib/helpers/enums.js b/src/lib/helpers/enums.js index 866f9fb6..eb17cda7 100644 --- a/src/lib/helpers/enums.js +++ b/src/lib/helpers/enums.js @@ -57,4 +57,12 @@ const fileSourceType = { User: 'user', Bot: 'bot' }; -export const FileSourceType = Object.freeze(fileSourceType); \ No newline at end of file +export const FileSourceType = Object.freeze(fileSourceType); + +const agentType = { + Routing: 'routing', + Task: 'task', + Static: 'static', + Evaluating: 'evaluating' +}; +export const AgentType = Object.freeze(agentType); \ No newline at end of file diff --git a/src/lib/helpers/types.js b/src/lib/helpers/types.js index fab78da0..529f6082 100644 --- a/src/lib/helpers/types.js +++ b/src/lib/helpers/types.js @@ -118,7 +118,6 @@ * @property {boolean} disabled * @property {boolean} is_public * @property {boolean} is_host - * @property {boolean} is_router * @property {boolean} allow_routing * @property {string} icon_url - Icon * @property {string[]} profiles - The agent profiles. diff --git a/src/routes/page/agent/[agentId]/agent-overview.svelte b/src/routes/page/agent/[agentId]/agent-overview.svelte index cfff48fd..f8ed48cd 100644 --- a/src/routes/page/agent/[agentId]/agent-overview.svelte +++ b/src/routes/page/agent/[agentId]/agent-overview.svelte @@ -4,6 +4,7 @@ import { format } from '$lib/helpers/datetime'; import { onMount } from 'svelte'; import { getAgentUtilities } from '$lib/services/agent-service'; + import { AgentType } from '$lib/helpers/enums'; /** @type {import('$types').AgentModel} */ export let agent; @@ -89,10 +90,16 @@ Type - {#if agent.is_router} + {#if agent.type == AgentType.Routing} Routing Agent - {:else} + {:else if agent.type == AgentType.Evaluating} + Evaluation Agent + {:else if agent.type == AgentType.Static} + Static Agent + {:else if agent.type == AgentType.Task} Task Agent + {:else} + Unkown {/if} From 047eef52d77b71203aaa127290fe0155831ad6bb Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Tue, 16 Jul 2024 14:33:42 -0500 Subject: [PATCH 66/70] minor change --- src/routes/page/agent/[agentId]/agent-overview.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/page/agent/[agentId]/agent-overview.svelte b/src/routes/page/agent/[agentId]/agent-overview.svelte index f8ed48cd..b09b1926 100644 --- a/src/routes/page/agent/[agentId]/agent-overview.svelte +++ b/src/routes/page/agent/[agentId]/agent-overview.svelte @@ -1,10 +1,10 @@ diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte index e1a80ce6..1d31e7e9 100644 --- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte @@ -25,7 +25,7 @@ import { onMount, setContext, tick } from 'svelte'; import Viewport from 'svelte-viewport-info'; import { PUBLIC_LIVECHAT_ENTRY_ICON } from '$env/static/public'; - import { BOT_SENDERS, TEXT_EDITORS, USER_SENDERS } from '$lib/helpers/constants'; + import { BOT_SENDERS, LERNER_ID, TEXT_EDITORS, TRAINING_MODE, USER_SENDERS } from '$lib/helpers/constants'; import { signalr } from '$lib/services/signalr-service.js'; import { webSpeech } from '$lib/services/web-speech.js'; import { newConversation } from '$lib/services/conversation-service'; @@ -130,6 +130,9 @@ let autoScrollLog = false; let disableAction = false; + /** @type {string} */ + let mode = ''; + $: { const editor = lastBotMsg?.rich_content?.editor || ''; loadTextEditor = TEXT_EDITORS.includes(editor) || !Object.values(EditorType).includes(editor); @@ -184,6 +187,7 @@ function initChatView() { isFrame = $page.url.searchParams.get('isFrame') === 'true'; + mode = $page.url.searchParams.get('mode') || ''; // initial condition isPersistLogClosed = false; isInstantLogClosed = false; @@ -394,6 +398,9 @@ window.location.href = url; } + function handleSaveKnowledge() { + sendChatMessage("Save knowledge"); + } /** * @param {string} msgText @@ -952,14 +959,17 @@ {/if} - New Conversation + handleNewConversation()}>New Conversation + {#if agent?.id === LERNER_ID && mode === TRAINING_MODE} + handleSaveKnowledge()}>Save Knowledge + {/if}

{#if agent.is_public }

- + {$_('Train')}

From ef68fdb2068c631eede01e66b38a8019c1549c60 Mon Sep 17 00:00:00 2001 From: Jicheng Lu Date: Thu, 18 Jul 2024 22:20:48 -0500 Subject: [PATCH 70/70] use arrow functions --- .../[conversationId]/chat-box.svelte | 20 +++++++++---------- src/routes/page/conversation/+page.svelte | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte index 1d31e7e9..4826398b 100644 --- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte @@ -863,9 +863,9 @@ title={'Edit message'} size={'md'} isOpen={isOpenEditMsgModal} - toggleModal={toggleEditMsgModal} - confirm={confirmEditMsg} - cancel={toggleEditMsgModal} + toggleModal={() => toggleEditMsgModal()} + confirm={() => confirmEditMsg()} + cancel={() => toggleEditMsgModal()} disableConfirmBtn={!!!_.trim(editText)} > @@ -875,9 +875,9 @@ isOpen={isOpenUserAddStateModal} bind:states={userAddStates} requireActiveRounds - toggleModal={toggleUserAddStateModal} - confirm={handleConfirmUserAddStates} - cancel={toggleUserAddStateModal} + toggleModal={() => toggleUserAddStateModal()} + confirm={() => handleConfirmUserAddStates()} + cancel={() => toggleUserAddStateModal()} /> <HeadTitle title="Chat" addOn='' /> @@ -890,7 +890,7 @@ bind:agentQueueLogs={agentQueueLogs} agent={agent} autoScroll={autoScrollLog} - closeWindow={closeInstantLog} + closeWindow={() => closeInstantLog()} /> </Pane> {/if} @@ -1086,7 +1086,7 @@ <RichContent message={lastBotMsg} disabled={isSendingMsg || isThinking} - onConfirm={confirmSelectedOption} + onConfirm={(title, payload) => confirmSelectedOption(title, payload)} /> {/if} </div> @@ -1142,8 +1142,8 @@ bind:contentLogs={contentLogs} bind:convStateLogs={convStateLogs} autoScroll={autoScrollLog} - closeWindow={closePersistLog} - cleanScreen={cleanPersistLogScreen} + closeWindow={() => closePersistLog()} + cleanScreen={() => cleanPersistLogScreen()} /> </Pane> {/if} diff --git a/src/routes/page/conversation/+page.svelte b/src/routes/page/conversation/+page.svelte index 21452b1a..fb8c029e 100644 --- a/src/routes/page/conversation/+page.svelte +++ b/src/routes/page/conversation/+page.svelte @@ -336,9 +336,9 @@ validateKey={true} validateValue={false} bind:states={searchOption.states} - toggleModal={toggleSearchStateModal} - confirm={handleConfirmStateModal} - cancel={toggleSearchStateModal} + toggleModal={() => toggleSearchStateModal()} + confirm={() => handleConfirmStateModal()} + cancel={() => toggleSearchStateModal()} /> <Row> @@ -410,7 +410,7 @@ </Row> {#if searchStateStrs?.length > 0} {#each searchStateStrs as str, idx (idx)} - <Label index={idx} text={str} onClose={handleCloseLabel} /> + <Label index={idx} text={str} onClose={(index) => handleCloseLabel(index)} /> {/each} {/if} </CardBody> @@ -464,7 +464,7 @@ </tbody> </Table> </div> - <TablePagination pagination={pager} pageTo={pageTo} /> + <TablePagination pagination={pager} pageTo={(pn) => pageTo(pn)} /> </CardBody> </Card> </Col>

{$_('Notifications')}

{currentUser?.full_name}

+ {agent?.name || ''} +

- {agent?.name || ''} + + +

directToAgentPage(agent?.id)} + > + {agent?.name || ''}