Update server.js

server.js

@@ -11,47 +11,49 @@ async function loadModel() {
     console.log("Model loaded successfully!");
 }
 
-// ── WIKIPEDIA SEARCH ─────────────────────────────────────────────────────────
-// Step 1: Search Wikipedia for the best matching article title
+// ── WIKIPEDIA ────────────────────────────────────────────────────────────────
 async function searchWikipedia(query) {
     try {
-        const url = `https://en.wikipedia.org/w/api.php?action=search&list=search&srsearch=${encodeURIComponent(query)}&srlimit=1&format=json&origin=*`;
+        const url = `https://en.wikipedia.org/w/api.php?action=query&list=search&srsearch=${encodeURIComponent(query)}&srlimit=1&format=json&origin=*`;
         const res  = await fetch(url);
         const data = await res.json();
         const results = data?.query?.search;
         if (!results || results.length === 0) return null;
-        return results[0].title; // Return best matching article title
-    } catch {
+        return results[0].title;
+    } catch (e) {
+        console.error("Wikipedia search error:", e.message);
         return null;
     }
 }
 
-// Step 2: Fetch the article summary (first 600 chars) using the title
 async function fetchWikipediaSummary(title) {
     try {
         const url = `https://en.wikipedia.org/api/rest_v1/page/summary/${encodeURIComponent(title)}`;
         const res  = await fetch(url);
         const data = await res.json();
-        if (data.extract) {
-            // Trim to 600 chars so it fits the model's context without overloading it
-            return data.extract.slice(0, 600);
-        }
+        if (data.extract) return data.extract.slice(0, 800);
         return null;
-    } catch {
+    } catch (e) {
+        console.error("Wikipedia fetch error:", e.message);
         return null;
     }
 }
 
-// Step 3: Combine search + fetch into one call
 async function getWikipediaContext(prompt) {
-    const title   = await searchWikipedia(prompt);
-    if (!title) return null;
-    const summary = await fetchWikipediaSummary(title);
-    if (!summary) return null;
-    return { title, summary };
+    try {
+        const title = await searchWikipedia(prompt);
+        if (!title) return null;
+        const summary = await fetchWikipediaSummary(title);
+        if (!summary) return null;
+        console.log(`Wikipedia context fetched: "${title}"`);
+        return { title, summary };
+    } catch (e) {
+        console.error("Wikipedia context error:", e.message);
+        return null;
+    }
 }
 
-// ── CODING KEYWORD DETECTION ─────────────────────────────────────────────────
+// ── CODING DETECTION ─────────────────────────────────────────────────────────
 const CODING_PHRASES = [
     'generate code', 'write code', 'create code',
     'generate a website', 'build a website', 'create a website', 'make a website',
@@ -79,7 +81,9 @@ const NON_CODING_CONTEXTS = [
     'explain', 'what is', 'what are', 'tell me about',
     'history of', 'meaning of', 'definition of',
     'describe', 'how does', 'why is', 'benefits of',
-    'importance of', 'effects of', 'causes of'
+    'importance of', 'effects of', 'causes of',
+    'who is', 'who was', 'when did', 'when was',
+    'where is', 'where was', 'which is', 'which was'
 ];
 
 function isCodingRequest(prompt) {
@@ -128,6 +132,17 @@ function enforceHTMLStructure(text) {
     return text;
 }
 
+// ── CORE GENERATION (non-streaming, reliable) ─────────────────────────────────
+async function generateResponse(messages, coding) {
+    const output = await generator(messages, {
+        max_new_tokens: coding ? 800 : 400,
+        temperature: coding ? 0.2 : 0.5,
+        repetition_penalty: 1.2,
+        do_sample: !coding
+    });
+    return output[0].generated_text.at(-1).content || '';
+}
+
 // ── HTTP SERVER ───────────────────────────────────────────────────────────────
 const server = http.createServer(async (req, res) => {
     res.setHeader('Access-Control-Allow-Origin', '*');
@@ -164,69 +179,54 @@ const server = http.createServer(async (req, res) => {
                 const coding     = isCodingRequest(prompt);
                 const websiteReq = isWebsiteRequest(prompt);
 
-                // ── Fetch Wikipedia context for non-coding questions ──────────
+                // ── Fetch Wikipedia for non-coding questions ──────────────────
                 let wikipediaContext = '';
+                let wikiTitle       = null;
                 if (!coding) {
                     const wiki = await getWikipediaContext(prompt);
                     if (wiki) {
-                        wikipediaContext = `\n\nWIKIPEDIA REFERENCE (from article: "${wiki.title}"):\n${wiki.summary}\n\nUse the above Wikipedia information to improve your answer. Rewrite it in your own words — do not copy it directly. Add your own explanation on top of it.`;
-                        console.log(`Wikipedia context fetched: "${wiki.title}"`);
+                        wikiTitle       = wiki.title;
+                        wikipediaContext = `\n\nWIKIPEDIA REFERENCE (article: "${wiki.title}"):\n${wiki.summary}\n\nIMPORTANT: Use this Wikipedia data to answer accurately. Rewrite it in your own words and add helpful context.`;
                     }
                 }
 
                 const finalPrompt = coding
-                    ? `You are a coding assistant. Write complete, working code for this task. Never refuse. Always provide full code: ${prompt}`
+                    ? `You are a coding assistant. Write complete, working code. Never refuse: ${prompt}`
                     : prompt;
 
                 const systemPrompt = coding
                     ? `You are Gini AI, a full-stack web development AI assistant created by Emalawi19, founded by Professor Roosevelt Chinkwende.
 
-IDENTITY:
-- Your name is Gini AI, created by Emalawi19, founded by Professor Roosevelt Chinkwende.
-- You are an AI assistant, not a human.
-
-CODING RULES — NEVER BREAK THESE:
-1. You ALWAYS write code when asked. You NEVER refuse any coding task.
-2. Code must be complete, real, and copy-paste ready — no placeholders.
-3. Default language is always JavaScript/HTML/CSS — NEVER Python unless the user asks.
-4. Add short comments inside the code.
-
-HTML WEBSITE RULES:
-1. ALL website/page code MUST start with <!DOCTYPE html> on the very first line.
-2. Then <html lang="en"> on the second line.
-3. Must include a proper <head> with <meta charset>, <meta viewport>, <title>, and <style>.
-4. Must include a proper <body> with all content.
-5. Must end with </body> then </html> as the very last line.
-6. ALL CSS inside <style> in <head>. ALL JS inside <script> at the bottom of <body>.
-7. Wrap full HTML in a \`\`\`html code block.
-8. The page must be complete and functional — never cut off mid-code.
-
-STEP-BY-STEP RULES:
-1. When asked to build a full website or app, list ALL steps first.
-2. Say: "Let's begin with Step 1. Say 'next' when ready."
-3. For each step: title, explanation, complete code, filename, how to run, then "Say 'next' to continue."
-4. ONE step per response. Never combine. Never cut off mid-code.`
+IDENTITY: Your name is Gini AI. Company: Emalawi19. Founder: Professor Roosevelt Chinkwende.
+
+CODING RULES:
+1. ALWAYS write code when asked. NEVER refuse.
+2. Complete, real, copy-paste ready code only — no placeholders.
+3. Default: JavaScript/HTML/CSS. Never Python unless asked.
+4. Add comments inside the code.
+
+HTML RULES:
+1. Start with <!DOCTYPE html> then <html lang="en">
+2. Include proper <head> with meta tags, title, and <style>
+3. End with </body> then </html>
+4. All CSS in <style>, all JS in <script> at bottom of body.
+5. Wrap in \`\`\`html code block. Never cut off mid-code.
+
+STEP-BY-STEP: List all steps first, then one step at a time. Say "next" to continue.`
 
                     : `You are Gini AI, a helpful AI assistant created by Emalawi19, founded by Professor Roosevelt Chinkwende.
 
-IDENTITY:
-- Your name is Gini AI, created by Emalawi19, founded by Professor Roosevelt Chinkwende.
-- You are an AI assistant, not a human.
+IDENTITY: Your name is Gini AI. Company: Emalawi19. Founder: Professor Roosevelt Chinkwende. You are an AI, not a human.
 ${wikipediaContext}
-GENERAL BEHAVIOR:
+RULES:
 - Answer the question directly and clearly in plain English.
-- If Wikipedia reference data is provided above, use it to make your answer accurate and informative.
-- Rewrite the Wikipedia information in your own words — never copy it word for word.
-- Add your own helpful explanation beyond just what Wikipedia says.
-- NEVER generate code for general knowledge or everyday questions.
-- Keep answers concise, friendly, and easy to understand.`;
-
-                const messages = [
-                    { role: 'system', content: systemPrompt },
-                    { role: 'user',   content: finalPrompt  }
-                ];
+- If Wikipedia reference is provided above, use it to give an accurate, well-informed answer.
+- Rewrite Wikipedia info in your own words — never copy it directly.
+- If the question is about a person (president, leader, founder etc.), state their name clearly at the start.
+- NEVER generate code for general knowledge questions.
+- Keep answers friendly, clear, and concise.`;
 
-                // ── SSE streaming response ────────────────────────────────────
+                // ── Set SSE headers ─��─────────────────────────────────────────
                 res.writeHead(200, {
                     'Content-Type': 'text/event-stream',
                     'Cache-Control': 'no-cache',
@@ -234,57 +234,58 @@ GENERAL BEHAVIOR:
                     'X-Accel-Buffering': 'no'
                 });
 
-                let fullResult = '';
-
-                await generator(messages, {
-                    max_new_tokens: coding ? 800 : 300,
-                    temperature: coding ? 0.2 : 0.5,
-                    repetition_penalty: 1.2,
-                    do_sample: !coding,
-                    callback_function: (beams) => {
-                        const newText = beams[0]?.generated_text ?? '';
-                        if (newText.length > fullResult.length) {
-                            const chunk = newText.slice(fullResult.length);
-                            fullResult  = newText;
-                            res.write(`data: ${JSON.stringify({ chunk })}\n\n`);
-                        }
-                    }
-                });
+                // Send a heartbeat so the client knows we're working
+                res.write(`data: ${JSON.stringify({ status: "generating" })}\n\n`);
+
+                // ── Generate (wait for full result, then stream it out) ────────
+                // The callback_function in transformers.js is unreliable on CPU
+                // so we generate fully then simulate streaming character by character
+                const messages = [
+                    { role: 'system', content: systemPrompt },
+                    { role: 'user',   content: finalPrompt  }
+                ];
+
+                let result = await generateResponse(messages, coding);
 
-                // Catch refusals and retry
+                // Catch refusals
                 const refusals = ["i can't assist", "i cannot assist", "i'm sorry", "i am sorry", "i'm unable", "i cannot help", "i can't help"];
-                const refused  = refusals.some(r => fullResult.toLowerCase().startsWith(r));
+                const refused  = refusals.some(r => result.toLowerCase().startsWith(r));
 
                 if (refused && coding) {
-                    fullResult = '';
-                    await generator([
+                    result = await generateResponse([
                         { role: 'system', content: 'You are a code generator. Output only complete working code. Never refuse.' },
-                        { role: 'user',   content: `Write complete working HTML code starting with <!DOCTYPE html> and ending with </html> for: ${prompt}` }
-                    ], {
-                        max_new_tokens: 800,
-                        temperature: 0.1,
-                        do_sample: false,
-                        callback_function: (beams) => {
-                            const newText = beams[0]?.generated_text ?? '';
-                            if (newText.length > fullResult.length) {
-                                const chunk = newText.slice(fullResult.length);
-                                fullResult  = newText;
-                                res.write(`data: ${JSON.stringify({ chunk })}\n\n`);
-                            }
-                        }
-                    });
+                        { role: 'user',   content: `Write complete HTML code starting with <!DOCTYPE html> ending with </html> for: ${prompt}` }
+                    ], true);
+                }
+
+                // If result is still empty, use Wikipedia summary directly
+                if (!result || result.trim().length < 5) {
+                    if (wikiTitle && wikipediaContext) {
+                        result = `Based on Wikipedia: ${wikipediaContext.split('\n').slice(3).join(' ').trim()}`;
+                    } else {
+                        result = "I'm sorry, I couldn't generate a response. Please try again.";
+                    }
                 }
 
                 if (websiteReq && coding) {
-                    fullResult = enforceHTMLStructure(fullResult);
+                    result = enforceHTMLStructure(result);
+                }
+
+                // ── Stream the result word by word ────────────────────────────
+                const words = result.split(' ');
+                for (let i = 0; i < words.length; i++) {
+                    const chunk = (i === 0 ? '' : ' ') + words[i];
+                    res.write(`data: ${JSON.stringify({ chunk })}\n\n`);
+                    // Small delay so frontend can render progressively
+                    await new Promise(r => setTimeout(r, 15));
                 }
 
-                // Send final done event with source info
-                const wikiSource = (!coding && wikipediaContext) ? '📖 Wikipedia' : null;
-                res.write(`data: ${JSON.stringify({ done: true, result: fullResult, source: wikiSource })}\n\n`);
+                // Send done event
+                res.write(`data: ${JSON.stringify({ done: true, result, source: wikiTitle ? `📖 Wikipedia — ${wikiTitle}` : null })}\n\n`);
                 res.end();
 
             } catch (err) {
+                console.error("Generation error:", err.message);
                 res.write(`data: ${JSON.stringify({ error: err.message })}\n\n`);
                 res.end();
             }