l

app.py

@@ -531,7 +531,7 @@ class RiskDetector:
     def __init__(self):
         # Risk indicators patterns
         self.critical_indicators = [
-            r'\b(suicide|kill myself|end it all'
+            r'\b(suicide|kill myself|end it all)\b',
         ]
         self.high_risk_indicators = [
             r'\b(hopeless|worthless|burden|better off without)\b',

chatbot/app.js

@@ -169,13 +169,38 @@
   }
   
   async function api(path, opts) {
-    const url = API_BASE_URL + path;
-    const res = await fetch(url, opts);
-    if (!res.ok) {
-      const txt = await res.text();
-      throw new Error(txt || res.statusText);
+    // Try multiple endpoint patterns to handle both app.py and run_aimhsa.py
+    const endpoints = [
+      API_BASE_URL + path,           // Direct path (app.py style)
+      API_BASE_URL + '/api' + path   // API prefixed path (run_aimhsa.py style)
+    ];
+    
+    let lastError;
+    for (const url of endpoints) {
+      try {
+        const res = await fetch(url, opts);
+        if (res.ok) {
+          return res.json();
+        }
+        if (res.status === 404 && url === endpoints[0]) {
+          // Try the next endpoint
+          continue;
+        }
+        // If not 404 or this is the last endpoint, handle the error
+        const txt = await res.text();
+        throw new Error(txt || res.statusText);
+      } catch (error) {
+        lastError = error;
+        if (url === endpoints[0] && error.message.includes('404')) {
+          // Try the next endpoint
+          continue;
+        }
+        // If not a 404 or this is the last endpoint, throw the error
+        throw error;
+      }
     }
-    return res.json();
+    // If we get here, all endpoints failed
+    throw lastError || new Error('All API endpoints failed');
   }
 
   async function initSession(useAccount = false) {
@@ -227,6 +252,10 @@
       ensureScroll();
     } catch (err) {
       console.error("history load error", err);
+      // If history fails to load, just show a welcome message
+      if (messagesEl.children.length === 0) {
+        appendMessage("bot", "Welcome! How can I help you today?");
+      }
     }
   }
 
@@ -270,11 +299,31 @@
       
       removeTypingIndicator();
       
-      // Ensure we got a valid response
-      if (!resp.answer || resp.answer.trim() === '') {
-        appendMessage("assistant", "I'm here to help. Could you please rephrase your question?");
+      // Handle scope rejection with special styling
+      if (resp.scope_rejection) {
+        const botMessage = appendMessage("assistant", resp.answer);
+        botMessage.classList.add("scope-rejection");
+        // Add visual indicator for scope rejection
+        const indicator = document.createElement("div");
+        indicator.className = "scope-indicator";
+        indicator.innerHTML = "🎯 Mental Health Focus";
+        indicator.style.cssText = `
+          font-size: 12px;
+          color: #f59e0b;
+          background: rgba(245, 158, 11, 0.1);
+          padding: 4px 8px;
+          border-radius: 4px;
+          margin-top: 8px;
+          display: inline-block;
+        `;
+        botMessage.querySelector('.msg-content').appendChild(indicator);
       } else {
-        appendMessage("assistant", resp.answer);
+        // Ensure we got a valid response
+        if (!resp.answer || resp.answer.trim() === '') {
+          appendMessage("assistant", "I'm here to help. Could you please rephrase your question?");
+        } else {
+          appendMessage("assistant", resp.answer);
+        }
       }
       
       // Risk assessment is handled in backend only (no display)
@@ -381,48 +430,64 @@
     disableComposer(true);
     showUploadPreview(file);
 
-    const url = API_BASE_URL + "/upload_pdf";
-    const xhr = new XMLHttpRequest();
-    xhr.open("POST", url, true);
+    // Try both endpoint patterns
+    const tryUpload = (url) => {
+      return new Promise((resolve, reject) => {
+        const xhr = new XMLHttpRequest();
+        xhr.open("POST", url, true);
 
-    xhr.upload.onprogress = function(e) {
-      if (e.lengthComputable) {
-        const pct = Math.round((e.loaded / e.total) * 100);
-        updateUploadProgress(pct);
-      }
-    };
+        xhr.upload.onprogress = function(e) {
+          if (e.lengthComputable) {
+            const pct = Math.round((e.loaded / e.total) * 100);
+            updateUploadProgress(pct);
+          }
+        };
 
-    xhr.onload = function() {
-      disableComposer(false);
-      try {
-        const resText = xhr.responseText || "{}";
-        const data = JSON.parse(resText);
-        if (xhr.status >= 200 && xhr.status < 300) {
-          convId = data.id;
-          localStorage.setItem("aimhsa_conv", convId);
-          appendMessage("bot", `Uploaded ${data.filename}. What would you like to know about this document?`);
-          clearUploadPreview();
-          if (account) updateHistoryList();
-        } else {
-          appendMessage("bot", "PDF upload failed: " + (data.error || xhr.statusText));
-        }
-      } catch (err) {
-        appendMessage("bot", "Upload parsing error");
-      }
-    };
+        xhr.onload = function() {
+          try {
+            const resText = xhr.responseText || "{}";
+            const data = JSON.parse(resText);
+            if (xhr.status >= 200 && xhr.status < 300) {
+              resolve(data);
+            } else {
+              reject(new Error(data.error || xhr.statusText));
+            }
+          } catch (err) {
+            reject(new Error("Upload parsing error"));
+          }
+        };
 
-    xhr.onerror = function() {
-      disableComposer(false);
-      appendMessage("bot", "PDF upload error");
+        xhr.onerror = function() {
+          reject(new Error("Upload network error"));
+        };
+
+        const fd = new FormData();
+        fd.append("file", file, file.name);
+        if (convId) fd.append("id", convId);
+        if (account) fd.append("account", account);
+        const model = getSelectedModel();
+        if (model) fd.append("model", model);
+        xhr.send(fd);
+      });
     };
 
-    const fd = new FormData();
-    fd.append("file", file, file.name);
-    if (convId) fd.append("id", convId);
-    if (account) fd.append("account", account);
-    const model = getSelectedModel();
-    if (model) fd.append("model", model);
-    xhr.send(fd);
+    // Try upload_pdf endpoint first, then api/upload_pdf as fallback
+    tryUpload(API_BASE_URL + "/upload_pdf")
+      .catch(() => tryUpload(API_BASE_URL + "/api/upload_pdf"))
+      .then((data) => {
+        disableComposer(false);
+        convId = data.id;
+        localStorage.setItem("aimhsa_conv", convId);
+        appendMessage("bot", `Uploaded ${data.filename}. What would you like to know about this document?`);
+        clearUploadPreview();
+        if (account) updateHistoryList();
+      })
+      .catch((error) => {
+        disableComposer(false);
+        console.error("PDF upload failed:", error);
+        appendMessage("bot", "PDF upload failed: " + error.message);
+        clearUploadPreview();
+      });
   }
 
   function disableComposer(disabled) {
@@ -500,18 +565,20 @@
         
         appendMessage("bot", "Chat history cleared. How can I help you?");
         
-        // Start a new conversation
-        const payload = { account };
-        const resp = await api("/conversations", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(payload)
-        });
-        
-        if (resp && resp.id) {
-          convId = resp.id;
-          localStorage.setItem("aimhsa_conv", convId);
-          await updateHistoryList();
+        // Start a new conversation if account exists
+        if (account && account !== 'null') {
+          const payload = { account };
+          const resp = await api("/conversations", {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify(payload)
+          });
+          
+          if (resp && resp.id) {
+            convId = resp.id;
+            localStorage.setItem("aimhsa_conv", convId);
+            await updateHistoryList();
+          }
         }
       } catch (err) {
         console.error("Failed to clear chat history", err);
@@ -897,7 +964,7 @@
   
   async function handleBookingResponse(response) {
     try {
-      const res = await fetch(API_ROOT + '/booking_response', {
+      const res = await api('/booking_response', {
         method: 'POST',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify({
@@ -907,7 +974,7 @@
         })
       });
       
-      const data = await res.json();
+      const data = res; // api() already returns parsed JSON
       
       if (response === 'yes' && data.booking) {
         // Show booking confirmation

run_aimhsa.py

@@ -48,13 +48,27 @@ openai_client = OpenAI(
 )
 
 # System prompt for AIMHSA
-SYSTEM_PROMPT = """You are AIMHSA, a supportive mental-health companion for Rwanda.
-- Be warm, brief, and evidence-informed. Use simple English (or Kinyarwanda if the user uses it).
-- Do NOT diagnose or prescribe medications. Encourage professional care when appropriate.
-- If the user mentions self-harm or immediate danger, express care and advise contacting local emergency services right away.
-- Ground answers in the provided CONTEXT. If context is insufficient, say what is known and unknown, and offer general coping strategies.
-- Only answer in English!
-- Also keep it brief except when details are required.
+SYSTEM_PROMPT = """You are AIMHSA, a professional mental health support assistant for Rwanda.
+
+## CRITICAL SCOPE ENFORCEMENT - REJECT OFF-TOPIC QUERIES
+- You ONLY provide mental health, emotional well-being, and psychological support
+- IMMEDIATELY REJECT any questions about: technology, politics, sports, entertainment, cooking, general knowledge, science, business, or any non-mental health topics
+- For rejected queries, respond with: "I'm a mental health support assistant and can only help with emotional well-being and mental health concerns. Let's focus on how you're feeling today - is there anything causing you stress, anxiety, or affecting your mood?"
+- NEVER provide detailed answers to non-mental health questions
+- Always redirect to mental health topics after rejection
+
+## Professional Guidelines
+- Be warm, empathetic, and culturally sensitive
+- Provide evidence-based information from the context when available
+- Do NOT diagnose or prescribe medications
+- Encourage professional care when appropriate
+- For emergencies, always mention Rwanda's Mental Health Hotline: 105
+- Keep responses professional, concise, and helpful
+- Use the provided context to give accurate, relevant information
+- Maintain a natural, conversational tone
+- Ensure professional mental health support standards
+
+Remember: You are a professional mental health support system. ALWAYS enforce scope boundaries by rejecting non-mental health queries and redirecting to emotional well-being topics.
 """
 
 # Global variables for embeddings
@@ -241,12 +255,34 @@ def healthz():
 
 @app.route('/ask', methods=['POST'])
 def ask():
-    """Main chat endpoint"""
+    """Main chat endpoint with scope validation"""
     data = request.get_json(force=True)
     query = (data.get("query") or "").strip()
     if not query:
         return jsonify({"error": "Missing 'query'"}), 400
 
+    # Simple scope validation for non-mental health topics
+    query_lower = query.lower()
+    non_mental_health_indicators = [
+        'computer', 'technology', 'programming', 'politics', 'sports', 'football',
+        'recipe', 'cooking', 'weather', 'mathematics', 'history', 'business',
+        'movie', 'music', 'travel', 'shopping', 'news', 'science'
+    ]
+    
+    # Check if query is clearly outside mental health scope
+    if any(indicator in query_lower for indicator in non_mental_health_indicators):
+        rejection_message = "I'm a mental health support assistant and can only help with emotional well-being and mental health concerns. Let's focus on how you're feeling today - is there anything causing you stress, anxiety, or affecting your mood?"
+        
+        conv_id = data.get("id") or str(uuid.uuid4())
+        save_message(conv_id, "user", query)
+        save_message(conv_id, "assistant", rejection_message)
+        
+        return jsonify({
+            "answer": rejection_message,
+            "id": conv_id,
+            "scope_rejection": True
+        })
+
     # Conversation ID handling
     conv_id = data.get("id")
     new_conv = False