Compare commits
15 Commits
59daebbd38
...
projekti1
| Author | SHA1 | Date | |
|---|---|---|---|
| 20cea8f268 | |||
| 38a18c555b | |||
| 8138e41aa1 | |||
| 6ee5bdf960 | |||
| cf3bf54bf8 | |||
| 56f21a96c9 | |||
| 763b93396c | |||
| e09962940a | |||
| 5e44b63b0c | |||
| 0f3881aa02 | |||
| fa85dcc5b3 | |||
| 58d93613f0 | |||
| 66b4435362 | |||
| 3a00de9b8e | |||
| 670141c8c3 |
@@ -1 +1 @@
|
|||||||
dirty-3e9cdd70c60dadfb970cee47ebbd912c
|
cf3bf54
|
||||||
|
|||||||
Binary file not shown.
BIN
network-poc/frontend/public/forge_hero.webp
Normal file
BIN
network-poc/frontend/public/forge_hero.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 91 KiB |
@@ -99,23 +99,27 @@ if [ -n "$KIPINA_MODEL" ]; then
|
|||||||
echo " Malli: $KIPINA_MODEL (Ympäristömuuttujasta)"
|
echo " Malli: $KIPINA_MODEL (Ympäristömuuttujasta)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Lataa binääri
|
# Binäärin automaattinen päivitys — vertaa build-hashia palvelimeen
|
||||||
BIN_PATH="./kipina-node-bin"
|
BIN_PATH="./kipina-node-bin"
|
||||||
if [ -f "$BIN_PATH" ]; then
|
HASH_PATH="./kipina-node-bin.hash"
|
||||||
echo ""
|
|
||||||
read -p " Löydettiin vanha kipina-node-bin lokaalisti. Haluatko poistaa sen ja ladata uusimman version? [Y/n] " -r DEL_CHOICE
|
|
||||||
if [[ "$DEL_CHOICE" =~ ^[Nn]$ ]]; then
|
|
||||||
echo " ✓ Käytetään lokaalia versiota."
|
|
||||||
else
|
|
||||||
rm -f "$BIN_PATH"
|
|
||||||
echo " ✓ Vanha binääri poistettu ja korvataan uudella."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f "$BIN_PATH" ]; then
|
REMOTE_HASH=$(curl -sSL "$BASE_URL/.build-hash?v=$(date +%s)" 2>/dev/null | tr -d '[:space:]')
|
||||||
echo " Ladataan tuorein $BINARY..."
|
LOCAL_HASH=""
|
||||||
|
[ -f "$HASH_PATH" ] && LOCAL_HASH=$(cat "$HASH_PATH" | tr -d '[:space:]')
|
||||||
|
|
||||||
|
if [ -f "$BIN_PATH" ] && [ -n "$REMOTE_HASH" ] && [ "$REMOTE_HASH" = "$LOCAL_HASH" ]; then
|
||||||
|
echo " ✓ Binääri ajan tasalla (versio: $LOCAL_HASH)"
|
||||||
|
else
|
||||||
|
if [ -f "$BIN_PATH" ]; then
|
||||||
|
echo " ↻ Uusi versio saatavilla ($LOCAL_HASH → $REMOTE_HASH)"
|
||||||
|
else
|
||||||
|
echo " Ladataan $BINARY..."
|
||||||
|
fi
|
||||||
|
rm -f "$BIN_PATH"
|
||||||
curl -sSL "$BASE_URL/$BINARY?v=$(date +%s)" -o "$BIN_PATH"
|
curl -sSL "$BASE_URL/$BINARY?v=$(date +%s)" -o "$BIN_PATH"
|
||||||
chmod +x "$BIN_PATH"
|
chmod +x "$BIN_PATH"
|
||||||
|
echo "$REMOTE_HASH" > "$HASH_PATH"
|
||||||
|
echo " ✓ Päivitetty versioon $REMOTE_HASH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
BIN
network-poc/frontend/public/serpent_hero.webp
Normal file
BIN
network-poc/frontend/public/serpent_hero.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 79 KiB |
@@ -32,6 +32,7 @@ import Settings from "../components/Settings.astro";
|
|||||||
<div class="bg-mesh"></div>
|
<div class="bg-mesh"></div>
|
||||||
<header class="landing-nav">
|
<header class="landing-nav">
|
||||||
<a href="/" class="landing-logo"><span class="logo-accent">KIPINÄ</span> <span class="logo-sub">/ agentic studio</span></a>
|
<a href="/" class="landing-logo"><span class="logo-accent">KIPINÄ</span> <span class="logo-sub">/ agentic studio</span></a>
|
||||||
|
<button id="theme-cycle-btn" class="theme-cycle-btn" title="Vaihda teemaa"></button>
|
||||||
</header>
|
</header>
|
||||||
|
|
||||||
<section class="hero">
|
<section class="hero">
|
||||||
@@ -136,12 +137,52 @@ import Settings from "../components/Settings.astro";
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script is:inline>
|
<script is:inline>
|
||||||
|
// === Teemajärjestelmä (gecko/forge/serpent) — oletus forge ===
|
||||||
|
const KS_THEMES = [
|
||||||
|
{ id: 'gecko', icon: '\u{1F98E}' },
|
||||||
|
{ id: 'forge', icon: '\u{2699}\u{FE0F}' },
|
||||||
|
{ id: 'serpent', icon: '\u{1F40D}' }
|
||||||
|
];
|
||||||
|
const KS_DEFAULT = 'forge';
|
||||||
|
(function() {
|
||||||
|
let saved = KS_DEFAULT;
|
||||||
|
try { saved = localStorage.getItem('kipina-studio-theme') || KS_DEFAULT; } catch(_){}
|
||||||
|
if (!KS_THEMES.find(t => t.id === saved)) saved = KS_DEFAULT;
|
||||||
|
document.documentElement.setAttribute('data-theme', saved);
|
||||||
|
})();
|
||||||
|
|
||||||
// === Helpers ===
|
// === Helpers ===
|
||||||
window.showJoinDialog = function() {
|
window.showJoinDialog = function() {
|
||||||
const d = document.getElementById('join-dialog');
|
const d = document.getElementById('join-dialog');
|
||||||
d.style.display = d.style.display === 'none' ? 'block' : 'none';
|
d.style.display = d.style.display === 'none' ? 'block' : 'none';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// === Teemapainike: kierrätys + hero-kuvan vaihto ===
|
||||||
|
(function() {
|
||||||
|
const btn = document.getElementById('theme-cycle-btn');
|
||||||
|
const heroImg = document.querySelector('.hero-orb-img');
|
||||||
|
function currentTheme() { return document.documentElement.getAttribute('data-theme') || KS_DEFAULT; }
|
||||||
|
function applyTheme(themeId) {
|
||||||
|
document.documentElement.setAttribute('data-theme', themeId);
|
||||||
|
const t = KS_THEMES.find(x => x.id === themeId) || KS_THEMES[1];
|
||||||
|
if (btn) btn.textContent = t.icon;
|
||||||
|
if (heroImg) {
|
||||||
|
heroImg.style.opacity = '0';
|
||||||
|
setTimeout(() => { heroImg.src = '/' + themeId + '_hero.webp'; heroImg.style.opacity = '1'; }, 200);
|
||||||
|
}
|
||||||
|
try { localStorage.setItem('kipina-studio-theme', themeId); } catch(_){}
|
||||||
|
}
|
||||||
|
// Alkuasetus
|
||||||
|
applyTheme(currentTheme());
|
||||||
|
// Klikkaus kiertää seuraavaan
|
||||||
|
if (btn) btn.addEventListener('click', () => {
|
||||||
|
const cur = currentTheme();
|
||||||
|
const idx = KS_THEMES.findIndex(t => t.id === cur);
|
||||||
|
const next = KS_THEMES[(idx + 1) % KS_THEMES.length];
|
||||||
|
applyTheme(next.id);
|
||||||
|
});
|
||||||
|
})();
|
||||||
|
|
||||||
function esc(str) {
|
function esc(str) {
|
||||||
if (!str) return '';
|
if (!str) return '';
|
||||||
return String(str).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"');
|
return String(str).replace(/&/g,'&').replace(/</g,'<').replace(/>/g,'>').replace(/"/g,'"');
|
||||||
@@ -805,6 +846,7 @@ OUTPUT FORMAT:
|
|||||||
top_k: opts.topK ?? settings.topK ?? undefined,
|
top_k: opts.topK ?? settings.topK ?? undefined,
|
||||||
max_tokens: opts.maxTokens ?? settings.maxTokens ?? undefined,
|
max_tokens: opts.maxTokens ?? settings.maxTokens ?? undefined,
|
||||||
repeat_penalty: opts.repeatPenalty ?? settings.repeatPenalty ?? undefined,
|
repeat_penalty: opts.repeatPenalty ?? settings.repeatPenalty ?? undefined,
|
||||||
|
capability: opts.capability || undefined, // "heavy" → isoin malli
|
||||||
};
|
};
|
||||||
|
|
||||||
const res = await fetch('/api/v1/chat/completions', {
|
const res = await fetch('/api/v1/chat/completions', {
|
||||||
@@ -1381,7 +1423,7 @@ Blog → Author: name,email,bio(Text|None) / Post: title, content(Text), author_
|
|||||||
highlightAgent('manager');
|
highlightAgent('manager');
|
||||||
explainStep('Arkkitehtuuri', `${mgr.name} analysoi vaatimukset ja tuottaa JSON-speksin: entiteetit, kentät, tyypit.`);
|
explainStep('Arkkitehtuuri', `${mgr.name} analysoi vaatimukset ja tuottaa JSON-speksin: entiteetit, kentät, tyypit.`);
|
||||||
|
|
||||||
const specRaw = await kpnRun(mgr.model, `${brief}\n\nOutput a JSON spec for this project.`, false, { ...mgr, prompt: SPEC_SYSTEM });
|
const specRaw = await kpnRun(mgr.model, `${brief}\n\nOutput a JSON spec for this project.`, false, { ...mgr, prompt: SPEC_SYSTEM, capability: 'heavy' });
|
||||||
const spec = specRaw ? extractJson(specRaw) : null;
|
const spec = specRaw ? extractJson(specRaw) : null;
|
||||||
promptLog.push({ step: 1, agentKey: 'manager', agentName: mgr.name, model: mgr.model, label: 'JSON-speksi', systemPrompt: SPEC_SYSTEM, userPrompt: brief, response: specRaw || '' });
|
promptLog.push({ step: 1, agentKey: 'manager', agentName: mgr.name, model: mgr.model, label: 'JSON-speksi', systemPrompt: SPEC_SYSTEM, userPrompt: brief, response: specRaw || '' });
|
||||||
|
|
||||||
@@ -1418,20 +1460,71 @@ Blog → Author: name,email,bio(Text|None) / Post: title, content(Text), author_
|
|||||||
|
|
||||||
let stepN = fileOrder.length + 2;
|
let stepN = fileOrder.length + 2;
|
||||||
|
|
||||||
// === Vaihe 4: Mekaaninen QA-validointi ===
|
// === Vaihe 4: Mekaaninen QA-validointi + korjaussilmukka ===
|
||||||
const qaAgent = agents.qa || Object.values(agents)[4];
|
const qaAgent = agents.qa || Object.values(agents)[4];
|
||||||
termLog(`\n<span style="color:#d2a8ff;font-weight:bold">[${stepN}] ${esc(qaAgent.name)}</span> — validointi`);
|
const MAX_FIX_ROUNDS = 2;
|
||||||
highlightAgent('qa');
|
let mechIssues = validateProjectCode(files);
|
||||||
explainStep('Validointi', `${qaAgent.name} ajaa mekaanisen koodivalidoinnin.`);
|
let fixRound = 0;
|
||||||
|
|
||||||
const mechIssues = validateProjectCode(files);
|
while (mechIssues.length > 0 && fixRound < MAX_FIX_ROUNDS) {
|
||||||
if (mechIssues.length > 0) {
|
fixRound++;
|
||||||
termLog(` <span style="color:#d29922">⚠ ${mechIssues.length} ongelmaa (template-bugeja — korjattava):</span>`);
|
termLog(`\n<span style="color:#d2a8ff;font-weight:bold">[${stepN}] ${esc(qaAgent.name)}</span> — validointi (kierros ${fixRound})`);
|
||||||
|
highlightAgent('qa');
|
||||||
|
explainStep('Validointi', `${qaAgent.name} löysi ${mechIssues.length} ongelmaa — delegoidaan korjattavaksi.`);
|
||||||
|
termLog(` <span style="color:#d29922">⚠ ${mechIssues.length} ongelmaa:</span>`);
|
||||||
for (const issue of mechIssues) termLog(` <span style="color:#d29922">${esc(issue)}</span>`);
|
for (const issue of mechIssues) termLog(` <span style="color:#d29922">${esc(issue)}</span>`);
|
||||||
} else {
|
promptLog.push({ step: promptLog.length, agentKey: 'qa', agentName: qaAgent.name, model: 'mekaaninen', label: `validointi #${fixRound}`, systemPrompt: '(mekaaninen validointi)', userPrompt: 'validateProjectCode(files)', response: mechIssues.join('\n') });
|
||||||
termLog(` <span style="color:#3fb950">✓ Kaikki tiedostot validoitu — 0 ongelmaa</span>`);
|
stepN++;
|
||||||
|
|
||||||
|
// Ryhmitellään ongelmat tiedostoittain
|
||||||
|
const issuesByFile = {};
|
||||||
|
for (const issue of mechIssues) {
|
||||||
|
const m = issue.match(/^ISSUE:\s*(\S+?):/);
|
||||||
|
const fname = m ? m[1] : 'unknown';
|
||||||
|
if (!issuesByFile[fname]) issuesByFile[fname] = [];
|
||||||
|
issuesByFile[fname].push(issue);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Delegoidaan korjaukset Coder-agentille tiedosto kerrallaan
|
||||||
|
for (const [fname, fIssues] of Object.entries(issuesByFile)) {
|
||||||
|
if (!files[fname]) continue;
|
||||||
|
const fixAgent = agents[agentMap[fname]] || cdr;
|
||||||
|
termLog(`\n<span style="color:#f0883e;font-weight:bold">[${stepN}] ${esc(fixAgent.name)}</span> — korjaa ${esc(fname)} (${fIssues.length} ongelmaa)`);
|
||||||
|
highlightAgent(agentMap[fname] || 'coder');
|
||||||
|
explainStep(`Korjaus: ${fname}`, `${fixAgent.name} korjaa validoinnin löytämät ongelmat.`);
|
||||||
|
|
||||||
|
const fixPrompt = `Fix the following issues in this Python file. Return ONLY the complete corrected file, no explanations.\n\nISSUES:\n${fIssues.join('\n')}\n\nCURRENT FILE (${fname}):\n\`\`\`python\n${files[fname]}\`\`\``;
|
||||||
|
const fixResult = await kpnRun(fixAgent.model, fixPrompt, false, { ...fixAgent, prompt: 'You are a Python code fixer. Return ONLY the corrected Python file. No markdown fences, no explanations — just valid Python code.', capability: 'heavy' });
|
||||||
|
|
||||||
|
if (fixResult) {
|
||||||
|
// Poistetaan markdown-koodiblokit jos LLM palauttaa ne
|
||||||
|
let cleaned = fixResult.replace(/^```(?:python)?\s*\n?/m, '').replace(/\n?```\s*$/m, '').trim() + '\n';
|
||||||
|
files[fname] = cleaned;
|
||||||
|
termLog(` <span style="color:#3fb950">✓ ${esc(fname)} korjattu</span>`);
|
||||||
|
} else {
|
||||||
|
termLog(` <span style="color:#f85149">✗ ${esc(fname)} korjaus epäonnistui — pidetään alkuperäinen</span>`);
|
||||||
|
}
|
||||||
|
promptLog.push({ step: promptLog.length, agentKey: agentMap[fname] || 'coder', agentName: fixAgent.name, model: fixAgent.model, label: `korjaus: ${fname}`, systemPrompt: '(code fixer)', userPrompt: fixPrompt, response: fixResult || '(epäonnistui)' });
|
||||||
|
stepN++;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Validoidaan uudelleen
|
||||||
|
mechIssues = validateProjectCode(files);
|
||||||
}
|
}
|
||||||
promptLog.push({ step: promptLog.length, agentKey: 'qa', agentName: qaAgent.name, model: 'mekaaninen', label: 'validointi', systemPrompt: '(mekaaninen validointi — ei LLM:ää)', userPrompt: 'validateProjectCode(files)', response: mechIssues.length === 0 ? 'OK — 0 issues' : mechIssues.join('\n') });
|
|
||||||
|
// Lopullinen validointitulos
|
||||||
|
termLog(`\n<span style="color:#d2a8ff;font-weight:bold">[${stepN}] ${esc(qaAgent.name)}</span> — lopullinen validointi`);
|
||||||
|
highlightAgent('qa');
|
||||||
|
if (mechIssues.length > 0) {
|
||||||
|
explainStep('Validointi', `${mechIssues.length} ongelmaa jäi korjaamatta ${MAX_FIX_ROUNDS} kierroksen jälkeen.`);
|
||||||
|
termLog(` <span style="color:#f85149">✗ ${mechIssues.length} ongelmaa jäljellä ${fixRound} korjauskierroksen jälkeen:</span>`);
|
||||||
|
for (const issue of mechIssues) termLog(` <span style="color:#f85149">${esc(issue)}</span>`);
|
||||||
|
} else {
|
||||||
|
const msg = fixRound > 0 ? `✓ Kaikki ongelmat korjattu (${fixRound} kierrosta)` : '✓ Kaikki tiedostot validoitu — 0 ongelmaa';
|
||||||
|
explainStep('Validointi', msg);
|
||||||
|
termLog(` <span style="color:#3fb950">${msg}</span>`);
|
||||||
|
}
|
||||||
|
promptLog.push({ step: promptLog.length, agentKey: 'qa', agentName: qaAgent.name, model: 'mekaaninen', label: 'lopullinen validointi', systemPrompt: '(mekaaninen validointi)', userPrompt: 'validateProjectCode(files)', response: mechIssues.length === 0 ? `OK — korjattu ${fixRound} kierroksessa` : mechIssues.join('\n') });
|
||||||
stepN++;
|
stepN++;
|
||||||
|
|
||||||
// Tarkkailija: yhteenveto + raportti + arvosana
|
// Tarkkailija: yhteenveto + raportti + arvosana
|
||||||
@@ -1465,7 +1558,7 @@ Blog → Author: name,email,bio(Text|None) / Post: title, content(Text), author_
|
|||||||
`## Architecture\nDescribe the project structure and design decisions.\n\n` +
|
`## Architecture\nDescribe the project structure and design decisions.\n\n` +
|
||||||
`## Risk Assessment\n| Severity | Issue |\n|----------|-------|\n| ... | ... |\n\n` +
|
`## Risk Assessment\n| Severity | Issue |\n|----------|-------|\n| ... | ... |\n\n` +
|
||||||
`Project code:\n${finalCode}`;
|
`Project code:\n${finalCode}`;
|
||||||
const readme = await kpnRun(obs.model, obsPrompt, false, obs);
|
const readme = await kpnRun(obs.model, obsPrompt, false, { ...obs, capability: 'heavy' });
|
||||||
if (readme) {
|
if (readme) {
|
||||||
files['README.md'] = readme;
|
files['README.md'] = readme;
|
||||||
// Tallennetaan raportti globaalisti jotta tarkkailija-klikkaus avaa sen
|
// Tallennetaan raportti globaalisti jotta tarkkailija-klikkaus avaa sen
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
/* Oletusvärit — ylikirjoitetaan teemalla */
|
||||||
:root {
|
:root {
|
||||||
--bg: #0d1117;
|
--bg: #0d1117;
|
||||||
--panel: #161b22;
|
--panel: #161b22;
|
||||||
@@ -8,6 +9,53 @@
|
|||||||
--red: #f85149;
|
--red: #f85149;
|
||||||
--purple: #a371f7;
|
--purple: #a371f7;
|
||||||
--border: #30363d;
|
--border: #30363d;
|
||||||
|
--hero-accent: #ff6b00;
|
||||||
|
--hero-glow: rgba(255, 107, 0, 0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Gecko — lämmin kulta/oranssi (kipina.tech) */
|
||||||
|
[data-theme="gecko"] {
|
||||||
|
--bg: #0a0500;
|
||||||
|
--panel: #1f1000;
|
||||||
|
--text: #fff5e6;
|
||||||
|
--accent: #ff7b00;
|
||||||
|
--green: #3fb950;
|
||||||
|
--yellow: #ffae00;
|
||||||
|
--red: #f85149;
|
||||||
|
--purple: #ff9d4d;
|
||||||
|
--border: rgba(255, 174, 0, 0.2);
|
||||||
|
--hero-accent: #ff7b00;
|
||||||
|
--hero-glow: rgba(255, 123, 0, 0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Forge — kyber-sininen/syaani (kipina.tech) */
|
||||||
|
[data-theme="forge"] {
|
||||||
|
--bg: #060b11;
|
||||||
|
--panel: #121e2d;
|
||||||
|
--text: #e0f2fe;
|
||||||
|
--accent: #00e5ff;
|
||||||
|
--green: #3fb950;
|
||||||
|
--yellow: #ff5e3a;
|
||||||
|
--red: #f85149;
|
||||||
|
--purple: #7dd3fc;
|
||||||
|
--border: rgba(0, 229, 255, 0.15);
|
||||||
|
--hero-accent: #00e5ff;
|
||||||
|
--hero-glow: rgba(0, 229, 255, 0.15);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Serpent — neon-turkoosi/teal (kipina.tech) */
|
||||||
|
[data-theme="serpent"] {
|
||||||
|
--bg: #000808;
|
||||||
|
--panel: #001e1e;
|
||||||
|
--text: #ccffff;
|
||||||
|
--accent: #00ffff;
|
||||||
|
--green: #00ffaa;
|
||||||
|
--yellow: #d29922;
|
||||||
|
--red: #f85149;
|
||||||
|
--purple: #66cccc;
|
||||||
|
--border: rgba(0, 255, 255, 0.15);
|
||||||
|
--hero-accent: #00ffff;
|
||||||
|
--hero-glow: rgba(0, 255, 255, 0.15);
|
||||||
}
|
}
|
||||||
|
|
||||||
* { box-sizing: border-box; margin: 0; padding: 0; }
|
* { box-sizing: border-box; margin: 0; padding: 0; }
|
||||||
@@ -235,17 +283,27 @@ body {
|
|||||||
.bg-mesh {
|
.bg-mesh {
|
||||||
position: fixed; inset: 0; z-index: -1;
|
position: fixed; inset: 0; z-index: -1;
|
||||||
background:
|
background:
|
||||||
radial-gradient(ellipse 80% 60% at 20% 40%, rgba(255,107,0,0.08) 0%, transparent 70%),
|
radial-gradient(ellipse 80% 60% at 20% 40%, var(--hero-glow) 0%, transparent 70%),
|
||||||
radial-gradient(ellipse 60% 50% at 80% 20%, rgba(88,166,255,0.06) 0%, transparent 70%),
|
radial-gradient(ellipse 60% 50% at 80% 20%, rgba(88,166,255,0.06) 0%, transparent 70%),
|
||||||
var(--bg);
|
var(--bg);
|
||||||
}
|
}
|
||||||
|
|
||||||
.landing-nav {
|
.landing-nav {
|
||||||
padding: 20px 40px;
|
padding: 20px 40px;
|
||||||
|
display: flex; align-items: center; justify-content: space-between;
|
||||||
}
|
}
|
||||||
.landing-logo { text-decoration: none; font-size: 18px; font-weight: 700; }
|
.landing-logo { text-decoration: none; font-size: 18px; font-weight: 700; }
|
||||||
.logo-accent { color: #ff6b00; }
|
.logo-accent { color: var(--hero-accent); }
|
||||||
.logo-sub { color: #8b949e; font-weight: 400; }
|
.logo-sub { color: #8b949e; font-weight: 400; }
|
||||||
|
.theme-cycle-btn {
|
||||||
|
background: none; border: 1px solid var(--border); border-radius: 8px;
|
||||||
|
width: 38px; height: 38px; font-size: 20px; cursor: pointer;
|
||||||
|
display: flex; align-items: center; justify-content: center;
|
||||||
|
transition: border-color 0.2s, transform 0.15s;
|
||||||
|
}
|
||||||
|
.theme-cycle-btn:hover {
|
||||||
|
border-color: var(--hero-accent); transform: scale(1.1);
|
||||||
|
}
|
||||||
|
|
||||||
/* Hero */
|
/* Hero */
|
||||||
.hero {
|
.hero {
|
||||||
@@ -260,7 +318,7 @@ body {
|
|||||||
line-height: 1.15; color: #e6edf3; margin-bottom: 16px;
|
line-height: 1.15; color: #e6edf3; margin-bottom: 16px;
|
||||||
}
|
}
|
||||||
.hero-divider {
|
.hero-divider {
|
||||||
width: 60px; height: 3px; background: #ff6b00;
|
width: 60px; height: 3px; background: var(--hero-accent);
|
||||||
border-radius: 2px; margin-bottom: 20px;
|
border-radius: 2px; margin-bottom: 20px;
|
||||||
}
|
}
|
||||||
.hero-desc {
|
.hero-desc {
|
||||||
@@ -283,7 +341,7 @@ body {
|
|||||||
outline: none; transition: border-color 0.2s;
|
outline: none; transition: border-color 0.2s;
|
||||||
}
|
}
|
||||||
.hero-input:focus {
|
.hero-input:focus {
|
||||||
border-color: #ff6b00; box-shadow: 0 0 0 3px rgba(255,107,0,0.15);
|
border-color: var(--hero-accent); box-shadow: 0 0 0 3px var(--hero-glow);
|
||||||
}
|
}
|
||||||
.hero-input::placeholder { color: #484f58; }
|
.hero-input::placeholder { color: #484f58; }
|
||||||
.hero-input.shake {
|
.hero-input.shake {
|
||||||
@@ -299,11 +357,11 @@ body {
|
|||||||
.hero-btn {
|
.hero-btn {
|
||||||
padding: 14px 28px; font-size: 16px; font-weight: 600;
|
padding: 14px 28px; font-size: 16px; font-weight: 600;
|
||||||
font-family: 'Inter', sans-serif;
|
font-family: 'Inter', sans-serif;
|
||||||
background: #ff6b00; color: #fff; border: none; border-radius: 8px;
|
background: var(--hero-accent); color: #fff; border: none; border-radius: 8px;
|
||||||
cursor: pointer; transition: background 0.2s, transform 0.1s;
|
cursor: pointer; transition: background 0.2s, transform 0.1s;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
}
|
}
|
||||||
.hero-btn:hover { background: #e05e00; transform: translateY(-1px); }
|
.hero-btn:hover { filter: brightness(0.85); transform: translateY(-1px); }
|
||||||
.hero-btn:active { transform: translateY(0); }
|
.hero-btn:active { transform: translateY(0); }
|
||||||
|
|
||||||
/* Example buttons */
|
/* Example buttons */
|
||||||
@@ -325,13 +383,14 @@ body {
|
|||||||
}
|
}
|
||||||
.hero-orb {
|
.hero-orb {
|
||||||
width: 340px; height: 340px; border-radius: 50%;
|
width: 340px; height: 340px; border-radius: 50%;
|
||||||
background: radial-gradient(circle at 30% 30%, rgba(255,107,0,0.15) 0%, transparent 70%);
|
background: radial-gradient(circle at 30% 30%, var(--hero-glow) 0%, transparent 70%);
|
||||||
display: flex; align-items: center; justify-content: center;
|
display: flex; align-items: center; justify-content: center;
|
||||||
animation: orb-float 6s ease-in-out infinite;
|
animation: orb-float 6s ease-in-out infinite;
|
||||||
}
|
}
|
||||||
.hero-orb-img {
|
.hero-orb-img {
|
||||||
width: 100%; height: 100%; object-fit: contain;
|
width: 100%; height: 100%; object-fit: contain;
|
||||||
filter: drop-shadow(0 0 40px rgba(255,107,0,0.25));
|
filter: drop-shadow(0 0 40px var(--hero-glow));
|
||||||
|
transition: opacity 0.2s ease;
|
||||||
}
|
}
|
||||||
@keyframes orb-float {
|
@keyframes orb-float {
|
||||||
0%, 100% { transform: translateY(0); }
|
0%, 100% { transform: translateY(0); }
|
||||||
@@ -357,11 +416,11 @@ body {
|
|||||||
background: var(--panel); border: 1px solid var(--border);
|
background: var(--panel); border: 1px solid var(--border);
|
||||||
border-radius: 12px; transition: border-color 0.3s;
|
border-radius: 12px; transition: border-color 0.3s;
|
||||||
}
|
}
|
||||||
.how-step:hover { border-color: rgba(255,107,0,0.4); }
|
.how-step:hover { border-color: var(--hero-accent); }
|
||||||
.how-step-num {
|
.how-step-num {
|
||||||
width: 40px; height: 40px; line-height: 40px;
|
width: 40px; height: 40px; line-height: 40px;
|
||||||
border-radius: 50%; background: rgba(255,107,0,0.12);
|
border-radius: 50%; background: var(--hero-glow);
|
||||||
color: #ff6b00; font-weight: 700; font-size: 18px;
|
color: var(--hero-accent); font-weight: 700; font-size: 18px;
|
||||||
margin: 0 auto 14px;
|
margin: 0 auto 14px;
|
||||||
}
|
}
|
||||||
.how-step h3 { color: #e6edf3; font-size: 1rem; margin-bottom: 8px; }
|
.how-step h3 { color: #e6edf3; font-size: 1rem; margin-bottom: 8px; }
|
||||||
@@ -397,8 +456,8 @@ body {
|
|||||||
.learn-step-header:hover { background: rgba(88,166,255,0.04); }
|
.learn-step-header:hover { background: rgba(88,166,255,0.04); }
|
||||||
.learn-step-num {
|
.learn-step-num {
|
||||||
width: 28px; height: 28px; line-height: 28px; text-align: center;
|
width: 28px; height: 28px; line-height: 28px; text-align: center;
|
||||||
border-radius: 50%; background: rgba(255,107,0,0.12);
|
border-radius: 50%; background: var(--hero-glow);
|
||||||
color: #ff6b00; font-weight: 700; font-size: 13px; flex-shrink: 0;
|
color: var(--hero-accent); font-weight: 700; font-size: 13px; flex-shrink: 0;
|
||||||
}
|
}
|
||||||
.learn-step-agent {
|
.learn-step-agent {
|
||||||
font-weight: 600; color: #e6edf3; font-size: 14px;
|
font-weight: 600; color: #e6edf3; font-size: 14px;
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ struct AppState {
|
|||||||
pending_responses: Mutex<HashMap<String, tokio::sync::oneshot::Sender<serde_json::Value>>>, // task_id → oneshot API-vastaukselle
|
pending_responses: Mutex<HashMap<String, tokio::sync::oneshot::Sender<serde_json::Value>>>, // task_id → oneshot API-vastaukselle
|
||||||
api_rate_limits: Mutex<HashMap<IpAddr, (std::time::Instant, u32)>>, // IP → (ikkuna-alku, pyyntömäärä)
|
api_rate_limits: Mutex<HashMap<IpAddr, (std::time::Instant, u32)>>, // IP → (ikkuna-alku, pyyntömäärä)
|
||||||
node_models: tokio::sync::RwLock<HashMap<u64, serde_json::Value>>, // node_id → ollama tags JSON
|
node_models: tokio::sync::RwLock<HashMap<u64, serde_json::Value>>, // node_id → ollama tags JSON
|
||||||
|
node_max_param_b: tokio::sync::RwLock<HashMap<u64, u32>>, // node_id → suurimman mallin parametrit (B)
|
||||||
db: db::NodeDb,
|
db: db::NodeDb,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -335,6 +336,7 @@ async fn main() {
|
|||||||
pending_responses: Mutex::new(HashMap::new()),
|
pending_responses: Mutex::new(HashMap::new()),
|
||||||
api_rate_limits: Mutex::new(HashMap::new()),
|
api_rate_limits: Mutex::new(HashMap::new()),
|
||||||
node_models: tokio::sync::RwLock::new(HashMap::new()),
|
node_models: tokio::sync::RwLock::new(HashMap::new()),
|
||||||
|
node_max_param_b: tokio::sync::RwLock::new(HashMap::new()),
|
||||||
db: db::NodeDb::new(&std::env::var("DATABASE_PATH").unwrap_or_else(|_| "nodes.db".to_string())),
|
db: db::NodeDb::new(&std::env::var("DATABASE_PATH").unwrap_or_else(|_| "nodes.db".to_string())),
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -846,10 +848,34 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, ip: IpAddr) {
|
|||||||
node_id, ip, hostname, os, cores, ram, allocated
|
node_id, ip, hostname, os, cores, ram, allocated
|
||||||
);
|
);
|
||||||
|
|
||||||
// Tallennetaan välitetyt mallit muistiin
|
// Tallennetaan välitetyt mallit muistiin + parsitaan suurin malli
|
||||||
if let Some(models) = json.get("models") {
|
if let Some(models) = json.get("models") {
|
||||||
let mut nm = state.node_models.write().await;
|
let mut nm = state.node_models.write().await;
|
||||||
nm.insert(node_id, models.clone());
|
nm.insert(node_id, models.clone());
|
||||||
|
|
||||||
|
// Parsitaan suurin mallikoko (B) nimestä: "qwen3:32b" → 32, "qwen2.5-coder:7b" → 7
|
||||||
|
let max_b = models.get("models").and_then(|v| v.as_array()).map(|arr| {
|
||||||
|
arr.iter().filter_map(|m| {
|
||||||
|
let name = m.get("name")?.as_str()?;
|
||||||
|
// Etsitään :N tai :Nb tai -Nb muoto
|
||||||
|
let lower = name.to_lowercase();
|
||||||
|
for part in lower.split(&[':', '-'][..]) {
|
||||||
|
if let Some(num_str) = part.strip_suffix('b') {
|
||||||
|
if let Ok(n) = num_str.parse::<f32>() { return Some(n as u32); }
|
||||||
|
} else if let Ok(n) = part.parse::<f32>() {
|
||||||
|
if n >= 0.5 && n <= 500.0 { return Some(n as u32); }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Fallback: koko tiedostosta (size / ~0.5GB per B param Q4)
|
||||||
|
let size = m.get("size")?.as_u64()?;
|
||||||
|
Some((size / 500_000_000) as u32) // karkea arvio
|
||||||
|
}).max().unwrap_or(0)
|
||||||
|
}).unwrap_or(0);
|
||||||
|
|
||||||
|
if max_b > 0 {
|
||||||
|
state.node_max_param_b.write().await.insert(node_id, max_b);
|
||||||
|
tracing::info!("Solmu {} — suurin malli: ~{}B parametria", node_id, max_b);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(gpus) = json.get("gpus").and_then(|v| v.as_array()) {
|
if let Some(gpus) = json.get("gpus").and_then(|v| v.as_array()) {
|
||||||
@@ -1149,6 +1175,7 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, ip: IpAddr) {
|
|||||||
state.node_types.lock().unwrap().remove(&node_id);
|
state.node_types.lock().unwrap().remove(&node_id);
|
||||||
state.node_paused.lock().unwrap().remove(&node_id);
|
state.node_paused.lock().unwrap().remove(&node_id);
|
||||||
state.node_models.write().await.remove(&node_id);
|
state.node_models.write().await.remove(&node_id);
|
||||||
|
state.node_max_param_b.write().await.remove(&node_id);
|
||||||
tracing::info!("Solmu {} ({}) poistui verkosta.", node_id, ip);
|
tracing::info!("Solmu {} ({}) poistui verkosta.", node_id, ip);
|
||||||
broadcast_stats(&state).await;
|
broadcast_stats(&state).await;
|
||||||
sender_task.abort();
|
sender_task.abort();
|
||||||
@@ -1170,6 +1197,8 @@ struct ChatCompletionRequest {
|
|||||||
repeat_penalty: Option<f64>,
|
repeat_penalty: Option<f64>,
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
stop: Option<Vec<String>>,
|
stop: Option<Vec<String>>,
|
||||||
|
#[serde(default)]
|
||||||
|
capability: Option<String>, // "heavy" → priorisoi isoin malli, "light" → mikä tahansa
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(serde::Serialize)]
|
#[derive(serde::Serialize)]
|
||||||
@@ -1279,15 +1308,26 @@ async fn api_chat_completions(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Etsitään vapaa solmu — priorisoidaan natiivisolmut (GPU) selaimen edelle
|
// Etsitään vapaa solmu — älykäs reititys kyvykkyyden mukaan
|
||||||
|
let want_heavy = payload.capability.as_deref() == Some("heavy");
|
||||||
|
// Haetaan param_b-snapshot ennen Mutex-lukituksia (async RwLock ei saa olla Mutex-scopen sisällä)
|
||||||
|
let param_b_snapshot: HashMap<u64, u32> = state.node_max_param_b.read().await.clone();
|
||||||
let (target_node, _total_matching) = {
|
let (target_node, _total_matching) = {
|
||||||
let tasks = state.node_tasks.lock().unwrap();
|
let tasks = state.node_tasks.lock().unwrap();
|
||||||
let _busy = state.node_busy.lock().unwrap();
|
let busy = state.node_busy.lock().unwrap();
|
||||||
let node_types = state.node_types.lock().unwrap();
|
let node_types = state.node_types.lock().unwrap();
|
||||||
let paused = state.node_paused.lock().unwrap();
|
let paused = state.node_paused.lock().unwrap();
|
||||||
|
// Debug: logita kaikki solmut ja niiden tilat
|
||||||
|
let all_nodes: Vec<String> = tasks.iter().map(|(id, task)| {
|
||||||
|
let ty = node_types.get(id).map(|s| s.as_str()).unwrap_or("?");
|
||||||
|
let b = if busy.contains(id) { " BUSY" } else { "" };
|
||||||
|
let p = if paused.contains(id) { " PAUSED" } else { "" };
|
||||||
|
format!("#{}({}:{}{}{}", id, ty, task, b, p)
|
||||||
|
}).collect();
|
||||||
|
tracing::info!("Reititys '{}'{} — solmut: [{}]", payload.model, if want_heavy { " (heavy)" } else { "" }, all_nodes.join(", "));
|
||||||
let matching: Vec<u64> = tasks.iter().filter(|(k, task)| {
|
let matching: Vec<u64> = tasks.iter().filter(|(k, task)| {
|
||||||
if paused.contains(k) { return false; } // Ei sallita tauotettuja
|
if paused.contains(k) { return false; } // Ei tauotettuja
|
||||||
// Eksakti match tai qwen-perheen yhteensopivuus (selain: qwen-coder-05b, natiivi: qwen2.5-coder:7b)
|
if busy.contains(k) { return false; } // Ei varattuja
|
||||||
let req_model = payload.model.to_lowercase();
|
let req_model = payload.model.to_lowercase();
|
||||||
let node_task = task.to_lowercase();
|
let node_task = task.to_lowercase();
|
||||||
if req_model.starts_with("qwen") {
|
if req_model.starts_with("qwen") {
|
||||||
@@ -1298,11 +1338,32 @@ async fn api_chat_completions(
|
|||||||
**task == payload.model
|
**task == payload.model
|
||||||
}
|
}
|
||||||
}).map(|(k, _)| *k).collect();
|
}).map(|(k, _)| *k).collect();
|
||||||
// Etsitään mikä tahansa matchaava solmu (natiivi priorisoidaan)
|
|
||||||
let native = matching.iter().find(|id| {
|
let any = if want_heavy {
|
||||||
node_types.get(id).map(|t| t == "native").unwrap_or(false)
|
// Heavy: priorisoi solmu jolla on suurin malli (B-parametrit)
|
||||||
}).copied();
|
let mut ranked: Vec<(u64, u32)> = matching.iter().map(|id| {
|
||||||
let any = native.or_else(|| matching.first().copied());
|
(*id, param_b_snapshot.get(id).copied().unwrap_or(0))
|
||||||
|
}).collect();
|
||||||
|
ranked.sort_by(|a, b| b.1.cmp(&a.1)); // suurin ensin
|
||||||
|
if let Some((best_id, best_b)) = ranked.first() {
|
||||||
|
tracing::info!("Heavy-reititys: solmu {} valittu ({}B parametria)", best_id, best_b);
|
||||||
|
Some(*best_id)
|
||||||
|
} else {
|
||||||
|
// Kaikki heavy-solmut busy — fallback mihin tahansa vapaaseen
|
||||||
|
let all_matching: Vec<u64> = tasks.iter().filter(|(k, task)| {
|
||||||
|
if paused.contains(k) || busy.contains(k) { return false; }
|
||||||
|
let req_model = payload.model.to_lowercase();
|
||||||
|
task.to_lowercase().starts_with(&req_model.split('-').next().unwrap_or(""))
|
||||||
|
}).map(|(k, _)| *k).collect();
|
||||||
|
all_matching.first().copied()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Oletus: vapaa natiivi ensin, sitten mikä tahansa vapaa
|
||||||
|
let native = matching.iter().find(|id| {
|
||||||
|
node_types.get(id).map(|t| t == "native").unwrap_or(false)
|
||||||
|
}).copied();
|
||||||
|
native.or_else(|| matching.first().copied())
|
||||||
|
};
|
||||||
(any, matching.len())
|
(any, matching.len())
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
30
network-poc/kipina-node
Executable file → Normal file
30
network-poc/kipina-node
Executable file → Normal file
@@ -99,23 +99,27 @@ if [ -n "$KIPINA_MODEL" ]; then
|
|||||||
echo " Malli: $KIPINA_MODEL (Ympäristömuuttujasta)"
|
echo " Malli: $KIPINA_MODEL (Ympäristömuuttujasta)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Lataa binääri
|
# Binäärin automaattinen päivitys — vertaa build-hashia palvelimeen
|
||||||
BIN_PATH="./kipina-node-bin"
|
BIN_PATH="./kipina-node-bin"
|
||||||
if [ -f "$BIN_PATH" ]; then
|
HASH_PATH="./kipina-node-bin.hash"
|
||||||
echo ""
|
|
||||||
read -p " Löydettiin vanha kipina-node-bin lokaalisti. Haluatko poistaa sen ja ladata uusimman version? [Y/n] " -r DEL_CHOICE
|
|
||||||
if [[ "$DEL_CHOICE" =~ ^[Nn]$ ]]; then
|
|
||||||
echo " ✓ Käytetään lokaalia versiota."
|
|
||||||
else
|
|
||||||
rm -f "$BIN_PATH"
|
|
||||||
echo " ✓ Vanha binääri poistettu ja korvataan uudella."
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [ ! -f "$BIN_PATH" ]; then
|
REMOTE_HASH=$(curl -sSL "$BASE_URL/.build-hash?v=$(date +%s)" 2>/dev/null | tr -d '[:space:]')
|
||||||
echo " Ladataan tuorein $BINARY..."
|
LOCAL_HASH=""
|
||||||
|
[ -f "$HASH_PATH" ] && LOCAL_HASH=$(cat "$HASH_PATH" | tr -d '[:space:]')
|
||||||
|
|
||||||
|
if [ -f "$BIN_PATH" ] && [ -n "$REMOTE_HASH" ] && [ "$REMOTE_HASH" = "$LOCAL_HASH" ]; then
|
||||||
|
echo " ✓ Binääri ajan tasalla (versio: $LOCAL_HASH)"
|
||||||
|
else
|
||||||
|
if [ -f "$BIN_PATH" ]; then
|
||||||
|
echo " ↻ Uusi versio saatavilla ($LOCAL_HASH → $REMOTE_HASH)"
|
||||||
|
else
|
||||||
|
echo " Ladataan $BINARY..."
|
||||||
|
fi
|
||||||
|
rm -f "$BIN_PATH"
|
||||||
curl -sSL "$BASE_URL/$BINARY?v=$(date +%s)" -o "$BIN_PATH"
|
curl -sSL "$BASE_URL/$BINARY?v=$(date +%s)" -o "$BIN_PATH"
|
||||||
chmod +x "$BIN_PATH"
|
chmod +x "$BIN_PATH"
|
||||||
|
echo "$REMOTE_HASH" > "$HASH_PATH"
|
||||||
|
echo " ✓ Päivitetty versioon $REMOTE_HASH"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo ""
|
echo ""
|
||||||
|
|||||||
Binary file not shown.
@@ -69,6 +69,10 @@ impl LlmEngine {
|
|||||||
self.model.borrow().clone()
|
self.model.borrow().clone()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn ollama_url(&self) -> &str {
|
||||||
|
&self.ollama_url
|
||||||
|
}
|
||||||
|
|
||||||
pub fn set_model(&self, new_model: String) {
|
pub fn set_model(&self, new_model: String) {
|
||||||
*self.model.borrow_mut() = new_model;
|
*self.model.borrow_mut() = new_model;
|
||||||
}
|
}
|
||||||
@@ -91,6 +95,32 @@ impl LlmEngine {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Hakee käynnissä olevan mallin VRAM-tilan (ollama ps)
|
||||||
|
pub async fn fetch_ps(&self) -> Result<Option<ModelVramStatus>, String> {
|
||||||
|
let resp = self.client.get(format!("{}/api/ps", self.ollama_url))
|
||||||
|
.send()
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("Ollama ps: {}", e))?;
|
||||||
|
|
||||||
|
if !resp.status().is_success() {
|
||||||
|
return Err(format!("Ollama ps HTTP {}", resp.status()));
|
||||||
|
}
|
||||||
|
|
||||||
|
let body: serde_json::Value = resp.json().await
|
||||||
|
.map_err(|e| format!("Ollama ps json: {}", e))?;
|
||||||
|
|
||||||
|
let models = body["models"].as_array();
|
||||||
|
if let Some(arr) = models {
|
||||||
|
if let Some(m) = arr.first() {
|
||||||
|
let name = m["name"].as_str().unwrap_or("?").to_string();
|
||||||
|
let size = m["size"].as_u64().unwrap_or(0);
|
||||||
|
let size_vram = m["size_vram"].as_u64().unwrap_or(0);
|
||||||
|
return Ok(Some(ModelVramStatus { name, size, size_vram }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Ok(None) // ei ladattua mallia
|
||||||
|
}
|
||||||
|
|
||||||
/// Hakee kaikki Ollamaan asennetut mallit
|
/// Hakee kaikki Ollamaan asennetut mallit
|
||||||
pub async fn fetch_models(&self) -> Result<serde_json::Value, String> {
|
pub async fn fetch_models(&self) -> Result<serde_json::Value, String> {
|
||||||
let resp = self.client.get(format!("{}/api/tags", self.ollama_url))
|
let resp = self.client.get(format!("{}/api/tags", self.ollama_url))
|
||||||
@@ -126,6 +156,7 @@ impl LlmEngine {
|
|||||||
"messages": messages,
|
"messages": messages,
|
||||||
"stream": false,
|
"stream": false,
|
||||||
"options": {
|
"options": {
|
||||||
|
"num_ctx": 16384,
|
||||||
"num_predict": opts.max_tokens,
|
"num_predict": opts.max_tokens,
|
||||||
"temperature": opts.temperature.unwrap_or(0.7),
|
"temperature": opts.temperature.unwrap_or(0.7),
|
||||||
"top_k": opts.top_k.unwrap_or(40),
|
"top_k": opts.top_k.unwrap_or(40),
|
||||||
@@ -184,3 +215,32 @@ pub struct GenerateResult {
|
|||||||
pub duration_ms: f64,
|
pub duration_ms: f64,
|
||||||
pub tokens_per_sec: f64,
|
pub tokens_per_sec: f64,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub struct ModelVramStatus {
|
||||||
|
pub name: String,
|
||||||
|
pub size: u64, // kokonaiskoko (tavuina)
|
||||||
|
pub size_vram: u64, // VRAM:ssa oleva osuus (tavuina)
|
||||||
|
}
|
||||||
|
|
||||||
|
impl ModelVramStatus {
|
||||||
|
pub fn fully_in_vram(&self) -> bool {
|
||||||
|
self.size > 0 && self.size_vram >= self.size
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn vram_percent(&self) -> f64 {
|
||||||
|
if self.size == 0 { return 0.0; }
|
||||||
|
(self.size_vram as f64 / self.size as f64) * 100.0
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn display(&self) -> String {
|
||||||
|
let size_gb = self.size as f64 / 1_073_741_824.0;
|
||||||
|
let vram_gb = self.size_vram as f64 / 1_073_741_824.0;
|
||||||
|
if self.fully_in_vram() {
|
||||||
|
format!("✓ {} ({:.1} GB) — 100% GPU", self.name, size_gb)
|
||||||
|
} else if self.size_vram == 0 {
|
||||||
|
format!("✗ {} ({:.1} GB) — 100% CPU", self.name, size_gb)
|
||||||
|
} else {
|
||||||
|
format!("◐ {} ({:.1}/{:.1} GB VRAM, {:.0}% GPU)", self.name, vram_gb, size_gb, self.vram_percent())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -363,6 +363,48 @@ async fn main() {
|
|||||||
st.push_log("System", format!("Malli valmis: {}", active_model), None);
|
st.push_log("System", format!("Malli valmis: {}", active_model), None);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Lämmittelykutsu: ladataan malli VRAM:iin ja haetaan VRAM-tila
|
||||||
|
if let Some(ref engine) = llm {
|
||||||
|
{
|
||||||
|
let mut st = tui_state.write().await;
|
||||||
|
st.vram_status = "Ladataan VRAM:iin...".to_string();
|
||||||
|
st.push_log("System", "Ladataan mallia VRAM:iin...".to_string(), None);
|
||||||
|
}
|
||||||
|
// Lyhyt generate-kutsu pakottaa Ollaman lataamaan mallin GPU:lle
|
||||||
|
let _ = engine.generate("hi", &inference::GenerateOptions {
|
||||||
|
max_tokens: 1, system_prompt: None, temperature: Some(0.0),
|
||||||
|
top_k: Some(1), repeat_penalty: None, stop: None,
|
||||||
|
}).await;
|
||||||
|
if let Ok(Some(ps)) = engine.fetch_ps().await {
|
||||||
|
let mut st = tui_state.write().await;
|
||||||
|
st.vram_status = ps.display();
|
||||||
|
st.push_log("System", format!("VRAM: {}", ps.display()), None);
|
||||||
|
}
|
||||||
|
let vram_engine_url = engine.ollama_url().to_string();
|
||||||
|
let vram_state = tui_state.clone();
|
||||||
|
tokio::spawn(async move {
|
||||||
|
let client = reqwest::Client::new();
|
||||||
|
loop {
|
||||||
|
tokio::time::sleep(std::time::Duration::from_secs(30)).await;
|
||||||
|
if let Ok(resp) = client.get(format!("{}/api/ps", vram_engine_url)).send().await {
|
||||||
|
if let Ok(body) = resp.json::<serde_json::Value>().await {
|
||||||
|
if let Some(arr) = body["models"].as_array() {
|
||||||
|
if let Some(m) = arr.first() {
|
||||||
|
let name = m["name"].as_str().unwrap_or("?").to_string();
|
||||||
|
let size = m["size"].as_u64().unwrap_or(0);
|
||||||
|
let size_vram = m["size_vram"].as_u64().unwrap_or(0);
|
||||||
|
let status = inference::ModelVramStatus { name, size, size_vram };
|
||||||
|
vram_state.write().await.vram_status = status.display();
|
||||||
|
} else {
|
||||||
|
vram_state.write().await.vram_status = "Ei ladattua mallia".to_string();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Käynnistetään graafinen TUI vain jos stdin on terminaali (ei taustaprosessina)
|
// Käynnistetään graafinen TUI vain jos stdin on terminaali (ei taustaprosessina)
|
||||||
let ui_state = tui_state.clone();
|
let ui_state = tui_state.clone();
|
||||||
if std::io::stdin().is_terminal() {
|
if std::io::stdin().is_terminal() {
|
||||||
|
|||||||
@@ -36,6 +36,8 @@ pub struct DashboardState {
|
|||||||
pub last_tokens_sec: f64,
|
pub last_tokens_sec: f64,
|
||||||
pub network_active_nodes: usize,
|
pub network_active_nodes: usize,
|
||||||
pub network_total_tasks: u64,
|
pub network_total_tasks: u64,
|
||||||
|
// VRAM-tila (ollama ps)
|
||||||
|
pub vram_status: String,
|
||||||
// Mallivalikko
|
// Mallivalikko
|
||||||
pub model_picker_open: bool,
|
pub model_picker_open: bool,
|
||||||
pub model_picker_items: Vec<String>,
|
pub model_picker_items: Vec<String>,
|
||||||
@@ -56,6 +58,7 @@ impl DashboardState {
|
|||||||
last_tokens_sec: 0.0,
|
last_tokens_sec: 0.0,
|
||||||
network_active_nodes: 1, // oletetaan itsemme
|
network_active_nodes: 1, // oletetaan itsemme
|
||||||
network_total_tasks: 0,
|
network_total_tasks: 0,
|
||||||
|
vram_status: "Haetaan...".to_string(),
|
||||||
model_picker_open: false,
|
model_picker_open: false,
|
||||||
model_picker_items: Vec::new(),
|
model_picker_items: Vec::new(),
|
||||||
model_picker_idx: 0,
|
model_picker_idx: 0,
|
||||||
@@ -182,7 +185,7 @@ fn ui(f: &mut ratatui::Frame, st: &DashboardState) {
|
|||||||
let body_chunks = Layout::default()
|
let body_chunks = Layout::default()
|
||||||
.direction(Direction::Vertical)
|
.direction(Direction::Vertical)
|
||||||
.constraints([
|
.constraints([
|
||||||
Constraint::Length(7), // Yläosan info ja tehtävä
|
Constraint::Length(8), // Yläosan info ja tehtävä
|
||||||
Constraint::Min(0), // Lokit / Chat alas
|
Constraint::Min(0), // Lokit / Chat alas
|
||||||
].as_ref())
|
].as_ref())
|
||||||
.split(chunks[1]);
|
.split(chunks[1]);
|
||||||
@@ -195,12 +198,38 @@ fn ui(f: &mut ratatui::Frame, st: &DashboardState) {
|
|||||||
].as_ref())
|
].as_ref())
|
||||||
.split(body_chunks[0]);
|
.split(body_chunks[0]);
|
||||||
|
|
||||||
// Vasen paneeli: Laitteisto, Malli & Verkosto
|
// Vasen paneeli: Laitteisto, Malli & Verkosto — VRAM-rivi värikoodattu
|
||||||
let info_text = format!(
|
let vram_color = if st.vram_status.starts_with('✓') {
|
||||||
"🚀 Malli: {}\n💻 Järjestelmä: {}\n📊 Tehdyt: {} | Nopeus: {} t/s\n🌐 Verkosto: {} solmua | {} tehtävää",
|
Color::Green
|
||||||
st.model_name, st.sys_info, st.tasks_completed, st.last_tokens_sec, st.network_active_nodes, st.network_total_tasks
|
} else if st.vram_status.starts_with('◐') {
|
||||||
);
|
Color::Yellow
|
||||||
let left_panel = Paragraph::new(info_text)
|
} else if st.vram_status.starts_with('✗') {
|
||||||
|
Color::Red
|
||||||
|
} else {
|
||||||
|
Color::DarkGray
|
||||||
|
};
|
||||||
|
|
||||||
|
let info_lines = vec![
|
||||||
|
ratatui::text::Line::from(vec![
|
||||||
|
ratatui::text::Span::raw("🚀 Malli: "),
|
||||||
|
ratatui::text::Span::styled(&st.model_name, Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD)),
|
||||||
|
]),
|
||||||
|
ratatui::text::Line::from(vec![
|
||||||
|
ratatui::text::Span::raw("🎮 VRAM: "),
|
||||||
|
ratatui::text::Span::styled(&st.vram_status, Style::default().fg(vram_color)),
|
||||||
|
]),
|
||||||
|
ratatui::text::Line::from(vec![
|
||||||
|
ratatui::text::Span::raw("💻 Järjestelmä: "),
|
||||||
|
ratatui::text::Span::styled(&st.sys_info, Style::default().fg(Color::White)),
|
||||||
|
]),
|
||||||
|
ratatui::text::Line::from(format!(
|
||||||
|
"📊 Tehdyt: {} | Nopeus: {:.1} t/s", st.tasks_completed, st.last_tokens_sec
|
||||||
|
)),
|
||||||
|
ratatui::text::Line::from(format!(
|
||||||
|
"🌐 Verkosto: {} solmua | {} tehtävää", st.network_active_nodes, st.network_total_tasks
|
||||||
|
)),
|
||||||
|
];
|
||||||
|
let left_panel = Paragraph::new(info_lines)
|
||||||
.block(Block::default().title(" Laitteisto ja AI ").borders(Borders::ALL))
|
.block(Block::default().title(" Laitteisto ja AI ").borders(Borders::ALL))
|
||||||
.style(Style::default().fg(Color::White))
|
.style(Style::default().fg(Color::White))
|
||||||
.wrap(Wrap { trim: true });
|
.wrap(Wrap { trim: true });
|
||||||
|
|||||||
513
network-poc/tests/model-benchmark.mjs
Normal file
513
network-poc/tests/model-benchmark.mjs
Normal file
@@ -0,0 +1,513 @@
|
|||||||
|
#!/usr/bin/env node
|
||||||
|
/**
|
||||||
|
* Kipinä Model Benchmark
|
||||||
|
*
|
||||||
|
* Generoi projekteja eri Ollama-malleilla ja testaa niiden toimivuus.
|
||||||
|
* Käyttö:
|
||||||
|
* node model-benchmark.mjs # kaikki mallit, oletusskenaario
|
||||||
|
* node model-benchmark.mjs --models qwen3:8b,qwen3:30b
|
||||||
|
* node model-benchmark.mjs --ollama http://host:11434
|
||||||
|
* node model-benchmark.mjs --scenarios all # kaikki skenaariot
|
||||||
|
*/
|
||||||
|
|
||||||
|
import { execSync } from 'child_process';
|
||||||
|
import { writeFileSync, mkdirSync, rmSync, existsSync } from 'fs';
|
||||||
|
|
||||||
|
// === CLI-argumentit ===
|
||||||
|
const args = process.argv.slice(2);
|
||||||
|
function arg(name, fallback) {
|
||||||
|
const i = args.indexOf(`--${name}`);
|
||||||
|
return i >= 0 && args[i + 1] ? args[i + 1] : fallback;
|
||||||
|
}
|
||||||
|
const OLLAMA_URL = arg('ollama', process.env.OLLAMA_URL || 'http://localhost:11434');
|
||||||
|
const HUB_URL = arg('hub', ''); // Vaihtoehto: --hub https://kipina.studio
|
||||||
|
const FILTER_MODELS = arg('models', '');
|
||||||
|
const SCENARIO_FILTER = arg('scenarios', 'default');
|
||||||
|
const OUTPUT_DIR = arg('output', '/tmp/kipina-benchmark');
|
||||||
|
const MAX_FIX_ROUNDS = 2;
|
||||||
|
|
||||||
|
// === Ollama / Hub -client ===
|
||||||
|
async function ollamaChat(model, prompt, systemPrompt, maxTokens = 2048) {
|
||||||
|
const start = Date.now();
|
||||||
|
|
||||||
|
if (HUB_URL) {
|
||||||
|
// Hub-reitti: /api/v1/chat/completions
|
||||||
|
const taskId = `bench-${Date.now()}-${Math.random().toString(36).slice(2,8)}`;
|
||||||
|
const resp = await fetch(`${HUB_URL}/api/v1/chat/completions`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({ model, prompt, task_id: taskId, system_prompt: systemPrompt, max_tokens: maxTokens }),
|
||||||
|
});
|
||||||
|
if (!resp.ok) throw new Error(`Hub HTTP ${resp.status}: ${await resp.text()}`);
|
||||||
|
const data = await resp.json();
|
||||||
|
const elapsed = Date.now() - start;
|
||||||
|
return {
|
||||||
|
text: (data.response || '').trim(),
|
||||||
|
tokens: data.tokens_generated || 0,
|
||||||
|
durationMs: elapsed,
|
||||||
|
tokPerSec: data.tokens_per_sec || (data.tokens_generated || 0) / (elapsed / 1000),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Suora Ollama-reitti: /api/chat
|
||||||
|
const messages = [];
|
||||||
|
if (systemPrompt) messages.push({ role: 'system', content: systemPrompt });
|
||||||
|
messages.push({ role: 'user', content: prompt });
|
||||||
|
|
||||||
|
const resp = await fetch(`${OLLAMA_URL}/api/chat`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: { 'Content-Type': 'application/json' },
|
||||||
|
body: JSON.stringify({
|
||||||
|
model,
|
||||||
|
messages,
|
||||||
|
stream: false,
|
||||||
|
options: { num_predict: maxTokens, temperature: 0.7, top_k: 40, repeat_penalty: 1.15 },
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
if (!resp.ok) throw new Error(`Ollama HTTP ${resp.status}: ${await resp.text()}`);
|
||||||
|
const data = await resp.json();
|
||||||
|
const elapsed = Date.now() - start;
|
||||||
|
const text = (data.message?.content || '').trim();
|
||||||
|
const evalCount = data.eval_count || 0;
|
||||||
|
const evalDurationNs = data.eval_duration || 1;
|
||||||
|
const tokPerSec = evalCount / (evalDurationNs / 1e9);
|
||||||
|
return { text, tokens: evalCount, durationMs: elapsed, tokPerSec };
|
||||||
|
}
|
||||||
|
|
||||||
|
async function ollamaListModels() {
|
||||||
|
const url = HUB_URL ? `${HUB_URL}/api/v1/ollama/tags` : `${OLLAMA_URL}/api/tags`;
|
||||||
|
const resp = await fetch(url);
|
||||||
|
if (!resp.ok) throw new Error(`Tags: HTTP ${resp.status}`);
|
||||||
|
const data = await resp.json();
|
||||||
|
return (data.models || []).map(m => m.name);
|
||||||
|
}
|
||||||
|
|
||||||
|
// === Promptit (kopioitu index.astrosta) ===
|
||||||
|
const CLIENT_SYSTEM = `You are a product owner who turns vague ideas into clear, actionable software requirements.
|
||||||
|
|
||||||
|
GIVEN a short project description from the user, produce a structured brief:
|
||||||
|
|
||||||
|
1. PROJECT NAME: a short, descriptive name
|
||||||
|
2. GOAL: one sentence explaining what the software does and who it's for
|
||||||
|
3. CORE FEATURES: numbered list of 3-8 concrete features (not vague wishes)
|
||||||
|
4. DATA MODEL: list the main entities and their key fields (include field types)
|
||||||
|
5. API ENDPOINTS: list the REST endpoints (method + path + purpose)
|
||||||
|
6. CONSTRAINTS: any technical constraints (e.g. "must use SQLite", "no auth needed")
|
||||||
|
|
||||||
|
RULES:
|
||||||
|
- Be specific: "User can filter todos by status" not "todo management"
|
||||||
|
- Use plain English, no code
|
||||||
|
- Maximum 400 words total`;
|
||||||
|
|
||||||
|
const SPEC_SYSTEM = `You are a software architect who designs database schemas for Python web applications.
|
||||||
|
|
||||||
|
THINK STEP BY STEP before outputting JSON:
|
||||||
|
1. What are the main ENTITIES (nouns) in this project?
|
||||||
|
2. What FIELDS does each entity need? (name, type, required?)
|
||||||
|
3. Which entities REFERENCE each other? (e.g. "a Book belongs to an Author" → Book has author_id)
|
||||||
|
4. Are there Date/DateTime fields? → add extra_imports
|
||||||
|
|
||||||
|
Then output ONLY valid JSON (no explanations before or after).
|
||||||
|
|
||||||
|
SCHEMA:
|
||||||
|
{"project_name":"short-name","description":"One sentence","entities":[{"name":"EntityName","table_name":"entity_names","fields":[{"name":"field_name","sa_type":"String(255)","py_type":"str","nullable":false,"default":null}]}],"relationships":[{"from":"ChildEntity","field":"parent_id","to":"ParentEntity","type":"many-to-one"}],"extra_imports":[]}
|
||||||
|
|
||||||
|
FIELD RULES:
|
||||||
|
- sa_type: String(N), Text, Integer, Date, DateTime, Boolean, Float
|
||||||
|
- py_type: str, int, float, bool, date, datetime — append " | None" if nullable
|
||||||
|
- Status fields: use String(20) with default value, NEVER Enum
|
||||||
|
- Every entity gets "id" automatically — do NOT add id or redundant ID fields
|
||||||
|
- Use snake_case for field names
|
||||||
|
|
||||||
|
RELATIONSHIP RULES:
|
||||||
|
- If entity A "belongs to" entity B → A has b_id field (Integer, nullable=false) + relationship entry
|
||||||
|
- EVERY _id field MUST have a matching relationship entry
|
||||||
|
- Parent entities must appear BEFORE children in the entities array
|
||||||
|
- If no relationships, set "relationships": []
|
||||||
|
|
||||||
|
AVOID: redundant ID fields, generic names, more than 7 fields or 3 entities, non-English entity/field names (ALWAYS English even if description is Finnish)
|
||||||
|
|
||||||
|
EXAMPLES (adapt, don't copy):
|
||||||
|
Todo app → Todo: title(str), description(Text|None), due_date(Date|None), status(String20="pending")
|
||||||
|
Blog → Author: name,email,bio(Text|None) / Post: title, content(Text), author_id→Author, published_at(DateTime|None), status(String20="draft")`;
|
||||||
|
|
||||||
|
const FIX_SYSTEM = 'You are a Python code fixer. Return ONLY the corrected Python file. No markdown fences, no explanations — just valid Python code.';
|
||||||
|
|
||||||
|
// === Template-funktiot (kopioitu korjatusta index.astrosta) ===
|
||||||
|
function pyLiteral(val) {
|
||||||
|
if (val === true) return 'True';
|
||||||
|
if (val === false) return 'False';
|
||||||
|
if (val === null || val === undefined) return 'None';
|
||||||
|
if (typeof val === 'string') return `"${val}"`;
|
||||||
|
return String(val);
|
||||||
|
}
|
||||||
|
function pyJsonLiteral(obj) {
|
||||||
|
const parts = Object.entries(obj).map(([k, v]) => {
|
||||||
|
let pyVal;
|
||||||
|
if (v === true) pyVal = 'True'; else if (v === false) pyVal = 'False';
|
||||||
|
else if (v === null) pyVal = 'None'; else if (typeof v === 'string') pyVal = `"${v}"`;
|
||||||
|
else pyVal = String(v);
|
||||||
|
return `"${k}":${pyVal}`;
|
||||||
|
});
|
||||||
|
return '{' + parts.join(',') + '}';
|
||||||
|
}
|
||||||
|
function tmplModels(spec) {
|
||||||
|
const saTypes = new Set(['Integer']);
|
||||||
|
for (const e of spec.entities) for (const f of e.fields) saTypes.add(f.sa_type.match(/^(\w+)/)[1]);
|
||||||
|
const relMap = {};
|
||||||
|
for (const r of (spec.relationships || [])) {
|
||||||
|
const target = spec.entities.find(e => e.name === r.to);
|
||||||
|
if (target) relMap[`${r.from}.${r.field}`] = target.table_name;
|
||||||
|
}
|
||||||
|
if (Object.keys(relMap).length > 0) saTypes.add('ForeignKey');
|
||||||
|
const imports = [...saTypes].sort().join(', ');
|
||||||
|
let code = `from sqlalchemy import create_engine, Column, ${imports}\nfrom sqlalchemy.orm import declarative_base, sessionmaker\n\nDATABASE_URL = "sqlite:///./app.db"\nengine = create_engine(DATABASE_URL, connect_args={"check_same_thread": False})\nSessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)\nBase = declarative_base()\n\n`;
|
||||||
|
for (const e of spec.entities) {
|
||||||
|
code += `class ${e.name}(Base):\n __tablename__ = "${e.table_name}"\n id = Column(Integer, primary_key=True, index=True)\n`;
|
||||||
|
for (const f of e.fields) {
|
||||||
|
const fkTarget = relMap[`${e.name}.${f.name}`];
|
||||||
|
let parts = fkTarget ? [`Column(${f.sa_type}, ForeignKey("${fkTarget}.id")`] : [`Column(${f.sa_type}`];
|
||||||
|
if (!f.nullable) parts.push('nullable=False');
|
||||||
|
if (f.default !== null && f.default !== undefined) parts.push(`default=${pyLiteral(f.default)}`);
|
||||||
|
code += ` ${f.name} = ${parts.join(', ')})\n`;
|
||||||
|
}
|
||||||
|
code += '\n';
|
||||||
|
}
|
||||||
|
code += 'Base.metadata.create_all(bind=engine)\n';
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
function tmplSchemas(spec) {
|
||||||
|
const dtTypes = new Set();
|
||||||
|
for (const e of spec.entities) for (const f of e.fields) {
|
||||||
|
if (/\bdate\b/i.test(f.py_type) && !/datetime/.test(f.py_type)) dtTypes.add('date');
|
||||||
|
if (/\bdatetime\b/i.test(f.py_type)) dtTypes.add('datetime');
|
||||||
|
}
|
||||||
|
let code = 'from pydantic import BaseModel, ConfigDict\n';
|
||||||
|
if (dtTypes.size > 0) code += `from datetime import ${[...dtTypes].sort().join(', ')}\n`;
|
||||||
|
for (const imp of (spec.extra_imports || [])) {
|
||||||
|
if (/^(date|datetime)$/.test(imp.trim())) continue;
|
||||||
|
if (/^from\s/.test(imp) || /^import\s/.test(imp)) code += imp + '\n';
|
||||||
|
}
|
||||||
|
code += '\n';
|
||||||
|
for (const e of spec.entities) {
|
||||||
|
code += `class ${e.name}Create(BaseModel):\n`;
|
||||||
|
for (const f of e.fields) {
|
||||||
|
if (f.default !== null && f.default !== undefined) code += ` ${f.name}: ${f.py_type} = ${pyLiteral(f.default)}\n`;
|
||||||
|
else if (f.nullable && f.py_type.includes('None')) code += ` ${f.name}: ${f.py_type} = None\n`;
|
||||||
|
else code += ` ${f.name}: ${f.py_type}\n`;
|
||||||
|
}
|
||||||
|
code += `\nclass ${e.name}Response(${e.name}Create):\n id: int\n model_config = ConfigDict(from_attributes=True)\n\n`;
|
||||||
|
}
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
function tmplMain(spec) {
|
||||||
|
const modelNames = spec.entities.map(e => e.name).join(', ');
|
||||||
|
const createNames = spec.entities.map(e => e.name+'Create').join(', ');
|
||||||
|
const responseNames = spec.entities.map(e => e.name+'Response').join(', ');
|
||||||
|
let code = `from fastapi import FastAPI, Depends, HTTPException\nfrom sqlalchemy.orm import Session\nfrom models import Base, engine, SessionLocal, ${modelNames}\nfrom schemas import ${createNames}, ${responseNames}\n\napp = FastAPI()\n\ndef get_db():\n db = SessionLocal()\n try:\n yield db\n finally:\n db.close()\n\n`;
|
||||||
|
for (const e of spec.entities) {
|
||||||
|
const lo = e.name.toLowerCase(), tb = e.table_name;
|
||||||
|
code += `@app.post("/${tb}/", response_model=${e.name}Response, status_code=201)\ndef create_${lo}(item: ${e.name}Create, db: Session = Depends(get_db)):\n db_item = ${e.name}(**item.model_dump())\n db.add(db_item)\n db.commit()\n db.refresh(db_item)\n return db_item\n\n`;
|
||||||
|
code += `@app.get("/${tb}/", response_model=list[${e.name}Response])\ndef list_${lo}s(db: Session = Depends(get_db)):\n return db.query(${e.name}).all()\n\n`;
|
||||||
|
code += `@app.get("/${tb}/{item_id}", response_model=${e.name}Response)\ndef get_${lo}(item_id: int, db: Session = Depends(get_db)):\n item = db.query(${e.name}).filter(${e.name}.id == item_id).first()\n if not item:\n raise HTTPException(status_code=404, detail="${e.name} not found")\n return item\n\n`;
|
||||||
|
code += `@app.put("/${tb}/{item_id}", response_model=${e.name}Response)\ndef update_${lo}(item_id: int, item: ${e.name}Create, db: Session = Depends(get_db)):\n db_item = db.query(${e.name}).filter(${e.name}.id == item_id).first()\n if not db_item:\n raise HTTPException(status_code=404, detail="${e.name} not found")\n for key, value in item.model_dump().items():\n setattr(db_item, key, value)\n db.commit()\n db.refresh(db_item)\n return db_item\n\n`;
|
||||||
|
code += `@app.delete("/${tb}/{item_id}", status_code=204)\ndef delete_${lo}(item_id: int, db: Session = Depends(get_db)):\n db_item = db.query(${e.name}).filter(${e.name}.id == item_id).first()\n if not db_item:\n raise HTTPException(status_code=404, detail="${e.name} not found")\n db.delete(db_item)\n db.commit()\n\n`;
|
||||||
|
}
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
function tmplTests(spec) {
|
||||||
|
let code = `from fastapi.testclient import TestClient\nfrom sqlalchemy import create_engine\nfrom sqlalchemy.orm import sessionmaker\nfrom main import app, get_db\nfrom models import Base\n\nTEST_DB = "sqlite:///./test.db"\ntest_engine = create_engine(TEST_DB, connect_args={"check_same_thread": False})\nTestSession = sessionmaker(autocommit=False, autoflush=False, bind=test_engine)\nBase.metadata.create_all(bind=test_engine)\n\ndef override_get_db():\n db = TestSession()\n try:\n yield db\n finally:\n db.close()\n\napp.dependency_overrides[get_db] = override_get_db\nclient = TestClient(app)\n\n`;
|
||||||
|
for (const e of spec.entities) {
|
||||||
|
const lo = e.name.toLowerCase(), tb = e.table_name;
|
||||||
|
const testData = {};
|
||||||
|
for (const f of e.fields) {
|
||||||
|
if (f.default !== null && f.default !== undefined) { testData[f.name] = f.default; continue; }
|
||||||
|
if (f.py_type.includes('str')) testData[f.name] = `Test ${f.name}`;
|
||||||
|
else if (f.py_type.includes('int')) testData[f.name] = 1;
|
||||||
|
else if (f.py_type.includes('float')) testData[f.name] = 1.0;
|
||||||
|
else if (f.py_type.includes('bool')) testData[f.name] = true;
|
||||||
|
else if (f.py_type.includes('date')) testData[f.name] = '2024-01-15';
|
||||||
|
}
|
||||||
|
const td = pyJsonLiteral(testData);
|
||||||
|
const firstStr = e.fields.find(f => f.py_type.includes('str') && f.name !== 'status');
|
||||||
|
const updateData = {...testData};
|
||||||
|
if (firstStr) updateData[firstStr.name] = `Updated ${firstStr.name}`;
|
||||||
|
const ud = pyJsonLiteral(updateData);
|
||||||
|
code += `def test_create_${lo}():\n response = client.post('/${tb}/', json=${td})\n assert response.status_code == 201\n assert 'id' in response.json()\n\n`;
|
||||||
|
code += `def test_list_${lo}s():\n client.post('/${tb}/', json=${td})\n response = client.get('/${tb}/')\n assert response.status_code == 200\n assert len(response.json()) >= 1\n\n`;
|
||||||
|
code += `def test_get_${lo}_by_id():\n created = client.post('/${tb}/', json=${td}).json()\n item_id = created['id']\n response = client.get(f'/${tb}/{item_id}')\n assert response.status_code == 200\n assert response.json()['id'] == item_id\n\n`;
|
||||||
|
code += `def test_get_${lo}_not_found():\n response = client.get('/${tb}/99999')\n assert response.status_code == 404\n\n`;
|
||||||
|
code += `def test_update_${lo}():\n created = client.post('/${tb}/', json=${td}).json()\n item_id = created['id']\n response = client.put(f'/${tb}/{item_id}', json=${ud})\n assert response.status_code == 200\n\n`;
|
||||||
|
code += `def test_delete_${lo}():\n created = client.post('/${tb}/', json=${td}).json()\n item_id = created['id']\n response = client.delete(f'/${tb}/{item_id}')\n assert response.status_code == 204\n response = client.get(f'/${tb}/{item_id}')\n assert response.status_code == 404\n\n`;
|
||||||
|
}
|
||||||
|
return code;
|
||||||
|
}
|
||||||
|
function tmplPyproject(spec) {
|
||||||
|
const name = (spec.project_name || 'app').toLowerCase().replace(/\s+/g, '-');
|
||||||
|
return `[project]\nname = "${name}"\nversion = "0.1.0"\nrequires-python = ">=3.11"\ndependencies = [\n "fastapi",\n "uvicorn[standard]",\n "sqlalchemy",\n "pytest",\n "httpx",\n]\n`;
|
||||||
|
}
|
||||||
|
|
||||||
|
// === Validaattori ===
|
||||||
|
function validateProjectCode(files) {
|
||||||
|
const issues = [];
|
||||||
|
for (const [fname, code] of Object.entries(files)) {
|
||||||
|
if (!fname.endsWith('.py')) continue;
|
||||||
|
const lines = code.split('\n');
|
||||||
|
for (const line of lines) {
|
||||||
|
const m = line.match(/^from\s+\.(\w*)\s+import/);
|
||||||
|
if (m) issues.push(`ISSUE: ${fname}: relatiivinen import`);
|
||||||
|
}
|
||||||
|
for (const line of lines) {
|
||||||
|
const m = line.match(/^from\s+(models|schemas|main)\s+import\s+(.+)/);
|
||||||
|
if (!m) continue;
|
||||||
|
const srcCode = files[m[1] + '.py'];
|
||||||
|
if (!srcCode) { issues.push(`ISSUE: ${fname}: ${m[1]}.py puuttuu`); continue; }
|
||||||
|
const names = m[2].split(',').map(n => n.trim().split(/\s+as\s+/)[0].trim());
|
||||||
|
for (const name of names) {
|
||||||
|
if (name && !srcCode.includes(name)) issues.push(`ISSUE: ${fname}: "${name}" puuttuu ${m[1]}.py:stä`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (fname === 'schemas.py') {
|
||||||
|
if (/:\s*date\b/.test(code) && !/from datetime import/.test(code))
|
||||||
|
issues.push('ISSUE: schemas.py: date-import puuttuu');
|
||||||
|
if (/:\s*datetime\b/.test(code) && !/from datetime import/.test(code))
|
||||||
|
issues.push('ISSUE: schemas.py: datetime-import puuttuu');
|
||||||
|
}
|
||||||
|
for (let i = 0; i < lines.length; i++) {
|
||||||
|
const line = lines[i];
|
||||||
|
if (/^\s*#/.test(line) || /^\s*$/.test(line)) continue;
|
||||||
|
if (/(?<!["\w])false(?![\w"])/.test(line)) issues.push(`ISSUE: ${fname}:${i+1}: "false" → "False"`);
|
||||||
|
if (/(?<!["\w])true(?![\w"])/.test(line)) issues.push(`ISSUE: ${fname}:${i+1}: "true" → "True"`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return issues;
|
||||||
|
}
|
||||||
|
|
||||||
|
function extractJson(text) {
|
||||||
|
const m = text.match(/```(?:json)?\s*\n([\s\S]*?)```/);
|
||||||
|
if (m) text = m[1].trim();
|
||||||
|
let depth = 0, start = null;
|
||||||
|
for (let i = 0; i < text.length; i++) {
|
||||||
|
if (text[i] === '{') { if (depth === 0) start = i; depth++; }
|
||||||
|
else if (text[i] === '}') { depth--; if (depth === 0 && start !== null) { try { return JSON.parse(text.slice(start, i+1)); } catch(e) { continue; } } }
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// === Testiskenaariot ===
|
||||||
|
const SCENARIOS = [
|
||||||
|
{ id: 'todo', prompt: 'Todo-sovellus: tehtävien hallinta, deadline, prioriteetti ja status' },
|
||||||
|
{ id: 'users', prompt: 'REST API käyttäjähallinnalle SQLite-tietokannalla' },
|
||||||
|
{ id: 'blog', prompt: 'Blogi-API: kirjoittajat ja artikkelit, julkaisupäivämäärä ja status' },
|
||||||
|
];
|
||||||
|
|
||||||
|
// === Pipeline: yhdelle mallille ja skenaariolle ===
|
||||||
|
async function runPipeline(model, scenario) {
|
||||||
|
const result = {
|
||||||
|
model, scenario: scenario.id,
|
||||||
|
reqOk: false, specOk: false, specEntities: 0,
|
||||||
|
validationIssues: 0, fixRounds: 0,
|
||||||
|
testsTotal: 0, testsPassed: 0, testsFailed: 0,
|
||||||
|
totalDurationMs: 0, totalTokens: 0, avgTokPerSec: 0,
|
||||||
|
error: null,
|
||||||
|
};
|
||||||
|
const timings = [];
|
||||||
|
const dir = `${OUTPUT_DIR}/${model.replace(/[/:]/g, '_')}__${scenario.id}`;
|
||||||
|
mkdirSync(dir, { recursive: true });
|
||||||
|
|
||||||
|
try {
|
||||||
|
// 1. Vaatimukset
|
||||||
|
console.log(` [1/5] Vaatimukset...`);
|
||||||
|
const req = await ollamaChat(model, scenario.prompt, CLIENT_SYSTEM, 1024);
|
||||||
|
timings.push(req);
|
||||||
|
if (!req.text || req.text.length < 50) { result.error = 'Vaatimukset liian lyhyet'; return result; }
|
||||||
|
result.reqOk = true;
|
||||||
|
writeFileSync(`${dir}/_requirements.txt`, req.text);
|
||||||
|
|
||||||
|
// 2. JSON-speksi
|
||||||
|
console.log(` [2/5] JSON-speksi...`);
|
||||||
|
const specResp = await ollamaChat(model, `${req.text}\n\nOutput a JSON spec for this project.`, SPEC_SYSTEM, 2048);
|
||||||
|
timings.push(specResp);
|
||||||
|
const spec = extractJson(specResp.text);
|
||||||
|
if (!spec || !spec.entities || spec.entities.length === 0) { result.error = 'JSON-speksi epäonnistui'; writeFileSync(`${dir}/_spec_raw.txt`, specResp.text); return result; }
|
||||||
|
result.specOk = true;
|
||||||
|
result.specEntities = spec.entities.length;
|
||||||
|
writeFileSync(`${dir}/_spec.json`, JSON.stringify(spec, null, 2));
|
||||||
|
|
||||||
|
// 3. Template-generointi
|
||||||
|
console.log(` [3/5] Koodigenerointi...`);
|
||||||
|
const files = {
|
||||||
|
'models.py': tmplModels(spec),
|
||||||
|
'schemas.py': tmplSchemas(spec),
|
||||||
|
'main.py': tmplMain(spec),
|
||||||
|
'test_main.py': tmplTests(spec),
|
||||||
|
'pyproject.toml': tmplPyproject(spec),
|
||||||
|
};
|
||||||
|
|
||||||
|
// 4. Validointi + korjaussilmukka
|
||||||
|
let issues = validateProjectCode(files);
|
||||||
|
let fixRound = 0;
|
||||||
|
while (issues.length > 0 && fixRound < MAX_FIX_ROUNDS) {
|
||||||
|
fixRound++;
|
||||||
|
console.log(` [4/5] Korjauskierros ${fixRound} (${issues.length} ongelmaa)...`);
|
||||||
|
const issuesByFile = {};
|
||||||
|
for (const issue of issues) {
|
||||||
|
const m = issue.match(/^ISSUE:\s*(\S+?):/);
|
||||||
|
const fname = m ? m[1] : 'unknown';
|
||||||
|
if (!issuesByFile[fname]) issuesByFile[fname] = [];
|
||||||
|
issuesByFile[fname].push(issue);
|
||||||
|
}
|
||||||
|
for (const [fname, fIssues] of Object.entries(issuesByFile)) {
|
||||||
|
if (!files[fname]) continue;
|
||||||
|
const fixPrompt = `Fix the following issues in this Python file. Return ONLY the complete corrected file, no explanations.\n\nISSUES:\n${fIssues.join('\n')}\n\nCURRENT FILE (${fname}):\n\`\`\`python\n${files[fname]}\`\`\``;
|
||||||
|
const fixResp = await ollamaChat(model, fixPrompt, FIX_SYSTEM, 2048);
|
||||||
|
timings.push(fixResp);
|
||||||
|
if (fixResp.text) {
|
||||||
|
files[fname] = fixResp.text.replace(/^```(?:python)?\s*\n?/m, '').replace(/\n?```\s*$/m, '').trim() + '\n';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
issues = validateProjectCode(files);
|
||||||
|
}
|
||||||
|
result.validationIssues = issues.length;
|
||||||
|
result.fixRounds = fixRound;
|
||||||
|
|
||||||
|
// Kirjoita tiedostot levylle
|
||||||
|
for (const [fn, content] of Object.entries(files)) writeFileSync(`${dir}/${fn}`, content);
|
||||||
|
|
||||||
|
// 5. Pytest
|
||||||
|
console.log(` [5/5] Pytest...`);
|
||||||
|
try {
|
||||||
|
const uvPath = process.env.HOME + '/.local/bin/uv';
|
||||||
|
const uv = existsSync(uvPath) ? uvPath : 'uv';
|
||||||
|
execSync(`cd "${dir}" && ${uv} sync 2>/dev/null`, { timeout: 60000, stdio: 'pipe' });
|
||||||
|
execSync(`cd "${dir}" && rm -f app.db test.db`, { stdio: 'pipe' });
|
||||||
|
const pytestOut = execSync(`cd "${dir}" && ${uv} run pytest test_main.py -v --tb=short 2>&1`, { timeout: 60000, encoding: 'utf-8' });
|
||||||
|
writeFileSync(`${dir}/_pytest.txt`, pytestOut);
|
||||||
|
|
||||||
|
const passedMatch = pytestOut.match(/(\d+) passed/);
|
||||||
|
const failedMatch = pytestOut.match(/(\d+) failed/);
|
||||||
|
result.testsPassed = passedMatch ? parseInt(passedMatch[1]) : 0;
|
||||||
|
result.testsFailed = failedMatch ? parseInt(failedMatch[1]) : 0;
|
||||||
|
result.testsTotal = result.testsPassed + result.testsFailed;
|
||||||
|
} catch (e) {
|
||||||
|
const output = e.stdout || e.stderr || e.message || '';
|
||||||
|
writeFileSync(`${dir}/_pytest.txt`, output);
|
||||||
|
const passedMatch = output.match(/(\d+) passed/);
|
||||||
|
const failedMatch = output.match(/(\d+) failed/);
|
||||||
|
const errorMatch = output.match(/(\d+) error/);
|
||||||
|
result.testsPassed = passedMatch ? parseInt(passedMatch[1]) : 0;
|
||||||
|
result.testsFailed = (failedMatch ? parseInt(failedMatch[1]) : 0) + (errorMatch ? parseInt(errorMatch[1]) : 0);
|
||||||
|
result.testsTotal = result.testsPassed + result.testsFailed;
|
||||||
|
if (result.testsTotal === 0) result.error = 'Pytest kaatui';
|
||||||
|
}
|
||||||
|
} catch (e) {
|
||||||
|
result.error = e.message;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Yhteenveto
|
||||||
|
result.totalDurationMs = timings.reduce((s, t) => s + t.durationMs, 0);
|
||||||
|
result.totalTokens = timings.reduce((s, t) => s + t.tokens, 0);
|
||||||
|
result.avgTokPerSec = timings.length > 0 ? timings.reduce((s, t) => s + t.tokPerSec, 0) / timings.length : 0;
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// === Main ===
|
||||||
|
async function main() {
|
||||||
|
console.log('╔══════════════════════════════════════════════╗');
|
||||||
|
console.log('║ Kipinä Model Benchmark ║');
|
||||||
|
console.log('╚══════════════════════════════════════════════╝');
|
||||||
|
console.log(`Ollama: ${OLLAMA_URL}`);
|
||||||
|
|
||||||
|
// Haetaan mallit
|
||||||
|
let models;
|
||||||
|
try {
|
||||||
|
models = await ollamaListModels();
|
||||||
|
} catch (e) {
|
||||||
|
console.error(`Ei yhteyttä Ollamaan (${OLLAMA_URL}): ${e.message}`);
|
||||||
|
process.exit(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (FILTER_MODELS) {
|
||||||
|
const filter = FILTER_MODELS.split(',').map(s => s.trim());
|
||||||
|
models = models.filter(m => filter.some(f => m.includes(f)));
|
||||||
|
}
|
||||||
|
|
||||||
|
console.log(`Mallit (${models.length}): ${models.join(', ')}`);
|
||||||
|
|
||||||
|
const scenarios = SCENARIO_FILTER === 'all' ? SCENARIOS : [SCENARIOS[0]];
|
||||||
|
console.log(`Skenaariot (${scenarios.length}): ${scenarios.map(s => s.id).join(', ')}`);
|
||||||
|
console.log(`Tulokset: ${OUTPUT_DIR}/`);
|
||||||
|
console.log('');
|
||||||
|
|
||||||
|
// Puhdista output
|
||||||
|
rmSync(OUTPUT_DIR, { recursive: true, force: true });
|
||||||
|
mkdirSync(OUTPUT_DIR, { recursive: true });
|
||||||
|
|
||||||
|
const results = [];
|
||||||
|
|
||||||
|
for (const model of models) {
|
||||||
|
for (const scenario of scenarios) {
|
||||||
|
console.log(`\n━━━ ${model} × ${scenario.id} ━━━`);
|
||||||
|
const r = await runPipeline(model, scenario);
|
||||||
|
results.push(r);
|
||||||
|
|
||||||
|
const status = r.error ? `✗ ${r.error}` :
|
||||||
|
r.testsPassed === r.testsTotal && r.testsTotal > 0 ? `✓ ${r.testsPassed}/${r.testsTotal}` :
|
||||||
|
`◐ ${r.testsPassed}/${r.testsTotal}`;
|
||||||
|
console.log(` → ${status} | ${(r.totalDurationMs/1000).toFixed(1)}s | ${r.totalTokens} tok | ${r.avgTokPerSec.toFixed(1)} tok/s`);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// === Tulostaulu ===
|
||||||
|
console.log('\n\n╔══════════════════════════════════════════════════════════════════════════════════════════════════╗');
|
||||||
|
console.log('║ TULOKSET ║');
|
||||||
|
console.log('╠══════════════════════════════════════════════════════════════════════════════════════════════════╣');
|
||||||
|
|
||||||
|
const header = [
|
||||||
|
'Malli'.padEnd(40),
|
||||||
|
'Skenaario'.padEnd(10),
|
||||||
|
'Speksi'.padEnd(8),
|
||||||
|
'Testit'.padEnd(10),
|
||||||
|
'Korjaus'.padEnd(8),
|
||||||
|
'Aika'.padEnd(8),
|
||||||
|
'tok/s'.padEnd(8),
|
||||||
|
'Tulos',
|
||||||
|
].join(' │ ');
|
||||||
|
console.log(`║ ${header} ║`);
|
||||||
|
console.log('╠' + '═'.repeat(header.length + 2) + '╣');
|
||||||
|
|
||||||
|
for (const r of results) {
|
||||||
|
const specStatus = r.specOk ? `✓ ${r.specEntities}e` : '✗';
|
||||||
|
const testStatus = r.testsTotal > 0 ? `${r.testsPassed}/${r.testsTotal}` : '-';
|
||||||
|
const fixStatus = r.fixRounds > 0 ? `${r.fixRounds}×` : '-';
|
||||||
|
const time = `${(r.totalDurationMs/1000).toFixed(0)}s`;
|
||||||
|
const speed = `${r.avgTokPerSec.toFixed(0)}`;
|
||||||
|
const verdict = r.error ? '✗ FAIL' : r.testsPassed === r.testsTotal && r.testsTotal > 0 ? '✓ PASS' : '◐ PARTIAL';
|
||||||
|
|
||||||
|
const row = [
|
||||||
|
r.model.padEnd(40),
|
||||||
|
r.scenario.padEnd(10),
|
||||||
|
specStatus.padEnd(8),
|
||||||
|
testStatus.padEnd(10),
|
||||||
|
fixStatus.padEnd(8),
|
||||||
|
time.padEnd(8),
|
||||||
|
speed.padEnd(8),
|
||||||
|
verdict,
|
||||||
|
].join(' │ ');
|
||||||
|
console.log(`║ ${row} ║`);
|
||||||
|
}
|
||||||
|
console.log('╚' + '═'.repeat(header.length + 2) + '╝');
|
||||||
|
|
||||||
|
// Tallenna JSON
|
||||||
|
writeFileSync(`${OUTPUT_DIR}/results.json`, JSON.stringify(results, null, 2));
|
||||||
|
console.log(`\nJSON: ${OUTPUT_DIR}/results.json`);
|
||||||
|
|
||||||
|
// Yhteenveto
|
||||||
|
const passed = results.filter(r => !r.error && r.testsPassed === r.testsTotal && r.testsTotal > 0);
|
||||||
|
const partial = results.filter(r => !r.error && r.testsPassed < r.testsTotal && r.testsTotal > 0);
|
||||||
|
const failed = results.filter(r => r.error || r.testsTotal === 0);
|
||||||
|
console.log(`\n✓ PASS: ${passed.length} | ◐ PARTIAL: ${partial.length} | ✗ FAIL: ${failed.length} | Yhteensä: ${results.length}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
main().catch(e => { console.error(e); process.exit(1); });
|
||||||
Reference in New Issue
Block a user