Added RPG
This commit is contained in:
+37
-1
@@ -1,4 +1,4 @@
|
||||
import { toggleSidebar, dom } from './state.js';
|
||||
import { toggleSidebar, dom, setRpgEnabled } from './state.js';
|
||||
import { initSessions, createNewChat } from './sessions.js';
|
||||
import { loadPersonas, initPersonaModals } from './personas.js';
|
||||
import { sendMessage, clearHistory } from './chat.js';
|
||||
@@ -25,6 +25,42 @@ dom.inputEl.addEventListener('keydown', (e) => {
|
||||
dom.sendBtn.addEventListener('click', sendMessage);
|
||||
dom.clearBtn.addEventListener('click', clearHistory);
|
||||
|
||||
dom.rpgToggle?.addEventListener('change', async () => {
|
||||
setRpgEnabled(dom.rpgToggle.checked);
|
||||
const { sessionId } = await import('./state.js');
|
||||
if (!sessionId) return;
|
||||
await fetch(`/sessions/${sessionId}`, {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ rpg_enabled: dom.rpgToggle.checked }),
|
||||
});
|
||||
|
||||
// Debug: immediately bootstrap plot arc and show it in chat
|
||||
if (dom.rpgToggle.checked) {
|
||||
const { currentPersona } = await import('./state.js');
|
||||
const res = await fetch('/chat/rpg/bootstrap', {
|
||||
method: 'POST',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify({ session_id: sessionId, persona_id: currentPersona }),
|
||||
});
|
||||
if (res.ok) {
|
||||
const data = await res.json();
|
||||
if (data.plot_arc) {
|
||||
const { addMessage } = await import('./chat.js');
|
||||
const title = data.plot_arc.title || 'PlotArc';
|
||||
const phase = data.plot_arc.phase || '';
|
||||
const hint = data.plot_arc.next_beat_hint || '';
|
||||
addMessage('assistant', `--- PlotArc ---\n${title}\nphase: ${phase}\nnext: ${hint}\n---`);
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
dom.systemBlobToggle?.addEventListener('click', () => {
|
||||
const hidden = dom.systemBlobContent.classList.toggle('hidden');
|
||||
dom.systemBlobToggle.textContent = hidden ? 'Показать' : 'Скрыть';
|
||||
});
|
||||
|
||||
initPersonaModals();
|
||||
await initSessions();
|
||||
loadPersonas();
|
||||
|
||||
@@ -53,6 +53,52 @@ export function createImagePromptBlock(promptText) {
|
||||
return block;
|
||||
}
|
||||
|
||||
function renderChoices(wrapper, choices) {
|
||||
if (!choices || !choices.length) return;
|
||||
const row = document.createElement('div');
|
||||
row.className = 'choice-row';
|
||||
for (const c of choices) {
|
||||
const btn = document.createElement('button');
|
||||
btn.type = 'button';
|
||||
btn.className = 'choice-btn';
|
||||
btn.textContent = c.label;
|
||||
btn.addEventListener('click', () => {
|
||||
dom.inputEl.value = c.label;
|
||||
dom.inputEl.focus();
|
||||
});
|
||||
row.appendChild(btn);
|
||||
}
|
||||
wrapper.appendChild(row);
|
||||
}
|
||||
|
||||
function renderResolution(wrapper, resolution) {
|
||||
if (!resolution?.text) return;
|
||||
const block = document.createElement('div');
|
||||
block.className = 'resolution-block';
|
||||
block.innerHTML = `
|
||||
<div class="resolution-title">Resolution (d20=${resolution.roll}, ${resolution.outcome})</div>
|
||||
<div class="resolution-text"></div>
|
||||
`;
|
||||
block.querySelector('.resolution-text').textContent = resolution.text;
|
||||
wrapper.appendChild(block);
|
||||
}
|
||||
|
||||
function renderDebugBlocks(wrapper, blocks) {
|
||||
if (!blocks || !blocks.length) return;
|
||||
for (const b of blocks) {
|
||||
if (!b?.text) continue;
|
||||
if (b.type === 'global_plot') {
|
||||
addMessage('assistant', `--- Global plot ---\n${b.text}\n---`);
|
||||
} else if (b.type === 'facts') {
|
||||
addMessage('assistant', b.text);
|
||||
} else if (b.type === 'status_quo') {
|
||||
addMessage('assistant', b.text);
|
||||
} else {
|
||||
addMessage('assistant', b.text);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async function generateImageViaA1111(promptText, block) {
|
||||
block.parentElement.querySelector('.chat-image')?.remove();
|
||||
block.parentElement.querySelector('.image-error')?.remove();
|
||||
@@ -238,6 +284,16 @@ export async function sendMessage() {
|
||||
err.textContent = '🖼 ' + data.image_error;
|
||||
bubble.parentElement.appendChild(err);
|
||||
}
|
||||
if (data.choices && bubble) {
|
||||
renderChoices(bubble.parentElement, data.choices);
|
||||
}
|
||||
if (data.resolution && bubble) {
|
||||
// show resolution under the last user message (best-effort: attach near assistant response)
|
||||
renderResolution(bubble.parentElement, data.resolution);
|
||||
}
|
||||
if (data.debug) {
|
||||
renderDebugBlocks(bubble?.parentElement || dom.messagesEl, data.debug);
|
||||
}
|
||||
const { loadSessions } = await import('./sessions.js');
|
||||
loadSessions();
|
||||
}
|
||||
|
||||
+91
-3
@@ -1,6 +1,8 @@
|
||||
import { currentPersona, setCurrentPersona, sessionId } from './state.js';
|
||||
import { initChat } from './chat.js';
|
||||
|
||||
export let personaIndex = new Map();
|
||||
|
||||
export function highlightPersona(personaId) {
|
||||
document.querySelectorAll('.persona-card').forEach(c => {
|
||||
c.classList.toggle('active', c.dataset.id === personaId);
|
||||
@@ -10,6 +12,7 @@ export function highlightPersona(personaId) {
|
||||
export async function loadPersonas() {
|
||||
const res = await fetch('/personas/');
|
||||
const personas = await res.json();
|
||||
personaIndex = new Map(personas.map(p => [p.persona_id, p]));
|
||||
const bar = document.getElementById('personaBar');
|
||||
bar.innerHTML = '';
|
||||
|
||||
@@ -18,11 +21,14 @@ export async function loadPersonas() {
|
||||
card.className = 'persona-card' + (p.persona_id === currentPersona ? ' active' : '');
|
||||
card.dataset.id = p.persona_id;
|
||||
const isCard = p.persona_id.startsWith('card_');
|
||||
const isCustomPersona = p.custom && !isCard;
|
||||
const avatar = p.avatar_path ? `/static/${p.avatar_path}` : '';
|
||||
card.innerHTML = `
|
||||
<span class="emoji">${p.emoji}</span>
|
||||
${avatar ? `<img class="avatar" src="${avatar}" alt="">` : `<span class="emoji">${p.emoji}</span>`}
|
||||
<span class="pname">${p.name}</span>
|
||||
${p.custom ? `<button class="del-btn" type="button">✕</button>` : ''}
|
||||
${isCard ? `<button class="edit-btn" type="button">✏️</button>` : ''}
|
||||
${isCustomPersona ? `<button class="edit-persona-btn" type="button">✏️</button>` : ''}
|
||||
`;
|
||||
card.addEventListener('click', () => selectPersona(p.persona_id));
|
||||
card.querySelector('.del-btn')?.addEventListener('click', async (e) => {
|
||||
@@ -48,6 +54,27 @@ export async function loadPersonas() {
|
||||
document.getElementById('editLoraWeight').value = data.lora_weight ?? 0.8;
|
||||
document.getElementById('cardEditOverlay').classList.add('open');
|
||||
});
|
||||
|
||||
card.querySelector('.edit-persona-btn')?.addEventListener('click', async (e) => {
|
||||
e.stopPropagation();
|
||||
const r = await fetch(`/personas/${p.persona_id}`);
|
||||
const data = await r.json();
|
||||
document.getElementById('editPersonaId').value = p.persona_id;
|
||||
document.getElementById('editPName').value = data.name || '';
|
||||
document.getElementById('editPEmoji').value = data.emoji || '';
|
||||
document.getElementById('editPDesc').value = data.description || '';
|
||||
document.getElementById('editPPersonality').value = data.personality || '';
|
||||
document.getElementById('editPScenario').value = data.scenario || '';
|
||||
document.getElementById('editPFirstMes').value = data.first_mes || '';
|
||||
document.getElementById('editPMesExample').value = data.mes_example || '';
|
||||
document.getElementById('editPLorebook').value = data.lorebook_json || '[]';
|
||||
document.getElementById('editPPrompt').value = data.prompt || '';
|
||||
document.getElementById('editPSdEnabled').checked = !!data.sd_enabled;
|
||||
document.getElementById('editPLora').value = data.lora_name || '';
|
||||
document.getElementById('editPLoraWeight').value = data.lora_weight ?? 0.8;
|
||||
document.getElementById('editPAppearance').value = data.appearance_tags || '';
|
||||
document.getElementById('personaEditOverlay').classList.add('open');
|
||||
});
|
||||
bar.appendChild(card);
|
||||
});
|
||||
|
||||
@@ -90,6 +117,14 @@ export function initPersonaModals() {
|
||||
document.getElementById('cardEditOverlay').classList.remove('open');
|
||||
});
|
||||
|
||||
// custom persona editor (reuses create modal fields)
|
||||
const personaEditCancel = document.getElementById('personaEditCancel');
|
||||
if (personaEditCancel) {
|
||||
personaEditCancel.addEventListener('click', () => {
|
||||
document.getElementById('personaEditOverlay').classList.remove('open');
|
||||
});
|
||||
}
|
||||
|
||||
document.getElementById('modalSave').addEventListener('click', async () => {
|
||||
const data = {
|
||||
persona_id: document.getElementById('pId').value.trim(),
|
||||
@@ -100,9 +135,14 @@ export function initPersonaModals() {
|
||||
sd_enabled: document.getElementById('pSdEnabled').checked,
|
||||
lora_name: document.getElementById('pLora').value.trim(),
|
||||
appearance_tags: document.getElementById('pAppearance').value.trim(),
|
||||
personality: document.getElementById('pPersonality').value.trim(),
|
||||
scenario: document.getElementById('pScenario').value.trim(),
|
||||
first_mes: document.getElementById('pFirstMes').value.trim(),
|
||||
mes_example: document.getElementById('pMesExample').value.trim(),
|
||||
lorebook_json: document.getElementById('pLorebook').value.trim() || '[]',
|
||||
};
|
||||
if (!data.persona_id || !data.name || !data.prompt) {
|
||||
alert('Заполни ID, имя и промт');
|
||||
if (!data.persona_id || !data.name) {
|
||||
alert('Заполни ID и имя');
|
||||
return;
|
||||
}
|
||||
await fetch('/personas/', {
|
||||
@@ -134,6 +174,15 @@ export function initPersonaModals() {
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
if (!res.ok) { alert('Ошибка сохранения'); return; }
|
||||
|
||||
const avatarFile = document.getElementById('editCardAvatar')?.files?.[0];
|
||||
if (avatarFile) {
|
||||
const form = new FormData();
|
||||
form.append('file', avatarFile);
|
||||
await fetch(`/characters/${cardId}/avatar`, { method: 'POST', body: form });
|
||||
document.getElementById('editCardAvatar').value = '';
|
||||
}
|
||||
|
||||
document.getElementById('cardEditOverlay').classList.remove('open');
|
||||
await loadPersonas();
|
||||
});
|
||||
@@ -160,5 +209,44 @@ export function initPersonaModals() {
|
||||
await loadPersonas();
|
||||
await selectPersona(data.persona_id);
|
||||
});
|
||||
|
||||
const personaEditSave = document.getElementById('personaEditSave');
|
||||
if (personaEditSave) {
|
||||
personaEditSave.addEventListener('click', async () => {
|
||||
const personaId = document.getElementById('editPersonaId').value;
|
||||
const body = {
|
||||
name: document.getElementById('editPName').value.trim() || undefined,
|
||||
emoji: document.getElementById('editPEmoji').value.trim() || undefined,
|
||||
description: document.getElementById('editPDesc').value.trim() || undefined,
|
||||
personality: document.getElementById('editPPersonality').value.trim() || undefined,
|
||||
scenario: document.getElementById('editPScenario').value.trim() || undefined,
|
||||
first_mes: document.getElementById('editPFirstMes').value.trim() || undefined,
|
||||
mes_example: document.getElementById('editPMesExample').value.trim() || undefined,
|
||||
lorebook_json: document.getElementById('editPLorebook').value.trim() || undefined,
|
||||
prompt: document.getElementById('editPPrompt').value.trim() || undefined,
|
||||
sd_enabled: document.getElementById('editPSdEnabled').checked,
|
||||
lora_name: document.getElementById('editPLora').value.trim() || undefined,
|
||||
lora_weight: parseFloat(document.getElementById('editPLoraWeight').value) || undefined,
|
||||
appearance_tags: document.getElementById('editPAppearance').value.trim() || undefined,
|
||||
};
|
||||
const res = await fetch(`/personas/${personaId}`, {
|
||||
method: 'PATCH',
|
||||
headers: { 'Content-Type': 'application/json' },
|
||||
body: JSON.stringify(body),
|
||||
});
|
||||
if (!res.ok) { alert('Ошибка сохранения'); return; }
|
||||
|
||||
const avatarFile = document.getElementById('editPAvatar')?.files?.[0];
|
||||
if (avatarFile) {
|
||||
const form = new FormData();
|
||||
form.append('file', avatarFile);
|
||||
await fetch(`/personas/${personaId}/avatar`, { method: 'POST', body: form });
|
||||
document.getElementById('editPAvatar').value = '';
|
||||
}
|
||||
|
||||
document.getElementById('personaEditOverlay').classList.remove('open');
|
||||
await loadPersonas();
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+23
-2
@@ -1,6 +1,6 @@
|
||||
import { sessionId, setSessionId, setCurrentPersona, currentPersona, dom } from './state.js';
|
||||
import { sessionId, setSessionId, setCurrentPersona, currentPersona, dom, setRpgEnabled } from './state.js';
|
||||
import { clearMessages, addMessage, initChat } from './chat.js';
|
||||
import { highlightPersona } from './personas.js';
|
||||
import { highlightPersona, personaIndex } from './personas.js';
|
||||
|
||||
function escapeTitle(t) {
|
||||
const d = document.createElement('div');
|
||||
@@ -16,8 +16,10 @@ export async function loadSessions() {
|
||||
sessions.forEach(s => {
|
||||
const item = document.createElement('div');
|
||||
item.className = 'session-item' + (s.session_id === sessionId ? ' active' : '');
|
||||
const personaName = personaIndex.get(s.persona_id)?.name || s.persona_id || 'default';
|
||||
item.innerHTML = `
|
||||
<div class="s-title">${escapeTitle(s.title || 'Новый чат')}</div>
|
||||
<div class="s-companion">С: ${escapeTitle(personaName)}</div>
|
||||
<div class="s-meta">${s.message_count} сообщ.</div>
|
||||
<button class="s-del" type="button">🗑</button>
|
||||
`;
|
||||
@@ -48,8 +50,27 @@ export async function loadChatHistory(id) {
|
||||
setCurrentPersona(s.persona_id);
|
||||
highlightPersona(s.persona_id);
|
||||
}
|
||||
if (dom.rpgToggle) {
|
||||
const enabled = !!s.rpg_enabled;
|
||||
dom.rpgToggle.checked = enabled;
|
||||
setRpgEnabled(enabled);
|
||||
}
|
||||
}
|
||||
|
||||
// system blob
|
||||
try {
|
||||
const blobRes = await fetch(`/chat/system/${id}`);
|
||||
if (blobRes.ok) {
|
||||
const blob = await blobRes.json();
|
||||
const parts = [];
|
||||
if (blob.system_prompt) parts.push(blob.system_prompt);
|
||||
if (blob.status_quo) parts.push(`--- Status quo ---\n${blob.status_quo}\n---`);
|
||||
if (blob.facts_json) parts.push(`facts_json: ${blob.facts_json}`);
|
||||
if (blob.plot_arc_json) parts.push(`plot_arc_json: ${blob.plot_arc_json}`);
|
||||
dom.systemBlobContent.textContent = parts.filter(Boolean).join('\n\n') || '—';
|
||||
}
|
||||
} catch { /* ignore */ }
|
||||
|
||||
const histRes = await fetch(`/chat/history/${id}`);
|
||||
if (!histRes.ok) return;
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
export let sessionId = localStorage.getItem('chat_session_id') || null;
|
||||
export let currentPersona = localStorage.getItem('persona_id') || 'default';
|
||||
export let sidebarOpen = true;
|
||||
export let rpgEnabled = false;
|
||||
export function toggleSidebar() { sidebarOpen = !sidebarOpen; return sidebarOpen; }
|
||||
|
||||
export function setSessionId(id) {
|
||||
@@ -13,6 +14,8 @@ export function setCurrentPersona(id) {
|
||||
localStorage.setItem('persona_id', id);
|
||||
}
|
||||
|
||||
export function setRpgEnabled(v) { rpgEnabled = !!v; }
|
||||
|
||||
export const dom = {
|
||||
messagesEl: document.getElementById('messages'),
|
||||
inputEl: document.getElementById('input'),
|
||||
@@ -21,4 +24,8 @@ export const dom = {
|
||||
sessionList: document.getElementById('sessionList'),
|
||||
headerTitle: document.getElementById('headerTitle'),
|
||||
emptyState: document.getElementById('emptyState'),
|
||||
rpgToggle: document.getElementById('rpgToggle'),
|
||||
systemBlob: document.getElementById('systemBlob'),
|
||||
systemBlobContent: document.getElementById('systemBlobContent'),
|
||||
systemBlobToggle: document.getElementById('systemBlobToggle'),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user