feat(feedback): personal AI models, AI run tracking and profiles/options endpoint
- user_settings allowlist: feedback_models (up to 10 personal model configs) - normalizeFeedbackModels() validation, UI block "Мои модели" in #fbPromptModal - GET /api/ai/profiles/options for tutors (no api_key), used by feedback/shorts - feedbacks columns ai_prompt/ai_model/ai_duration_ms + backup/restore support - "ИИ-запрос" popover on feedback card with status, model, timing and prompt - audit: feedback.update / feedback.ai.run / feedback.ai.error labels
This commit is contained in:
dev
+205
-10
@@ -1,7 +1,7 @@
|
||||
(async function() {
|
||||
const API = location.origin;
|
||||
const PAGE_SIZE = 20;
|
||||
let page = 1, total = 0, searchTimer, groupsLoaded, feedbacks = [], shortsListCache = null, shortsFetchTimer = null, lastFbAutoText = '', userSettings = { settings: {}, defaults: {} }, aiActive = 'native';
|
||||
let page = 1, total = 0, searchTimer, groupsLoaded, feedbacks = [], shortsListCache = null, shortsFetchTimer = null, lastFbAutoText = '', userSettings = { settings: {}, defaults: {} }, aiActive = 'native', myModels = [], modelEditIdx = null;
|
||||
const topicReportCache = new Map();
|
||||
|
||||
function hdr() { const t = sessionStorage.getItem('authToken'); return t ? { 'X-Auth-Token': t } : {}; }
|
||||
@@ -27,6 +27,7 @@
|
||||
const text = (f.text||'').trim();
|
||||
const del = f.deleted_at ? ' style="opacity:.5"' : '';
|
||||
const day = fmtDay(f.feedback_date);
|
||||
const hasAiInfo = f.ai_status !== 'none' || !!f.ai_prompt;
|
||||
return `<div class="lesson-item feedback-item" data-id="${f.id}"${del}>
|
||||
<div class="lesson-item-head">
|
||||
<span class="lesson-author">${escapeHtml(f.group_name||'')}</span>
|
||||
@@ -35,6 +36,7 @@
|
||||
${aiBadge(f.ai_status)}
|
||||
${f.sent_at ? '<span class="ai-badge ai-badge-sent">Отправлено</span>' : ''}
|
||||
<div class="lesson-actions">
|
||||
${hasAiInfo ? `<button type="button" class="btn-link" data-aiinfo="${f.id}">ИИ-запрос</button>` : ''}
|
||||
${f.ai_status === 'error' ? `<button type="button" class="btn-link" data-retry="${f.id}">Повторить</button>` : ''}
|
||||
${f.deleted_at ? '' : `<button type="button" class="btn-link" data-sent="${f.id}">${f.sent_at ? 'Вернуть' : 'Отправлено'}</button>`}
|
||||
<button type="button" class="btn-link" data-edit="${f.id}">Изменить</button>
|
||||
@@ -45,9 +47,46 @@
|
||||
${f.resident ? `<div class="lesson-group">${escapeHtml(f.resident)}</div>` : ''}
|
||||
${f.topic ? `<div class="lesson-topic">${escapeHtml(f.topic)}</div>` : ''}
|
||||
${text ? `<div class="lesson-text">${escapeHtml(text)}</div>` : ''}
|
||||
<div class="fb-ai-pop" id="fbAiPop-${f.id}" hidden>${fbAiInfoHtml(f)}</div>
|
||||
</div>`;
|
||||
}
|
||||
|
||||
function fmtDurMs(ms) {
|
||||
if (!Number.isFinite(ms) || ms < 0) return '';
|
||||
return ms >= 1000 ? `${(ms / 1000).toFixed(1)} с` : `${Math.round(ms)} мс`;
|
||||
}
|
||||
|
||||
function fmtTs(v) {
|
||||
if (!v) return '';
|
||||
try { if (typeof fmtFull === 'function') return fmtFull(v) || String(v); } catch (e) {}
|
||||
return String(v);
|
||||
}
|
||||
|
||||
function fbAiInfoHtml(f) {
|
||||
let html = `<div class="fb-ai-row"><span>Статус</span>${aiBadge(f.ai_status)}</div>`;
|
||||
html += `<div class="fb-ai-row"><span>Модель</span><b>${escapeHtml(f.ai_model || '—')}</b></div>`;
|
||||
const dur = fmtDurMs(f.ai_duration_ms);
|
||||
html += `<div class="fb-ai-row"><span>Время ответа</span><b>${escapeHtml(dur || '—')}</b></div>`;
|
||||
if (f.ai_checked_at) html += `<div class="fb-ai-row"><span>Проверено</span><b>${escapeHtml(fmtTs(f.ai_checked_at))}</b></div>`;
|
||||
if (f.ai_error) html += `<div class="fb-ai-err"><b>Ошибка:</b> ${escapeHtml(f.ai_error)}</div>`;
|
||||
if (f.ai_prompt) {
|
||||
html += `<div class="fb-ai-label">Промпт, отправленный в модель</div><pre>${escapeHtml(f.ai_prompt)}</pre>`;
|
||||
} else {
|
||||
html += '<div class="fb-ai-empty">Нет данных о запуске ИИ</div>';
|
||||
}
|
||||
return html;
|
||||
}
|
||||
|
||||
function closeAiPops() {
|
||||
document.querySelectorAll('.fb-ai-pop').forEach(p => { p.hidden = true; });
|
||||
}
|
||||
|
||||
document.addEventListener('click', e => {
|
||||
if (e.target.closest('[data-aiinfo]') || e.target.closest('.fb-ai-pop')) return;
|
||||
closeAiPops();
|
||||
});
|
||||
document.addEventListener('keydown', e => { if (e.key === 'Escape') closeAiPops(); });
|
||||
|
||||
function ensureModal() {
|
||||
let m = document.getElementById('feedbackModal');
|
||||
if (m) return m;
|
||||
@@ -89,18 +128,120 @@
|
||||
const j = await r.json();
|
||||
userSettings.settings = j.settings || {};
|
||||
userSettings.defaults = j.defaults || {};
|
||||
parseMyModels();
|
||||
} catch (e) {}
|
||||
}
|
||||
|
||||
function openPromptModal() {
|
||||
function parseMyModels() {
|
||||
try { myModels = JSON.parse(userSettings.settings.feedback_models || '[]'); } catch (e) { myModels = []; }
|
||||
if (!Array.isArray(myModels)) myModels = [];
|
||||
}
|
||||
|
||||
function renderModelsList() {
|
||||
const el = document.getElementById('fbModelsList');
|
||||
if (!el) return;
|
||||
const cnt = document.getElementById('fbModelsCount');
|
||||
if (cnt) cnt.textContent = myModels.length ? ` (${myModels.length})` : '';
|
||||
if (!myModels.length) {
|
||||
el.innerHTML = '<div class="hint">Своих моделей нет — используются системные</div>';
|
||||
return;
|
||||
}
|
||||
el.innerHTML = myModels.map((m, i) => `
|
||||
<div style="display:flex;justify-content:space-between;gap:8px;align-items:center;padding:4px 0">
|
||||
<span>${escapeHtml(m.name)} — <span class="muted">${escapeHtml(m.model)}</span></span>
|
||||
<span style="display:flex;gap:6px">
|
||||
<button type="button" class="btn-xs" data-medit="${i}">Изменить</button>
|
||||
<button type="button" class="btn-xs" data-mdel="${i}">Удалить</button>
|
||||
</span>
|
||||
</div>`).join('');
|
||||
}
|
||||
|
||||
function showModelForm(idx) {
|
||||
modelEditIdx = idx;
|
||||
const m = idx == null ? null : myModels[idx];
|
||||
document.getElementById('fbMName').value = m ? m.name : '';
|
||||
document.getElementById('fbMModel').value = m ? m.model : '';
|
||||
document.getElementById('fbMUrl').value = m ? m.base_url : '';
|
||||
document.getElementById('fbMKey').value = m ? (m.api_key || '') : '';
|
||||
document.getElementById('fbMMaxTok').value = m && m.max_tokens ? m.max_tokens : '';
|
||||
document.getElementById('fbModelEdit').hidden = false;
|
||||
document.getElementById('fbMName').focus();
|
||||
}
|
||||
|
||||
function hideModelForm() {
|
||||
const el = document.getElementById('fbModelEdit');
|
||||
if (el) el.hidden = true;
|
||||
modelEditIdx = null;
|
||||
}
|
||||
|
||||
function saveModelForm() {
|
||||
const name = document.getElementById('fbMName').value.trim();
|
||||
const model = document.getElementById('fbMModel').value.trim();
|
||||
const base = document.getElementById('fbMUrl').value.trim().replace(/\/+$/, '');
|
||||
const key = document.getElementById('fbMKey').value.trim();
|
||||
const tok = document.getElementById('fbMMaxTok').value.trim();
|
||||
if (!name) return alert('Укажите название модели');
|
||||
if (!model) return alert('Укажите имя модели');
|
||||
try {
|
||||
const u = new URL(base);
|
||||
if (u.protocol !== 'http:' && u.protocol !== 'https:') throw new Error('bad');
|
||||
} catch (e) { return alert('Base URL должен начинаться с http:// или https://'); }
|
||||
let maxTokens = null;
|
||||
if (tok) {
|
||||
maxTokens = parseInt(tok, 10);
|
||||
if (!Number.isFinite(maxTokens) || maxTokens < 16 || maxTokens > 131072) return alert('max_tokens: 16–131072');
|
||||
}
|
||||
if (modelEditIdx == null && myModels.length >= 10) return alert('Не больше 10 моделей');
|
||||
const entry = {
|
||||
id: modelEditIdx == null ? `me-${Date.now().toString(36)}${Math.random().toString(36).slice(2, 8)}` : myModels[modelEditIdx].id,
|
||||
name, model, base_url: base, api_key: key, max_tokens: maxTokens
|
||||
};
|
||||
if (modelEditIdx == null) myModels.push(entry); else myModels[modelEditIdx] = entry;
|
||||
hideModelForm();
|
||||
renderModelsList();
|
||||
refreshModelSelects();
|
||||
}
|
||||
|
||||
function deleteModel(i) {
|
||||
const m = myModels[i];
|
||||
if (!m) return;
|
||||
if (!confirm(`Удалить модель «${m.name}»?`)) return;
|
||||
myModels.splice(i, 1);
|
||||
const dst = document.getElementById('fbDefaultModel');
|
||||
if (dst && dst.value === m.id) dst.value = '';
|
||||
renderModelsList();
|
||||
refreshModelSelects();
|
||||
}
|
||||
|
||||
function fillDefaultModelOptions(preserve) {
|
||||
const src = document.getElementById('fbModel');
|
||||
const dst = document.getElementById('fbDefaultModel');
|
||||
if (!src || !dst) return;
|
||||
dst.innerHTML = '<option value="">Активная модель по умолчанию</option>' + src.innerHTML;
|
||||
dst.value = userSettings.settings.feedback_profile || '';
|
||||
dst.value = preserve || '';
|
||||
if (preserve && dst.value !== preserve) {
|
||||
const o = document.createElement('option');
|
||||
o.value = preserve;
|
||||
o.textContent = `${preserve} (недоступна)`;
|
||||
dst.appendChild(o);
|
||||
dst.value = preserve;
|
||||
}
|
||||
}
|
||||
|
||||
async function refreshModelSelects() {
|
||||
const keep = document.getElementById('fbDefaultModel').value;
|
||||
await loadAiProfiles();
|
||||
fillDefaultModelOptions(keep);
|
||||
}
|
||||
|
||||
function openPromptModal() {
|
||||
fillDefaultModelOptions(userSettings.settings.feedback_profile);
|
||||
const ta = document.getElementById('fbPromptText');
|
||||
ta.value = userSettings.settings.feedback_prompt || '';
|
||||
ta.placeholder = userSettings.defaults.feedback_prompt || 'Системный шаблон';
|
||||
document.getElementById('fbPromptStatus').hidden = true;
|
||||
hideModelForm();
|
||||
renderModelsList();
|
||||
updatePromptCount();
|
||||
document.getElementById('fbPromptModal').classList.add('open');
|
||||
if (window.lucide) lucide.createIcons();
|
||||
@@ -108,10 +249,16 @@
|
||||
|
||||
async function savePromptSettings() {
|
||||
const st = document.getElementById('fbPromptStatus');
|
||||
if (!document.getElementById('fbModel').options.length) {
|
||||
st.hidden = false;
|
||||
st.innerHTML = '<span class="ai-badge error">Список моделей не загружен — сохранение отменено</span>';
|
||||
return;
|
||||
}
|
||||
const body = {
|
||||
settings: {
|
||||
feedback_prompt: document.getElementById('fbPromptText').value.trim(),
|
||||
feedback_profile: document.getElementById('fbDefaultModel').value || '',
|
||||
feedback_models: myModels.length ? JSON.stringify(myModels) : '',
|
||||
}
|
||||
};
|
||||
try {
|
||||
@@ -124,6 +271,9 @@
|
||||
}
|
||||
userSettings.settings = j.settings || {};
|
||||
userSettings.defaults = j.defaults || userSettings.defaults;
|
||||
parseMyModels();
|
||||
renderModelsList();
|
||||
await loadAiProfiles();
|
||||
st.hidden = false;
|
||||
st.innerHTML = '<span class="ai-badge done">Сохранено</span>';
|
||||
setTimeout(closePromptModal, 700);
|
||||
@@ -224,16 +374,32 @@
|
||||
|
||||
async function loadAiProfiles() {
|
||||
try {
|
||||
const r = await fetch(`${API}/api/ai/profiles`, { headers: hdr() });
|
||||
const r = await fetch(`${API}/api/ai/profiles/options`, { headers: hdr() });
|
||||
if (r.ok) {
|
||||
const d = await r.json();
|
||||
const sel = document.getElementById('fbModel');
|
||||
if (!sel) return;
|
||||
const keep = sel.value;
|
||||
sel.innerHTML = '';
|
||||
const nativeOpt = document.createElement('option'); nativeOpt.value = 'native'; nativeOpt.textContent = 'Нативная (llama.cpp)'; sel.appendChild(nativeOpt);
|
||||
(d.profiles||[]).forEach(p => { const o = document.createElement('option'); o.value = p.id; o.textContent = p.name; sel.appendChild(o); });
|
||||
if (d.active) sel.value = d.active;
|
||||
if (myModels.length) {
|
||||
const mine = document.createElement('optgroup');
|
||||
mine.label = 'Мои модели';
|
||||
myModels.forEach(m => {
|
||||
const o = document.createElement('option');
|
||||
o.value = m.id;
|
||||
o.textContent = m.name;
|
||||
mine.appendChild(o);
|
||||
});
|
||||
sel.appendChild(mine);
|
||||
}
|
||||
const sys = document.createElement('optgroup');
|
||||
sys.label = 'Системные';
|
||||
const nativeOpt = document.createElement('option'); nativeOpt.value = 'native'; nativeOpt.textContent = 'Нативная (llama.cpp)'; sys.appendChild(nativeOpt);
|
||||
(d.profiles||[]).forEach(p => { const o = document.createElement('option'); o.value = p.id; o.textContent = p.name; sys.appendChild(o); });
|
||||
sel.appendChild(sys);
|
||||
aiActive = d.active || 'native';
|
||||
if (keep && [...sel.options].some(o => o.value === keep)) sel.value = keep;
|
||||
else sel.value = aiActive;
|
||||
}
|
||||
} catch (e) {}
|
||||
}
|
||||
@@ -317,6 +483,8 @@
|
||||
lastFbAutoText = '';
|
||||
document.getElementById('fbTextHint').textContent = `${(f.text||'').length} / 5000`;
|
||||
document.getElementById('fbAiCheck').checked = (f.ai_status === 'pending' || f.ai_status === 'processing' || f.ai_status === 'none') ? true : false;
|
||||
const fms = document.getElementById('fbModel');
|
||||
if (f.ai_profile && [...fms.options].some(o => o.value === f.ai_profile)) fms.value = f.ai_profile;
|
||||
document.getElementById('fbModalTitle').textContent = 'Редактировать отзыв';
|
||||
document.getElementById('fbSubmit').textContent = 'Сохранить';
|
||||
if (f.short_message_ids && f.short_message_ids.length) {
|
||||
@@ -396,6 +564,15 @@
|
||||
updatePromptCount();
|
||||
});
|
||||
document.getElementById('fbPromptSave').addEventListener('click', savePromptSettings);
|
||||
document.getElementById('fbModelAdd').addEventListener('click', () => showModelForm(null));
|
||||
document.getElementById('fbMCancel').addEventListener('click', hideModelForm);
|
||||
document.getElementById('fbMSave').addEventListener('click', saveModelForm);
|
||||
document.getElementById('fbModelsList').addEventListener('click', e => {
|
||||
const ed = e.target.closest('[data-medit]');
|
||||
if (ed) { showModelForm(parseInt(ed.dataset.medit, 10)); return; }
|
||||
const del = e.target.closest('[data-mdel]');
|
||||
if (del) deleteModel(parseInt(del.dataset.mdel, 10));
|
||||
});
|
||||
document.getElementById('feedbackModal').addEventListener('click', e => { if (e.target.id === 'feedbackModal') closeModal(); });
|
||||
document.getElementById('fbForm').addEventListener('submit', async e => {
|
||||
e.preventDefault();
|
||||
@@ -436,6 +613,11 @@
|
||||
});
|
||||
document.getElementById('fbTopic').addEventListener('change', applyTopicText);
|
||||
document.getElementById('feedbackList').addEventListener('click', async e => {
|
||||
const aiinfo = e.target.closest('[data-aiinfo]'); if (aiinfo) {
|
||||
const pop = document.getElementById(`fbAiPop-${aiinfo.dataset.aiinfo}`);
|
||||
if (pop) { const wasOpen = !pop.hidden; closeAiPops(); pop.hidden = wasOpen; }
|
||||
return;
|
||||
}
|
||||
const sentBtn = e.target.closest('[data-sent]'); if (sentBtn) {
|
||||
const id = parseInt(sentBtn.dataset.sent, 10);
|
||||
if (!id) return;
|
||||
@@ -448,14 +630,27 @@
|
||||
const del = e.target.closest('[data-del]'); if (del) {
|
||||
const id = parseInt(del.dataset.id||del.dataset.del,10);
|
||||
if (!id) return;
|
||||
if (!confirm('Удалить отзыв?')) return;
|
||||
try { const r = await fetch(`${API}/api/feedbacks/${id}`, { method:'DELETE', headers: hdr() }); if (r.ok) loadFeedbacks(); } catch (e) {}
|
||||
const row = feedbacks.find(x => x.id === id);
|
||||
const perm = !!(row && row.deleted_at);
|
||||
if (!confirm(perm ? 'Удалить отзыв навсегда? Это действие нельзя отменить.' : 'Удалить отзыв?')) return;
|
||||
const url = perm ? `${API}/api/feedbacks/${id}/permanent` : `${API}/api/feedbacks/${id}`;
|
||||
try {
|
||||
const r = await fetch(url, { method:'DELETE', headers: hdr() });
|
||||
if (r.ok) { loadFeedbacks(); return; }
|
||||
const err = await r.json().catch(() => null);
|
||||
alert((err && err.error) || `Ошибка ${r.status}`);
|
||||
} catch (err) { alert('Ошибка сети'); }
|
||||
return;
|
||||
}
|
||||
const ret = e.target.closest('[data-restore]'); if (ret) {
|
||||
const id = parseInt(ret.dataset.id||ret.dataset.restore,10);
|
||||
if (!id) return;
|
||||
try { const r = await fetch(`${API}/api/feedbacks/${id}/restore`, { method:'PUT', headers: hdr() }); if (r.ok) loadFeedbacks(); } catch (e) {}
|
||||
try {
|
||||
const r = await fetch(`${API}/api/feedbacks/${id}/restore`, { method:'PUT', headers: hdr() });
|
||||
if (r.ok) { loadFeedbacks(); return; }
|
||||
const err = await r.json().catch(() => null);
|
||||
alert((err && err.error) || `Ошибка ${r.status}`);
|
||||
} catch (err) { alert('Ошибка сети'); }
|
||||
return;
|
||||
}
|
||||
const retry = e.target.closest('[data-retry]'); if (retry) {
|
||||
|
||||
Reference in New Issue
Block a user