From 4075d0bce335a3c0c841e7f5741b96dc7dd1d15a Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Thu, 6 Mar 2025 11:12:05 -0600 Subject: [PATCH 1/2] refine instruction log --- src/lib/common/markdown/Markdown.svelte | 3 +++ src/lib/helpers/types/instructTypes.js | 1 + src/lib/scss/custom/pages/_instruction.scss | 1 + src/routes/page/instruction/log/+page.svelte | 7 ++++--- src/routes/page/instruction/log/log-item.svelte | 1 + src/routes/page/instruction/{ => testing}/+page.svelte | 8 ++++---- svelte.config.js | 2 +- 7 files changed, 15 insertions(+), 8 deletions(-) rename src/routes/page/instruction/{ => testing}/+page.svelte (97%) diff --git a/src/lib/common/markdown/Markdown.svelte b/src/lib/common/markdown/Markdown.svelte index 40655858..8c95e9ea 100644 --- a/src/lib/common/markdown/Markdown.svelte +++ b/src/lib/common/markdown/Markdown.svelte @@ -16,6 +16,9 @@ let innerText = ''; $: { + if (typeof text !== 'string') { + text = `${JSON.stringify(text)}`; + } const markedText = !rawText ? replaceNewLine(marked(replaceMarkdown(text || ''))?.toString()) : marked(text || '')?.toString(); if (!!markedText && markedText.endsWith('
')) { const idx = markedText.lastIndexOf('
'); diff --git a/src/lib/helpers/types/instructTypes.js b/src/lib/helpers/types/instructTypes.js index ee8ea9f3..21eb8b8a 100644 --- a/src/lib/helpers/types/instructTypes.js +++ b/src/lib/helpers/types/instructTypes.js @@ -33,6 +33,7 @@ * @property {string} provider * @property {string} model * @property {string?} [template_name] + * @property {string?} [user_name] * @property {string} user_message * @property {string?} [system_instruction] * @property {string} completion_text diff --git a/src/lib/scss/custom/pages/_instruction.scss b/src/lib/scss/custom/pages/_instruction.scss index f80a81a5..0e0789f7 100644 --- a/src/lib/scss/custom/pages/_instruction.scss +++ b/src/lib/scss/custom/pages/_instruction.scss @@ -95,6 +95,7 @@ padding: 10px 5px; .instruction-log-message { + margin-top: 10px; overflow-y: auto; max-height: 350px; scrollbar-width: none; diff --git a/src/routes/page/instruction/log/+page.svelte b/src/routes/page/instruction/log/+page.svelte index 0410ca33..2e0187c2 100644 --- a/src/routes/page/instruction/log/+page.svelte +++ b/src/routes/page/instruction/log/+page.svelte @@ -201,7 +201,7 @@ - + @@ -260,9 +260,10 @@ {$_('Agent')} - {$_('Provider')} - {$_('Model')} + {$_('Llm Provider')} + {$_('Llm Model')} {$_('Template')} + {$_('Caller')} {$_('Created Time')} {$_('')} diff --git a/src/routes/page/instruction/log/log-item.svelte b/src/routes/page/instruction/log/log-item.svelte index b04a8312..da4f5c3f 100644 --- a/src/routes/page/instruction/log/log-item.svelte +++ b/src/routes/page/instruction/log/log-item.svelte @@ -20,6 +20,7 @@ {item.provider} {item.model} {item.template_name || 'N/A'} + {item.user_name || 'N/A'} {utcToLocal(item.created_time)}
    diff --git a/src/routes/page/instruction/+page.svelte b/src/routes/page/instruction/testing/+page.svelte similarity index 97% rename from src/routes/page/instruction/+page.svelte rename to src/routes/page/instruction/testing/+page.svelte index af0e8011..cbc0cc7e 100644 --- a/src/routes/page/instruction/+page.svelte +++ b/src/routes/page/instruction/testing/+page.svelte @@ -8,7 +8,7 @@ import HeadTitle from '$lib/common/HeadTitle.svelte'; import Breadcrumb from '$lib/common/Breadcrumb.svelte'; import Markdown from '$lib/common/markdown/Markdown.svelte'; - import InstructionState from './instruction-components/instruction-state.svelte'; + import InstructionState from '../instruction-components/instruction-state.svelte'; import { getAgents } from '$lib/services/agent-service'; import LoadingToComplete from '$lib/common/LoadingToComplete.svelte'; import { sendChatCompletion } from '$lib/services/instruct-service'; @@ -16,8 +16,8 @@ import { LlmModelType } from '$lib/helpers/enums'; import NavBar from '$lib/common/nav-bar/NavBar.svelte'; import NavItem from '$lib/common/nav-bar/NavItem.svelte'; - import InstructionTemplate from './instruction-components/instruction-template.svelte'; - import InstructionLlm from './instruction-components/instruction-llm.svelte'; + import InstructionTemplate from '../instruction-components/instruction-template.svelte'; + import InstructionLlm from '../instruction-components/instruction-llm.svelte'; const maxLength = 64000; const DEFAULT_PROVIDER = 'openai'; @@ -165,7 +165,7 @@ - +
    diff --git a/svelte.config.js b/svelte.config.js index a5e89ad7..03780c3c 100644 --- a/svelte.config.js +++ b/svelte.config.js @@ -52,7 +52,7 @@ const config = { "/page/agent/[agentId]", "/page/agent/[agentId]/build", "/page/agent/[agentId]/train", - "/page/instruction", + "/page/instruction/testing", "/page/instruction/log", "/page/conversation", "/page/conversation/[conversationId]", From c78893a670f227f52b3a6a30ef02c7b89f89b83a Mon Sep 17 00:00:00 2001 From: Jicheng Lu <103353@smsassist.com> Date: Thu, 6 Mar 2025 17:02:03 -0600 Subject: [PATCH 2/2] refine state search style --- src/routes/page/conversation/+page.svelte | 8 +++++-- .../page/conversation/state-search.svelte | 23 ++++++++++--------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/routes/page/conversation/+page.svelte b/src/routes/page/conversation/+page.svelte index 78564da7..bd381b97 100644 --- a/src/routes/page/conversation/+page.svelte +++ b/src/routes/page/conversation/+page.svelte @@ -374,8 +374,12 @@
    {#if showStateSearch} - - handleStateSearch(q)}/> + + + + handleStateSearch(q)}/> + + {/if} diff --git a/src/routes/page/conversation/state-search.svelte b/src/routes/page/conversation/state-search.svelte index 7296ae1f..87480b56 100644 --- a/src/routes/page/conversation/state-search.svelte +++ b/src/routes/page/conversation/state-search.svelte @@ -36,7 +36,7 @@ > {#each states as state, idx}
    -
    +
    -
    +
    {/each} {#if states.length < limit} -
    - -
    +
    + +
    +
    {/if}