Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refine utility name #281

Merged
merged 1 commit into from
Dec 4, 2024
Merged

refine utility name #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/lib/helpers/types/agentTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@
/**
* @typedef {Object} UtilityBase
* @property {string} name
* @property {string?} [displayName]
*/

export default {};
17 changes: 17 additions & 0 deletions src/lib/helpers/utils/common.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,21 @@ export function formatObject(object) {
} catch {
return object;
}
}


/**
* @param {string?} str
* @param {string?} prefix
*/
export function truncateByPrefix(str, prefix) {
if (!str || !prefix) {
return str;
}

if (!str.startsWith(prefix)) {
return str;
}

return str.replace(prefix, '');
}
4 changes: 2 additions & 2 deletions src/routes/chat/[agentId]/[conversationId]/chat-box.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,7 +1759,7 @@
{#if !!lastBotMsg && !isSendingMsg && !isThinking}
<RichContent
message={lastBotMsg}
disabled={isSendingMsg || isThinking}
disabled={isSendingMsg || isThinking || disableAction}
onConfirm={(title, payload) => confirmSelectedOption(title, payload)}
/>
{/if}
Expand Down Expand Up @@ -1843,7 +1843,7 @@
<div class="chat-util-links">
{#if !isLite}
<ChatBigMessage
disabled={disableAction}
disabled={isSendingMsg || isThinking || disableAction}
on:click={() => toggleBigMessageModal()}
/>
{/if}
Expand Down
63 changes: 47 additions & 16 deletions src/routes/page/agent/[agentId]/agent-utility.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@
import { onMount } from 'svelte';
import { Card, CardBody, Input, Button } from '@sveltestrap/sveltestrap';
import { getAgentUtilityOptions } from '$lib/services/agent-service';
import { truncateByPrefix } from '$lib/helpers/utils/common';

const limit = 5;
const maxLength = 30;
const prefix = "util-";

/** @type {import('$agentTypes').AgentModel} */
export let agent;
Expand Down Expand Up @@ -60,13 +61,29 @@
getAgentUtilityOptions().then(data => {
const list = data || [];
list.forEach(item => {
const fns = item.functions.map(f => f.name);
const tps = item.templates.map(t => t.name);
const fns = item.functions.map(f => {
return {
name: f.name,
displayName: truncateByPrefix(f.name, prefix)
};
});
const tps = item.templates.map(t => {
return {
name: t.name,
displayName: truncateByPrefix(t.name, prefix)
};
});

if (!utilityMapper[item.name]) {
utilityMapper[item.name] = {
functions: ["", ...fns],
templates: ["", ...tps]
functions: [{
name: "",
displayName: ""
}, ...fns],
templates: [{
name: "",
displayName: ""
}, ...tps]
};
} else {
const prevFns = utilityMapper[item.name].functions;
Expand All @@ -82,7 +99,20 @@
});

function init() {
refresh(agent.utilities);
const list = agent.utilities?.map(x => {
return {
...x,
functions: x.functions?.map(f => ({
...f,
displayName: truncateByPrefix(f.name, prefix)
})) || [],
templates: x.templates?.map(t => ({
...t,
displayName: truncateByPrefix(t.name, prefix)
})) || []
};
}) || [];
refresh(list);
}

/**
Expand All @@ -97,11 +127,11 @@
found.name = name;
found.functions = [
// @ts-ignore
...utilityMapper[name].functions?.filter(x => !!x)?.map(x => ({ name: x })) || []
...utilityMapper[name].functions?.filter(x => !!x.name) || []
];
found.templates = [
// @ts-ignore
...utilityMapper[name].templates?.filter(x => !!x)?.map(x => ({ name: x })) || []
...utilityMapper[name].templates?.filter(x => !!x.name) || []
];
refresh(innerUtilities);
}
Expand Down Expand Up @@ -132,9 +162,9 @@
if (!found || found.disabled) return;

if (type === 'function') {
found.functions.push({ name: '' });
found.functions.push({ name: '', displayName: '' });
} else if (type === 'template') {
found.templates.push({ name: '' });
found.templates.push({ name: '', displayName: '' });
}

refresh(innerUtilities);
Expand Down Expand Up @@ -171,15 +201,18 @@
const found = innerUtilities.find((_, index) => index === uid);
if (!found) return;

const vals = e.target.value.split("#");
if (type === 'function') {
const fn = found.functions?.find((_, index) => index === idx);
if (fn) {
fn.name = e.target.value;
fn.name = vals[0];
fn.displayName = vals[1];
}
} else if (type === 'template') {
const tp = found.templates?.find((_, index) => index === idx);
if (tp) {
tp.name = e.target.value;
tp.name = vals[0];
tp.displayName = vals[1];
}
}
refresh(innerUtilities);
Expand Down Expand Up @@ -305,12 +338,11 @@
<div class="utility-input line-align-center">
<Input
type="select"
value={fn.name}
disabled={utility.disabled}
on:change={e => selectContent(e, uid, fid, 'function')}
>
{#each (utilityMapper[utility.name]?.functions || []) as option}
<option value={option} selected={option == fn.name}>{option}</option>
<option value={`${option.name}#${option.dsiplayName}`} selected={option.name == fn.name}>{option.displayName}</option>
{/each}
</Input>
</div>
Expand Down Expand Up @@ -355,12 +387,11 @@
<div class="utility-input line-align-center">
<Input
type="select"
value={tp.name}
disabled={utility.disabled}
on:change={e => selectContent(e, uid, tid, 'template')}
>
{#each (utilityMapper[utility.name]?.templates || []) as option}
<option value={option} selected={option == tp.name}>{option}</option>
<option value={`${option.name}#${option.dsiplayName}`} selected={option.name == tp.name}>{option.displayName}</option>
{/each}
</Input>
</div>
Expand Down
Loading