From 2acdd7ea5dac90be2d43b1606a695c40e6c35f37 Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Thu, 7 Nov 2024 17:40:29 -0600 Subject: [PATCH] revert markdown --- src/lib/common/markdown/Markdown.svelte | 17 +++++++++++------ src/lib/helpers/constants.js | 3 ++- src/lib/scss/custom/common/_common.scss | 13 +++++++++++++ src/lib/scss/custom/pages/_chat.scss | 3 ++- src/routes/chat/[agentId]/+page.svelte | 6 +++--- .../[agentId]/[conversationId]/chat-box.svelte | 6 +++--- src/routes/page/agent/card-agent.svelte | 4 ++-- 7 files changed, 36 insertions(+), 16 deletions(-) diff --git a/src/lib/common/markdown/Markdown.svelte b/src/lib/common/markdown/Markdown.svelte index 5684b9c0..40655858 100644 --- a/src/lib/common/markdown/Markdown.svelte +++ b/src/lib/common/markdown/Markdown.svelte @@ -1,7 +1,6 @@ @@ -25,11 +30,11 @@ class={`markdown-container markdown-lite ${containerClasses || 'text-white'}`} style={`${containerStyles}`} > - - + /> --> \ No newline at end of file diff --git a/src/lib/helpers/constants.js b/src/lib/helpers/constants.js index aa550b80..142d881a 100644 --- a/src/lib/helpers/constants.js +++ b/src/lib/helpers/constants.js @@ -31,7 +31,8 @@ export const FILE_EDITORS = [ EditorType.File ]; -export const LERNER_ID = "01acc3e5-0af7-49e6-ad7a-a760bd12dc40"; +export const LEARNER_ID = "01acc3e5-0af7-49e6-ad7a-a760bd12dc40"; +export const EVALUATOR_ID = "2cd4b805-7078-4405-87e9-2ec9aadf8a11"; export const TRAINING_MODE = "training"; export const DEFAULT_KNOWLEDGE_COLLECTION = "BotSharp"; \ No newline at end of file diff --git a/src/lib/scss/custom/common/_common.scss b/src/lib/scss/custom/common/_common.scss index a447d826..51ce695e 100644 --- a/src/lib/scss/custom/common/_common.scss +++ b/src/lib/scss/custom/common/_common.scss @@ -185,6 +185,19 @@ button:focus { overflow-x: auto; scrollbar-width: thin; + &:has(.language-sql), + &:has(.language-java), + &:has(.language-javascript), + &:has(.language-typescript), + &:has(.language-csharp), + &:has(.language-python), + &:has(.language-json) { + background-color: black; + color: white; + border-radius: 5px; + padding: 5px 10px; + } + pre { -ms-overflow-style: none !important; white-space: pre-wrap; diff --git a/src/lib/scss/custom/pages/_chat.scss b/src/lib/scss/custom/pages/_chat.scss index cae51309..b9835833 100644 --- a/src/lib/scss/custom/pages/_chat.scss +++ b/src/lib/scss/custom/pages/_chat.scss @@ -770,7 +770,8 @@ padding: 10px 15px; overflow-y: auto; scrollbar-width: none; - height: 200px; + height: fit-content; + max-height: 200px; .card-element-title { font-size: 0.85rem; diff --git a/src/routes/chat/[agentId]/+page.svelte b/src/routes/chat/[agentId]/+page.svelte index 7a5b8bbd..b6b11eed 100644 --- a/src/routes/chat/[agentId]/+page.svelte +++ b/src/routes/chat/[agentId]/+page.svelte @@ -8,7 +8,7 @@ import { getToken, setToken } from '$lib/services/auth-service.js' import { getUserStore } from '$lib/helpers/store.js'; import { conversationStore } from '$lib/helpers/store.js'; - import { LERNER_ID, TRAINING_MODE } from '$lib/helpers/constants'; + import { LEARNER_ID, TRAINING_MODE } from '$lib/helpers/constants'; const params = $page.params; @@ -29,7 +29,7 @@ } else { await getToken("guest@gmail.com", "123456", () => { console.log("login as guest."); - }); + }, () => {}); } conversation = conversationStore.get(); @@ -43,7 +43,7 @@ const chatUrl = new URL(`chat/${agentId}/${conversationId}`, window.location.origin); const searchParams = new URLSearchParams(); - if (agentId === LERNER_ID) { + if (agentId === LEARNER_ID) { searchParams.append('mode', TRAINING_MODE); } diff --git a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte index 1dfe8291..21f92e2f 100644 --- a/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte +++ b/src/routes/chat/[agentId]/[conversationId]/chat-box.svelte @@ -43,7 +43,7 @@ PUBLIC_LIVECHAT_ENABLE_TRAINING, PUBLIC_DEBUG_MODE } from '$env/static/public'; - import { BOT_SENDERS, LERNER_ID, TEXT_EDITORS, TRAINING_MODE, USER_SENDERS, ADMIN_ROLES } from '$lib/helpers/constants'; + import { BOT_SENDERS, LEARNER_ID, TRAINING_MODE, USER_SENDERS, ADMIN_ROLES } 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'; @@ -573,7 +573,7 @@ function sendChatMessage(msgText, data = null, conversationId = null) { isSendingMsg = true; autoScrollLog = true; - clearInstantLogs(); + clearInstantLogs(); renewUserSentMessages(msgText); const agentId = params.agentId; const convId = conversationId || params.conversationId; @@ -1530,7 +1530,7 @@ Add Tags {/if} - {#if agent?.id === LERNER_ID && mode === TRAINING_MODE} + {#if agent?.id === LEARNER_ID && mode === TRAINING_MODE} handleSaveKnowledge()}>Save Knowledge {/if} diff --git a/src/routes/page/agent/card-agent.svelte b/src/routes/page/agent/card-agent.svelte index 3b5788b1..059539aa 100644 --- a/src/routes/page/agent/card-agent.svelte +++ b/src/routes/page/agent/card-agent.svelte @@ -3,7 +3,7 @@ import { Badge, Card, CardBody, Col } from '@sveltestrap/sveltestrap'; import { format } from '$lib/helpers/datetime'; import { _ } from 'svelte-i18n'; - import { LERNER_ID } from "$lib/helpers/constants"; + import { LEARNER_ID } from "$lib/helpers/constants"; /** @type {import('$agentTypes').AgentModel[]} */ export let agents; @@ -73,7 +73,7 @@ {#if agent.is_public }
  • - + {$_('Train')}