rollback check: 3f7ecbf12d52376c19152837f9f3b9c161ed1570

app.py

@@ -20,8 +20,7 @@ import retriever
 import auth as auth_module
 import feed as feed_module
 from config import GOOGLE_CLIENT_ID
-from graph import chatbot, _classify, _pick
-from tools import run_web_search, fetch_yt_transcript
+from graph import chatbot
 
 
 app = FastAPI()
@@ -300,27 +299,24 @@ def chat(request: ChatRequest, req: Request):
         if web_search_enabled:
             yield sse_tool_event("tool_start", "web_search")
             try:
+                from tools import run_web_search
                 web_results = run_web_search(clean_message)
-                print(f"[WEB SEARCH] Fetched {len(web_results)} chars for query: {clean_message[:60]}", flush=True)
                 context += f"\n\n[Web Search Results]\n{web_results}\n[End Web Search Results]\n"
             except Exception as e:
-                print(f"[SEARCH ERROR] {e}", flush=True)
+                print(f"[SEARCH ERROR] {e}")
                 context += "\n\nWeb search failed to complete.\n"
             yield sse_tool_event("tool_end", "web_search")
 
         elif yt_search_enabled:
             yield sse_tool_event("tool_start", "yt_transcript")
             try:
+                from tools import fetch_yt_transcript
+                # Find video URL or ID in clean_message
                 transcript = fetch_yt_transcript(clean_message)
-                if transcript.startswith("TRANSCRIPT_UNAVAILABLE") or transcript.startswith("Could not"):
-                    print(f"[YT TRANSCRIPT] Unavailable: {transcript[:120]}", flush=True)
-                    context += f"\n\n[YouTube Transcript Status]\n{transcript}\n"
-                else:
-                    print(f"[YT TRANSCRIPT] Fetched {len(transcript)} chars for query: {clean_message[:60]}", flush=True)
-                    context += f"\n\n[YouTube Video Transcript]\n{transcript[:15_000]}\n[End Transcript]\n"
+                context += f"\n\n[YouTube Video Transcript]\n{transcript[:15_000]}\n[End Transcript]\n"
             except Exception as e:
-                print(f"[YT TRANSCRIPT ERROR] Unexpected exception: {e}", flush=True)
-                context += "\n\n[YouTube Transcript Status]\nYouTube transcript extraction failed unexpectedly.\n"
+                print(f"[YT TRANSCRIPT ERROR] {e}")
+                context += "\n\nYouTube transcript extraction failed.\n"
             yield sse_tool_event("tool_end", "yt_transcript")
 
         # Step 4: Handle document context
@@ -349,6 +345,7 @@ def chat(request: ChatRequest, req: Request):
 
         # Resolve target model dynamically to print/trace and pass to LangGraph config
         try:
+            from graph import _classify, _pick
             category = _classify(clean_message)
             target_model, _ = _pick(category, has_image=has_image)
         except Exception as e:
@@ -381,12 +378,8 @@ def chat(request: ChatRequest, req: Request):
                 if isinstance(chunk, AIMessage) and chunk.content:
                     yield sse_token(chunk.content)
         except Exception as e:
-            print(f"[CHAT STREAM EXCEPTION] Final failure: {e}", flush=True)
-            import traceback; traceback.print_exc()
             error_str = str(e).lower()
-            if "timeout" in error_str or "timed out" in error_str or "readtimeout" in error_str:
-                yield sse_error("Models are responding slowly. Please try again in a moment.")
-            elif "429" in str(e) or "rate" in error_str:
+            if "429" in str(e) or "rate" in error_str:
                 yield sse_error("Rate limited. Please wait a moment and try again.")
             elif "402" in str(e) or "payment" in error_str or "credits" in error_str:
                 yield sse_error("Free credits exhausted on OpenRouter.")

graph.py

@@ -287,7 +287,6 @@ def _make_llm(api_key: str, model_id: str):
         max_tokens=4096,
         max_retries=0,
         streaming=True,
-        timeout=LLM_TIMEOUT,
     )
 
 
@@ -316,15 +315,13 @@ def chat_node(state: ChatState, config: RunnableConfig):
     base_prompt = prompts.build(persona, context, language, username, profile)
 
     if search_enabled:
-        scope_override = (
-            "## IMPORTANT OVERRIDE — READ THIS FIRST BEFORE ANY OTHER INSTRUCTION:\n"
-            "The student has activated Web Search or YouTube mode. "
-            "In this mode you are a general-purpose assistant. "
-            "The CBSE/PCM-only scope restriction is SUSPENDED for this message. "
-            "Answer whatever the student asks using the provided search results or transcript. "
-            "Saying 'I can only help with Physics, Chemistry, and Maths' is FORBIDDEN in this mode.\n\n"
+        base_prompt += (
+            "\n\nSCOPE OVERRIDE (ACTIVE SEARCH/YT DETECTED):\n"
+            "The user has enabled Web Search / YouTube Video Search. You are acting as a general information assistant. "
+            "The strict Physics, Chemistry, and Mathematics scope restriction is temporarily suspended. "
+            "Answer the user's query comprehensively using the web search or YouTube transcript context provided, "
+            "regardless of the academic or non-academic nature of the query. Do NOT output a scope refusal message.\n"
         )
-        base_prompt = scope_override + base_prompt
 
     if has_image:
         base_prompt += (
@@ -354,16 +351,12 @@ def chat_node(state: ChatState, config: RunnableConfig):
             return {"messages": [resp]}
         except Exception as e:
             err_str = str(e)
-            err_lower = err_str.lower()
-            if "timeout" in err_lower or "timed out" in err_lower or "readtimeout" in err_lower:
-                print(f"[ROUTER TIMEOUT] Model {model_id} timed out after {LLM_TIMEOUT}s — rotating to next model", flush=True)
-            elif "429" in err_str or "rate" in err_lower:
-                print(f"[ROUTER 429] Model {model_id} rate-limited — rotating to next model", flush=True)
-            else:
-                print(f"[ROUTER ERROR] Model {model_id} failed: {err_str[:120]}", flush=True)
             last_error = e
-            skip_models.add(model_id)
-            continue
+            if "429" in err_str or "TooManyRequests" in err_str or "rate" in err_str.lower():
+                print(f"[ROUTER] 429 on {model_id}, rotating...")
+                skip_models.add(model_id)
+                continue
+            raise
 
     raise last_error
 

static/app.js

@@ -696,10 +696,7 @@ function _renderOverlayHistory() {
             e.stopPropagation();
             const wasOpen = ctx.classList.contains('show');
             _closeAllCtxMenus();
-            if (!wasOpen) {
-                ctx.classList.add('show');
-                item.classList.add('menu-active');
-            }
+            if (!wasOpen) ctx.classList.add('show');
         });
         // Rename
         item.querySelector('[data-action="rename"]').addEventListener('click', (e) => {
@@ -737,7 +734,6 @@ function _renderOverlayHistory() {
 
 function _closeAllCtxMenus() {
     document.querySelectorAll('.overlay-ctx-menu.show').forEach(m => m.classList.remove('show'));
-    document.querySelectorAll('.overlay-history-item.menu-active').forEach(i => i.classList.remove('menu-active'));
 }
 document.addEventListener('click', () => _closeAllCtxMenus());
 
@@ -974,7 +970,6 @@ function toggleMenu(e, btn) {
     e.stopPropagation(); closeAllMenus();
     btn.nextElementSibling.classList.add('show');
     btn.classList.add('menu-open');
-    btn.closest('.history-item').classList.add('menu-active');
 }
 
 document.addEventListener('click', closeAllMenus);
@@ -982,7 +977,6 @@ document.addEventListener('click', closeAllMenus);
 function closeAllMenus() {
     document.querySelectorAll('.options-menu.show').forEach(m => m.classList.remove('show'));
     document.querySelectorAll('.options-btn.menu-open').forEach(b => b.classList.remove('menu-open'));
-    document.querySelectorAll('.history-item.menu-active').forEach(i => i.classList.remove('menu-active'));
     if (userMenu) userMenu.classList.remove('show');
     // Close ALL style dropdowns — static and dynamic hero ones
     document.querySelectorAll('.style-dropdown.show').forEach(d => d.classList.remove('show'));
@@ -994,44 +988,40 @@ function closeAllMenus() {
 
 function deleteChat(e, optionEl) {
     e.stopPropagation();
-    closeAllMenus();
     const item = optionEl.closest('.history-item');
     const threadId = item.getAttribute('data-thread-id');
-    const thread = threads.find(t => t.id === threadId);
-    if (!thread) return;
-    pwaConfirm('Delete this chat?').then(yes => {
-        if (yes) {
-            fetch('/thread/' + threadId, { method: 'DELETE' })
-                .then(() => {
-                    const idx = threads.findIndex(t => t.id === threadId);
-                    if (idx !== -1) threads.splice(idx, 1);
-                    if (threadId === currentThreadId) startNewChat();
-                    _renderOverlayHistory();
-                    renderHistory();
-                })
-                .catch(() => showToast('Failed to delete.', 'error'));
-        }
-    });
+    const idx = threads.findIndex(t => t.id === threadId);
+    if (idx !== -1) threads.splice(idx, 1);
+    item.style.opacity = '0';
+    setTimeout(() => item.remove(), 200);
+    fetch('/thread/' + threadId, { method: 'DELETE' });
 }
 
 function renameChat(e, optionEl) {
     e.stopPropagation();
-    closeAllMenus();
     const item = optionEl.closest('.history-item');
+    const titleSpan = item.querySelector('.chat-title');
     const threadId = item.getAttribute('data-thread-id');
-    const thread = threads.find(t => t.id === threadId);
-    if (!thread) return;
-    pwaPrompt('Rename chat:', thread.title).then(newTitle => {
-        if (newTitle && newTitle.trim()) {
-            fetch('/rename', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ thread_id: threadId, title: newTitle.trim() }) })
-                .then(() => {
-                    thread.title = newTitle.trim();
-                    _renderOverlayHistory();
-                    renderHistory();
-                })
-                .catch(() => showToast('Failed to rename.', 'error'));
-        }
+    closeAllMenus();
+    const currentTitle = titleSpan.innerText;
+    const input = document.createElement('input');
+    input.type = 'text'; input.value = currentTitle; input.className = 'rename-input';
+    titleSpan.replaceWith(input); input.focus();
+    input.selectionStart = input.selectionEnd = input.value.length;
+
+    function saveRename() {
+        const newTitle = input.value.trim() || 'Untitled Chat';
+        titleSpan.innerText = newTitle; input.replaceWith(titleSpan);
+        const thread = threads.find(t => t.id === threadId);
+        if (thread) thread.title = newTitle;
+        fetch('/rename', { method: 'POST', headers: { 'Content-Type': 'application/json' }, body: JSON.stringify({ thread_id: threadId, title: newTitle }) });
+    }
+    input.addEventListener('blur', saveRename);
+    input.addEventListener('keydown', evt => {
+        if (evt.key === 'Enter') saveRename();
+        if (evt.key === 'Escape') { titleSpan.innerText = currentTitle; input.replaceWith(titleSpan); }
     });
+    input.addEventListener('click', evt => evt.stopPropagation());
 }
 
 

static/style.css

@@ -613,14 +613,6 @@ textarea, input, select {
     position: relative;
 }
 
-.overlay-history-item.menu-active {
-    z-index: 15;
-}
-
-.overlay-history-item:hover {
-    z-index: 5;
-}
-
 .overlay-history-main {
     display: flex;
     align-items: center;
@@ -846,14 +838,6 @@ textarea, input, select {
     transition: background 0.2s, color 0.2s, transform 0.15s;
 }
 
-.history-item.menu-active {
-    z-index: 15;
-}
-
-.history-item:hover {
-    z-index: 5;
-}
-
 .history-item:hover { background: var(--bg-hover); color: var(--text-primary); }
 .history-item:active { transform: scale(0.98); }
 

tools.py

@@ -74,32 +74,20 @@ def fetch_yt_transcript(youtube_url: str) -> str:
         return f"Could not extract a valid YouTube video ID from: {youtube_url}"
 
     try:
-        ytt = YouTubeTranscriptApi()
-        fetched = ytt.fetch(video_id, languages=["en", "hi", "en-IN", "en-US"])
-        transcript = " ".join(snippet.text for snippet in fetched)
+        transcript_list = YouTubeTranscriptApi.get_transcript(video_id)
+        transcript = " ".join(seg["text"] for seg in transcript_list)
         if not transcript.strip():
-            print(f"[YT TRANSCRIPT] Empty transcript for video_id={video_id}", flush=True)
-            return "TRANSCRIPT_UNAVAILABLE: Transcript is empty for this video."
-        print(f"[YT TRANSCRIPT] OK — {len(transcript)} chars for video_id={video_id}", flush=True)
+            return "Transcript is empty for this video."
         return transcript
     except Exception as exc:
-        print(f"[YT TRANSCRIPT EXCEPTION] video_id={video_id} | error={exc}", flush=True)
+        print(f"[YT TRANSCRIPT EXCEPTION] Video ID: {video_id}, Error: {exc}", flush=True)
         err = str(exc).lower()
-        if "disabled" in err or "no transcript" in err or "no element" in err:
+        if "disabled" in err or "no transcript" in err:
             return (
-                "TRANSCRIPT_UNAVAILABLE: This video has no transcript available "
-                "(subtitles are disabled or no captions exist for this video)."
+                "This video has no available transcript (subtitles may be disabled "
+                "or auto-generated captions are not available)."
             )
-        if "too many requests" in err or "429" in err:
-            return (
-                "TRANSCRIPT_UNAVAILABLE: YouTube is rate-limiting transcript requests. "
-                "Please try again in a few minutes."
-            )
-        return (
-            f"TRANSCRIPT_UNAVAILABLE: Could not retrieve transcript. "
-            f"Reason: {exc}. "
-            f"Do NOT fabricate — inform the student the transcript could not be fetched."
-        )
+        return f"Error fetching transcript: {exc}"
 
 
 # ── Exported list ─────────────────────────────────────────────