1
0
Fork 0

Compare commits

..

No commits in common. "df46bdafe40476068390dbfd0b258c524419390f" and "ce67d072697af7049a7874d23bb878fba65cac6d" have entirely different histories.

6 changed files with 39 additions and 51 deletions

View File

@ -2,11 +2,9 @@ import { Header } from "./header/header";
import { Chat } from "./chat";
import { Input } from "./input";
import bgImage from '../assets/bg.jpg';
export const App = () => {
return (
<div class='root' style={{ backgroundImage: `url('${bgImage.src}')` }}>
<div class='root'>
<div class='app'>
<Header />
<Chat />

View File

@ -24,7 +24,6 @@ export const Message = ({ message, index, isLastUser, isLastAssistant }: IProps)
const content = swipe?.content;
const summary = swipe?.summary;
const cost = swipe?.cost ?? 0;
const htmlContent = useMemo(() => MessageTools.format(content ?? ''), [content]);
const handleEnableEdit = useCallback(() => {
@ -33,10 +32,10 @@ export const Message = ({ message, index, isLastUser, isLastAssistant }: IProps)
}, [content]);
const handleSaveEdit = useCallback(() => {
editMessage(index, editedMessage.trim(), cost);
editSummary(index, '', 0);
editMessage(index, editedMessage.trim());
editSummary(index, '');
setEditing(false);
}, [editMessage, editSummary, index, editedMessage, cost]);
}, [editMessage, editSummary, index, editedMessage]);
const handleCancelEdit = useCallback(() => {
setEditing(false);
@ -78,7 +77,6 @@ export const Message = ({ message, index, isLastUser, isLastAssistant }: IProps)
: <>
<div class={styles.text} dangerouslySetInnerHTML={{ __html: htmlContent }} ref={textRef} />
{summary && <small class={styles.summary}>{summary}</small>}
{cost > 0 && <small class={styles.summary}>💲&nbsp;{cost}</small>}
</>
}
<div class={styles.buttons}>

View File

@ -33,9 +33,9 @@ const MESSAGES_TO_KEEP = 10;
interface IActions {
compilePrompt: (messages: IMessage[], args?: ICompileArgs) => Promise<ICompiledPrompt>;
generate: (prompt: string, extraSettings?: IGenerationSettings) => AsyncGenerator<Connection.TextChunk>;
generate: (prompt: string, extraSettings?: IGenerationSettings) => AsyncGenerator<string>;
stopGeneration: () => void;
summarize: (content: string) => Promise<Connection.TextChunk>;
summarize: (content: string) => Promise<string>;
countTokens: (prompt: string) => Promise<number>;
}
export type ILLMContext = IContext & IActions;
@ -168,17 +168,18 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
isRegen,
};
},
generate: async function* (prompt, extraSettings = {}): AsyncGenerator<Connection.TextChunk> {
generate: async function* (prompt, extraSettings = {}) {
try {
console.log('[LLM.generate]', prompt);
setSpentKudos(0);
for await (const { text, cost } of Connection.generate(connection, prompt, {
...extraSettings,
banned_tokens: bannedWords.filter(w => w.trim()),
})) {
setSpentKudos(sk => sk + cost);
setTotalSpentKudos(sk => sk + cost);
yield { text, cost };
yield text;
}
} catch (e) {
if (e instanceof Error && e.name !== 'AbortError') {
@ -188,7 +189,7 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
}
}
},
summarize: async (message) => {
summarize: async (message) => {
try {
const content = Huggingface.applyTemplate(summarizePrompt, { message });
const prompt = Huggingface.applyChatTemplate(connection.instruct, [{ role: 'user', content }]);
@ -203,13 +204,10 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
setSpentKudos(sk => sk + summary.cost);
setTotalSpentKudos(sk => sk + summary.cost);
return {
text: MessageTools.trimSentence(summary.text),
cost: summary.cost,
};
return MessageTools.trimSentence(summary.text);
} catch (e) {
console.error('Error summarizing:', e);
return { text: '', cost: 0 };
return '';
}
},
countTokens: async (prompt) => {
@ -227,7 +225,6 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
let messageId = messages.length - 1;
let text = '';
let cost = 0;
const { prompt, isRegen } = await actions.compilePrompt(messages, { continueLast });
@ -239,18 +236,17 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
}
generating.setTrue();
editSummary(messageId, 'Generating...', 0);
editSummary(messageId, 'Generating...');
for await (const chunk of actions.generate(prompt)) {
text += chunk.text;
cost += chunk.cost;
text += chunk;
setPromptTokens(promptTokens + approximateTokens(text));
editMessage(messageId, text.trim(), cost);
editMessage(messageId, text.trim());
}
generating.setFalse();
text = MessageTools.trimSentence(text);
editMessage(messageId, text, cost);
editSummary(messageId, '', 0);
editMessage(messageId, text);
editSummary(messageId, '');
MessageTools.playReady();
}
@ -264,8 +260,8 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
const message = messages[id];
const swipe = MessageTools.getSwipe(message);
if (message.role === 'assistant' && swipe?.content?.includes('\n') && !swipe.summary) {
const { text, cost } = await actions.summarize(swipe.content);
editSummary(id, text, cost);
const summary = await actions.summarize(swipe.content);
editSummary(id, summary);
}
}
} catch (e) {

View File

@ -80,8 +80,8 @@ interface IActions {
setMessages: (messages: IMessage[]) => void;
addMessage: (content: string, role: IMessage['role'], triggerNext?: boolean) => void;
editMessage: (index: number, content: string, cost: number) => void;
editSummary: (index: number, summary: string, cost: number) => void;
editMessage: (index: number, content: string) => void;
editSummary: (index: number, summary: string) => void;
deleteMessage: (index: number) => void;
setCurrentSwipe: (index: number, swipe: number) => void;
addSwipe: (index: number, content: string) => void;
@ -270,11 +270,11 @@ export const StateContextProvider = ({ children }: { children?: any }) => {
]);
setTriggerNext(triggerNext);
},
editMessage: (index, content, cost) => {
setMessages(messages => MessageTools.updateSwipe(messages, index, { content }, cost));
editMessage: (index, content) => {
setMessages(messages => MessageTools.updateSwipe(messages, index, { content }));
},
editSummary: (index, summary, cost) => {
setMessages(messages => MessageTools.updateSwipe(messages, index, { summary }, cost));
editSummary: (index, summary) => {
setMessages(messages => MessageTools.updateSwipe(messages, index, { summary }));
},
deleteMessage: (index) => setMessages(messages =>
messages.filter((_, i) => i !== index)
@ -291,7 +291,7 @@ export const StateContextProvider = ({ children }: { children?: any }) => {
if (currentSwipe >= swipes.length) {
if (latestSwipe.content.length > 0) {
currentSwipe = swipes.length;
swipes.push({ content: '', cost: 0 });
swipes.push({ content: '' });
} else {
currentSwipe = swipes.length - 1;
}
@ -315,7 +315,7 @@ export const StateContextProvider = ({ children }: { children?: any }) => {
messages.map(
(message, i) => {
if (i === index) {
const swipes = [...message.swipes, { content, cost: 0 }];
const swipes = [...message.swipes, { content }];
return {
...message,

View File

@ -106,7 +106,7 @@ export namespace Huggingface {
console.log(`[huggingface] searching config in '${name}/tokenizer_config.json'`);
const fileResponse = await hub.downloadFile({
repo: name,
path: 'tokenizer_config.json',
path: 'tokenizer_config.json',
});
if (fileResponse) {
const maybeConfig = JSON.parse(await fileResponse.text());
@ -236,17 +236,13 @@ export namespace Huggingface {
if (config?.chat_template?.trim()) {
template = config.chat_template.trim()
.replace(/raise_exception\(('[^')]+'|"[^")]+")\)/g, `''`)
.replaceAll('eos_token', `'${config.eos_token ?? ''}'`)
.replaceAll('bos_token', `''`)
.replace(/\{\{ ?(''|"") ?\}\}/g, '')
.replace(/\n'/g, `\\n'`)
.replace(/\n"/g, `\\n"`)
.replace(/'\s*\+\s*'/g, '')
.replace(/"\s*\+\s*"/g, '')
.replace(/\{%\s*else\s*%\}\{%\s*endif\s*%\}/gi, '{% endif %}')
.replace(/\{%\s*elif[^}]+%\}\{%\s*endif\s*%\}/gi, '{% endif %}')
.replace(/\{%\s*if[^}]+%\}\{%\s*endif\s*%\}/gi, '');
.replaceAll('bos_token', `''`);
if (config.bos_token) {
template = template
.replace(/\{\{ ?(''|"") ?\}\}/g, '');
}
}
}
@ -312,6 +308,7 @@ export namespace Huggingface {
try {
let template = compiledTemplates.get(templateString);
if (!template) {
templateString = templateString.replace(/raise_exception\(('[^')]+'|"[^")]+")\)/g, `''`)
template = new Template(templateString);
compiledTemplates.set(templateString, template);
}

View File

@ -3,7 +3,6 @@ import messageSound from '../assets/message.mp3';
export interface ISwipe {
content: string;
summary?: string;
cost: number;
}
export interface IMessage {
@ -15,8 +14,8 @@ export interface IMessage {
export namespace MessageTools {
export const getSwipe = (message?: IMessage | null) => message?.swipes[message?.currentSwipe];
export const create = (content: string, role: IMessage['role'] = 'user', technical = false, cost = 0): IMessage => (
{ role, currentSwipe: 0, swipes: [{ content, cost }], technical }
export const create = (content: string, role: IMessage['role'] = 'user', technical = false): IMessage => (
{ role, currentSwipe: 0, swipes: [{ content }], technical }
);
export const playReady = () => {
@ -98,12 +97,12 @@ export namespace MessageTools {
return text.trim();
}
export const updateSwipe = (messages: IMessage[], index: number, update: Partial<ISwipe>, cost = 0) => (
export const updateSwipe = (messages: IMessage[], index: number, update: Partial<ISwipe>) => (
messages.map(
(m, i) => ({
...m,
swipes: i === index
? m.swipes.map((s, si) => (si === m.currentSwipe ? { ...s, ...update, cost: s.cost + cost } : s))
? m.swipes.map((s, si) => (si === m.currentSwipe ? { ...s, ...update } : s))
: m.swipes
})
)