Merge pull request #344 from iceljc/features/refine-chat-window

revert agent reset

Author: Oceania2018

src/routes/page/agent/[agentId]/+page.svelte

@@ -18,7 +18,6 @@
     import Swal from 'sweetalert2'
 	import { goto } from '$app/navigation';
 	import { AgentExtensions } from '$lib/helpers/utils/agent';
-    import LocalStorageManager from '$lib/helpers/utils/storage-manager';
 	import AgentTemplate from './agent-components/agent-template.svelte';
 
     /** @type {import('$agentTypes').AgentModel} */
@@ -31,51 +30,23 @@
     let agentTemplateCmp = null;
     /** @type {any} */
     let agentTabsCmp = null;
-    /** @type {import('$agentTypes').AgentModel} */
-    let originalAgent;
-    /** @type {any} */
-    let agentDraft = null;
 
     /** @type {boolean} */
     let isLoading = false;
     let isComplete = false;
 
     const duration = 3000;
     const params = $page.params;
-    const agentStorage = new LocalStorageManager();
-    
 
     onMount(() => {
         isLoading = true;
-        agentDraft = getAgentDraft();
         getAgent(params.agentId).then(data => {
-            originalAgent = {
-                ...data,
-                llm_config: data.llm_config || {}
-            };
-            if (agentDraft) {
-                agent = agentDraft;
-            } else {
-                agent = JSON.parse(JSON.stringify(originalAgent));
-            }
+            agent = data;
         }).finally(() => {
             isLoading = false;
         });
     });
 
-    function getAgentDraft() {
-        return agentStorage.get(`agent_draft_${params.agentId}`)
-    }
-
-    /** @param {any} data */
-    function saveAgentDraft(data) {
-        agentStorage.set(`agent_draft_${params.agentId}`, data, 24 * 60 * 60 * 1000)
-    }
-
-    function deleteAgentDraft() {
-        agentStorage.remove(`agent_draft_${params.agentId}`);
-    }
-
     function updateCurrentAgent() {
         Swal.fire({
             title: 'Are you sure?',
@@ -107,15 +78,17 @@
             utilities: agent.utilities || [],
             knowledge_bases: agent.knowledge_bases || [],
             rules: agent.rules || [],
-            max_message_count: Number(agent.max_message_count) > 0 ? Number(agent.max_message_count) : null
+            max_message_count: Number(agent.max_message_count) > 0 ? Number(agent.max_message_count) : null,
+            llm_config: {
+                ...agent.llm_config,
+                max_output_tokens: Number(agent.llm_config.max_output_tokens) > 0 ? Number(agent.llm_config.max_output_tokens) : null
+            }
         };
         isLoading = true;
         saveAgent(agent).then(res => {
             isLoading = false;
             isComplete = true;
-            deleteAgentDraft();
-            refreshInstructions();
-            refreshTemplates();
+            refresh();
             setTimeout(() => {
                 isComplete = false;
             }, duration);
@@ -144,53 +117,17 @@
         agent.responses = data.responses;
     }
 
-    // Insturctions
-    function formatOriginalInstructions() {
-        const obj = agentInstructionCmp?.fetchOriginalInstructions();
-        return {
-            instruction: obj.systemPrompt,
-            channel_instructions: obj.channelPrompts || []
-        }
-    }
-
     function fetchInstructions() {
         const obj = agentInstructionCmp?.fetchInstructions();
         agent.instruction = obj.systemPrompt;
         agent.channel_instructions = obj.channelPrompts || [];
     }
 
-    function refreshInstructions() {
-        agentInstructionCmp?.refresh();
-    }
-
-    // Templates
-    function formatOriginalTemplates() {
-        const templates = agentTemplateCmp?.fetchOriginalTemplates();
-        return {
-            templates: templates || []
-        }
-    }
-
     function fetchTemplates() {
         agent.templates = agentTemplateCmp?.fetchTemplates();;
     }
 
-    function refreshTemplates() {
-        agentTemplateCmp?.refresh();
-    }
-
-
     // Tab data
-    function formatOriginalTabData() {
-        const data = agentTabsCmp?.fetchOriginalTabData();
-        return data ? {
-            utilities: data.utilities || [],
-            knowledge_bases: data.knwoledgebases || [],
-            rules: data.rules || [],
-            mcp_tools: data.mcpTools || []
-        } : null;
-    }
-
     function fetchTabData() {
         const data = agentTabsCmp?.fetchTabData();
         if (data) {
@@ -221,32 +158,12 @@
 
     function handleAgentDelete() {
         deleteAgent(agent?.id).then(res => {
-            deleteAgentDraft();
             goto(`page/agent`);
         });
     }
 
-    function handleAgentChange() {
-        const data = {
-            ...agent,
-            ...formatJsonContent(),
-            ...formatOriginalInstructions(),
-            ...formatOriginalTemplates(),
-            ...formatOriginalTabData(),
-        };
-        saveAgentDraft(data);
-    }
-
-    function handleAgentReset() {
-        agent = JSON.parse(JSON.stringify(originalAgent));
-        agentDraft = null;
-        deleteAgentDraft();
-        setTimeout(() => {
-            refreshInstructions();
-            refreshTemplates();
-            agentFunctionCmp?.refresh();
-            agentTabsCmp?.refresh();
-        });
+    function refresh() {
+        agentInstructionCmp?.refresh();
     }
 </script>
 
@@ -263,16 +180,12 @@
                     agent={agent}
                     profiles={agent.profiles || []}
                     labels={agent.labels || []}
-                    resetable={!!agentDraft}
-                    resetAgent={() => handleAgentReset()}
-                    {handleAgentChange}
                 />
             </div>
             <div class="agent-detail-section">
                 <AgentTabs
                     bind:this={agentTabsCmp}
                     agent={agent}
-                    {handleAgentChange}
                 />
             </div>
         </Col>
@@ -281,27 +194,24 @@
                 <AgentInstruction
                     bind:this={agentInstructionCmp}
                     agent={agent}
-                    {handleAgentChange}
                 />
             </div>
             <div class="agent-detail-section">
                 <AgentTemplate
                     bind:this={agentTemplateCmp}
                     agent={agent}
-                    {handleAgentChange}
                 />
             </div>
             <div class="agent-detail-section">
                 <AgentFunction
                     bind:this={agentFunctionCmp}
                     agent={agent}
-                    {handleAgentChange}
                 />
             </div>
         </Col>
     </Row>
 
-    {#if !!AgentExtensions.editable(originalAgent)}
+    {#if !!AgentExtensions.editable(agent)}
         <Row>
             <div class="hstack gap-2 my-4">
                 <Button class="btn btn-soft-primary" on:click={() => updateCurrentAgent()}>{$_('Save Agent')}</Button>

src/routes/page/agent/[agentId]/agent-components/agent-instruction.svelte

@@ -15,16 +15,6 @@
     /** @type {() => void} */
     export let handleAgentChange = () => {};
 
-    export const fetchOriginalInstructions = () => {
-        return {
-            systemPrompt: inner_instructions?.[0]?.instruction || '',
-            channelPrompts: inner_instructions?.slice(1)?.map(x => ({
-                channel: x.channel,
-                instruction: x.instruction
-            })) || []
-        };
-    };
-
     export const fetchInstructions = () => {
         const candidates = inner_instructions?.filter((x, idx) => idx > 0 && !!x.channel?.trim())?.map(x => {
             return { channel: x.channel.trim().toLowerCase(), instruction: x.instruction };

src/routes/page/agent/[agentId]/agent-components/agent-knowledge-base.svelte

@@ -39,12 +39,6 @@
         return knowledgeBases;
     }
 
-    export const fetchOriginalKnowledgeBases = () => {
-        return innerKnowledgeBases;
-    }
-
-    export const refresh = () => init();
-
     /** @type {any[]} */
     let knowledgeBaseOptions = [];
 

src/routes/page/agent/[agentId]/agent-components/agent-llm-config.svelte

@@ -17,13 +17,6 @@
         };
     }
 
-    export const fetchOriginalLlmConfig = () => {};
-
-    export const refresh = () => {
-        config = agent.llm_config;
-        init();
-    };
-
     const recursiveDepthLowerLimit = 1;
 
     let config = agent.llm_config;

src/routes/page/agent/[agentId]/agent-components/agent-mcp-tool.svelte

@@ -48,12 +48,6 @@
         return mcps;
     }
 
-    export const fetchOriginalMcpTools = () => {
-        return innerMcps;
-    }
-
-    export const refresh = () => init();
-
     /** @type {any[]} */
     let mcpOptions = [];
 

src/routes/page/agent/[agentId]/agent-components/agent-overview.svelte

@@ -21,12 +21,6 @@
     
     /** @type {() => void} */
     export let handleAgentChange = () => {};
-
-    /** @type {boolean} */
-    export let resetable = false;
-
-    /** @type {() => void} */
-    export let resetAgent = () => {};
    
     onMount(() => {});
 
@@ -73,19 +67,6 @@
 
 <Card>
     <CardHeader>
-        {#if resetable}
-            <!-- svelte-ignore a11y-click-events-have-key-events -->
-            <!-- svelte-ignore a11y-no-static-element-interactions -->
-            <div
-                class="agent-reset-container"
-                data-bs-toggle="tooltip"
-                data-bs-placement="bottom"
-                title={$_('Reset')}
-                on:click={() => resetAgent()}
-            >
-                <i class="mdi mdi-refresh text-primary clickable" />
-            </div>
-        {/if}
         <div class="text-center">
             <div class="agent-overview-header">
                 <img

src/routes/page/agent/[agentId]/agent-components/agent-rule.svelte

@@ -35,12 +35,6 @@
         return rules;
     }
 
-    export const fetchOriginalRules = () => {
-        return innerRules;
-    }
-
-    export const refresh = () => init();
-
     /** @type {any[]} */
     let ruleOptions = [];
 

src/routes/page/agent/[agentId]/agent-components/agent-template.svelte

@@ -14,14 +14,6 @@
     /** @type {() => void} */
     export let handleAgentChange = () => {};
 
-    export const fetchOriginalTemplates = () => {
-        const templates = inner_templates?.map(x => ({
-                name: x.name,
-                content: x.content
-            })) || [];
-        return templates;
-    };
-
     export const fetchTemplates = () => {
         const candidates = inner_templates?.filter((x, idx) => !!x.name?.trim())?.map(x => {
             return { name: x.name.trim().toLowerCase(), content: x.content };
@@ -38,8 +30,6 @@
         return prompts;
     }
 
-    export const refresh = () => init();
-
 
     /** @type {import('$agentTypes').AgentTemplate} */
     const defaultTemplate = {

src/routes/page/agent/[agentId]/agent-components/agent-utility.svelte

@@ -50,13 +50,7 @@
         innerRefresh(candidates);
         return candidates;
     }
-
-    export const fetchOriginalUtilities = () => {
-        return innerUtilities;
-    }
-
-    export const refresh = () => init();
-
+    
     /** @type {any} */
     let utilityMapper = {};
 

src/routes/page/agent/[agentId]/agent-tabs.svelte

@@ -32,28 +32,6 @@
         };
     };
 
-    export const fetchOriginalTabData = () => {
-        const utilities = agentUtilityCmp?.fetchOriginalUtilities();
-        const knwoledgebases = agentKnowledgeBaseCmp?.fetchOriginalKnowledgeBases();
-        const rules = agentEventRuleCmp?.fetchOriginalRules();
-        const mcpTools = agentMcpToolCmp?.fetchOriginalMcpTools();
-
-        return {
-            utilities: utilities || [],
-            knwoledgebases: knwoledgebases || [],
-            rules: rules || [],
-            mcpTools: mcpTools || []
-        };
-    }
-
-    export const refresh = () => {
-        agentLlmConfigCmp?.refresh();
-        agentUtilityCmp?.refresh();
-        agentKnowledgeBaseCmp?.refresh();
-        agentEventRuleCmp?.refresh();
-        agentMcpToolCmp?.refresh();
-    }
-
     /** @type {any} */
     let agentLlmConfigCmp = null;
     /** @type {any} */