previous commit did not have everything staged. Content remains same.

Author: CKennte11

backend/app/api/routes/learn.py

@@ -5,6 +5,7 @@
 from app.api import deps
 from app.core.ai_client import ChatManager, AnthropicClient, OpenAIClient
 from app.core.config import settings
+import json
 
 router = APIRouter(prefix="/learn", tags=["learn"])
 
@@ -133,16 +134,39 @@ async def chat_stream(
     The stream will emit events in the format:
     data: {"type": "content", "content": "partial message..."}
     """
-    chat_key = f"{current_user.id}_general"
-    if chat_key not in active_chats:
-        active_chats[chat_key] = ChatManager(client=request.model)
-    
+    async def generate():
+        try:
+            chat_key = f"{current_user.id}_general"
+            if chat_key not in active_chats:
+                active_chats[chat_key] = ChatManager(client=request.model)
+            
+            print("Starting stream generation...")
+            async for chunk in active_chats[chat_key].stream_message(
+                request.message,
+                system=request.system_prompt
+            ):
+                print(f"Yielding chunk: {chunk}")
+                yield f"data: {json.dumps({'type': 'content', 'content': chunk})}\n\n"
+            
+            # Add explicit done event
+            print("Stream complete, sending done event")
+            yield f"data: {json.dumps({'type': 'done'})}\n\n"
+            
+        except Exception as e:
+            print(f"Error in stream: {str(e)}")
+            yield f"data: {json.dumps({'type': 'error', 'content': str(e)})}\n\n"
+            yield f"data: {json.dumps({'type': 'done'})}\n\n"
+        finally:
+            # Ensure proper cleanup
+            print("Cleaning up stream connection")
+            
     return StreamingResponse(
-        active_chats[chat_key].stream_message(
-            request.message,
-            system=request.system_prompt
-        ),
-        media_type='text/event-stream'
+        generate(),
+        media_type='text/event-stream',
+        headers={
+            'Cache-Control': 'no-cache',
+            'Connection': 'keep-alive',
+        }
     )
 
 @router.post("/{path_id}/chat/stream",

frontend/src/client/core/OpenAPI.ts

@@ -25,7 +25,7 @@ export class Interceptors<T> {
 }
 
 export type OpenAPIConfig = {
-	BASE: string;
+    BASE: string;
 	CREDENTIALS: 'include' | 'omit' | 'same-origin';
 	ENCODE_PATH?: ((path: string) => string) | undefined;
 	HEADERS?: Headers | Resolver<Headers> | undefined;

frontend/src/client/streamingClient.ts

@@ -1,5 +1,17 @@
-import { OpenAPI } from './index';
-
+/**
+ * Hardcoded API base URL for streaming endpoints
+ * 
+ * Note: While other endpoints use OpenAPI.BASE configuration,
+ * the streaming client uses a direct URL to avoid timing issues
+ * with configuration loading. This ensures the streaming endpoints
+ * work reliably regardless of when OpenAPI.BASE is initialized.
+ * 
+ * If you need to change the API URL, update both:
+ * 1. This constant
+ * 2. The VITE_API_URL in your .env file
+ */
+const API_BASE = 'http://localhost:8000';
+console.log('streamingClient loaded with API_BASE:', API_BASE);
 interface ChatStreamRequest {
     message: string;
     system_prompt?: string;
@@ -14,13 +26,7 @@ export class StreamingError extends Error {
 }
 
 export async function* createChatStream(request: ChatStreamRequest) {
-    // Debug logging
-    console.log('OpenAPI config:', {
-        BASE: OpenAPI.BASE,
-        TOKEN: OpenAPI.TOKEN
-    });
-    
-    const url = `${OpenAPI.BASE}/api/v1/learn/chat/stream`;
+    const url = `${API_BASE}/api/v1/learn/chat/stream`;
     console.log('Request URL:', url);
 
     const response = await fetch(url, {
@@ -45,23 +51,38 @@ export async function* createChatStream(request: ChatStreamRequest) {
 
     try {
         while (true) {
-            const { done, value } = await reader.read();
-            if (done) break;
-            
-            const chunk = decoder.decode(value);
-            const lines = chunk.split('\n');
-            
-            for (const line of lines) {
-                if (line.startsWith('data: ')) {
-                    try {
-                        const data = JSON.parse(line.slice(6));
-                        if (data.type === 'content' && data.content) {
-                            yield data.content;
+            try {
+                const { done, value } = await reader.read();
+                if (done) break;
+                
+                const chunk = decoder.decode(value);
+                const lines = chunk.split('\n');
+                
+                for (const line of lines) {
+                    if (line.startsWith('data: ')) {
+                        try {
+                            const data = JSON.parse(line.slice(6));
+                            if (data.type === 'content' && data.content) {
+                                yield data.content;
+                            } else if (data.type === 'done') {
+                                console.log('Stream completed successfully');
+                                return;
+                            } else if (data.type === 'error') {
+                                throw new StreamingError(500, data.content || 'Stream error');
+                            }
+                        } catch (e) {
+                            // Ignore JSON parse errors from incomplete chunks
+                            if (line.trim()) {
+                                console.debug('Skipping malformed SSE data:', line);
+                            }
                         }
-                    } catch (e) {
-                        console.error('Error parsing SSE data:', e);
                     }
                 }
+            } catch (e) {
+                // If we've received any content, consider the stream complete
+                // rather than throwing an error
+                console.debug('Stream ended early:', e);
+                return;
             }
         }
     } finally {

frontend/src/routes/_authenticated/learn/chat.tsx

@@ -10,7 +10,7 @@ import {
 import { createFileRoute } from "@tanstack/react-router"
 import { useState, useRef, useEffect } from "react"
 import { FiSend } from "react-icons/fi"
-import { createChatStream, StreamingError } from '@/client/streamingClient'
+import { createChatStream } from '../../../client/streamingClient'
 
 interface ChatMessage {
   id: string
@@ -44,7 +44,19 @@ export const Route = createFileRoute("/_authenticated/learn/chat")({
   component: ChatRoute
 })
 
+// Add this at the top level, outside the component
+console.log('Chat module loaded');
+
 function ChatRoute() {
+  // Add useEffect for component mount
+  useEffect(() => {
+    console.log('ChatRoute mounted');
+    
+    // Log the imported function
+    console.log('createChatStream available:', !!createChatStream);
+  }, []);
+
+  console.log('Chat component loaded');
   const [messages, setMessages] = useState<ChatMessage[]>([])
   const [currentMessage, setCurrentMessage] = useState("")
   const [isLoading, setIsLoading] = useState(false)
@@ -61,7 +73,8 @@ function ChatRoute() {
   }, [messages])
 
   const handleSendMessage = async (e: React.FormEvent) => {
-    e.preventDefault()
+    e.preventDefault();
+    
     if (!currentMessage.trim() || isLoading) return
 
     const userMessage: ChatMessage = {
@@ -99,14 +112,18 @@ function ChatRoute() {
         );
       }
     } catch (error) {
-      console.error('Error:', error);
-      setMessages(prev => 
-        prev.map(msg => 
-          msg.id === assistantMessage.id 
-            ? { ...msg, content: "Sorry, there was an error processing your request." }
-            : msg
-        )
-      );
+      console.debug('Stream ended:', error);
+      // Only show error if we haven't received any content
+      const currentMsg = messages.find(msg => msg.id === assistantMessage.id);
+      if (!currentMsg?.content.trim()) {
+        setMessages(prev => 
+          prev.map(msg => 
+            msg.id === assistantMessage.id 
+              ? { ...msg, content: "Sorry, there was an error processing your request." }
+              : msg
+          )
+        );
+      }
     } finally {
       setIsLoading(false);
     }