toka toimiva vedos
This commit is contained in:
@@ -25,7 +25,7 @@ const ALLOWED_ORIGINS: &[&str] = &[
|
||||
];
|
||||
|
||||
// Sallitut viestityyypit clientilta
|
||||
const ALLOWED_MSG_TYPES: &[&str] = &["auth", "result", "pair_done", "llm_chunk"];
|
||||
const ALLOWED_MSG_TYPES: &[&str] = &["auth", "result", "pair_done", "llm_chunk", "llm_done", "download_progress"];
|
||||
|
||||
struct AppState {
|
||||
next_node_id: Mutex<u64>,
|
||||
@@ -34,6 +34,7 @@ struct AppState {
|
||||
stats_tx: broadcast::Sender<String>,
|
||||
ip_connections: Mutex<HashMap<IpAddr, u32>>,
|
||||
node_ips: Mutex<HashMap<u64, IpAddr>>,
|
||||
node_tasks: Mutex<HashMap<u64, String>>, // node_id → selected_task
|
||||
db: db::NodeDb,
|
||||
}
|
||||
|
||||
@@ -86,7 +87,7 @@ tr:hover td { background:#1c2333; }
|
||||
<div id="sessions" class="panel active">
|
||||
<div class="table-wrap">
|
||||
<table><thead><tr>
|
||||
<th>ID</th><th>Tila</th><th>Tyyppi</th><th>IP</th><th>Alusta</th>
|
||||
<th>ID</th><th>Tila</th><th>Tehtävä</th><th>Tyyppi</th><th>IP</th><th>Alusta</th>
|
||||
<th>OS</th><th>CPU</th><th>RAM</th><th>GPU</th><th>VRAM</th>
|
||||
<th>WebGPU</th><th>Teht.</th><th>Yhdistetty</th><th>Kesto</th>
|
||||
</tr></thead><tbody id="sessions-body"></tbody></table>
|
||||
@@ -161,6 +162,8 @@ async function load() {
|
||||
const online = !s.disconnected_at;
|
||||
const status = online ? '<span class="online">ONLINE</span>' : '<span class="offline">offline</span>';
|
||||
const typeBadge = s.node_type === 'native' ? badge('native','blue') : badge('browser','yellow');
|
||||
const taskNames = {'tokenize':'Tokenisaatio','smollm-135m':'SmolLM 135M','qwen-05b':'Qwen2.5 0.5B','phi3-mini':'Phi-3 Mini'};
|
||||
const taskBadge = badge(taskNames[s.selected_task] || s.selected_task || 'tokenize', s.selected_task === 'tokenize' ? 'green' : 'blue');
|
||||
const gpuBadge = s.has_webgpu ? badge('WebGPU','green') : badge('CPU','red');
|
||||
const gpu = s.gpu_name ? `${s.gpu_name}` : '-';
|
||||
const vram = s.vram_total_mb ? `${s.vram_total_mb} MB` : '-';
|
||||
@@ -171,7 +174,7 @@ async function load() {
|
||||
const time = s.connected_at ? new Date(s.connected_at).toLocaleString('fi-FI') : '';
|
||||
const dur = duration(s.connected_at, s.disconnected_at);
|
||||
return `<tr>
|
||||
<td>${s.node_id}</td><td>${status}</td><td>${typeBadge}</td><td>${s.ip}</td>
|
||||
<td>${s.node_id}</td><td>${status}</td><td>${taskBadge}</td><td>${typeBadge}</td><td>${s.ip}</td>
|
||||
<td>${plat}</td><td>${os}</td><td>${cores}</td><td>${ram}</td>
|
||||
<td>${gpu}</td><td>${vram}</td><td>${gpuBadge}</td>
|
||||
<td>${s.tasks_completed}</td><td>${time}</td><td>${dur}</td>
|
||||
@@ -221,6 +224,7 @@ async fn main() {
|
||||
stats_tx: stats_tx.clone(),
|
||||
ip_connections: Mutex::new(HashMap::new()),
|
||||
node_ips: Mutex::new(HashMap::new()),
|
||||
node_tasks: Mutex::new(HashMap::new()),
|
||||
db: db::NodeDb::new(&std::env::var("DATABASE_PATH").unwrap_or_else(|_| "nodes.db".to_string())),
|
||||
});
|
||||
|
||||
@@ -258,13 +262,31 @@ async fn main() {
|
||||
let idx = (rng_state as usize) % pairs.len();
|
||||
let (en, fi) = pairs[idx];
|
||||
|
||||
let task_msg = serde_json::json!({
|
||||
// Tokenisointiparit
|
||||
let pair_msg = serde_json::json!({
|
||||
"type": "pair_task",
|
||||
"en": en,
|
||||
"fi": fi,
|
||||
});
|
||||
tracing::debug!("Kielipari lähetetty: EN({}) vs FI({} merkkiä)", en.len(), fi.len());
|
||||
let _ = state_for_task.stats_tx.send(task_msg.to_string());
|
||||
let _ = state_for_task.stats_tx.send(pair_msg.to_string());
|
||||
|
||||
// LLM-promptit
|
||||
let llm_prompts = vec![
|
||||
"Tell me a short joke.",
|
||||
"What is WebGPU in one sentence?",
|
||||
"Explain distributed computing briefly.",
|
||||
"Write a haiku about technology.",
|
||||
"What makes Rust special?",
|
||||
];
|
||||
let llm_idx = (rng_state as usize / 7) % llm_prompts.len();
|
||||
let llm_msg = serde_json::json!({
|
||||
"type": "llm_prompt",
|
||||
"prompt": llm_prompts[llm_idx],
|
||||
"model": "smollm-135m",
|
||||
});
|
||||
let _ = state_for_task.stats_tx.send(llm_msg.to_string());
|
||||
|
||||
tracing::debug!("Tehtävät lähetetty: pair + llm_prompt");
|
||||
}
|
||||
});
|
||||
|
||||
@@ -496,6 +518,10 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, ip: IpAddr) {
|
||||
// Tallennetaan sessiotieto tietokantaan
|
||||
state.db.insert_session(node_id, &ip.to_string(), node_type, &json);
|
||||
|
||||
// Tallennetaan valittu tehtävä muistiin reititystä varten
|
||||
let selected_task = json.get("selected_task").and_then(|v| v.as_str()).unwrap_or("tokenize").to_string();
|
||||
state.node_tasks.lock().unwrap().insert(node_id, selected_task);
|
||||
|
||||
if node_type == "native" {
|
||||
let sys = json.get("system");
|
||||
let hostname = sys.and_then(|s| s.get("hostname")).and_then(|v| v.as_str()).unwrap_or("?");
|
||||
@@ -529,10 +555,11 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, ip: IpAddr) {
|
||||
.and_then(|g| g.get("description").or_else(|| g.get("vendor")))
|
||||
.and_then(|v| v.as_str())
|
||||
.unwrap_or("ei GPU:ta");
|
||||
let task = json.get("selected_task").and_then(|v| v.as_str()).unwrap_or("tokenize");
|
||||
|
||||
tracing::info!(
|
||||
"Solmu {} (selain) | {} | {} | {} ydintä | ~{} GB RAM | GPU: {} | varaus: {} GB",
|
||||
node_id, ip, platform, cores, ram, gpu_desc, allocated
|
||||
"Solmu {} (selain) | {} | {} | {} ydintä | ~{} GB RAM | GPU: {} | tehtävä: {} | varaus: {} GB",
|
||||
node_id, ip, platform, cores, ram, gpu_desc, task, allocated
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -605,11 +632,40 @@ async fn handle_socket(socket: WebSocket, state: Arc<AppState>, ip: IpAddr) {
|
||||
}
|
||||
let _ = state.stats_tx.send(json.to_string());
|
||||
}
|
||||
} else if msg_type == "llm_done" {
|
||||
{
|
||||
let mut json = json;
|
||||
if let Some(obj) = json.as_object_mut() {
|
||||
let model = obj.get("model").and_then(|v| v.as_str()).unwrap_or("?");
|
||||
let prompt = obj.get("prompt").and_then(|v| v.as_str()).unwrap_or("");
|
||||
let response = obj.get("response").and_then(|v| v.as_str()).unwrap_or("");
|
||||
let tok_gen = obj.get("tokens_generated").and_then(|v| v.as_u64()).unwrap_or(0);
|
||||
let duration = obj.get("duration_ms").and_then(|v| v.as_f64()).unwrap_or(0.0);
|
||||
let tok_s = obj.get("tokens_per_sec").and_then(|v| v.as_f64()).unwrap_or(0.0);
|
||||
|
||||
println!();
|
||||
println!("\x1b[35m━━━ Solmu {} ━━━ {} ━━━\x1b[0m", node_id, model);
|
||||
println!(" Prompt: \x1b[33m\"{}\"\x1b[0m", prompt);
|
||||
println!(" Vastaus: \x1b[32m{}\x1b[0m", response);
|
||||
println!(" {} tokenia | {:.0}ms | \x1b[36m{:.1} tok/s\x1b[0m", tok_gen, duration, tok_s);
|
||||
|
||||
state.db.increment_tasks(node_id);
|
||||
obj.insert("node_id".to_string(), serde_json::json!(node_id));
|
||||
}
|
||||
let _ = state.stats_tx.send(json.to_string());
|
||||
|
||||
{
|
||||
let mut task_count = state.total_tasks.lock().unwrap();
|
||||
*task_count += 1;
|
||||
}
|
||||
broadcast_stats(&state).await;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Yhteys katkesi — merkitään session päättyneeksi ja siivotaan
|
||||
state.db.close_session(node_id);
|
||||
state.node_tasks.lock().unwrap().remove(&node_id);
|
||||
{
|
||||
let mut conns = state.ip_connections.lock().unwrap();
|
||||
if let Some(count) = conns.get_mut(&ip) {
|
||||
|
||||
Reference in New Issue
Block a user