daveadmin/dobetternorge-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Bedrock advocate synthesis: engine guard, response_format, Claude engine option

Browse Source 
- DeepResearchAgent: engine guard now accepts dbn_legal_v3, claude_sonnet, claude_haiku
  (previously stripped these to azure_mini, breaking dbn_legal_v3 selection and
  preventing Claude engines from reaching the correct synthesis branch)
- DbnBedrockGateway: remove response_format=json_object from chat payload — LiteLLM
  converts this to a tool-use constraint for Bedrock, routing output into tool_calls
  instead of content (root cause of the {} empty brief)
- advocate.php: add Claude Sonnet 4.6 (AWS Bedrock) engine option
- account, billing, dashboard, nav, min-sak: pending UI/flow changes from prior sessions

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
davegilligan
2026-05-25 20:22:12 +02:00
parent 8205a22205
commit b78ab1e257
8 changed files with 1226 additions and 802 deletions
Download Patch File Download Diff File Expand all files Collapse all files
min-sak.php
+4 -317
View File
@@ -1,321 +1,8 @@
<?php
declare(strict_types=1);
require_once __DIR__ . '/includes/bootstrap.php';
require_once __DIR__ . '/includes/FreeTier.php';
require_once __DIR__ . '/includes/CaseStore.php';
require_once __DIR__ . '/includes/CaseResults.php';
// Consolidated into /account.php (My Case section).
// Preserve external bookmarks and help-doc links via 302.
dbnToolsRequirePageAuth('/min-sak.php');
$uiLang = dbnToolsCurrentLanguage();
$userId = (int)($_SESSION['dbn_tools_sso_uid'] ?? 0);
if ($userId <= 0) {
header('Location: /dashboard.php');
exit;
}
$detail = FreeTier::balanceDetail($userId);
$tier = (string)$detail['tier'];
// Free tier: show upgrade gate
if (!FreeTier::isPaidTier($tier)) {
require_once __DIR__ . '/includes/footer.php';
$upgradeUrl = '/pricing.php';
?><!doctype html>
<html lang="<?= htmlspecialchars($uiLang) ?>">
<head><meta charset="utf-8"><title>Min Sak — Do Better Norge</title>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Crimson+Pro:wght@400;700&family=IBM+Plex+Sans:wght@400;500;600&display=swap">
<link rel="stylesheet" href="assets/css/tools.css">
<link rel="stylesheet" href="assets/css/dbn-tools-redesign.css">
</head><body><main style="max-width:720px;margin:4rem auto;padding:0 1.5rem;text-align:center;font-family:'IBM Plex Sans',sans-serif;">
<h1 style="font-family:'Crimson Pro',serif;font-size:2.4rem;margin:0 0 0.5rem;color:#00205B;">Min Sak — bygg din egen sak</h1>
<p style="color:#4b5563;font-size:1.1rem;margin-bottom:2rem;">Last opp dokumentene fra saken din én gang, og la <strong>alle</strong> verktøyene jobbe på din private korpus.</p>
<ul style="text-align:left;display:inline-block;line-height:1.9;color:#1f2937;">
<li>📄 Privat dokumentbank med OCR</li>
<li>🔍 Hybrid søk (BM25 + vektor) i din sak</li>
<li>🧠 Alle verktøy kan referere til din egen sak</li>
<li>🇪🇺 Alt lagres i EU (Tyskland/Finland/Norge)</li>
</ul>
<p style="margin:2rem 0 0;"><a href="<?= htmlspecialchars($upgradeUrl) ?>" style="background:#00205B;color:#fff;padding:1rem 2rem;border-radius:8px;font-weight:700;text-decoration:none;display:inline-block;">Se planer fra NOK 129/mo</a></p>
</main></body></html><?php
exit;
}
$docs = CaseStore::listDocs($userId);
$used = (int)$detail['storage_used_bytes'];
$quota = (int)$detail['storage_quota_bytes'];
$usedMb = round($used / 1048576, 1);
$quotaMb = round($quota / 1048576, 0);
$pct = $quota > 0 ? min(100, round(($used / $quota) * 100)) : 0;
?>
<!doctype html>
<html lang="<?= htmlspecialchars($uiLang) ?>">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Min Sak — tools.dobetternorge.no</title>
<meta name="robots" content="noindex, nofollow">
<link rel="preconnect" href="https://fonts.googleapis.com">
<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Crimson+Pro:wght@400;700&family=IBM+Plex+Sans:wght@400;500;600;700&display=swap">
<link rel="stylesheet" href="assets/css/tools.css">
<link rel="stylesheet" href="assets/css/dbn-tools-redesign.css">
<style>
.ms-shell { max-width: 980px; margin: 0 auto; padding: 2rem 1.5rem 4rem; font-family: 'IBM Plex Sans', sans-serif; }
.ms-shell h1 { font-family: 'Crimson Pro', serif; margin: 0; }
.ms-shell .lede { color: #6b7280; margin: 0.25rem 0 2rem; }
.ms-status { display: grid; grid-template-columns: 1fr 1fr; gap: 1rem; margin-bottom: 1.5rem; }
@media (max-width: 640px) { .ms-status { grid-template-columns: 1fr; } }
.ms-card { background: #fff; border: 1px solid #e5e7eb; border-radius: 10px; padding: 1.25rem 1.5rem; }
.ms-card h2 { margin: 0 0 0.4rem; font-size: 1rem; color: #374151; text-transform: uppercase; letter-spacing: 0.05em; }
.ms-card .big { font-size: 1.6rem; font-weight: 700; color: #00205B; }
.ms-storage-bar { background: #f3f4f6; height: 10px; border-radius: 999px; overflow: hidden; margin: 0.6rem 0; }
.ms-storage-bar > div { background: linear-gradient(90deg, #00205B, #003478); height: 100%; }
.ms-upload { background: #fff; border: 2px dashed #cbd5e1; border-radius: 12px; padding: 2.5rem 1.5rem; text-align: center; cursor: pointer; transition: all 0.15s; margin-bottom: 2rem; }
.ms-upload:hover, .ms-upload.is-drag { border-color: #00205B; background: #f8fafc; }
.ms-upload input { display: none; }
.ms-upload-icon { font-size: 2.4rem; line-height: 1; margin-bottom: 0.5rem; }
.ms-upload p { margin: 0.25rem 0; color: #374151; }
.ms-upload .hint { color: #6b7280; font-size: 0.85rem; }
.ms-docs { background: #fff; border: 1px solid #e5e7eb; border-radius: 10px; }
.ms-doc { padding: 1rem 1.25rem; border-bottom: 1px solid #f3f4f6; display: flex; align-items: center; gap: 1rem; }
.ms-doc:last-child { border-bottom: none; }
.ms-doc-info { flex: 1; min-width: 0; }
.ms-doc-name { font-weight: 600; color: #1f2937; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
.ms-doc-meta { font-size: 0.85rem; color: #6b7280; }
.ms-status-pill { display: inline-block; padding: 2px 10px; border-radius: 999px; font-size: 0.78rem; font-weight: 600; }
.ms-status-pending { background: #fef3c7; color: #92400e; }
.ms-status-running { background: #ddd6fe; color: #5b21b6; }
.ms-status-ready { background: #d1fae5; color: #065f46; }
.ms-status-failed { background: #fee2e2; color: #991b1b; }
.ms-doc-actions button { background: #f3f4f6; border: none; padding: 6px 12px; border-radius: 6px; cursor: pointer; font-size: 0.85rem; }
.ms-doc-actions button:hover { background: #fee2e2; color: #991b1b; }
.ms-empty { padding: 2rem 1.5rem; text-align: center; color: #6b7280; }
</style>
</head>
<body>
<div class="dbn-context-bar" role="note">
<span class="dbn-context-bar__tag"><?= htmlspecialchars(dbnToolsT('context_bar_tag', $uiLang)) ?></span>
<nav class="dbn-context-bar__links" aria-label="About">
<a href="/why-ours.php<?= $uiLang !== 'en' ? '?lang=' . urlencode($uiLang) : '' ?>"><?= htmlspecialchars(dbnToolsT('context_bar_why', $uiLang)) ?></a>
<a href="/pricing.php<?= $uiLang !== 'en' ? '?lang=' . urlencode($uiLang) : '' ?>"><?= htmlspecialchars(dbnToolsT('context_bar_pricing', $uiLang)) ?></a>
<a href="/mcp-tool.php<?= $uiLang !== 'en' ? '?lang=' . urlencode($uiLang) : '' ?>"><?= htmlspecialchars(dbnToolsT('context_bar_mcp', $uiLang)) ?></a>
<a href="/privacy.php<?= $uiLang !== 'en' ? '?lang=' . urlencode($uiLang) : '' ?>"><?= htmlspecialchars(dbnToolsT('context_bar_privacy', $uiLang)) ?></a>
</nav>
</div>
<main class="ms-shell">
<p style="margin:0 0 0.25rem;color:#6b7280;font-size:0.85rem;text-transform:uppercase;letter-spacing:0.06em;">
<a href="/dashboard.php" style="color:inherit;">← Dashbord</a> · <a href="/billing.php" style="color:inherit;">Fakturering</a>
</p>
<h1>Min Sak</h1>
<p class="lede">Last opp dokumentene dine én gang. Alle verktøyene kan deretter referere til din private sak når du krysser av "Bruk min sak som kontekst".</p>
<section class="ms-status">
<div class="ms-card">
<h2>Lagring</h2>
<div class="big"><?= $usedMb ?> MB <span style="color:#6b7280;font-size:1rem;">/ <?= $quotaMb ?> MB</span></div>
<div class="ms-storage-bar"><div style="width: <?= $pct ?>%;"></div></div>
<p style="margin:0;color:#6b7280;font-size:0.85rem;"><?= count($docs) ?> dokumenter</p>
</div>
<div class="ms-card">
<h2>Plan</h2>
<div class="big" style="font-size:1.3rem;">
<?= htmlspecialchars(['plus'=>'Plus','pro'=>'Pro Familie'][$tier] ?? ucfirst($tier)) ?>
<?php if (!empty($detail['trial_active'])): ?>
<span style="display:inline-block;background:#fef3c7;color:#92400e;font-size:0.7rem;padding:2px 8px;border-radius:999px;margin-left:0.5rem;vertical-align:middle;">
Prøveperiode · <?= (int)$detail['trial_days_remaining'] ?> dager igjen
</span>
<?php endif; ?>
</div>
<p style="margin:0;color:#6b7280;font-size:0.85rem;">
<a href="/pricing.php">Oppgrader</a> · <a href="/billing.php">Administrer</a>
</p>
</div>
</section>
<label for="msFileInput" class="ms-upload" id="msUploadZone">
<input id="msFileInput" type="file" accept="application/pdf" multiple>
<div class="ms-upload-icon">📤</div>
<p><strong>Slipp PDF-filer her, eller klikk for å bla</strong></p>
<p class="hint">Maks 25 MB per fil · OCR kjøres automatisk · alt lagres kryptert i EU</p>
</label>
<div id="msFlash" role="status" aria-live="polite" style="margin-bottom:1rem;"></div>
<section class="ms-docs" aria-label="Dine dokumenter">
<?php if (empty($docs)): ?>
<p class="ms-empty">Ingen dokumenter ennå. Last opp din første PDF over.</p>
<?php else: foreach ($docs as $d): ?>
<div class="ms-doc" data-doc-id="<?= (int)$d['id'] ?>">
<div style="font-size:1.6rem;line-height:1;">📄</div>
<div class="ms-doc-info">
<div class="ms-doc-name"><?= htmlspecialchars($d['filename']) ?></div>
<div class="ms-doc-meta">
<?= round((int)$d['size_bytes'] / 1024, 0) ?> KB
<?php if (!empty($d['page_count'])): ?> · <?= (int)$d['page_count'] ?> sider<?php endif; ?>
<?php if (!empty($d['doc_type'])): ?> · <?= htmlspecialchars($d['doc_type']) ?><?php endif; ?>
· lastet opp <?= htmlspecialchars(date('j. F Y', strtotime((string)$d['uploaded_at']))) ?>
</div>
</div>
<span class="ms-status-pill ms-status-<?= htmlspecialchars($d['ocr_status']) ?>">
<?php
echo htmlspecialchars(['pending'=>'I kø','running'=>'OCR pågår','ready'=>'Klar','failed'=>'Feilet'][$d['ocr_status']] ?? $d['ocr_status']);
?>
</span>
<div class="ms-doc-actions">
<button type="button" class="ms-delete" data-id="<?= (int)$d['id'] ?>">Slett</button>
</div>
</div>
<?php endforeach; endif; ?>
</section>
<?php $results = CaseResults::listForUser($userId, 50); ?>
<h2 style="font-family:'Crimson Pro',serif;margin:2.5rem 0 0.5rem;font-size:1.6rem;color:#00205B;">Lagrede analyser</h2>
<p class="lede" style="margin:0 0 1rem;">Alle resultater fra Korrespondanse, Advokat, BVJ, Dyp analyse, Motstrid og Tidslinje samles her — klar til å gjenåpnes, kjøres på nytt eller eksporteres.</p>
<section class="ms-results" aria-label="Lagrede analyser">
<?php if (empty($results)): ?>
<p class="ms-empty">Ingen lagrede analyser ennå. Kjør et verktøy for å lagre din første.</p>
<?php else: foreach ($results as $r): ?>
<div class="ms-result" data-result-id="<?= (int)$r['id'] ?>"
style="display:flex;align-items:center;gap:1rem;padding:0.95rem 1.25rem;border-bottom:1px solid #f3f4f6;background:#fff;">
<div style="font-size:1.4rem;line-height:1;"><?= htmlspecialchars(CaseResults::toolIcon((string)$r['tool'])) ?></div>
<div style="flex:1;min-width:0;">
<div style="font-weight:600;color:#1f2937;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">
<a href="/case-result.php?id=<?= (int)$r['id'] ?>" style="color:inherit;text-decoration:none;">
<?= htmlspecialchars((string)($r['title'] ?? CaseResults::toolLabel((string)$r['tool']))) ?>
</a>
<?php if (!empty($r['pinned'])): ?>
<span title="Festet" style="color:#c9a84c;margin-left:0.4rem;">★</span>
<?php endif; ?>
</div>
<div style="font-size:0.85rem;color:#6b7280;">
<?= htmlspecialchars(CaseResults::toolLabel((string)$r['tool'])) ?>
· <?= htmlspecialchars(date('j. M Y H:i', strtotime((string)$r['created_at']))) ?>
<?php if (!empty($r['used_case_context'])): ?>
· <span style="background:#dbeafe;color:#1e3a8a;padding:1px 8px;border-radius:999px;font-size:0.75rem;font-weight:600;">Bruk min sak</span>
<?php endif; ?>
</div>
</div>
<div class="ms-result-actions" style="display:flex;gap:0.4rem;">
<button type="button" class="ms-pin" data-id="<?= (int)$r['id'] ?>"
style="background:#f3f4f6;border:none;padding:6px 10px;border-radius:6px;cursor:pointer;font-size:0.85rem;">
<?= !empty($r['pinned']) ? 'Løsne' : 'Fest' ?>
</button>
<a href="/case-result.php?id=<?= (int)$r['id'] ?>"
style="background:#00205B;color:#fff;padding:6px 12px;border-radius:6px;text-decoration:none;font-size:0.85rem;font-weight:600;">
Åpne
</a>
<button type="button" class="ms-result-delete" data-id="<?= (int)$r['id'] ?>"
style="background:#f3f4f6;border:none;padding:6px 10px;border-radius:6px;cursor:pointer;font-size:0.85rem;">
Slett
</button>
</div>
</div>
<?php endforeach; endif; ?>
</section>
</main>
<script>
(function() {
const fileInput = document.getElementById('msFileInput');
const dropZone = document.getElementById('msUploadZone');
const flash = document.getElementById('msFlash');
function showFlash(msg, isError) {
flash.style.cssText = 'padding:0.75rem 1rem;border-radius:6px;font-size:0.9rem;'
+ (isError ? 'background:#fee2e2;color:#991b1b;' : 'background:#d1fae5;color:#065f46;');
flash.textContent = msg;
}
async function uploadFile(file) {
if (file.size > 25 * 1024 * 1024) {
showFlash(file.name + ' er over 25 MB — del opp filen først.', true);
return;
}
const data = new FormData();
data.append('file', file);
try {
const res = await fetch('/api/case/upload.php', { method: 'POST', body: data });
const json = await res.json();
if (json.ok) {
showFlash('Lastet opp: ' + file.name + '. OCR starter automatisk.', false);
setTimeout(() => window.location.reload(), 1200);
} else {
showFlash(file.name + ': ' + (json.error?.message || 'Ukjent feil'), true);
}
} catch (e) {
showFlash('Nettverksfeil: ' + e.message, true);
}
}
fileInput.addEventListener('change', () => {
for (const f of fileInput.files) uploadFile(f);
});
['dragenter','dragover'].forEach(ev => dropZone.addEventListener(ev, e => {
e.preventDefault(); dropZone.classList.add('is-drag');
}));
['dragleave','drop'].forEach(ev => dropZone.addEventListener(ev, e => {
e.preventDefault(); dropZone.classList.remove('is-drag');
}));
dropZone.addEventListener('drop', e => {
for (const f of e.dataTransfer.files) {
if (f.type === 'application/pdf' || f.name.toLowerCase().endsWith('.pdf')) uploadFile(f);
}
});
document.querySelectorAll('.ms-delete').forEach(btn => {
btn.addEventListener('click', async () => {
if (!confirm('Slette dette dokumentet for godt?')) return;
const id = btn.getAttribute('data-id');
try {
const res = await fetch('/api/case/delete.php', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ doc_id: parseInt(id, 10) }),
});
const json = await res.json();
if (json.ok) window.location.reload();
else alert(json.error?.message || 'Sletting feilet.');
} catch (e) { alert('Nettverksfeil: ' + e.message); }
});
});
// Saved analyses: pin / delete
document.querySelectorAll('.ms-pin').forEach(btn => {
btn.addEventListener('click', async () => {
const id = btn.getAttribute('data-id');
try {
const res = await fetch('/api/case/result-action.php', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ action: 'pin', id: parseInt(id, 10) }),
});
const json = await res.json();
if (json.ok) window.location.reload();
else alert(json.error?.message || 'Festing feilet.');
} catch (e) { alert('Nettverksfeil: ' + e.message); }
});
});
document.querySelectorAll('.ms-result-delete').forEach(btn => {
btn.addEventListener('click', async () => {
if (!confirm('Slette denne analysen for godt?')) return;
const id = btn.getAttribute('data-id');
try {
const res = await fetch('/api/case/result-action.php', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ action: 'delete', id: parseInt(id, 10) }),
});
const json = await res.json();
if (json.ok) window.location.reload();
else alert(json.error?.message || 'Sletting feilet.');
} catch (e) { alert('Nettverksfeil: ' + e.message); }
});
});
})();
</script>
</body>
</html>
header('Location: /account.php#case', true, 302);
exit;