Compare commits
No commits in common. "77802634aef151e296af8ac4f0b2f4943213b4d8" and "0711d3b89ad1fa677e208c97066a2134319546c9" have entirely different histories.
77802634ae
...
0711d3b89a
|
|
@ -1,6 +1,6 @@
|
|||
import { useCallback, useEffect, useMemo, useState } from 'preact/hooks';
|
||||
import styles from './header.module.css';
|
||||
import { Connection, HORDE_ANON_KEY, type IConnection, type IHordeModel } from '../../tools/connection';
|
||||
import { Connection, HORDE_ANON_KEY, isHordeConnection, isKoboldConnection, type IConnection, type IHordeModel } from '../../tools/connection';
|
||||
import { Instruct } from '../../contexts/state';
|
||||
import { useInputState } from '@common/hooks/useInputState';
|
||||
import { useInputCallback } from '@common/hooks/useInputCallback';
|
||||
|
|
@ -23,17 +23,24 @@ export const ConnectionEditor = ({ connection, setConnection }: IProps) => {
|
|||
const [hordeModels, setHordeModels] = useState<IHordeModel[]>([]);
|
||||
const [contextLength, setContextLength] = useState<number>(0);
|
||||
|
||||
const backendType = useMemo(() => {
|
||||
if (isKoboldConnection(connection)) return 'kobold';
|
||||
if (isHordeConnection(connection)) return 'horde';
|
||||
return 'unknown';
|
||||
}, [connection]);
|
||||
|
||||
const isOnline = useMemo(() => contextLength > 0, [contextLength]);
|
||||
|
||||
useEffect(() => {
|
||||
setInstruct(connection.instruct);
|
||||
connection.url && setConnectionUrl(connection.url);
|
||||
connection.model && setModelName(connection.model);
|
||||
|
||||
if (isKoboldConnection(connection)) {
|
||||
setConnectionUrl(connection.url);
|
||||
Connection.getContextLength(connection).then(setContextLength);
|
||||
} else if (isHordeConnection(connection)) {
|
||||
setModelName(connection.model);
|
||||
setApiKey(connection.apiKey || HORDE_ANON_KEY);
|
||||
|
||||
if (connection.type === 'kobold') {
|
||||
Connection.getContextLength(connection).then(setContextLength);
|
||||
} else if (connection.type === 'horde') {
|
||||
Connection.getHordeModels()
|
||||
.then(m => setHordeModels(Array.from(m.values()).sort((a, b) => a.name.localeCompare(b.name))));
|
||||
}
|
||||
|
|
@ -52,17 +59,17 @@ export const ConnectionEditor = ({ connection, setConnection }: IProps) => {
|
|||
}, [modelName]);
|
||||
|
||||
const setBackendType = useInputCallback((type) => {
|
||||
switch (type) {
|
||||
case 'kobold':
|
||||
case 'horde':
|
||||
if (type === 'kobold') {
|
||||
setConnection({
|
||||
type,
|
||||
instruct,
|
||||
url: connectionUrl,
|
||||
});
|
||||
} else if (type === 'horde') {
|
||||
setConnection({
|
||||
instruct,
|
||||
apiKey,
|
||||
model: modelName,
|
||||
});
|
||||
break;
|
||||
}
|
||||
}, [setConnection, connectionUrl, apiKey, modelName, instruct]);
|
||||
|
||||
|
|
@ -75,19 +82,14 @@ export const ConnectionEditor = ({ connection, setConnection }: IProps) => {
|
|||
const url = connectionUrl.replace(regex, 'http$1://$2');
|
||||
|
||||
setConnection({
|
||||
type: 'kobold',
|
||||
instruct,
|
||||
url,
|
||||
apiKey,
|
||||
model: modelName,
|
||||
});
|
||||
}, [connectionUrl, instruct, setConnection]);
|
||||
|
||||
const handleBlurHorde = useCallback(() => {
|
||||
setConnection({
|
||||
type: 'horde',
|
||||
instruct,
|
||||
url: connectionUrl,
|
||||
apiKey,
|
||||
model: modelName,
|
||||
});
|
||||
|
|
@ -95,7 +97,7 @@ export const ConnectionEditor = ({ connection, setConnection }: IProps) => {
|
|||
|
||||
return (
|
||||
<div class={styles.connectionEditor}>
|
||||
<select value={connection.type} onChange={setBackendType}>
|
||||
<select value={backendType} onChange={setBackendType}>
|
||||
<option value='kobold'>Kobold CPP</option>
|
||||
<option value='horde'>Horde</option>
|
||||
</select>
|
||||
|
|
@ -114,13 +116,13 @@ export const ConnectionEditor = ({ connection, setConnection }: IProps) => {
|
|||
<option value={connection.instruct}>Custom</option>
|
||||
</optgroup>}
|
||||
</select>
|
||||
{connection.type === 'kobold' && <input
|
||||
{isKoboldConnection(connection) && <input
|
||||
value={connectionUrl}
|
||||
onInput={setConnectionUrl}
|
||||
onBlur={handleBlurUrl}
|
||||
class={isOnline ? styles.valid : styles.invalid}
|
||||
/>}
|
||||
{connection.type === 'horde' && <>
|
||||
{isHordeConnection(connection) && <>
|
||||
<input
|
||||
placeholder='Horde API key'
|
||||
title='Horde API key'
|
||||
|
|
|
|||
|
|
@ -22,11 +22,6 @@
|
|||
.info {
|
||||
margin: 0 8px;
|
||||
line-height: 36px;
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
}
|
||||
|
||||
.buttons {
|
||||
|
|
@ -65,27 +60,3 @@
|
|||
gap: 8px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
|
||||
.lore {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
min-height: 80dvh;
|
||||
|
||||
.currentStory {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
|
||||
.storiesSelector {
|
||||
height: 24px;
|
||||
flex-grow: 1;
|
||||
}
|
||||
}
|
||||
|
||||
.loreText {
|
||||
flex-grow: 1;
|
||||
}
|
||||
}
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
import { useCallback, useContext, useMemo } from "preact/hooks";
|
||||
import { useBool } from "@common/hooks/useBool";
|
||||
import { Modal } from "@common/components/modal/Modal";
|
||||
import { useInputCallback } from "@common/hooks/useInputCallback";
|
||||
|
||||
import { DEFAULT_STORY, StateContext } from "../../contexts/state";
|
||||
import { StateContext } from "../../contexts/state";
|
||||
import { LLMContext } from "../../contexts/llm";
|
||||
import { MiniChat } from "../minichat/minichat";
|
||||
import { AutoTextarea } from "../autoTextarea";
|
||||
|
|
@ -13,31 +12,10 @@ import { ConnectionEditor } from "./connectionEditor";
|
|||
import styles from './header.module.css';
|
||||
|
||||
export const Header = () => {
|
||||
const { contextLength, promptTokens, modelName, spentKudos } = useContext(LLMContext);
|
||||
const { contextLength, promptTokens, modelName } = useContext(LLMContext);
|
||||
const {
|
||||
messages,
|
||||
connection,
|
||||
systemPrompt,
|
||||
lore,
|
||||
userPrompt,
|
||||
bannedWords,
|
||||
summarizePrompt,
|
||||
summaryEnabled,
|
||||
totalSpentKudos,
|
||||
stories,
|
||||
currentStory,
|
||||
setSystemPrompt,
|
||||
setLore,
|
||||
setUserPrompt,
|
||||
addSwipe,
|
||||
setBannedWords,
|
||||
setInstruct,
|
||||
setSummarizePrompt,
|
||||
setSummaryEnabled,
|
||||
setConnection,
|
||||
setCurrentStory,
|
||||
createStory,
|
||||
deleteStory,
|
||||
messages, connection, systemPrompt, lore, userPrompt, bannedWords, summarizePrompt, summaryEnabled,
|
||||
setSystemPrompt, setLore, setUserPrompt, addSwipe, setBannedWords, setInstruct, setSummarizePrompt, setSummaryEnabled, setConnection,
|
||||
} = useContext(StateContext);
|
||||
|
||||
const connectionsOpen = useBool();
|
||||
|
|
@ -75,24 +53,6 @@ export const Header = () => {
|
|||
}
|
||||
}, [setSummaryEnabled]);
|
||||
|
||||
const handleChangeStory = useInputCallback((story) => {
|
||||
if (story === '@new') {
|
||||
const id = prompt('Story id');
|
||||
if (id) {
|
||||
createStory(id);
|
||||
setCurrentStory(id);
|
||||
}
|
||||
} else {
|
||||
setCurrentStory(story);
|
||||
}
|
||||
}, []);
|
||||
|
||||
const handleDeleteStory = useCallback(() => {
|
||||
if (confirm(`Delete story "${currentStory}"?`)) {
|
||||
deleteStory(currentStory);
|
||||
}
|
||||
}, [currentStory]);
|
||||
|
||||
return (
|
||||
<div class={styles.header}>
|
||||
<div class={styles.inputs}>
|
||||
|
|
@ -102,12 +62,7 @@ export const Header = () => {
|
|||
</button>
|
||||
</div>
|
||||
<div class={styles.info}>
|
||||
<span>{modelName}</span>
|
||||
<span>📃{promptTokens}/{contextLength}</span>
|
||||
{connection.type === 'horde' ? <>
|
||||
<span>💲{spentKudos}</span>
|
||||
<span>💰{totalSpentKudos}</span>
|
||||
</> : null}
|
||||
{modelName} - {promptTokens} / {contextLength}
|
||||
</div>
|
||||
</div>
|
||||
<div class={styles.buttons}>
|
||||
|
|
@ -130,26 +85,12 @@ export const Header = () => {
|
|||
<h3 class={styles.modalTitle}>Connection settings</h3>
|
||||
<ConnectionEditor connection={connection} setConnection={setConnection} />
|
||||
</Modal>
|
||||
<Modal open={loreOpen.value} onClose={loreOpen.setFalse} class={styles.lore}>
|
||||
<Modal open={loreOpen.value} onClose={loreOpen.setFalse}>
|
||||
<h3 class={styles.modalTitle}>Lore Editor</h3>
|
||||
<div class={styles.currentStory}>
|
||||
<select value={currentStory} onChange={handleChangeStory} class={styles.storiesSelector}>
|
||||
{Object.keys(stories).map((story) => (
|
||||
<option key={story} value={story}>{story}</option>
|
||||
))}
|
||||
<option value='@new'>New Story...</option>
|
||||
</select>
|
||||
{currentStory !== DEFAULT_STORY
|
||||
? <button class='icon' onClick={handleDeleteStory}>
|
||||
🗑️
|
||||
</button>
|
||||
: null}
|
||||
</div>
|
||||
<AutoTextarea
|
||||
value={lore}
|
||||
onInput={setLore}
|
||||
placeholder="Describe your world, for example: World of Awoo has big mountains and wide rivers."
|
||||
class={styles.loreText}
|
||||
/>
|
||||
</Modal>
|
||||
<Modal open={genparamsOpen.value} onClose={genparamsOpen.setFalse}>
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ interface IContext {
|
|||
hasToolCalls: boolean;
|
||||
promptTokens: number;
|
||||
contextLength: number;
|
||||
spentKudos: number;
|
||||
}
|
||||
|
||||
const MESSAGES_TO_KEEP = 10;
|
||||
|
|
@ -50,7 +49,7 @@ const processing = {
|
|||
export const LLMContextProvider = ({ children }: { children?: any }) => {
|
||||
const {
|
||||
connection, messages, triggerNext, continueLast, lore, userPrompt, systemPrompt, bannedWords, summarizePrompt, summaryEnabled,
|
||||
setTriggerNext, setContinueLast, addMessage, editMessage, editSummary, setTotalSpentKudos,
|
||||
setTriggerNext, setContinueLast, addMessage, editMessage, editSummary,
|
||||
} = useContext(StateContext);
|
||||
|
||||
const generating = useBool(false);
|
||||
|
|
@ -58,7 +57,6 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
|
|||
const [contextLength, setContextLength] = useState(0);
|
||||
const [modelName, setModelName] = useState('');
|
||||
const [hasToolCalls, setHasToolCalls] = useState(false);
|
||||
const [spentKudos, setSpentKudos] = useState(0);
|
||||
|
||||
const isOnline = useMemo(() => contextLength > 0, [contextLength]);
|
||||
|
||||
|
|
@ -172,15 +170,10 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
|
|||
try {
|
||||
console.log('[LLM.generate]', prompt);
|
||||
|
||||
setSpentKudos(0);
|
||||
for await (const { text, cost } of Connection.generate(connection, prompt, {
|
||||
yield* Connection.generate(connection, prompt, {
|
||||
...extraSettings,
|
||||
banned_tokens: bannedWords.filter(w => w.trim()),
|
||||
})) {
|
||||
setSpentKudos(sk => sk + cost);
|
||||
setTotalSpentKudos(sk => sk + cost);
|
||||
yield text;
|
||||
}
|
||||
});
|
||||
} catch (e) {
|
||||
if (e instanceof Error && e.name !== 'AbortError') {
|
||||
alert(e.message);
|
||||
|
|
@ -195,16 +188,9 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
|
|||
const prompt = Huggingface.applyChatTemplate(connection.instruct, [{ role: 'user', content }]);
|
||||
console.log('[LLM.summarize]', prompt);
|
||||
|
||||
const tokens = await Array.fromAsync(Connection.generate(connection, prompt));
|
||||
const summary = tokens.reduce((sum, token) => ({
|
||||
text: sum.text + token.text,
|
||||
cost: sum.cost + token.cost,
|
||||
}), { text: '', cost: 0 });
|
||||
const tokens = await Array.fromAsync(Connection.generate(connection, prompt, {}));
|
||||
|
||||
setSpentKudos(sk => sk + summary.cost);
|
||||
setTotalSpentKudos(sk => sk + summary.cost);
|
||||
|
||||
return MessageTools.trimSentence(summary.text);
|
||||
return MessageTools.trimSentence(tokens.join(''));
|
||||
} catch (e) {
|
||||
console.error('Error summarizing:', e);
|
||||
return '';
|
||||
|
|
@ -311,7 +297,6 @@ export const LLMContextProvider = ({ children }: { children?: any }) => {
|
|||
hasToolCalls,
|
||||
promptTokens,
|
||||
contextLength,
|
||||
spentKudos,
|
||||
};
|
||||
|
||||
const context = useMemo(() => rawContext, Object.values(rawContext));
|
||||
|
|
|
|||
|
|
@ -1,28 +1,20 @@
|
|||
import { createContext } from "preact";
|
||||
import { useCallback, useEffect, useMemo, useState, type Dispatch, type StateUpdater } from "preact/hooks";
|
||||
import { useCallback, useEffect, useMemo, useState } from "preact/hooks";
|
||||
import { MessageTools, type IMessage } from "../tools/messages";
|
||||
import { useInputState } from "@common/hooks/useInputState";
|
||||
import { type IConnection } from "../tools/connection";
|
||||
import { loadObject, saveObject } from "../tools/storage";
|
||||
import { useInputCallback } from "@common/hooks/useInputCallback";
|
||||
|
||||
interface IStory {
|
||||
lore: string;
|
||||
messages: IMessage[];
|
||||
}
|
||||
|
||||
interface IContext {
|
||||
currentConnection: number;
|
||||
availableConnections: IConnection[];
|
||||
input: string;
|
||||
systemPrompt: string;
|
||||
lore: string;
|
||||
userPrompt: string;
|
||||
summarizePrompt: string;
|
||||
summaryEnabled: boolean;
|
||||
bannedWords: string[];
|
||||
totalSpentKudos: number;
|
||||
stories: Record<string, IStory>;
|
||||
currentStory: string;
|
||||
messages: IMessage[];
|
||||
//
|
||||
triggerNext: boolean;
|
||||
continueLast: boolean;
|
||||
|
|
@ -30,8 +22,6 @@ interface IContext {
|
|||
|
||||
interface IComputableContext {
|
||||
connection: IConnection;
|
||||
lore: string;
|
||||
messages: IMessage[];
|
||||
}
|
||||
|
||||
interface IActions {
|
||||
|
|
@ -46,7 +36,6 @@ interface IActions {
|
|||
setSummarizePrompt: (prompt: string | Event) => void;
|
||||
setBannedWords: (words: string[]) => void;
|
||||
setSummaryEnabled: (summaryEnabled: boolean) => void;
|
||||
setTotalSpentKudos: Dispatch<StateUpdater<number>>;
|
||||
|
||||
setTriggerNext: (triggerNext: boolean) => void;
|
||||
setContinueLast: (continueLast: boolean) => void;
|
||||
|
|
@ -60,14 +49,9 @@ interface IActions {
|
|||
addSwipe: (index: number, content: string) => void;
|
||||
|
||||
continueMessage: (continueLast?: boolean) => void;
|
||||
|
||||
setCurrentStory: (id: string) => void;
|
||||
createStory: (id: string) => void;
|
||||
deleteStory: (id: string) => void;
|
||||
}
|
||||
|
||||
const SAVE_KEY = 'ai_game_save_state';
|
||||
export const DEFAULT_STORY = 'default';
|
||||
|
||||
export enum Instruct {
|
||||
CHATML = `{% for message in messages %}{{'<|im_start|>' + message['role'] + '\\n\\n' + message['content'] + '<|im_end|>' + '\\n'}}{% endfor %}{% if add_generation_prompt %}{{ '<|im_start|>assistant\\n\\n' }}{% endif %}`,
|
||||
|
|
@ -86,14 +70,12 @@ export enum Instruct {
|
|||
const DEFAULT_CONTEXT: IContext = {
|
||||
currentConnection: 0,
|
||||
availableConnections: [{
|
||||
type: 'kobold',
|
||||
url: 'http://localhost:5001',
|
||||
instruct: Instruct.MISTRAL,
|
||||
instruct: Instruct.CHATML,
|
||||
}],
|
||||
input: '',
|
||||
systemPrompt: 'You are a creative writer. Write a story based on the world description below. Story should be adult and mature; and could include swearing, violence and unfairness. Portray characters realistically and stay in the lore.',
|
||||
stories: {},
|
||||
currentStory: DEFAULT_STORY,
|
||||
lore: '',
|
||||
userPrompt: `{% if isStart -%}
|
||||
Write a novel using information above as a reference.
|
||||
{%- else -%}
|
||||
|
|
@ -108,45 +90,48 @@ Make sure to follow the world description and rules exactly. Avoid cliffhangers
|
|||
summarizePrompt: 'Summarize following text in one paragraph:\n\n{{ message }}\n\nAnswer with shortened text only.',
|
||||
summaryEnabled: true,
|
||||
bannedWords: [],
|
||||
totalSpentKudos: 0,
|
||||
messages: [],
|
||||
triggerNext: false,
|
||||
continueLast: false,
|
||||
};
|
||||
|
||||
const EMPTY_STORY: IStory = {
|
||||
lore: '',
|
||||
messages: [],
|
||||
};
|
||||
|
||||
const saveContext = async (context: IContext & IComputableContext) => {
|
||||
const contextToSave: Partial<IContext & IComputableContext> = { ...context };
|
||||
delete contextToSave.connection;
|
||||
export const saveContext = (context: IContext) => {
|
||||
const contextToSave: Partial<IContext> = { ...context };
|
||||
delete contextToSave.triggerNext;
|
||||
delete contextToSave.continueLast;
|
||||
delete contextToSave.lore;
|
||||
delete contextToSave.messages;
|
||||
|
||||
return saveObject(SAVE_KEY, contextToSave);
|
||||
localStorage.setItem(SAVE_KEY, JSON.stringify(contextToSave));
|
||||
}
|
||||
|
||||
export const loadContext = (): IContext => {
|
||||
let loadedContext: Partial<IContext> = {};
|
||||
|
||||
try {
|
||||
const json = localStorage.getItem(SAVE_KEY);
|
||||
if (json) {
|
||||
loadedContext = JSON.parse(json);
|
||||
}
|
||||
} catch { }
|
||||
|
||||
return { ...DEFAULT_CONTEXT, ...loadedContext };
|
||||
}
|
||||
|
||||
export type IStateContext = IContext & IActions & IComputableContext;
|
||||
|
||||
export const StateContext = createContext<IStateContext>({} as IStateContext);
|
||||
|
||||
const loadedContext = await loadObject(SAVE_KEY, DEFAULT_CONTEXT);
|
||||
|
||||
export const StateContextProvider = ({ children }: { children?: any }) => {
|
||||
const loadedContext = useMemo(() => loadContext(), []);
|
||||
const [currentConnection, setCurrentConnection] = useState<number>(loadedContext.currentConnection);
|
||||
const [availableConnections, setAvailableConnections] = useState<IConnection[]>(loadedContext.availableConnections);
|
||||
const [input, setInput] = useInputState(loadedContext.input);
|
||||
const [stories, setStories] = useState(loadedContext.stories);
|
||||
const [currentStory, setCurrentStory] = useState(loadedContext.currentStory);
|
||||
const [lore, setLore] = useInputState(loadedContext.lore);
|
||||
const [systemPrompt, setSystemPrompt] = useInputState(loadedContext.systemPrompt);
|
||||
const [userPrompt, setUserPrompt] = useInputState(loadedContext.userPrompt);
|
||||
const [summarizePrompt, setSummarizePrompt] = useInputState(loadedContext.summarizePrompt);
|
||||
const [bannedWords, setBannedWords] = useState<string[]>(loadedContext.bannedWords);
|
||||
const [messages, setMessages] = useState(loadedContext.messages);
|
||||
const [summaryEnabled, setSummaryEnabled] = useState(loadedContext.summaryEnabled);
|
||||
const [totalSpentKudos, setTotalSpentKudos] = useState(loadedContext.totalSpentKudos);
|
||||
|
||||
const connection = availableConnections[currentConnection] ?? DEFAULT_CONTEXT.availableConnections[0];
|
||||
|
||||
|
|
@ -166,35 +151,6 @@ export const StateContextProvider = ({ children }: { children?: any }) => {
|
|||
|
||||
useEffect(() => setConnection({ ...connection, instruct }), [instruct]);
|
||||
|
||||
const setLore = useInputCallback((lore) => {
|
||||
if (!currentStory) return;
|
||||
setStories(ss => ({
|
||||
...ss,
|
||||
[currentStory]: {
|
||||
...EMPTY_STORY,
|
||||
...stories[currentStory],
|
||||
lore,
|
||||
}
|
||||
}));
|
||||
}, [currentStory]);
|
||||
|
||||
const setMessages = useCallback((msg: StateUpdater<IMessage[]>) => {
|
||||
if (!currentStory) return;
|
||||
|
||||
let messages = (typeof msg === 'function')
|
||||
? msg(stories[currentStory]?.messages ?? EMPTY_STORY.messages)
|
||||
: msg;
|
||||
|
||||
setStories(ss => ({
|
||||
...ss,
|
||||
[currentStory]: {
|
||||
...EMPTY_STORY,
|
||||
...stories[currentStory],
|
||||
messages,
|
||||
}
|
||||
}));
|
||||
}, [currentStory]);
|
||||
|
||||
const actions: IActions = useMemo(() => ({
|
||||
setConnection,
|
||||
setCurrentConnection,
|
||||
|
|
@ -208,8 +164,6 @@ export const StateContextProvider = ({ children }: { children?: any }) => {
|
|||
|
||||
setTriggerNext,
|
||||
setContinueLast,
|
||||
setTotalSpentKudos,
|
||||
setCurrentStory,
|
||||
|
||||
setBannedWords: (words) => setBannedWords(words.slice()),
|
||||
setAvailableConnections: (connections) => setAvailableConnections(connections.slice()),
|
||||
|
|
@ -284,19 +238,7 @@ export const StateContextProvider = ({ children }: { children?: any }) => {
|
|||
setTriggerNext(true);
|
||||
setContinueLast(c);
|
||||
},
|
||||
createStory: (id: string) => {
|
||||
setStories(ss => ({
|
||||
...ss,
|
||||
[id]: { ...EMPTY_STORY }
|
||||
}))
|
||||
},
|
||||
deleteStory: (id: string) => {
|
||||
if (id === DEFAULT_STORY) return;
|
||||
|
||||
setStories(ss => Object.fromEntries(Object.entries(ss).filter(([k]) => k !== id)));
|
||||
setCurrentStory(cs => cs === id ? DEFAULT_STORY : cs);
|
||||
}
|
||||
}), [setLore, setMessages]);
|
||||
}), []);
|
||||
|
||||
const rawContext: IContext & IComputableContext = {
|
||||
connection,
|
||||
|
|
@ -304,18 +246,15 @@ export const StateContextProvider = ({ children }: { children?: any }) => {
|
|||
availableConnections,
|
||||
input,
|
||||
systemPrompt,
|
||||
lore,
|
||||
userPrompt,
|
||||
summarizePrompt,
|
||||
summaryEnabled,
|
||||
bannedWords,
|
||||
totalSpentKudos,
|
||||
stories,
|
||||
currentStory,
|
||||
messages,
|
||||
//
|
||||
triggerNext,
|
||||
continueLast,
|
||||
lore: stories[currentStory]?.lore ?? '',
|
||||
messages: stories[currentStory]?.messages ?? [],
|
||||
};
|
||||
|
||||
const context = useMemo(() => rawContext, Object.values(rawContext));
|
||||
|
|
|
|||
|
|
@ -6,24 +6,26 @@ import { Huggingface } from "./huggingface";
|
|||
import { approximateTokens, normalizeModel } from "./model";
|
||||
|
||||
interface IBaseConnection {
|
||||
type: 'kobold' | 'horde';
|
||||
instruct: string;
|
||||
url?: string;
|
||||
apiKey?: string;
|
||||
model?: string;
|
||||
}
|
||||
|
||||
interface IKoboldConnection extends IBaseConnection {
|
||||
type: 'kobold';
|
||||
url: string;
|
||||
}
|
||||
|
||||
interface IHordeConnection extends IBaseConnection {
|
||||
type: 'horde';
|
||||
apiKey?: string;
|
||||
model: string;
|
||||
}
|
||||
|
||||
export const isKoboldConnection = (obj: unknown): obj is IKoboldConnection => (
|
||||
obj != null && typeof obj === 'object' && 'url' in obj && typeof obj.url === 'string'
|
||||
);
|
||||
|
||||
export const isHordeConnection = (obj: unknown): obj is IHordeConnection => (
|
||||
obj != null && typeof obj === 'object' && 'model' in obj && typeof obj.model === 'string'
|
||||
);
|
||||
|
||||
export type IConnection = IKoboldConnection | IHordeConnection;
|
||||
|
||||
interface IHordeWorker {
|
||||
|
|
@ -49,7 +51,6 @@ interface IHordeResult {
|
|||
faulted: boolean;
|
||||
done: boolean;
|
||||
finished: number;
|
||||
kudos: number;
|
||||
generations?: {
|
||||
text: string;
|
||||
}[];
|
||||
|
|
@ -87,12 +88,7 @@ export namespace Connection {
|
|||
|
||||
let abortController = new AbortController();
|
||||
|
||||
export interface TextChunk {
|
||||
text: string;
|
||||
cost: number;
|
||||
}
|
||||
|
||||
async function* generateKobold(url: string, prompt: string, extraSettings: IGenerationSettings = {}): AsyncGenerator<TextChunk> {
|
||||
async function* generateKobold(url: string, prompt: string, extraSettings: IGenerationSettings = {}): AsyncGenerator<string> {
|
||||
const sse = new SSE(`${url}/api/extra/generate/stream`, {
|
||||
payload: JSON.stringify({
|
||||
...DEFAULT_GENERATION_SETTINGS,
|
||||
|
|
@ -134,10 +130,10 @@ export namespace Connection {
|
|||
|
||||
while (!end || messages.length) {
|
||||
while (messages.length > 0) {
|
||||
const text = messages.shift();
|
||||
if (text != null) {
|
||||
const message = messages.shift();
|
||||
if (message != null) {
|
||||
try {
|
||||
yield { text, cost: 0 };
|
||||
yield message;
|
||||
} catch { }
|
||||
}
|
||||
}
|
||||
|
|
@ -149,7 +145,7 @@ export namespace Connection {
|
|||
sse.close();
|
||||
}
|
||||
|
||||
async function* generateHorde(connection: IHordeConnection, prompt: string, extraSettings: IGenerationSettings = {}): AsyncGenerator<TextChunk> {
|
||||
async function* generateHorde(connection: IHordeConnection, prompt: string, extraSettings: IGenerationSettings = {}): AsyncGenerator<string> {
|
||||
if (!connection.model) {
|
||||
throw new Error('Horde not connected');
|
||||
}
|
||||
|
|
@ -194,14 +190,14 @@ export namespace Connection {
|
|||
}
|
||||
|
||||
const { id } = await generateResponse.json() as { id: string };
|
||||
const request = async (method = 'GET'): Promise<TextChunk | null> => {
|
||||
const request = async (method = 'GET'): Promise<string | null> => {
|
||||
const response = await fetch(`${AIHORDE}/api/v2/generate/text/status/${id}`, { method });
|
||||
if (response.ok && response.status < 400) {
|
||||
const result: IHordeResult = await response.json();
|
||||
if (result.generations?.length === 1) {
|
||||
const { text } = result.generations[0];
|
||||
|
||||
return { text, cost: result.kudos };
|
||||
return text;
|
||||
}
|
||||
} else {
|
||||
throw new Error(await response.text());
|
||||
|
|
@ -210,17 +206,16 @@ export namespace Connection {
|
|||
return null;
|
||||
};
|
||||
|
||||
const deleteRequest = async () => (await request('DELETE')) ?? { text: '', cost: 0 };
|
||||
const deleteRequest = async () => (await request('DELETE')) ?? '';
|
||||
let text: string | null = null;
|
||||
|
||||
while (!text) {
|
||||
try {
|
||||
await delay(2500, { signal });
|
||||
|
||||
const response = await request();
|
||||
text = await request();
|
||||
|
||||
if (response?.text) {
|
||||
text = response.text;
|
||||
if (text) {
|
||||
for (const sequence of requestData.params.stop_sequence) {
|
||||
const stopIdx = text.indexOf(sequence);
|
||||
if (stopIdx >= 0) {
|
||||
|
|
@ -238,7 +233,7 @@ export namespace Connection {
|
|||
}
|
||||
}
|
||||
|
||||
yield { text: unsloppedText, cost: response.cost };
|
||||
yield unsloppedText;
|
||||
|
||||
requestData.prompt += unsloppedText;
|
||||
|
||||
|
|
@ -262,9 +257,9 @@ export namespace Connection {
|
|||
}
|
||||
|
||||
export async function* generate(connection: IConnection, prompt: string, extraSettings: IGenerationSettings = {}) {
|
||||
if (connection.type === 'kobold') {
|
||||
if (isKoboldConnection(connection)) {
|
||||
yield* generateKobold(connection.url, prompt, extraSettings);
|
||||
} else if (connection.type === 'horde') {
|
||||
} else if (isHordeConnection(connection)) {
|
||||
yield* generateHorde(connection, prompt, extraSettings);
|
||||
}
|
||||
}
|
||||
|
|
@ -329,7 +324,7 @@ export namespace Connection {
|
|||
export const getHordeModels = throttle(requestHordeModels, 10000);
|
||||
|
||||
export async function getModelName(connection: IConnection): Promise<string> {
|
||||
if (connection.type === 'kobold') {
|
||||
if (isKoboldConnection(connection)) {
|
||||
try {
|
||||
const response = await fetch(`${connection.url}/api/v1/model`);
|
||||
if (response.ok) {
|
||||
|
|
@ -339,7 +334,7 @@ export namespace Connection {
|
|||
} catch (e) {
|
||||
console.error('Error getting max tokens', e);
|
||||
}
|
||||
} else if (connection.type === 'horde') {
|
||||
} else if (isHordeConnection(connection)) {
|
||||
return connection.model;
|
||||
}
|
||||
|
||||
|
|
@ -347,7 +342,7 @@ export namespace Connection {
|
|||
}
|
||||
|
||||
export async function getContextLength(connection: IConnection): Promise<number> {
|
||||
if (connection.type === 'kobold') {
|
||||
if (isKoboldConnection(connection)) {
|
||||
try {
|
||||
const response = await fetch(`${connection.url}/api/extra/true_max_context_length`);
|
||||
if (response.ok) {
|
||||
|
|
@ -357,7 +352,7 @@ export namespace Connection {
|
|||
} catch (e) {
|
||||
console.error('Error getting max tokens', e);
|
||||
}
|
||||
} else if (connection.type === 'horde' && connection.model) {
|
||||
} else if (isHordeConnection(connection) && connection.model) {
|
||||
const models = await getHordeModels();
|
||||
const model = models.get(connection.model);
|
||||
if (model) {
|
||||
|
|
@ -369,7 +364,7 @@ export namespace Connection {
|
|||
}
|
||||
|
||||
export async function countTokens(connection: IConnection, prompt: string) {
|
||||
if (connection.type === 'kobold') {
|
||||
if (isKoboldConnection(connection)) {
|
||||
try {
|
||||
const response = await fetch(`${connection.url}/api/extra/tokencount`, {
|
||||
body: JSON.stringify({ prompt }),
|
||||
|
|
@ -383,7 +378,7 @@ export namespace Connection {
|
|||
} catch (e) {
|
||||
console.error('Error counting tokens:', e);
|
||||
}
|
||||
} else if (connection.type === 'horde') {
|
||||
} else {
|
||||
const model = await getModelName(connection);
|
||||
const tokenizer = await Huggingface.findTokenizer(model);
|
||||
if (tokenizer) {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ import * as hub from '@huggingface/hub';
|
|||
import { Template } from '@huggingface/jinja';
|
||||
import { AutoTokenizer, PreTrainedTokenizer } from '@huggingface/transformers';
|
||||
import { normalizeModel } from './model';
|
||||
import { loadObject, saveObject } from './storage';
|
||||
|
||||
export namespace Huggingface {
|
||||
export interface ITemplateMessage {
|
||||
|
|
@ -61,9 +60,27 @@ export namespace Huggingface {
|
|||
|
||||
const TEMPLATE_CACHE_KEY = 'ai_game_template_cache';
|
||||
|
||||
const templateCache: Record<string, string> = {};
|
||||
loadObject(TEMPLATE_CACHE_KEY, {}).then(c => Object.assign(templateCache, c));
|
||||
const loadCache = (): Record<string, string> => {
|
||||
const json = localStorage.getItem(TEMPLATE_CACHE_KEY);
|
||||
|
||||
try {
|
||||
if (json) {
|
||||
const cache = JSON.parse(json);
|
||||
if (cache && typeof cache === 'object') {
|
||||
return cache
|
||||
}
|
||||
}
|
||||
} catch { }
|
||||
|
||||
return {};
|
||||
};
|
||||
|
||||
const saveCache = (cache: Record<string, string>) => {
|
||||
const json = JSON.stringify(cache);
|
||||
localStorage.setItem(TEMPLATE_CACHE_KEY, json);
|
||||
};
|
||||
|
||||
const templateCache: Record<string, string> = loadCache();
|
||||
const compiledTemplates = new Map<string, Template>();
|
||||
const tokenizerCache = new Map<string, PreTrainedTokenizer | null>();
|
||||
|
||||
|
|
@ -244,7 +261,7 @@ export namespace Huggingface {
|
|||
}
|
||||
|
||||
templateCache[modelName] = template;
|
||||
saveObject(TEMPLATE_CACHE_KEY, templateCache);
|
||||
saveCache(templateCache);
|
||||
|
||||
return template;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,44 +0,0 @@
|
|||
const API_KEY = 'awoorwa32';
|
||||
|
||||
export const loadObject = async <T>(key: string, defaultObject: T): Promise<T> => {
|
||||
let localObject: Partial<T> = {};
|
||||
|
||||
try {
|
||||
const json = localStorage.getItem(key);
|
||||
if (json) {
|
||||
localObject = JSON.parse(json);
|
||||
}
|
||||
} catch { }
|
||||
|
||||
let remoteObject: Partial<T> = {};
|
||||
try {
|
||||
const response = await fetch(`https://demo.pabloader.ru/storage/${key}`);
|
||||
if (response.ok) {
|
||||
remoteObject = await response.json();
|
||||
}
|
||||
} catch { }
|
||||
|
||||
return { ...defaultObject, ...localObject, ...remoteObject };
|
||||
}
|
||||
|
||||
export const saveObject = async <T>(key: string, obj: T) => {
|
||||
const saveData = JSON.stringify(obj);
|
||||
|
||||
localStorage.setItem(key, saveData);
|
||||
try {
|
||||
const url = new URL('https://demo.pabloader.ru/storage/index.php');
|
||||
url.searchParams.set('filename', key);
|
||||
const response = await fetch(url, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
'Authorization': `Bearer ${API_KEY}`,
|
||||
},
|
||||
body: saveData,
|
||||
});
|
||||
if (!response.ok) {
|
||||
throw new Error('Failed to save context');
|
||||
}
|
||||
} catch {
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue