made streaming primary

Author: paullizer

application/single_app/config.py

@@ -94,7 +94,7 @@
 EXECUTOR_TYPE = 'thread'
 EXECUTOR_MAX_WORKERS = 30
 SESSION_TYPE = 'filesystem'
-VERSION = "0.239.125"
+VERSION = "0.239.127"
 
 SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production')
 

application/single_app/functions_settings.py

@@ -276,7 +276,7 @@ def get_settings(use_cosmos=False):
         'enable_external_healthcheck': False,
 
         # Streaming settings
-        'streamingEnabled': False,
+        'streamingEnabled': True,
 
         # Reasoning effort settings (per-model)
         'reasoningEffortSettings': {},

application/single_app/route_backend_chats.py

@@ -2904,7 +2904,8 @@ def result_requires_message_reload(result: Any) -> bool:
                         'conversation_id': conversation_id,
                         'conversation_title': conversation_item['title'],
                         'model_deployment_name': image_gen_model,
-                        'message_id': image_message_id
+                        'message_id': image_message_id,
+                        'user_message_id': user_message_id
                     }), 200
                 except Exception as e:
                     debug_print(f"Image generation error: {str(e)}")
@@ -4361,6 +4362,94 @@ def chat_stream_api():
             request_start_time = time.time()
         except Exception as e:
             return jsonify({'error': f'Failed to parse request: {str(e)}'}), 400
+
+        compatibility_mode = bool(data.get('image_generation')) or bool(
+            data.get('retry_user_message_id') or data.get('edited_user_message_id')
+        )
+
+        def normalize_legacy_chat_payload(payload):
+            """Convert the legacy JSON response shape into the streaming terminal payload."""
+            return {
+                'done': True,
+                'conversation_id': payload.get('conversation_id'),
+                'conversation_title': payload.get('conversation_title'),
+                'classification': payload.get('classification', []),
+                'model_deployment_name': payload.get('model_deployment_name'),
+                'message_id': payload.get('message_id'),
+                'user_message_id': payload.get('user_message_id'),
+                'augmented': payload.get('augmented', False),
+                'hybrid_citations': payload.get('hybrid_citations', []),
+                'web_search_citations': payload.get('web_search_citations', []),
+                'agent_citations': payload.get('agent_citations', []),
+                'agent_display_name': payload.get('agent_display_name'),
+                'agent_name': payload.get('agent_name'),
+                'full_content': payload.get('reply', ''),
+                'image_url': payload.get('image_url'),
+                'reload_messages': payload.get('reload_messages', False),
+                'kernel_fallback_notice': payload.get('kernel_fallback_notice'),
+                'thoughts_enabled': payload.get('thoughts_enabled', False),
+                'blocked': payload.get('blocked', False),
+            }
+
+        def generate_compatibility_response():
+            """Bridge legacy JSON chat handling into a terminal SSE event for parity cases."""
+            try:
+                if data.get('image_generation'):
+                    prompt_text = (data.get('message') or '').strip()
+                    prompt_preview = prompt_text[:120] + '...' if len(prompt_text) > 120 else prompt_text
+
+                    yield f"data: {json.dumps({
+                        'type': 'thought',
+                        'step_type': 'generation',
+                        'content': f'Generating image based on \"{prompt_preview}\"' if prompt_preview else 'Generating image from your prompt'
+                    })}\n\n"
+
+                    yield f"data: {json.dumps({
+                        'type': 'thought',
+                        'step_type': 'generation',
+                        'content': 'Preparing image model request'
+                    })}\n\n"
+
+                legacy_result = chat_api()
+                legacy_response = legacy_result
+                status_code = 200
+
+                if isinstance(legacy_result, tuple):
+                    legacy_response = legacy_result[0]
+                    if len(legacy_result) > 1 and isinstance(legacy_result[1], int):
+                        status_code = legacy_result[1]
+
+                if hasattr(legacy_response, 'get_json'):
+                    payload = legacy_response.get_json(silent=True) or {}
+                else:
+                    payload = {}
+
+                if status_code >= 400:
+                    error_message = payload.get('error') or f'Compatibility chat request failed ({status_code})'
+                    yield f"data: {json.dumps({'error': error_message})}\n\n"
+                    return
+
+                if payload.get('image_url'):
+                    yield f"data: {json.dumps({
+                        'type': 'thought',
+                        'step_type': 'generation',
+                        'content': 'Image generated and ready to display'
+                    })}\n\n"
+
+                yield f"data: {json.dumps(normalize_legacy_chat_payload(payload))}\n\n"
+            except Exception as compatibility_error:
+                yield f"data: {json.dumps({'error': str(compatibility_error)})}\n\n"
+
+        if compatibility_mode:
+            return Response(
+                stream_with_context(generate_compatibility_response()),
+                mimetype='text/event-stream',
+                headers={
+                    'Cache-Control': 'no-cache',
+                    'X-Accel-Buffering': 'no',
+                    'Connection': 'keep-alive'
+                }
+            )
 
         def generate():
             try:

application/single_app/static/js/chat/chat-edit.js

@@ -3,6 +3,7 @@
 
 import { showToast } from './chat-toast.js';
 import { showLoadingIndicatorInChatbox, hideLoadingIndicatorInChatbox } from './chat-loading-indicator.js';
+import { sendMessageWithStreaming } from './chat-streaming.js';
 
 /**
  * Handle edit button click - opens edit modal
@@ -146,70 +147,48 @@ window.executeMessageEdit = function() {
                 console.log('   retry_thread_id:', data.chat_request.retry_thread_id);
                 console.log('   retry_thread_attempt:', data.chat_request.retry_thread_attempt);
                 console.log('   Full chat_request:', data.chat_request);
-                
-                // Call chat API with the edit parameters
-                return fetch('/api/chat', {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/json',
-                    },
-                    credentials: 'same-origin',
-                    body: JSON.stringify(data.chat_request)
-                });
+
+                const streamStarted = sendMessageWithStreaming(
+                    data.chat_request,
+                    null,
+                    data.chat_request.conversation_id,
+                    {
+                        onDone: () => {
+                            const conversationId = window.chatConversations?.getCurrentConversationId() || data.chat_request.conversation_id;
+                            if (conversationId) {
+                                import('./chat-messages.js').then(module => {
+                                    module.loadMessages(conversationId);
+                                }).catch(err => {
+                                    console.error('❌ Error loading chat-messages module:', err);
+                                    showToast('Failed to reload messages', 'error');
+                                });
+                            }
+                        },
+                        onError: (errorMessage) => {
+                            showToast(`Edit failed: ${errorMessage}`, 'error');
+                        },
+                        onFinally: () => {
+                            hideLoadingIndicatorInChatbox();
+                        }
+                    }
+                );
+
+                if (!streamStarted) {
+                    throw new Error('Failed to start streaming edit response');
+                }
+
+                return null;
             } else {
                 throw new Error('Edit response missing chat_request');
             }
         })
-        .then(response => {
-            if (!response.ok) {
-                return response.json().then(data => {
-                    throw new Error(data.error || 'Chat API failed');
-                });
-            }
-            return response.json();
-        })
-        .then(chatData => {
-            console.log('✅ Chat API response:', chatData);
-            
-            // Hide typing indicator
-            hideLoadingIndicatorInChatbox();
-            console.log('🧹 Typing indicator removed');
-            
-            // Get current conversation ID using the proper API
-            const conversationId = window.chatConversations?.getCurrentConversationId();
-            
-            console.log(`🔍 Current conversation ID: ${conversationId}`);
-            
-            // Reload messages to show edited message and new response
-            if (conversationId) {
-                console.log('🔄 Reloading messages for conversation:', conversationId);
-                
-                // Import loadMessages dynamically
-                import('./chat-messages.js').then(module => {
-                    console.log('📦 chat-messages.js module loaded, calling loadMessages...');
-                    module.loadMessages(conversationId);
-                    // No toast - the reloaded messages are enough feedback
-                }).catch(err => {
-                    console.error('❌ Error loading chat-messages module:', err);
-                    showToast('error', 'Failed to reload messages');
-                });
-            } else {
-                console.error('❌ No currentConversationId found!');
-                
-                // Try to force a page refresh as fallback
-                console.log('🔄 Attempting page refresh as fallback...');
-                setTimeout(() => {
-                    window.location.reload();
-                }, 1000);
-            }
-        })
         .catch(error => {
             console.error('❌ Edit error:', error);
 
             // Hide typing indicator on error
             hideLoadingIndicatorInChatbox();
 
-            showToast('error', `Edit failed: ${error.message}`);
+            showToast(`Edit failed: ${error.message}`, 'error');
         })
         .finally(() => {
             // Clean up pending edit

application/single_app/static/js/chat/chat-input-actions.js

@@ -319,7 +319,6 @@ if (imageGenBtn) {
     const docBtn = document.getElementById("search-documents-btn");
     const webBtn = document.getElementById("search-web-btn");
     const fileBtn = document.getElementById("choose-file-btn");
-    const streamingBtn = document.getElementById("streaming-toggle-btn");
     const modelSelectContainer = document.getElementById("model-select-container");
 
     if (isImageGenEnabled) {
@@ -335,21 +334,13 @@ if (imageGenBtn) {
         fileBtn.disabled = true;
         fileBtn.classList.remove("active");
       }
-      // Hide streaming toggle and model selector for image generation
-      if (streamingBtn) {
-        streamingBtn.style.display = "none";
-      }
       if (modelSelectContainer) {
         modelSelectContainer.style.display = "none";
       }
     } else {
       if (docBtn) docBtn.disabled = false;
       if (webBtn) webBtn.disabled = false;
       if (fileBtn) fileBtn.disabled = false;
-      // Show streaming toggle and model selector when not in image generation mode
-      if (streamingBtn) {
-        streamingBtn.style.display = "flex";
-      }
       if (modelSelectContainer) {
         modelSelectContainer.style.display = "block";
       }