From dee77122dfc58008de71fc296db494f429ea17b8 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Mon, 24 Nov 2025 14:48:23 -0500 Subject: [PATCH 01/34] added message masking mask selected content of message or an entire message --- application/single_app/config.py | 2 +- application/single_app/route_backend_chats.py | 207 ++++++++- .../single_app/route_frontend_chats.py | 6 + application/single_app/static/css/styles.css | 106 +++++ .../static/js/chat/chat-messages.js | 412 +++++++++++++++++- application/single_app/templates/chats.html | 6 + 6 files changed, 731 insertions(+), 8 deletions(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 16156c37c..061156bb7 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.179" +VERSION = "0.233.182" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/route_backend_chats.py b/application/single_app/route_backend_chats.py index b03b27da1..5c62aa3c8 100644 --- a/application/single_app/route_backend_chats.py +++ b/application/single_app/route_backend_chats.py @@ -1282,6 +1282,19 @@ def chat_api(): for message in recent_messages: role = message.get('role') content = message.get('content') + metadata = message.get('metadata', {}) + + # Check if message is fully masked - skip it entirely + if metadata.get('masked', False): + print(f"[MASK] Skipping fully masked message {message.get('id')}") + continue + + # Check for partially masked content + masked_ranges = metadata.get('masked_ranges', []) + if masked_ranges and content: + # Remove masked portions from content + content = remove_masked_content(content, masked_ranges) + print(f"[MASK] Applied {len(masked_ranges)} masked ranges to message {message.get('id')}") if role in allowed_roles_in_history: conversation_history_for_api.append({"role": role, "content": content}) @@ -2055,4 +2068,196 @@ def gpt_error(e): return jsonify({ 'error': f'Internal server error: {str(e)}', 'details': error_traceback if app.debug else None - }), 500 \ No newline at end of file + }), 500 + + @app.route('/api/message//mask', methods=['POST']) + @swagger_route( + security=get_auth_security() + ) + @login_required + @user_required + def mask_message_api(message_id): + """ + API endpoint to mask/unmask messages or parts of messages. + This prevents masked content from being sent to the AI model in conversation history. + """ + try: + settings = get_settings() + data = request.get_json() + user_id = get_current_user_id() + + if not user_id: + return jsonify({'error': 'User not authenticated'}), 401 + + # Get action: "mask_all", "mask_selection", or "unmask_all" + action = data.get('action') + selection = data.get('selection', {}) + user_display_name = data.get('display_name', 'Unknown User') + + # Validate action + if action not in ['mask_all', 'mask_selection', 'unmask_all']: + return jsonify({'error': 'Invalid action'}), 400 + + # Fetch the message + try: + # Query for the message (need conversation_id for partition key) + query = "SELECT * FROM c WHERE c.id = @message_id" + params = [{"name": "@message_id", "value": message_id}] + + # We need to find the message across all partitions first + # This is inefficient but necessary without knowing the conversation_id + message_results = list(cosmos_messages_container.query_items( + query=query, + parameters=params, + enable_cross_partition_query=True + )) + + if not message_results: + return jsonify({'error': 'Message not found'}), 404 + + message_doc = message_results[0] + conversation_id = message_doc.get('conversation_id') + + except Exception as e: + print(f"Error fetching message {message_id}: {str(e)}") + return jsonify({'error': f'Error fetching message: {str(e)}'}), 500 + + # Initialize metadata if it doesn't exist + if 'metadata' not in message_doc: + message_doc['metadata'] = {} + + # Process based on action + if action == 'mask_all': + # Mask the entire message + message_doc['metadata']['masked'] = True + message_doc['metadata']['masked_by_user_id'] = user_id + message_doc['metadata']['masked_timestamp'] = datetime.now(timezone.utc).isoformat() + message_doc['metadata']['masked_by_display_name'] = user_display_name + + elif action == 'unmask_all': + # Unmask the entire message and clear all masked ranges + message_doc['metadata']['masked'] = False + message_doc['metadata']['masked_ranges'] = [] + message_doc['metadata']['masked_by_user_id'] = None + message_doc['metadata']['masked_timestamp'] = None + message_doc['metadata']['masked_by_display_name'] = None + + elif action == 'mask_selection': + # Mask a selection of text + start = selection.get('start') + end = selection.get('end') + text = selection.get('text', '') + + if start is None or end is None: + return jsonify({'error': 'Selection start and end required'}), 400 + + # Initialize masked_ranges if it doesn't exist + if 'masked_ranges' not in message_doc['metadata']: + message_doc['metadata']['masked_ranges'] = [] + + # Create new masked range + new_range = { + 'id': str(uuid.uuid4()), + 'user_id': user_id, + 'display_name': user_display_name, + 'start': start, + 'end': end, + 'text': text, + 'timestamp': datetime.now(timezone.utc).isoformat() + } + + # Add the new range + message_doc['metadata']['masked_ranges'].append(new_range) + + # Sort and merge overlapping/adjacent ranges + message_doc['metadata']['masked_ranges'] = merge_masked_ranges( + message_doc['metadata']['masked_ranges'] + ) + + # Update the message in Cosmos DB + try: + cosmos_messages_container.upsert_item(message_doc) + except Exception as e: + print(f"Error updating message {message_id}: {str(e)}") + return jsonify({'error': f'Error updating message: {str(e)}'}), 500 + + return jsonify({ + 'success': True, + 'message_id': message_id, + 'masked': message_doc['metadata'].get('masked', False), + 'masked_ranges': message_doc['metadata'].get('masked_ranges', []) + }), 200 + + except Exception as e: + import traceback + error_traceback = traceback.format_exc() + print(f"[MASK API ERROR] Unhandled exception: {str(e)}") + print(f"[MASK API ERROR] Full traceback:\n{error_traceback}") + return jsonify({ + 'error': f'Internal server error: {str(e)}', + 'details': error_traceback if app.debug else None + }), 500 + + +def merge_masked_ranges(ranges): + """ + Merge overlapping and adjacent masked ranges. + Preserves the earliest timestamp and user info for merged ranges. + """ + if not ranges: + return [] + + # Sort by start position + sorted_ranges = sorted(ranges, key=lambda x: x['start']) + merged = [sorted_ranges[0]] + + for current in sorted_ranges[1:]: + last_merged = merged[-1] + + # Check if current range overlaps or is adjacent to the last merged range + if current['start'] <= last_merged['end']: + # Merge: extend the end if current goes further + if current['end'] > last_merged['end']: + last_merged['end'] = current['end'] + # Update text to cover merged range + last_merged['text'] = last_merged['text'] + current['text'][last_merged['end'] - current['start']:] + # Keep the earliest timestamp + if current['timestamp'] < last_merged['timestamp']: + last_merged['timestamp'] = current['timestamp'] + else: + # No overlap, add as separate range + merged.append(current) + + return merged + + +def remove_masked_content(content, masked_ranges): + """ + Remove masked portions from message content. + Works backwards through sorted ranges to maintain correct offsets. + """ + if not masked_ranges or not content: + return content + + # Sort ranges by start position (descending) to work backwards + sorted_ranges = sorted(masked_ranges, key=lambda x: x['start'], reverse=True) + + # Create a list from content for easier manipulation + result = content + + # Remove masked ranges working backwards to maintain offsets + for range_item in sorted_ranges: + start = range_item['start'] + end = range_item['end'] + + # Ensure indices are within bounds + if start < 0: + start = 0 + if end > len(result): + end = len(result) + + # Remove the masked portion + if start < end: + result = result[:start] + result[end:] + + return result \ No newline at end of file diff --git a/application/single_app/route_frontend_chats.py b/application/single_app/route_frontend_chats.py index 749577b40..f13770867 100644 --- a/application/single_app/route_frontend_chats.py +++ b/application/single_app/route_frontend_chats.py @@ -35,6 +35,10 @@ def chats(): if not user_id: return redirect(url_for('login')) + + # Get user display name from user settings + user_display_name = user_settings.get('display_name', '') + return render_template( 'chats.html', settings=public_settings, @@ -45,6 +49,8 @@ def chats(): enable_document_classification=enable_document_classification, document_classification_categories=categories_list, enable_extract_meta_data=enable_extract_meta_data, + user_id=user_id, + user_display_name=user_display_name, ) @app.route('/upload', methods=['POST']) diff --git a/application/single_app/static/css/styles.css b/application/single_app/static/css/styles.css index 1ea286fa5..eb881066a 100644 --- a/application/single_app/static/css/styles.css +++ b/application/single_app/static/css/styles.css @@ -696,3 +696,109 @@ main { font-size: 0.875rem !important; } } + +/* ============= Message Masking Styles ============= */ + +/* Masked content spans */ +.masked-content { + text-decoration: line-through; + opacity: 0.5; + background-color: rgba(255, 193, 7, 0.15); + padding: 0 2px; + border-radius: 2px; + cursor: help; + transition: opacity 0.2s ease, background-color 0.2s ease; +} + +.masked-content:hover { + opacity: 0.7; + background-color: rgba(255, 193, 7, 0.25); +} + +/* Fully masked message styling */ +.fully-masked .message-bubble { + border: 2px dashed rgba(255, 193, 7, 0.5); + opacity: 0.7; + background-color: rgba(255, 193, 7, 0.05); +} + +/* Message exclusion badge in footer */ +.message-exclusion-badge { + display: flex; + align-items: center; + gap: 0.25rem; + font-size: 0.875rem; + padding: 0.25rem 0.5rem; + border-radius: 0.25rem; + background-color: rgba(255, 193, 7, 0.15); + color: #5c4503 !important; + position: absolute; + left: 50%; + transform: translateX(-50%); +} + +.message-exclusion-badge i { + font-size: 1rem; + color: #5c4503 !important; +} + +/* Ensure message footer supports absolute positioning */ +.message-footer { + position: relative; +} + +/* Mask button styling */ +.mask-btn { + border: none; + background: transparent; + color: #6c757d; + font-size: 0.875rem; + padding: 4px 8px; + border-radius: 4px; + cursor: pointer; + transition: color 0.2s ease, background-color 0.2s ease; +} + +.mask-btn:hover { + color: #ffc107; + background-color: rgba(255, 193, 7, 0.1); +} + +/* Make mask button icons same size as other action buttons */ +.mask-btn i { + font-size: 1rem; + width: 16px; + height: 24px; + display: inline-flex; + align-items: center; + justify-content: center; +} + +/* Dark mode styles for masked content */ +[data-bs-theme="dark"] .masked-content { + background-color: rgba(255, 193, 7, 0.2); +} + +[data-bs-theme="dark"] .masked-content:hover { + opacity: 0.8; + background-color: rgba(255, 193, 7, 0.3); +} + +[data-bs-theme="dark"] .fully-masked .message-bubble { + border-color: rgba(255, 193, 7, 0.6); + background-color: rgba(255, 193, 7, 0.08); +} + +[data-bs-theme="dark"] .message-exclusion-badge { + background-color: rgba(255, 193, 7, 0.15); + color: #ffc107; +} + +[data-bs-theme="dark"] .mask-btn { + color: #adb5bd; +} + +[data-bs-theme="dark"] .mask-btn:hover { + color: #ffc107; + background-color: rgba(255, 193, 7, 0.15); +} diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index 02b0640bc..a9918d94d 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -459,7 +459,7 @@ export function loadMessages(conversationId) { console.log(`[loadMessages Loop] -------- START Message ID: ${msg.id} --------`); console.log(`[loadMessages Loop] Role: ${msg.role}`); if (msg.role === "user") { - appendMessage("You", msg.content, null, msg.id); + appendMessage("You", msg.content, null, msg.id, false, [], [], [], null, null, msg); } else if (msg.role === "assistant") { console.log(` [loadMessages Loop] Full Assistant msg object:`, JSON.stringify(msg)); // Stringify to see exact keys console.log(` [loadMessages Loop] Checking keys: msg.id=${msg.id}, msg.augmented=${msg.augmented}, msg.hybrid_citations exists=${'hybrid_citations' in msg}, msg.web_search_citations exists=${'web_search_citations' in msg}, msg.agent_citations exists=${'agent_citations' in msg}`); @@ -479,8 +479,9 @@ export function loadMessages(conversationId) { const arg9 = msg.agent_display_name; // Get agent display name const arg10 = msg.agent_name; // Get agent name console.log(` [loadMessages Loop] Calling appendMessage with -> sender: ${senderType}, id: ${arg4}, augmented: ${arg5} (type: ${typeof arg5}), hybrid_len: ${arg6?.length}, web_len: ${arg7?.length}, agent_len: ${arg8?.length}, agent_display: ${arg9}`); + console.log(` [loadMessages Loop] Message metadata:`, msg.metadata); - appendMessage(senderType, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10); + appendMessage(senderType, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, msg); console.log(`[loadMessages Loop] -------- END Message ID: ${msg.id} --------`); } else if (msg.role === "file") { appendMessage("File", msg); @@ -600,6 +601,18 @@ export function appendMessage( // --- Footer Content (Copy, Feedback, Citations) --- const feedbackHtml = renderFeedbackIcons(messageId, currentConversationId); const hiddenTextId = `copy-md-${messageId || Date.now()}`; + + // Check if message is masked + const isMasked = fullMessageObject?.metadata?.masked || (fullMessageObject?.metadata?.masked_ranges && fullMessageObject.metadata.masked_ranges.length > 0); + const maskIcon = isMasked ? 'bi-front' : 'bi-back'; + const maskTitle = isMasked ? 'Unmask all masked content' : 'Mask entire message'; + + const maskButtonHtml = ` + + `; + const copyButtonHtml = ` +
+ + +
@@ -920,6 +964,14 @@ export function appendMessage( // Add event listeners for user message buttons if (sender === "You") { attachUserMessageEventListeners(messageDiv, messageId, messageContent); + + // Apply masked state if message has masking + if (fullMessageObject?.metadata) { + console.log('Applying masked state for user message:', messageId, fullMessageObject.metadata); + applyMaskedState(messageDiv, fullMessageObject.metadata); + } else { + console.log('No metadata found for user message:', messageId, 'fullMessageObject:', fullMessageObject); + } } // Add event listener for image info button (uploaded images) @@ -1480,6 +1532,7 @@ function updateUserMessageId(tempId, realId) { function attachUserMessageEventListeners(messageDiv, messageId, messageContent) { const copyBtn = messageDiv.querySelector(".copy-user-btn"); const metadataToggleBtn = messageDiv.querySelector(".metadata-toggle-btn"); + const maskBtn = messageDiv.querySelector(".mask-btn"); if (copyBtn) { copyBtn.addEventListener("click", () => { @@ -1504,6 +1557,18 @@ function attachUserMessageEventListeners(messageDiv, messageId, messageContent) toggleUserMessageMetadata(messageDiv, messageId); }); } + + if (maskBtn) { + // Update tooltip dynamically on hover + maskBtn.addEventListener("mouseenter", () => { + updateMaskButtonTooltip(maskBtn, messageDiv); + }); + + // Handle mask button click + maskBtn.addEventListener("click", () => { + handleMaskButtonClick(messageDiv, messageId, messageContent); + }); + } } // Function to toggle user message metadata drawer @@ -2220,6 +2285,341 @@ export function scrollToMessageSmooth(messageId) { }, 2000); } +// ============= Message Masking Functions ============= + +/** + * Apply masked state to a message when loading from database + */ +function applyMaskedState(messageDiv, metadata) { + if (!metadata) return; + + const messageText = messageDiv.querySelector('.message-text'); + const messageFooter = messageDiv.querySelector('.message-footer'); + + if (!messageText) return; + + // Check if entire message is masked + if (metadata.masked) { + messageDiv.classList.add('fully-masked'); + + // Add exclusion badge to footer if not already present + if (messageFooter && !messageFooter.querySelector('.message-exclusion-badge')) { + const badge = document.createElement('div'); + badge.className = 'message-exclusion-badge text-warning small'; + badge.innerHTML = ' Excluded from conversation'; + messageFooter.appendChild(badge); + } + return; + } + + // Apply masked ranges if they exist + if (metadata.masked_ranges && metadata.masked_ranges.length > 0) { + const content = messageText.textContent; + let htmlContent = ''; + let lastIndex = 0; + + // Sort masked ranges by start position + const sortedRanges = [...metadata.masked_ranges].sort((a, b) => a.start - b.start); + + // Build HTML with masked spans + sortedRanges.forEach(range => { + // Add text before masked range + if (range.start > lastIndex) { + htmlContent += escapeHtml(content.substring(lastIndex, range.start)); + } + + // Add masked span + const maskedText = escapeHtml(content.substring(range.start, range.end)); + const timestamp = new Date(range.timestamp).toLocaleDateString(); + htmlContent += `${maskedText}`; + + lastIndex = range.end; + }); + + // Add remaining text after last masked range + if (lastIndex < content.length) { + htmlContent += escapeHtml(content.substring(lastIndex)); + } + + // Update message text with masked content + messageText.innerHTML = htmlContent; + } +} + +/** + * Update mask button tooltip based on current selection and mask state + */ +function updateMaskButtonTooltip(maskBtn, messageDiv) { + const messageBubble = messageDiv.querySelector('.message-bubble'); + if (!messageBubble) return; + + // Check if there's a text selection within this message + const selection = window.getSelection(); + const hasSelection = selection && selection.toString().trim().length > 0; + + // Verify selection is within this message bubble + let selectionInMessage = false; + if (hasSelection && selection.anchorNode) { + selectionInMessage = messageBubble.contains(selection.anchorNode); + } + + // Check current mask state + const isMasked = messageDiv.querySelector('.masked-content') || messageDiv.classList.contains('fully-masked'); + + // Update tooltip based on state + if (isMasked) { + maskBtn.title = 'Unmask all masked content'; + } else if (selectionInMessage) { + maskBtn.title = 'Mask selected content'; + } else { + maskBtn.title = 'Mask entire message'; + } +} + +/** + * Handle mask button click - masks entire message or selected content + */ +function handleMaskButtonClick(messageDiv, messageId, messageContent) { + const messageBubble = messageDiv.querySelector('.message-bubble'); + const messageText = messageDiv.querySelector('.message-text'); + const maskBtn = messageDiv.querySelector('.mask-btn'); + + if (!messageBubble || !messageText || !maskBtn) { + console.error('Required elements not found for masking'); + return; + } + + // Check if message is currently masked + const isMasked = messageDiv.querySelector('.masked-content') || messageDiv.classList.contains('fully-masked'); + + if (isMasked) { + // Unmask all + unmaskMessage(messageDiv, messageId, maskBtn); + return; + } + + // Check for text selection within message + const selection = window.getSelection(); + const hasSelection = selection && selection.toString().trim().length > 0; + + let selectionInMessage = false; + if (hasSelection && selection.anchorNode) { + selectionInMessage = messageBubble.contains(selection.anchorNode); + } + + if (selectionInMessage) { + // Mask selection + maskSelection(messageDiv, messageId, selection, messageText, maskBtn); + } else { + // Mask entire message + maskEntireMessage(messageDiv, messageId, maskBtn); + } +} + +/** + * Mask the entire message + */ +function maskEntireMessage(messageDiv, messageId, maskBtn) { + console.log(`Masking entire message: ${messageId}`); + + // Get user info + const userDisplayName = window.currentUser?.display_name || 'Unknown User'; + const userId = window.currentUser?.id || 'unknown'; + + console.log('Mask entire message - User info:', { userId, userDisplayName, windowCurrentUser: window.currentUser }); + + const payload = { + action: 'mask_all', + user_id: userId, + display_name: userDisplayName + }; + + console.log('Mask entire message - Sending payload:', payload); + + // Call API to mask message + fetch(`/api/message/${messageId}/mask`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(payload) + }) + .then(response => { + console.log('Mask entire message - Response status:', response.status); + if (!response.ok) { + return response.json().then(err => { + console.error('Mask entire message - Error response:', err); + throw new Error(err.error || 'Failed to mask message'); + }); + } + return response.json(); + }) + .then(data => { + console.log('Mask entire message - Success response:', data); + if (data.success) { + // Add fully-masked class and exclusion badge + messageDiv.classList.add('fully-masked'); + + // Update mask button + const icon = maskBtn.querySelector('i'); + icon.className = 'bi bi-front'; + maskBtn.title = 'Unmask all masked content'; + + // Add exclusion badge to footer if not already present + const messageFooter = messageDiv.querySelector('.message-footer'); + if (messageFooter && !messageFooter.querySelector('.message-exclusion-badge')) { + const badge = document.createElement('div'); + badge.className = 'message-exclusion-badge text-warning small'; + badge.innerHTML = ' Excluded from conversation'; + messageFooter.appendChild(badge); + } + + showToast('Message masked successfully', 'success'); + } else { + showToast('Failed to mask message', 'error'); + } + }) + .catch(error => { + console.error('Error masking message:', error); + showToast('Error masking message', 'error'); + }); +} + +/** + * Mask selected text content + */ +function maskSelection(messageDiv, messageId, selection, messageText, maskBtn) { + const selectedText = selection.toString().trim(); + console.log(`Masking selection in message: ${messageId}`); + + // Get the range and calculate character offsets + const range = selection.getRangeAt(0); + const preSelectionRange = range.cloneRange(); + preSelectionRange.selectNodeContents(messageText); + preSelectionRange.setEnd(range.startContainer, range.startOffset); + const start = preSelectionRange.toString().length; + const end = start + selectedText.length; + + // Get user info + const userDisplayName = window.currentUser?.display_name || 'Unknown User'; + const userId = window.currentUser?.id || 'unknown'; + + console.log('Mask selection - User info:', { userId, userDisplayName, windowCurrentUser: window.currentUser }); + console.log('Mask selection - Range:', { start, end, selectedText }); + + const payload = { + action: 'mask_selection', + selection: { + start: start, + end: end, + text: selectedText + }, + user_id: userId, + display_name: userDisplayName + }; + + console.log('Mask selection - Sending payload:', payload); + + // Call API to mask selection + fetch(`/api/message/${messageId}/mask`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(payload) + }) + .then(response => { + console.log('Mask selection - Response status:', response.status); + if (!response.ok) { + return response.json().then(err => { + console.error('Mask selection - Error response:', err); + throw new Error(err.error || 'Failed to mask selection'); + }); + } + return response.json(); + }) + .then(data => { + console.log('Mask selection - Success response:', data); + if (data.success) { + // Wrap selected text with masked span + const maskId = data.masked_ranges[data.masked_ranges.length - 1].id; + const span = document.createElement('span'); + span.className = 'masked-content'; + span.setAttribute('data-mask-id', maskId); + span.setAttribute('data-user-id', userId); + span.setAttribute('data-display-name', userDisplayName); + span.title = `Masked by ${userDisplayName}`; + + range.surroundContents(span); + selection.removeAllRanges(); + + // Update mask button + const icon = maskBtn.querySelector('i'); + icon.className = 'bi bi-front'; + maskBtn.title = 'Unmask all masked content'; + + showToast('Selection masked successfully', 'success'); + } else { + showToast('Failed to mask selection', 'error'); + } + }) + .catch(error => { + console.error('Error masking selection:', error); + showToast('Error masking selection', 'error'); + }); +} + +/** + * Unmask all masked content in a message + */ +function unmaskMessage(messageDiv, messageId, maskBtn) { + console.log(`Unmasking message: ${messageId}`); + + // Call API to unmask + fetch(`/api/message/${messageId}/mask`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify({ + action: 'unmask_all' + }) + }) + .then(response => response.json()) + .then(data => { + if (data.success) { + // Remove fully-masked class + messageDiv.classList.remove('fully-masked'); + + // Remove all masked-content spans + const maskedSpans = messageDiv.querySelectorAll('.masked-content'); + maskedSpans.forEach(span => { + const text = document.createTextNode(span.textContent); + span.parentNode.replaceChild(text, span); + }); + + // Remove exclusion badge + const badge = messageDiv.querySelector('.message-exclusion-badge'); + if (badge) { + badge.remove(); + } + + // Update mask button + const icon = maskBtn.querySelector('i'); + icon.className = 'bi bi-back'; + maskBtn.title = 'Mask entire message'; + + showToast('Message unmasked successfully', 'success'); + } else { + showToast('Failed to unmask message', 'error'); + } + }) + .catch(error => { + console.error('Error unmasking message:', error); + showToast('Error unmasking message', 'error'); + }); +} + // Expose functions globally window.chatMessages = { applySearchHighlight, diff --git a/application/single_app/templates/chats.html b/application/single_app/templates/chats.html index 3ecc61e89..2929304f4 100644 --- a/application/single_app/templates/chats.html +++ b/application/single_app/templates/chats.html @@ -635,6 +635,12 @@
Recent Searches
window.classification_categories = []; } + // Current user information for message masking + window.currentUser = { + id: "{{ user_id }}", + display_name: "{{ user_display_name }}" + }; + // Layout related globals (can stay here or move entirely into chat-layout.js if preferred) let splitInstance = null; let currentLayout = 'split'; // Default layout From d6010282cc0ff5af12440b2616988ea15b3aea66 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Tue, 25 Nov 2025 11:30:13 -0500 Subject: [PATCH 02/34] fixed citation border --- application/single_app/static/js/chat/chat-messages.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index a9918d94d..cf997a238 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -681,7 +681,9 @@ export function appendMessage( console.log(">>> Will generate and include citation elements."); const citationsContainerId = `citations-${messageId || Date.now()}`; citationToggleHtml = `
`; - citationContentContainerHtml = ``; + // citationsButtonsHtml already contains a
wrapper + // Just add ID and display style by wrapping minimally + citationContentContainerHtml = ``; } else { console.log(">>> Will NOT generate citation elements."); } From bead92addbfa54be5b235d4ef51ddbe928a84b57 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Tue, 2 Dec 2025 16:41:36 -0500 Subject: [PATCH 03/34] enabled streaming --- application/single_app/config.py | 2 +- application/single_app/functions_settings.py | 3 + application/single_app/route_backend_chats.py | 486 ++++++++++++++++++ application/single_app/route_backend_users.py | 2 +- application/single_app/static/css/chats.css | 14 + .../static/js/chat/chat-input-actions.js | 16 + .../single_app/static/js/chat/chat-layout.js | 5 +- .../static/js/chat/chat-messages.js | 55 +- .../single_app/static/js/chat/chat-onload.js | 4 + .../static/js/chat/chat-streaming.js | 312 +++++++++++ application/single_app/templates/chats.html | 12 + 11 files changed, 892 insertions(+), 19 deletions(-) create mode 100644 application/single_app/static/js/chat/chat-streaming.js diff --git a/application/single_app/config.py b/application/single_app/config.py index 061156bb7..a95eaf1e3 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.182" +VERSION = "0.233.186" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/functions_settings.py b/application/single_app/functions_settings.py index 576d6bb92..47635b521 100644 --- a/application/single_app/functions_settings.py +++ b/application/single_app/functions_settings.py @@ -225,6 +225,9 @@ def get_settings(use_cosmos=False): 'file_timer_unit': 'hours', 'file_processing_logs_turnoff_time': None, 'enable_external_healthcheck': False, + + # Streaming settings + 'streamingEnabled': False, # Video file settings with Azure Video Indexer Settings 'video_indexer_endpoint': video_indexer_endpoint, diff --git a/application/single_app/route_backend_chats.py b/application/single_app/route_backend_chats.py index 5c62aa3c8..080335521 100644 --- a/application/single_app/route_backend_chats.py +++ b/application/single_app/route_backend_chats.py @@ -2070,6 +2070,492 @@ def gpt_error(e): 'details': error_traceback if app.debug else None }), 500 + @app.route('/api/chat/stream', methods=['POST']) + @swagger_route(security=get_auth_security()) + @login_required + @user_required + def chat_stream_api(): + """ + Streaming version of chat endpoint using Server-Sent Events (SSE). + Streams tokens as they are generated from Azure OpenAI. + """ + from flask import Response, stream_with_context + import json + + # IMPORTANT: Parse JSON and get user_id BEFORE entering the generator + # because request context may not be available inside the generator + try: + data = request.get_json() + user_id = get_current_user_id() + settings = get_settings() + except Exception as e: + return jsonify({'error': f'Failed to parse request: {str(e)}'}), 400 + + def generate(): + try: + + if not user_id: + yield f"data: {json.dumps({'error': 'User not authenticated'})}\n\n" + return + + # Extract request parameters (same as non-streaming endpoint) + user_message = data.get('message', '') + conversation_id = data.get('conversation_id') + hybrid_search_enabled = data.get('hybrid_search') + selected_document_id = data.get('selected_document_id') + image_gen_enabled = data.get('image_generation') + document_scope = data.get('doc_scope') + active_group_id = data.get('active_group_id') + frontend_gpt_model = data.get('model_deployment') + classifications_to_send = data.get('classifications') + chat_type = data.get('chat_type', 'user') + + # Streaming does not support image generation + if image_gen_enabled: + yield f"data: {json.dumps({'error': 'Image generation is not supported in streaming mode'})}\n\n" + return + + # Initialize Flask context + g.conversation_id = conversation_id + + # Clear plugin invocations + from semantic_kernel_plugins.plugin_invocation_logger import get_plugin_logger + plugin_logger = get_plugin_logger() + plugin_logger.clear_invocations_for_conversation(user_id, conversation_id) + + # Validate chat_type + if chat_type not in ('user', 'group'): + chat_type = 'user' + + # Initialize variables + search_query = user_message + hybrid_citations_list = [] + agent_citations_list = [] + system_messages_for_augmentation = [] + search_results = [] + selected_agent = None + + # Configuration + raw_conversation_history_limit = settings.get('conversation_history_limit', 6) + conversation_history_limit = math.ceil(raw_conversation_history_limit) + if conversation_history_limit % 2 != 0: + conversation_history_limit += 1 + + # Convert toggles + if isinstance(hybrid_search_enabled, str): + hybrid_search_enabled = hybrid_search_enabled.lower() == 'true' + + # Initialize GPT client (simplified version) + gpt_model = "" + gpt_client = None + enable_gpt_apim = settings.get('enable_gpt_apim', False) + + try: + if enable_gpt_apim: + raw = settings.get('azure_apim_gpt_deployment', '') + if not raw: + yield f"data: {json.dumps({'error': 'APIM deployment not configured'})}\n\n" + return + + apim_models = [m.strip() for m in raw.split(',') if m.strip()] + if not apim_models: + yield f"data: {json.dumps({'error': 'No valid APIM models configured'})}\n\n" + return + + if frontend_gpt_model and frontend_gpt_model in apim_models: + gpt_model = frontend_gpt_model + else: + gpt_model = apim_models[0] + + gpt_client = AzureOpenAI( + api_version=settings.get('azure_apim_gpt_api_version'), + azure_endpoint=settings.get('azure_apim_gpt_endpoint'), + api_key=settings.get('azure_apim_gpt_subscription_key') + ) + else: + auth_type = settings.get('azure_openai_gpt_authentication_type') + endpoint = settings.get('azure_openai_gpt_endpoint') + api_version = settings.get('azure_openai_gpt_api_version') + gpt_model_obj = settings.get('gpt_model', {}) + + if gpt_model_obj and gpt_model_obj.get('selected'): + gpt_model = gpt_model_obj['selected'][0]['deploymentName'] + else: + gpt_model = settings.get('azure_openai_gpt_deployment', 'gpt-4o') + + if frontend_gpt_model: + gpt_model = frontend_gpt_model + + if auth_type == 'managed_identity': + credential = DefaultAzureCredential() + token_provider = get_bearer_token_provider( + credential, + "https://cognitiveservices.azure.com/.default" + ) + gpt_client = AzureOpenAI( + api_version=api_version, + azure_endpoint=endpoint, + azure_ad_token_provider=token_provider + ) + else: + gpt_client = AzureOpenAI( + api_version=api_version, + azure_endpoint=endpoint, + api_key=settings.get('azure_openai_gpt_key') + ) + + if not gpt_client or not gpt_model: + yield f"data: {json.dumps({'error': 'Failed to initialize AI model'})}\n\n" + return + + except Exception as e: + yield f"data: {json.dumps({'error': f'Model initialization failed: {str(e)}'})}\n\n" + return + + # Load or create conversation (simplified) + if not conversation_id: + conversation_id = str(uuid.uuid4()) + conversation_item = { + 'id': conversation_id, + 'user_id': user_id, + 'last_updated': datetime.utcnow().isoformat(), + 'title': 'New Conversation', + 'context': [], + 'tags': [], + 'strict': False + } + cosmos_conversations_container.upsert_item(conversation_item) + else: + try: + conversation_item = cosmos_conversations_container.read_item( + item=conversation_id, partition_key=conversation_id + ) + except CosmosResourceNotFoundError: + conversation_item = { + 'id': conversation_id, + 'user_id': user_id, + 'last_updated': datetime.utcnow().isoformat(), + 'title': 'New Conversation', + 'context': [], + 'tags': [], + 'strict': False + } + cosmos_conversations_container.upsert_item(conversation_item) + + # Determine chat type + actual_chat_type = 'personal' + if conversation_item.get('chat_type'): + actual_chat_type = conversation_item['chat_type'] + + # Save user message + user_message_id = f"{conversation_id}_user_{int(time.time())}_{random.randint(1000,9999)}" + + user_metadata = {} + current_user = get_current_user_info() + if current_user: + user_metadata['user_info'] = { + 'user_id': current_user.get('userId'), + 'username': current_user.get('userPrincipalName'), + 'display_name': current_user.get('displayName'), + 'email': current_user.get('email'), + 'timestamp': datetime.utcnow().isoformat() + } + + user_metadata['button_states'] = { + 'image_generation': False, + 'document_search': hybrid_search_enabled + } + + user_metadata['model_selection'] = { + 'selected_model': gpt_model, + 'frontend_requested_model': frontend_gpt_model + } + + user_metadata['chat_context'] = { + 'conversation_id': conversation_id + } + + user_message_doc = { + 'id': user_message_id, + 'conversation_id': conversation_id, + 'role': 'user', + 'content': user_message, + 'timestamp': datetime.utcnow().isoformat(), + 'model_deployment_name': None, + 'metadata': user_metadata, + } + + cosmos_messages_container.upsert_item(user_message_doc) + + # Log activity + try: + log_chat_activity( + user_id=user_id, + conversation_id=conversation_id, + message_type='user_message', + message_length=len(user_message) if user_message else 0, + has_document_search=hybrid_search_enabled, + has_image_generation=False, + document_scope=document_scope, + chat_context=actual_chat_type + ) + except Exception as e: + print(f"Activity logging error: {e}") + + # Update conversation title + if conversation_item.get('title', 'New Conversation') == 'New Conversation' and user_message: + new_title = (user_message[:30] + '...') if len(user_message) > 30 else user_message + conversation_item['title'] = new_title + + conversation_item['last_updated'] = datetime.utcnow().isoformat() + cosmos_conversations_container.upsert_item(conversation_item) + + # Hybrid search (if enabled) + combined_documents = [] + if hybrid_search_enabled: + try: + search_args = { + "query": search_query, + "user_id": user_id, + "top_n": 12, + "doc_scope": document_scope, + } + + if active_group_id and (document_scope == 'group' or document_scope == 'all' or chat_type == 'group'): + search_args['active_group_id'] = active_group_id + + if selected_document_id: + search_args['selected_document_id'] = selected_document_id + + search_results = hybrid_search(**search_args) + except Exception as e: + print(f"Error during hybrid search: {e}") + + if search_results: + retrieved_texts = [] + + for doc in search_results: + text = f"Source: {doc.get('source_file', 'unknown')}\n" + if doc.get('page_number'): + text += f"Page: {doc.get('page_number')}\n" + text += f"Content: {doc.get('content', '')}" + retrieved_texts.append(text) + + citation = { + 'source': doc.get('source_file', 'unknown'), + 'page_number': doc.get('page_number'), + 'chunk_id': doc.get('chunk_id'), + 'score': doc.get('@search.score'), + 'content_preview': doc.get('content', '')[:200] + } + hybrid_citations_list.append(citation) + combined_documents.append(doc) + + retrieved_content = "\n\n".join(retrieved_texts) + system_prompt_search = f"""You are an AI assistant. Use the following retrieved document excerpts to answer the user's question. Cite sources using the format (Source: filename, Page: page number). + +Retrieved Excerpts: +{retrieved_content} + +Based *only* on the information provided above, answer the user's query. If the answer isn't in the excerpts, say so.""" + + system_messages_for_augmentation.append({ + 'role': 'system', + 'content': system_prompt_search + }) + + hybrid_citations_list.sort(key=lambda x: x.get('page_number', 0), reverse=True) + + # Update message chat type + message_chat_type = None + if hybrid_search_enabled and search_results and len(search_results) > 0: + if document_scope == 'group': + message_chat_type = 'group' + elif document_scope == 'public': + message_chat_type = 'public' + else: + message_chat_type = 'personal' + else: + message_chat_type = 'Model' + + user_metadata['chat_context']['chat_type'] = message_chat_type + user_message_doc['metadata'] = user_metadata + cosmos_messages_container.upsert_item(user_message_doc) + + # Prepare conversation history + conversation_history_for_api = [] + + try: + all_messages_query = "SELECT * FROM c WHERE c.conversation_id = @conv_id ORDER BY c.timestamp ASC" + params_all = [{"name": "@conv_id", "value": conversation_id}] + all_messages = list(cosmos_messages_container.query_items( + query=all_messages_query, parameters=params_all, + partition_key=conversation_id, enable_cross_partition_query=True + )) + + total_messages = len(all_messages) + num_recent_messages = min(total_messages, conversation_history_limit) + recent_messages = all_messages[-num_recent_messages:] + + # Add augmentation messages + for aug_msg in system_messages_for_augmentation: + conversation_history_for_api.append({ + 'role': aug_msg['role'], + 'content': aug_msg['content'] + }) + + # Add recent messages + allowed_roles_in_history = ['user', 'assistant'] + for message in recent_messages: + if message.get('role') in allowed_roles_in_history: + conversation_history_for_api.append({ + 'role': message['role'], + 'content': message.get('content', '') + }) + + except Exception as e: + yield f"data: {json.dumps({'error': f'History error: {str(e)}'})}\n\n" + return + + # Add system prompt + default_system_prompt = settings.get('default_system_prompt', '').strip() + if default_system_prompt: + has_general_system_prompt = any( + msg.get('role') == 'system' and not ( + "retrieved document excerpts" in msg.get('content', '') + ) + for msg in conversation_history_for_api + ) + if not has_general_system_prompt: + conversation_history_for_api.insert(0, { + 'role': 'system', + 'content': default_system_prompt + }) + + # Stream the response + accumulated_content = "" + assistant_message_id = f"{conversation_id}_assistant_{int(time.time())}_{random.randint(1000,9999)}" + + try: + print(f"--- Streaming from GPT ({gpt_model}) ---") + stream = gpt_client.chat.completions.create( + model=gpt_model, + messages=conversation_history_for_api, + stream=True + ) + + for chunk in stream: + if chunk.choices and len(chunk.choices) > 0: + delta = chunk.choices[0].delta + if delta.content: + accumulated_content += delta.content + yield f"data: {json.dumps({'content': delta.content})}\n\n" + + # Stream complete - save message and send final metadata + assistant_doc = { + 'id': assistant_message_id, + 'conversation_id': conversation_id, + 'role': 'assistant', + 'content': accumulated_content, + 'timestamp': datetime.utcnow().isoformat(), + 'augmented': bool(system_messages_for_augmentation), + 'hybrid_citations': hybrid_citations_list, + 'hybridsearch_query': search_query if hybrid_search_enabled and search_results else None, + 'agent_citations': agent_citations_list, + 'user_message': user_message, + 'model_deployment_name': gpt_model, + 'agent_display_name': None, + 'agent_name': None, + 'metadata': {} + } + cosmos_messages_container.upsert_item(assistant_doc) + + # Update conversation + conversation_item['last_updated'] = datetime.utcnow().isoformat() + + try: + conversation_item = collect_conversation_metadata( + user_message=user_message, + conversation_id=conversation_id, + user_id=user_id, + active_group_id=active_group_id, + document_scope=document_scope, + selected_document_id=selected_document_id, + model_deployment=gpt_model, + hybrid_search_enabled=hybrid_search_enabled, + image_gen_enabled=False, + selected_documents=combined_documents if combined_documents else None, + selected_agent=None, + selected_agent_details=None, + search_results=search_results if search_results else None, + conversation_item=conversation_item + ) + except Exception as e: + print(f"Error collecting conversation metadata: {e}") + + cosmos_conversations_container.upsert_item(conversation_item) + + # Send final message with metadata + final_data = { + 'done': True, + 'conversation_id': conversation_id, + 'conversation_title': conversation_item['title'], + 'classification': conversation_item.get('classification', []), + 'model_deployment_name': gpt_model, + 'message_id': assistant_message_id, + 'user_message_id': user_message_id, + 'augmented': bool(system_messages_for_augmentation), + 'hybrid_citations': hybrid_citations_list, + 'agent_citations': agent_citations_list, + 'full_content': accumulated_content + } + yield f"data: {json.dumps(final_data)}\n\n" + + except Exception as e: + error_msg = str(e) + print(f"Error during streaming: {error_msg}") + + # Save partial response if we have content + if accumulated_content: + assistant_doc = { + 'id': assistant_message_id, + 'conversation_id': conversation_id, + 'role': 'assistant', + 'content': accumulated_content, + 'timestamp': datetime.utcnow().isoformat(), + 'augmented': bool(system_messages_for_augmentation), + 'hybrid_citations': hybrid_citations_list, + 'hybridsearch_query': search_query if hybrid_search_enabled and search_results else None, + 'agent_citations': agent_citations_list, + 'user_message': user_message, + 'model_deployment_name': gpt_model, + 'agent_display_name': None, + 'agent_name': None, + 'metadata': {'incomplete': True, 'error': error_msg} + } + try: + cosmos_messages_container.upsert_item(assistant_doc) + except: + pass + + yield f"data: {json.dumps({'error': error_msg, 'partial_content': accumulated_content})}\n\n" + + except Exception as e: + error_traceback = traceback.format_exc() + print(f"[STREAM API ERROR] Unhandled exception: {str(e)}") + print(f"[STREAM API ERROR] Full traceback:\n{error_traceback}") + yield f"data: {json.dumps({'error': f'Internal server error: {str(e)}'})}\n\n" + + return Response( + stream_with_context(generate()), + mimetype='text/event-stream', + headers={ + 'Cache-Control': 'no-cache', + 'X-Accel-Buffering': 'no', + 'Connection': 'keep-alive' + } + ) + @app.route('/api/message//mask', methods=['POST']) @swagger_route( security=get_auth_security() diff --git a/application/single_app/route_backend_users.py b/application/single_app/route_backend_users.py index 99320f6e3..59335dba9 100644 --- a/application/single_app/route_backend_users.py +++ b/application/single_app/route_backend_users.py @@ -147,7 +147,7 @@ def user_settings(): # Basic validation could go here (e.g., check allowed keys, value types) # Example: Allowed keys - allowed_keys = {'activeGroupOid', 'layoutPreference', 'splitSizesPreference', 'dockedSidebarHidden', 'darkModeEnabled', 'preferredModelDeployment', 'agents', 'plugins', "selected_agent", 'navLayout', 'profileImage', 'enable_agents'} # Add others as needed + allowed_keys = {'activeGroupOid', 'layoutPreference', 'splitSizesPreference', 'dockedSidebarHidden', 'darkModeEnabled', 'preferredModelDeployment', 'agents', 'plugins', "selected_agent", 'navLayout', 'profileImage', 'enable_agents', 'streamingEnabled'} # Add others as needed invalid_keys = set(settings_to_update.keys()) - allowed_keys if invalid_keys: print(f"Warning: Received invalid settings keys: {invalid_keys}") diff --git a/application/single_app/static/css/chats.css b/application/single_app/static/css/chats.css index e9fb5178b..7118784c0 100644 --- a/application/single_app/static/css/chats.css +++ b/application/single_app/static/css/chats.css @@ -1492,4 +1492,18 @@ mark.search-highlight { transform: scale(1.02); box-shadow: 0 0 20px 5px rgba(13, 202, 240, 0.6); } +} + +/* Streaming cursor animation */ +.streaming-cursor .badge { + animation: streamingPulse 1.5s ease-in-out infinite; +} + +@keyframes streamingPulse { + 0%, 100% { + opacity: 1; + } + 50% { + opacity: 0.6; + } } \ No newline at end of file diff --git a/application/single_app/static/js/chat/chat-input-actions.js b/application/single_app/static/js/chat/chat-input-actions.js index ad8e80888..02d511f3a 100644 --- a/application/single_app/static/js/chat/chat-input-actions.js +++ b/application/single_app/static/js/chat/chat-input-actions.js @@ -298,6 +298,8 @@ 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) { if (docBtn) { @@ -312,10 +314,24 @@ 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"; + } } }); } diff --git a/application/single_app/static/js/chat/chat-layout.js b/application/single_app/static/js/chat/chat-layout.js index 8b07e498d..d2206c5ce 100644 --- a/application/single_app/static/js/chat/chat-layout.js +++ b/application/single_app/static/js/chat/chat-layout.js @@ -70,7 +70,10 @@ export function saveUserSetting(settingUpdate) { if (!response.ok) { throw new Error(`HTTP error! status: ${response.status}`); } - console.log('User setting saved successfully:', settingUpdate); + return response.json(); + }) + .then(result => { + console.log('User setting saved successfully:', settingUpdate, 'Response:', result); }) .catch(error => { console.error('Failed to save user setting:', error); diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index cf997a238..00d17d118 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -16,6 +16,7 @@ import { updateSidebarConversationTitle } from "./chat-sidebar-conversations.js" import { escapeHtml, isColorLight, addTargetBlankToExternalLinks } from "./chat-utils.js"; import { showToast } from "./chat-toast.js"; import { saveUserSetting } from "./chat-layout.js"; +import { isStreamingEnabled, sendMessageWithStreaming } from "./chat-streaming.js"; /** * Unwraps markdown tables that are mistakenly wrapped in code blocks. @@ -1049,7 +1050,11 @@ export function actuallySendMessage(finalMessageToSend) { userInput.style.height = ""; // Update send button visibility after clearing input updateSendButtonVisibility(); - showLoadingIndicatorInChatbox(); + + // Only show loading indicator if NOT using streaming (streaming creates its own placeholder) + if (!isStreamingEnabled()) { + showLoadingIndicatorInChatbox(); + } const modelDeployment = modelSelect?.value; @@ -1155,26 +1160,44 @@ export function actuallySendMessage(finalMessageToSend) { // Fallback: if group_id is null/empty, use window.activeGroupId const finalGroupId = group_id || window.activeGroupId || null; + + // Prepare message data object + const messageData = { + message: finalMessageToSend, + conversation_id: currentConversationId, + hybrid_search: hybridSearchEnabled, + selected_document_id: selectedDocumentId, + classifications: classificationsToSend, + image_generation: imageGenEnabled, + doc_scope: effectiveDocScope, + chat_type: chat_type, + active_group_id: finalGroupId, + model_deployment: modelDeployment, + prompt_info: promptInfo, + agent_info: agentInfo + }; + + // Check if streaming is enabled (but not for image generation) + if (isStreamingEnabled() && !imageGenEnabled) { + const streamInitiated = sendMessageWithStreaming( + messageData, + tempUserMessageId, + currentConversationId + ); + if (streamInitiated) { + return; // Streaming handles the rest + } + // If streaming failed to initiate, fall through to regular fetch + } + + // Regular non-streaming fetch fetch("/api/chat", { method: "POST", headers: { "Content-Type": "application/json", }, credentials: "same-origin", - body: JSON.stringify({ - message: finalMessageToSend, - conversation_id: currentConversationId, - hybrid_search: hybridSearchEnabled, - selected_document_id: selectedDocumentId, - classifications: classificationsToSend, - image_generation: imageGenEnabled, - doc_scope: effectiveDocScope, - chat_type: chat_type, - active_group_id: finalGroupId, // for backward compatibility - model_deployment: modelDeployment, - prompt_info: promptInfo, - agent_info: agentInfo - }), + body: JSON.stringify(messageData), }) .then((response) => { if (!response.ok) { @@ -1467,7 +1490,7 @@ if (promptSelect) { } // Helper function to update user message ID after backend response -function updateUserMessageId(tempId, realId) { +export function updateUserMessageId(tempId, realId) { console.log(`🔄 Updating message ID: ${tempId} -> ${realId}`); // Find the message with the temporary ID diff --git a/application/single_app/static/js/chat/chat-onload.js b/application/single_app/static/js/chat/chat-onload.js index e4852f7df..748516c55 100644 --- a/application/single_app/static/js/chat/chat-onload.js +++ b/application/single_app/static/js/chat/chat-onload.js @@ -8,6 +8,7 @@ import { loadUserPrompts, loadGroupPrompts, initializePromptInteractions } from import { loadUserSettings } from "./chat-layout.js"; import { showToast } from "./chat-toast.js"; import { initConversationInfoButton } from "./chat-conversation-info-button.js"; +import { initializeStreamingToggle } from "./chat-streaming.js"; window.addEventListener('DOMContentLoaded', () => { console.log("DOM Content Loaded. Starting initializations."); // Log start @@ -61,6 +62,9 @@ window.addEventListener('DOMContentLoaded', () => { }); } + // Initialize streaming toggle + initializeStreamingToggle(); + // Load documents, prompts, and user settings Promise.all([ loadAllDocs(), diff --git a/application/single_app/static/js/chat/chat-streaming.js b/application/single_app/static/js/chat/chat-streaming.js new file mode 100644 index 000000000..4a98f2811 --- /dev/null +++ b/application/single_app/static/js/chat/chat-streaming.js @@ -0,0 +1,312 @@ +// chat-streaming.js +import { appendMessage, updateUserMessageId } from './chat-messages.js'; +import { hideLoadingIndicatorInChatbox, showLoadingIndicatorInChatbox } from './chat-loading-indicator.js'; +import { loadUserSettings, saveUserSetting } from './chat-layout.js'; +import { showToast } from './chat-toast.js'; + +let streamingEnabled = false; +let currentEventSource = null; + +export function initializeStreamingToggle() { + const streamingToggleBtn = document.getElementById('streaming-toggle-btn'); + if (!streamingToggleBtn) { + console.warn('Streaming toggle button not found'); + return; + } + + console.log('Initializing streaming toggle...'); + + // Load initial state from user settings + loadUserSettings().then(settings => { + console.log('Loaded user settings:', settings); + streamingEnabled = settings.streamingEnabled === true; + console.log('Streaming enabled:', streamingEnabled); + updateStreamingButtonState(); + }).catch(error => { + console.error('Error loading streaming settings:', error); + }); + + // Handle toggle click + streamingToggleBtn.addEventListener('click', () => { + streamingEnabled = !streamingEnabled; + console.log('Streaming toggled to:', streamingEnabled); + + // Save the setting + console.log('Saving streaming setting...'); + saveUserSetting({ streamingEnabled }); + + updateStreamingButtonState(); + + const message = streamingEnabled + ? 'Streaming enabled - responses will appear in real-time' + : 'Streaming disabled - responses will appear when complete'; + showToast(message, 'info'); + }); +} + +function updateStreamingButtonState() { + const streamingToggleBtn = document.getElementById('streaming-toggle-btn'); + if (!streamingToggleBtn) return; + + if (streamingEnabled) { + streamingToggleBtn.classList.remove('btn-outline-secondary'); + streamingToggleBtn.classList.add('btn-primary'); + streamingToggleBtn.title = 'Streaming enabled - click to disable'; + } else { + streamingToggleBtn.classList.remove('btn-primary'); + streamingToggleBtn.classList.add('btn-outline-secondary'); + streamingToggleBtn.title = 'Streaming disabled - click to enable'; + } +} + +export function isStreamingEnabled() { + // Check if image generation is active - streaming is incompatible with image gen + const imageGenBtn = document.getElementById('image-generate-btn'); + if (imageGenBtn && imageGenBtn.classList.contains('active')) { + return false; // Disable streaming when image generation is active + } + return streamingEnabled; +} + +export function sendMessageWithStreaming(messageData, tempUserMessageId, currentConversationId) { + if (!streamingEnabled) { + return null; // Caller should use regular fetch + } + + // Close any existing connection + if (currentEventSource) { + currentEventSource.close(); + currentEventSource = null; + } + + // Create a unique message ID for the AI response + const tempAiMessageId = `temp_ai_${Date.now()}`; + let accumulatedContent = ''; + let streamError = false; + let streamErrorMessage = ''; + + // Create placeholder message with streaming indicator + appendMessage('AI', ' Streaming...', null, tempAiMessageId); + + // Create timeout (5 minutes) + const streamTimeout = setTimeout(() => { + if (currentEventSource) { + currentEventSource.close(); + currentEventSource = null; + streamError = true; + streamErrorMessage = 'Stream timeout (5 minutes exceeded)'; + handleStreamError(tempAiMessageId, accumulatedContent, streamErrorMessage); + } + }, 5 * 60 * 1000); // 5 minutes + + // Use fetch to POST, then read the streaming response + fetch('/api/chat/stream', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + credentials: 'same-origin', + body: JSON.stringify(messageData) + }).then(response => { + if (!response.ok) { + return response.json().then(errData => { + throw new Error(errData.error || `HTTP error! status: ${response.status}`); + }); + } + + // Read the streaming response + const reader = response.body.getReader(); + const decoder = new TextDecoder(); + + function readStream() { + reader.read().then(({ done, value }) => { + if (done) { + clearTimeout(streamTimeout); + return; + } + + const chunk = decoder.decode(value, { stream: true }); + const lines = chunk.split('\n'); + + for (const line of lines) { + if (line.startsWith('data: ')) { + try { + const jsonStr = line.substring(6); // Remove 'data: ' + const data = JSON.parse(jsonStr); + + if (data.error) { + clearTimeout(streamTimeout); + streamError = true; + streamErrorMessage = data.error; + handleStreamError(tempAiMessageId, data.partial_content || accumulatedContent, data.error); + return; + } + + if (data.content) { + // Append chunk to accumulated content + accumulatedContent += data.content; + updateStreamingMessage(tempAiMessageId, accumulatedContent); + } + + if (data.done) { + clearTimeout(streamTimeout); + + // Update with final metadata + finalizeStreamingMessage( + tempAiMessageId, + tempUserMessageId, + data + ); + + currentEventSource = null; + return; + } + } catch (e) { + console.error('Error parsing SSE data:', e); + } + } + } + + readStream(); // Continue reading + }).catch(err => { + clearTimeout(streamTimeout); + console.error('Stream reading error:', err); + handleStreamError(tempAiMessageId, accumulatedContent, err.message); + }); + } + + readStream(); + + }).catch(error => { + clearTimeout(streamTimeout); + console.error('Streaming request error:', error); + showToast(`Error: ${error.message}`, 'error'); + + // Remove placeholder message + const msgElement = document.querySelector(`[data-message-id="${tempAiMessageId}"]`); + if (msgElement) { + msgElement.remove(); + } + }); + + return true; // Indicates streaming was initiated +} + +function updateStreamingMessage(messageId, content) { + const messageElement = document.querySelector(`[data-message-id="${messageId}"]`); + if (!messageElement) return; + + const contentElement = messageElement.querySelector('.message-text'); + if (contentElement) { + // Render markdown during streaming for proper formatting + if (typeof marked !== 'undefined' && typeof DOMPurify !== 'undefined') { + const renderedContent = DOMPurify.sanitize(marked.parse(content)); + contentElement.innerHTML = renderedContent; + } else { + contentElement.textContent = content; + } + + // Add subtle streaming cursor indicator + if (!messageElement.querySelector('.streaming-cursor')) { + const cursor = document.createElement('span'); + cursor.className = 'streaming-cursor'; + cursor.innerHTML = ' Streaming'; + contentElement.appendChild(cursor); + } + } +} + +function handleStreamError(messageId, partialContent, errorMessage) { + const messageElement = document.querySelector(`[data-message-id="${messageId}"]`); + if (!messageElement) return; + + const contentElement = messageElement.querySelector('.message-text'); + if (contentElement) { + // Remove streaming cursor + const cursor = contentElement.querySelector('.streaming-cursor'); + if (cursor) cursor.remove(); + + // Show partial content with error banner + let finalContent = partialContent || 'Stream interrupted before any content was received.'; + + // Parse markdown for partial content + if (typeof marked !== 'undefined' && typeof DOMPurify !== 'undefined') { + finalContent = DOMPurify.sanitize(marked.parse(finalContent)); + } + + contentElement.innerHTML = finalContent; + + // Add error banner + const errorBanner = document.createElement('div'); + errorBanner.className = 'alert alert-warning mt-2 mb-0'; + errorBanner.innerHTML = ` + + Stream interrupted: ${errorMessage} +
+ Response may be incomplete. The partial content above has been saved. + `; + contentElement.appendChild(errorBanner); + } + + showToast(`Stream error: ${errorMessage}`, 'error'); +} + +function finalizeStreamingMessage(messageId, userMessageId, finalData) { + const messageElement = document.querySelector(`[data-message-id="${messageId}"]`); + if (!messageElement) return; + + // Remove streaming cursor + const contentElement = messageElement.querySelector('.message-text'); + if (contentElement) { + const cursor = contentElement.querySelector('.streaming-cursor'); + if (cursor) cursor.remove(); + + // Parse markdown for final content + if (typeof marked !== 'undefined' && typeof DOMPurify !== 'undefined') { + contentElement.innerHTML = DOMPurify.sanitize(marked.parse(finalData.full_content || '')); + } + } + + // Update message ID + messageElement.setAttribute('data-message-id', finalData.message_id); + + // Update user message ID + if (finalData.user_message_id && userMessageId) { + updateUserMessageId(userMessageId, finalData.user_message_id); + } + + // Add citations if present + if (finalData.hybrid_citations && finalData.hybrid_citations.length > 0) { + // Import and call citation rendering + import('./chat-citations.js').then(module => { + module.renderCitations( + messageElement, + finalData.hybrid_citations, + [], + finalData.agent_citations || [] + ); + }); + } + + // Update conversation if needed + if (finalData.conversation_id && window.currentConversationId !== finalData.conversation_id) { + window.currentConversationId = finalData.conversation_id; + } + + if (finalData.conversation_title) { + const titleElement = document.getElementById('current-conversation-title'); + if (titleElement && titleElement.textContent === 'New Conversation') { + titleElement.textContent = finalData.conversation_title; + } + } + + showToast('Response complete', 'success'); +} + +export function cancelStreaming() { + if (currentEventSource) { + currentEventSource.close(); + currentEventSource = null; + showToast('Streaming cancelled', 'info'); + } +} diff --git a/application/single_app/templates/chats.html b/application/single_app/templates/chats.html index 2929304f4..0722e9399 100644 --- a/application/single_app/templates/chats.html +++ b/application/single_app/templates/chats.html @@ -279,6 +279,18 @@
+ + + {% if settings.enable_user_workspace or settings.enable_group_workspaces %} + + +
{% endblock %} @@ -676,6 +708,7 @@
Recent Searches
+ {% if settings.enable_semantic_kernel %} From ba7e9cc09f0e962059e99022a27af3ee5ea979da Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Tue, 2 Dec 2025 20:16:58 -0500 Subject: [PATCH 06/34] added reasoning to agents --- .../single_app/functions_group_agents.py | 1 + .../single_app/functions_personal_agents.py | 1 + .../single_app/semantic_kernel_loader.py | 68 +++++++++++++++++++ .../static/js/chat/chat-reasoning.js | 18 ++++- .../single_app/templates/_agent_modal.html | 13 ++++ 5 files changed, 100 insertions(+), 1 deletion(-) diff --git a/application/single_app/functions_group_agents.py b/application/single_app/functions_group_agents.py index 92880ebce..e9cbf242f 100644 --- a/application/single_app/functions_group_agents.py +++ b/application/single_app/functions_group_agents.py @@ -88,6 +88,7 @@ def save_group_agent(group_id: str, agent_data: Dict[str, Any]) -> Dict[str, Any payload.setdefault("azure_openai_gpt_key", "") payload.setdefault("azure_openai_gpt_deployment", "") payload.setdefault("azure_openai_gpt_api_version", "") + payload.setdefault("reasoning_effort", "") payload.setdefault("azure_agent_apim_gpt_endpoint", "") payload.setdefault("azure_agent_apim_gpt_subscription_key", "") payload.setdefault("azure_agent_apim_gpt_deployment", "") diff --git a/application/single_app/functions_personal_agents.py b/application/single_app/functions_personal_agents.py index 284e2f250..aeb5e9b19 100644 --- a/application/single_app/functions_personal_agents.py +++ b/application/single_app/functions_personal_agents.py @@ -123,6 +123,7 @@ def save_personal_agent(user_id, agent_data): agent_data.setdefault('azure_agent_apim_gpt_deployment', '') agent_data.setdefault('azure_agent_apim_gpt_api_version', '') agent_data.setdefault('enable_agent_gpt_apim', False) + agent_data.setdefault('reasoning_effort', '') agent_data.setdefault('actions_to_load', []) agent_data.setdefault('other_settings', {}) agent_data['is_global'] = False diff --git a/application/single_app/semantic_kernel_loader.py b/application/single_app/semantic_kernel_loader.py index 2d484e713..ea1e59319 100644 --- a/application/single_app/semantic_kernel_loader.py +++ b/application/single_app/semantic_kernel_loader.py @@ -1826,6 +1826,16 @@ def pick(key): # pass this to prevent additional future agent types from potentially failing pass + # Reasoning effort - only add if not 'none' or empty + reasoning_effort = pick("reasoning_effort") + if reasoning_effort and reasoning_effort != "none" and "reasoning_effort" in model_fields: + try: + setattr(prompt_exec_settings, "reasoning_effort", reasoning_effort) + print(f"[SK Loader] Set reasoning_effort={reasoning_effort} for agent: {agent_config.get('name')}") + except Exception as e: + print(f"[SK Loader] Failed to set reasoning_effort for agent {agent_config.get('name')}: {e}") + pass + if hasattr(prompt_exec_settings, 'function_choice_behavior'): if getattr(prompt_exec_settings, 'function_choice_behavior', None) is None: try: @@ -1844,4 +1854,62 @@ def pick(key): # Log error but do not set attribute directly to avoid Pydantic validation errors log_event(f"[SK Loader] Failed to set prompt execution settings via setter: {e}", level=logging.ERROR, exceptionTraceback=True) # Do not set prompt_execution_settings as an attribute if not supported by the service + + # Store reasoning_effort info for retry logic + if hasattr(chat_service, '_agent_config'): + chat_service._agent_config = agent_config + return chat_service + + +def handle_agent_reasoning_error(chat_service, error, agent_config): + """ + Handle reasoning_effort errors by retrying without the parameter. + Similar to the retry logic in route_backend_chats.py for direct GPT calls. + + Args: + chat_service: The AzureChatCompletion service + error: The exception that occurred + agent_config: The agent configuration dict + + Returns: + bool: True if reasoning_effort was removed and service updated, False otherwise + """ + error_str = str(error).lower() + has_reasoning = agent_config.get("reasoning_effort") and agent_config.get("reasoning_effort") != "none" + + # Check if error is related to reasoning_effort parameter + if has_reasoning and ( + 'reasoning_effort' in error_str or + 'unrecognized request argument' in error_str or + 'invalid_request_error' in error_str + ): + print(f"[SK Loader] Reasoning effort not supported by model, retrying without reasoning_effort for agent: {agent_config.get('name')}") + + # Remove reasoning_effort from agent_config + agent_config["reasoning_effort"] = "" + + # Update the service's prompt execution settings without reasoning_effort + try: + PromptExecutionSettingsClass = chat_service.get_prompt_execution_settings_class() + existing = getattr(chat_service, "prompt_execution_settings", None) + + if existing: + prompt_exec_settings = PromptExecutionSettingsClass.from_prompt_execution_settings(existing) + else: + prompt_exec_settings = PromptExecutionSettingsClass() + + # Remove reasoning_effort if it exists + if hasattr(prompt_exec_settings, "reasoning_effort"): + delattr(prompt_exec_settings, "reasoning_effort") + + # Update service settings + if hasattr(chat_service, "set_prompt_execution_settings"): + chat_service.set_prompt_execution_settings(prompt_exec_settings) + + return True + except Exception as update_error: + print(f"[SK Loader] Failed to remove reasoning_effort: {update_error}") + return False + + return False diff --git a/application/single_app/static/js/chat/chat-reasoning.js b/application/single_app/static/js/chat/chat-reasoning.js index d5536777b..252fba91c 100644 --- a/application/single_app/static/js/chat/chat-reasoning.js +++ b/application/single_app/static/js/chat/chat-reasoning.js @@ -51,15 +51,25 @@ export function initializeReasoningToggle() { observer.observe(imageGenBtn, { attributes: true, attributeFilter: ['class'] }); } + // Listen for agents toggle - hide reasoning button when agents are active + const enableAgentsBtn = document.getElementById('enable-agents-btn'); + if (enableAgentsBtn) { + const observer = new MutationObserver(() => { + updateReasoningButtonVisibility(); + }); + observer.observe(enableAgentsBtn, { attributes: true, attributeFilter: ['class'] }); + } + updateReasoningButtonVisibility(); } /** - * Update reasoning button visibility based on image generation state and model support + * Update reasoning button visibility based on image generation state, agent state, and model support */ function updateReasoningButtonVisibility() { const reasoningToggleBtn = document.getElementById('reasoning-toggle-btn'); const imageGenBtn = document.getElementById('image-generate-btn'); + const enableAgentsBtn = document.getElementById('enable-agents-btn'); if (!reasoningToggleBtn) return; @@ -69,6 +79,12 @@ function updateReasoningButtonVisibility() { return; } + // Hide reasoning button when agents are active + if (enableAgentsBtn && enableAgentsBtn.classList.contains('active')) { + reasoningToggleBtn.style.display = 'none'; + return; + } + // Hide reasoning button if current model doesn't support reasoning const modelName = getCurrentModelName(); if (modelName) { diff --git a/application/single_app/templates/_agent_modal.html b/application/single_app/templates/_agent_modal.html index b22dc789d..1f9775bb9 100644 --- a/application/single_app/templates/_agent_modal.html +++ b/application/single_app/templates/_agent_modal.html @@ -112,6 +112,19 @@
Model & Connection
Inheritable
+
+ + Optional + +
Only applies to models that support reasoning (e.g., gpt-5, o1, o3)
+
From 030f34ba1e88b662a9922868b33e304de228cbfd Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Wed, 3 Dec 2025 09:50:04 -0500 Subject: [PATCH 07/34] agent support --- application/single_app/route_backend_chats.py | 18 +++++++++++ .../single_app/static/js/chat/chat-agents.js | 9 ++++++ .../static/js/chat/chat-messages.js | 6 ++-- .../static/js/chat/chat-streaming.js | 31 +++++++++++++++++++ 4 files changed, 62 insertions(+), 2 deletions(-) diff --git a/application/single_app/route_backend_chats.py b/application/single_app/route_backend_chats.py index e42b45ec1..bd5abe043 100644 --- a/application/single_app/route_backend_chats.py +++ b/application/single_app/route_backend_chats.py @@ -2139,6 +2139,24 @@ def generate(): chat_type = data.get('chat_type', 'user') reasoning_effort = data.get('reasoning_effort') # Extract reasoning effort for reasoning models + # Check if agents are enabled + enable_semantic_kernel = settings.get('enable_semantic_kernel', False) + per_user_semantic_kernel = settings.get('per_user_semantic_kernel', False) + user_settings = {} + user_enable_agents = False + + if enable_semantic_kernel and per_user_semantic_kernel: + try: + user_settings = get_user_settings(user_id) + user_enable_agents = user_settings.get('enable_agents', False) + except Exception as e: + print(f"Error loading user settings: {e}") + + # Streaming does not support agents yet + if user_enable_agents: + yield f"data: {json.dumps({'error': 'Agents are not supported in streaming mode. Please disable streaming to use agents.'})}\n\n" + return + # Streaming does not support image generation if image_gen_enabled: yield f"data: {json.dumps({'error': 'Image generation is not supported in streaming mode'})}\n\n" diff --git a/application/single_app/static/js/chat/chat-agents.js b/application/single_app/static/js/chat/chat-agents.js index 015c3fbc1..b1e4f5feb 100644 --- a/application/single_app/static/js/chat/chat-agents.js +++ b/application/single_app/static/js/chat/chat-agents.js @@ -13,6 +13,15 @@ const enableAgentsBtn = document.getElementById("enable-agents-btn"); const agentSelectContainer = document.getElementById("agent-select-container"); const modelSelectContainer = document.getElementById("model-select-container"); +/** + * Check if agents are currently enabled + * @returns {boolean} True if agents are active + */ +export function areAgentsEnabled() { + const enableAgentsBtn = document.getElementById("enable-agents-btn"); + return enableAgentsBtn && enableAgentsBtn.classList.contains('active'); +} + export async function initializeAgentInteractions() { if (enableAgentsBtn && agentSelectContainer) { // On load, sync UI with enable_agents setting diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index 72ad93326..a0fb393f3 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -18,6 +18,7 @@ import { showToast } from "./chat-toast.js"; import { saveUserSetting } from "./chat-layout.js"; import { isStreamingEnabled, sendMessageWithStreaming } from "./chat-streaming.js"; import { getCurrentReasoningEffort, isReasoningEffortEnabled } from './chat-reasoning.js'; +import { areAgentsEnabled } from './chat-agents.js'; /** * Unwraps markdown tables that are mistakenly wrapped in code blocks. @@ -1179,8 +1180,9 @@ export function actuallySendMessage(finalMessageToSend) { reasoning_effort: getCurrentReasoningEffort() }; - // Check if streaming is enabled (but not for image generation) - if (isStreamingEnabled() && !imageGenEnabled) { + // Check if streaming is enabled (but not for image generation or agents) + const agentsEnabled = typeof areAgentsEnabled === 'function' && areAgentsEnabled(); + if (isStreamingEnabled() && !imageGenEnabled && !agentsEnabled) { const streamInitiated = sendMessageWithStreaming( messageData, tempUserMessageId, diff --git a/application/single_app/static/js/chat/chat-streaming.js b/application/single_app/static/js/chat/chat-streaming.js index 269d0da11..e4cac069b 100644 --- a/application/single_app/static/js/chat/chat-streaming.js +++ b/application/single_app/static/js/chat/chat-streaming.js @@ -22,6 +22,7 @@ export function initializeStreamingToggle() { streamingEnabled = settings.streamingEnabled === true; console.log('Streaming enabled:', streamingEnabled); updateStreamingButtonState(); + updateStreamingButtonVisibility(); }).catch(error => { console.error('Error loading streaming settings:', error); }); @@ -42,6 +43,17 @@ export function initializeStreamingToggle() { : 'Streaming disabled - responses will appear when complete'; showToast(message, 'info'); }); + + // Listen for agents toggle - hide streaming button when agents are active + const enableAgentsBtn = document.getElementById('enable-agents-btn'); + if (enableAgentsBtn) { + const observer = new MutationObserver(() => { + updateStreamingButtonVisibility(); + }); + observer.observe(enableAgentsBtn, { attributes: true, attributeFilter: ['class'] }); + } + + updateStreamingButtonVisibility(); } function updateStreamingButtonState() { @@ -59,6 +71,25 @@ function updateStreamingButtonState() { } } +/** + * Update streaming button visibility based on agent state + */ +function updateStreamingButtonVisibility() { + const streamingToggleBtn = document.getElementById('streaming-toggle-btn'); + const enableAgentsBtn = document.getElementById('enable-agents-btn'); + + if (!streamingToggleBtn) return; + + // Hide streaming button when agents are active + if (enableAgentsBtn && enableAgentsBtn.classList.contains('active')) { + streamingToggleBtn.style.display = 'none'; + return; + } + + // Otherwise show the button + streamingToggleBtn.style.display = 'flex'; +} + export function isStreamingEnabled() { // Check if image generation is active - streaming is incompatible with image gen const imageGenBtn = document.getElementById('image-generate-btn'); From d96f3f10878b5f2f7fb875853c1d2ec1ad7a760c Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Wed, 3 Dec 2025 11:14:30 -0500 Subject: [PATCH 08/34] fixed key bug --- application/single_app/route_backend_users.py | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/application/single_app/route_backend_users.py b/application/single_app/route_backend_users.py index 63d9dce2b..ee5a77663 100644 --- a/application/single_app/route_backend_users.py +++ b/application/single_app/route_backend_users.py @@ -147,7 +147,17 @@ def user_settings(): # Basic validation could go here (e.g., check allowed keys, value types) # Example: Allowed keys - allowed_keys = {'activeGroupOid', 'layoutPreference', 'splitSizesPreference', 'dockedSidebarHidden', 'darkModeEnabled', 'preferredModelDeployment', 'agents', 'plugins', "selected_agent", 'navLayout', 'profileImage', 'enable_agents', 'streamingEnabled', 'reasoningEffortSettings'} # Add others as needed + allowed_keys = { + 'activeGroupOid', 'layoutPreference', 'splitSizesPreference', 'dockedSidebarHidden', + 'darkModeEnabled', 'preferredModelDeployment', 'agents', 'plugins', "selected_agent", + 'navLayout', 'profileImage', 'enable_agents', 'streamingEnabled', 'reasoningEffortSettings', + # Public directory and workspace settings + 'publicDirectorySavedLists', 'publicDirectorySettings', 'activePublicWorkspaceOid', + # Chat UI settings + 'navbar_layout', 'chatLayout', 'showChatTitle', 'chatSplitSizes', + # Metrics and other settings + 'metrics', 'lastUpdated' + } # Add others as needed invalid_keys = set(settings_to_update.keys()) - allowed_keys if invalid_keys: print(f"Warning: Received invalid settings keys: {invalid_keys}") From 31f2f6d9d63a395d27202a0748f7bd7110be463a Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Wed, 3 Dec 2025 11:15:33 -0500 Subject: [PATCH 09/34] disable group create and fixed model fetch --- .../static/js/admin/admin_settings.js | 24 +++++++++++++++++++ .../single_app/templates/admin_settings.html | 17 +++++++++++++ 2 files changed, 41 insertions(+) diff --git a/application/single_app/static/js/admin/admin_settings.js b/application/single_app/static/js/admin/admin_settings.js index 47fb81a5b..308179871 100644 --- a/application/single_app/static/js/admin/admin_settings.js +++ b/application/single_app/static/js/admin/admin_settings.js @@ -394,9 +394,17 @@ if (fetchGptBtn) { const resp = await fetch('/api/models/gpt'); const data = await resp.json(); if (resp.ok && data.models && data.models.length > 0) { + // Clear old models and replace with new ones gptAll = data.models; + + // Filter out selected models that no longer exist in the newly fetched list + gptSelected = gptSelected.filter(selected => + gptAll.some(model => model.deploymentName === selected.deploymentName) + ); + renderGPTModels(); updateGptHiddenInput(); + markFormAsModified(); } else { listDiv.innerHTML = `

Error: ${data.error || 'No GPT models found'}

`; } @@ -441,9 +449,17 @@ if (fetchEmbeddingBtn) { const resp = await fetch('/api/models/embedding'); const data = await resp.json(); if (resp.ok && data.models && data.models.length > 0) { + // Clear old models and replace with new ones embeddingAll = data.models; + + // Filter out selected models that no longer exist in the newly fetched list + embeddingSelected = embeddingSelected.filter(selected => + embeddingAll.some(model => model.deploymentName === selected.deploymentName) + ); + renderEmbeddingModels(); updateEmbeddingHiddenInput(); + markFormAsModified(); } else { listDiv.innerHTML = `

Error: ${data.error || 'No embedding models found'}

`; } @@ -480,9 +496,17 @@ if (fetchImageBtn) { const resp = await fetch('/api/models/image'); const data = await resp.json(); if (resp.ok && data.models && data.models.length > 0) { + // Clear old models and replace with new ones imageAll = data.models; + + // Filter out selected models that no longer exist in the newly fetched list + imageSelected = imageSelected.filter(selected => + imageAll.some(model => model.deploymentName === selected.deploymentName) + ); + renderImageModels(); updateImageHiddenInput(); + markFormAsModified(); } else { listDiv.innerHTML = `

Error: ${data.error || 'No image models found'}

`; } diff --git a/application/single_app/templates/admin_settings.html b/application/single_app/templates/admin_settings.html index c0169389a..3abb4bb2d 100644 --- a/application/single_app/templates/admin_settings.html +++ b/application/single_app/templates/admin_settings.html @@ -1788,6 +1788,23 @@
+ + +
+ + + +
+

+ When enabled, no users will be able to create new groups, regardless of their role membership. This is a global setting that overrides the 'Require Membership to Create Groups' setting below. +

+
Date: Wed, 3 Dec 2025 11:15:42 -0500 Subject: [PATCH 10/34] updated config --- application/single_app/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 44c83624b..905a184fe 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.188" +VERSION = "0.233.189" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') From 5f8fdf8031c45a96e2d5b98717a72ffc5979be90 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Wed, 3 Dec 2025 12:41:59 -0500 Subject: [PATCH 11/34] fixed support for workspace search for streaming --- application/single_app/config.py | 2 +- application/single_app/route_backend_chats.py | 256 ++++++++++++++++-- .../single_app/route_frontend_chats.py | 5 + .../static/js/chat/chat-messages.js | 16 ++ .../static/js/chat/chat-streaming.js | 46 ++-- application/single_app/templates/chats.html | 1 + 6 files changed, 279 insertions(+), 47 deletions(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 905a184fe..1bbc59625 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.189" +VERSION = "0.233.199" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/route_backend_chats.py b/application/single_app/route_backend_chats.py index bd5abe043..7f4af0e67 100644 --- a/application/single_app/route_backend_chats.py +++ b/application/single_app/route_backend_chats.py @@ -60,6 +60,7 @@ def chat_api(): image_gen_enabled = data.get('image_generation') document_scope = data.get('doc_scope') active_group_id = data.get('active_group_id') + active_public_workspace_id = data.get('active_public_workspace_id') # Extract active public workspace ID frontend_gpt_model = data.get('model_deployment') top_n_results = data.get('top_n') # Extract top_n parameter from request classifications_to_send = data.get('classifications') # Extract classifications parameter from request @@ -339,6 +340,9 @@ def chat_api(): user_metadata['workspace_search']['group_name'] = None import traceback traceback.print_exc() + + if document_scope == 'public' and active_public_workspace_id: + user_metadata['workspace_search']['active_public_workspace_id'] = active_public_workspace_id else: user_metadata['workspace_search'] = { 'search_enabled': False @@ -401,7 +405,9 @@ def chat_api(): # Model selection information user_metadata['model_selection'] = { 'selected_model': gpt_model, - 'frontend_requested_model': frontend_gpt_model + 'frontend_requested_model': frontend_gpt_model, + 'reasoning_effort': reasoning_effort if reasoning_effort and reasoning_effort != 'none' else None, + 'streaming': 'Disabled' } # Chat type and group context for this specific message @@ -638,6 +644,11 @@ def chat_api(): if active_group_id and (document_scope == 'group' or document_scope == 'all' or chat_type == 'group'): search_args["active_group_id"] = active_group_id + # Add active_public_workspace_id when: + # 1. Document scope is 'public' or + # 2. Document scope is 'all' and public workspaces are enabled + if active_public_workspace_id and (document_scope == 'public' or document_scope == 'all'): + search_args["active_public_workspace_id"] = active_public_workspace_id if selected_document_id: search_args["document_id"] = selected_document_id @@ -2134,6 +2145,7 @@ def generate(): image_gen_enabled = data.get('image_generation') document_scope = data.get('doc_scope') active_group_id = data.get('active_group_id') + active_public_workspace_id = data.get('active_public_workspace_id') # Extract active public workspace ID frontend_gpt_model = data.get('model_deployment') classifications_to_send = data.get('classifications') chat_type = data.get('chat_type', 'user') @@ -2313,9 +2325,72 @@ def generate(): 'document_search': hybrid_search_enabled } + # Document search scope and selections + if hybrid_search_enabled: + user_metadata['workspace_search'] = { + 'search_enabled': True, + 'document_scope': document_scope, + 'selected_document_id': selected_document_id, + 'classification': classifications_to_send + } + + # Get document details if specific document selected + if selected_document_id and selected_document_id != "all": + try: + # Use the appropriate documents container based on scope + if document_scope == 'group': + cosmos_container = cosmos_group_documents_container + elif document_scope == 'public': + cosmos_container = cosmos_public_documents_container + elif document_scope == 'personal': + cosmos_container = cosmos_user_documents_container + + doc_query = "SELECT c.file_name, c.title, c.document_id, c.group_id FROM c WHERE c.id = @doc_id" + doc_params = [{"name": "@doc_id", "value": selected_document_id}] + doc_results = list(cosmos_container.query_items( + query=doc_query, parameters=doc_params, enable_cross_partition_query=True + )) + if doc_results: + doc_info = doc_results[0] + user_metadata['workspace_search']['document_name'] = doc_info.get('title') or doc_info.get('file_name') + user_metadata['workspace_search']['document_filename'] = doc_info.get('file_name') + except Exception as e: + print(f"Error retrieving document details: {e}") + + # Add scope-specific details + if document_scope == 'group' and active_group_id: + try: + from functions_debug import debug_print + debug_print(f"Workspace search - looking up group for id: {active_group_id}") + group_doc = find_group_by_id(active_group_id) + debug_print(f"Workspace search group lookup result: {group_doc}") + + if group_doc and group_doc.get('name'): + group_name = group_doc.get('name') + user_metadata['workspace_search']['group_name'] = group_name + debug_print(f"Workspace search - set group_name to: {group_name}") + else: + debug_print(f"Workspace search - no group found or no name for id: {active_group_id}") + user_metadata['workspace_search']['group_name'] = None + + except Exception as e: + print(f"Error retrieving group details: {e}") + user_metadata['workspace_search']['group_name'] = None + import traceback + traceback.print_exc() + + if document_scope == 'public' and active_public_workspace_id: + user_metadata['workspace_search']['active_public_workspace_id'] = active_public_workspace_id + else: + user_metadata['workspace_search'] = { + 'search_enabled': False + } + user_metadata['model_selection'] = { 'selected_model': gpt_model, - 'frontend_requested_model': frontend_gpt_model + 'frontend_requested_model': frontend_gpt_model, + 'reasoning_effort': reasoning_effort if reasoning_effort and reasoning_effort != 'none' else None, + 'streaming': 'Enabled' } user_metadata['chat_context'] = { @@ -2371,8 +2446,14 @@ def generate(): if active_group_id and (document_scope == 'group' or document_scope == 'all' or chat_type == 'group'): search_args['active_group_id'] = active_group_id + # Add active_public_workspace_id when: + # 1. Document scope is 'public' or + # 2. Document scope is 'all' and public workspaces are enabled + if active_public_workspace_id and (document_scope == 'public' or document_scope == 'all'): + search_args['active_public_workspace_id'] = active_public_workspace_id + if selected_document_id: - search_args['selected_document_id'] = selected_document_id + search_args['document_id'] = selected_document_id search_results = hybrid_search(**search_args) except Exception as e: @@ -2382,21 +2463,153 @@ def generate(): retrieved_texts = [] for doc in search_results: - text = f"Source: {doc.get('source_file', 'unknown')}\n" - if doc.get('page_number'): - text += f"Page: {doc.get('page_number')}\n" - text += f"Content: {doc.get('content', '')}" - retrieved_texts.append(text) + chunk_text = doc.get('chunk_text', '') + file_name = doc.get('file_name', 'Unknown') + version = doc.get('version', 'N/A') + chunk_sequence = doc.get('chunk_sequence', 0) + page_number = doc.get('page_number') or chunk_sequence or 1 + citation_id = doc.get('id', str(uuid.uuid4())) + classification = doc.get('document_classification') + chunk_id = doc.get('chunk_id', str(uuid.uuid4())) + score = doc.get('score', 0.0) + group_id = doc.get('group_id', None) - citation = { - 'source': doc.get('source_file', 'unknown'), - 'page_number': doc.get('page_number'), - 'chunk_id': doc.get('chunk_id'), - 'score': doc.get('@search.score'), - 'content_preview': doc.get('content', '')[:200] + citation = f"(Source: {file_name}, Page: {page_number}) [#{citation_id}]" + retrieved_texts.append(f"{chunk_text}\n{citation}") + + combined_documents.append({ + "file_name": file_name, + "citation_id": citation_id, + "page_number": page_number, + "version": version, + "classification": classification, + "chunk_text": chunk_text, + "chunk_sequence": chunk_sequence, + "chunk_id": chunk_id, + "score": score, + "group_id": group_id, + }) + + # Build citation data to match non-streaming format + citation_data = { + "file_name": file_name, + "citation_id": citation_id, + "page_number": page_number, + "chunk_id": chunk_id, + "chunk_sequence": chunk_sequence, + "score": score, + "group_id": group_id, + "version": version, + "classification": classification } - hybrid_citations_list.append(citation) - combined_documents.append(doc) + hybrid_citations_list.append(citation_data) + + # --- Extract metadata (keywords/abstract) for additional citations --- + if settings.get('enable_extract_meta_data', False): + from functions_documents import get_document_metadata_for_citations + + processed_doc_ids = set() + + for doc in search_results: + doc_id = doc.get('document_id') or doc.get('id') + if not doc_id or doc_id in processed_doc_ids: + continue + + processed_doc_ids.add(doc_id) + + file_name = doc.get('file_name', 'Unknown') + doc_group_id = doc.get('group_id', None) + + metadata = get_document_metadata_for_citations( + doc_id, + user_id, + doc_scope=document_scope, + active_group_id=active_group_id + ) + + if metadata: + keywords = metadata.get('keywords', []) + abstract = metadata.get('abstract', '') + + if keywords and len(keywords) > 0: + keywords_citation_id = f"{doc_id}_keywords" + keywords_text = ', '.join(keywords) if isinstance(keywords, list) else str(keywords) + + keywords_citation = { + "file_name": file_name, + "citation_id": keywords_citation_id, + "page_number": "Metadata", + "chunk_id": keywords_citation_id, + "chunk_sequence": 9999, + "score": 0.0, + "group_id": doc_group_id, + "version": doc.get('version', 'N/A'), + "classification": doc.get('document_classification'), + "metadata_type": "keywords", + "metadata_content": keywords_text + } + hybrid_citations_list.append(keywords_citation) + combined_documents.append(keywords_citation) + + keywords_context = f"Document Keywords ({file_name}): {keywords_text}" + retrieved_texts.append(keywords_context) + + if abstract and len(abstract.strip()) > 0: + abstract_citation_id = f"{doc_id}_abstract" + + abstract_citation = { + "file_name": file_name, + "citation_id": abstract_citation_id, + "page_number": "Metadata", + "chunk_id": abstract_citation_id, + "chunk_sequence": 9998, + "score": 0.0, + "group_id": doc_group_id, + "version": doc.get('version', 'N/A'), + "classification": doc.get('document_classification'), + "metadata_type": "abstract", + "metadata_content": abstract + } + hybrid_citations_list.append(abstract_citation) + combined_documents.append(abstract_citation) + + abstract_context = f"Document Abstract ({file_name}): {abstract}" + retrieved_texts.append(abstract_context) + + vision_analysis = metadata.get('vision_analysis') + if vision_analysis: + vision_citation_id = f"{doc_id}_vision" + + vision_description = vision_analysis.get('description', '') + vision_objects = vision_analysis.get('objects', []) + vision_text = vision_analysis.get('text', '') + + vision_content = f"AI Vision Analysis:\n" + if vision_description: + vision_content += f"Description: {vision_description}\n" + if vision_objects: + vision_content += f"Objects: {', '.join(vision_objects)}\n" + if vision_text: + vision_content += f"Text in Image: {vision_text}\n" + + vision_citation = { + "file_name": file_name, + "citation_id": vision_citation_id, + "page_number": "AI Vision", + "chunk_id": vision_citation_id, + "chunk_sequence": 9997, + "score": 0.0, + "group_id": doc_group_id, + "version": doc.get('version', 'N/A'), + "classification": doc.get('document_classification'), + "metadata_type": "vision", + "metadata_content": vision_content + } + hybrid_citations_list.append(vision_citation) + combined_documents.append(vision_citation) + + vision_context = f"AI Vision Analysis ({file_name}): {vision_content}" + retrieved_texts.append(vision_context) retrieved_content = "\n\n".join(retrieved_texts) system_prompt_search = f"""You are an AI assistant. Use the following retrieved document excerpts to answer the user's question. Cite sources using the format (Source: filename, Page: page number). @@ -2404,13 +2617,20 @@ def generate(): Retrieved Excerpts: {retrieved_content} -Based *only* on the information provided above, answer the user's query. If the answer isn't in the excerpts, say so.""" +Based *only* on the information provided above, answer the user's query. If the answer isn't in the excerpts, say so. + +Example +User: What is the policy on double dipping? +Assistant: The policy prohibits entities from using federal funds received through one program to apply for additional funds through another program, commonly known as 'double dipping' (Source: PolicyDocument.pdf, Page: 12) +""" system_messages_for_augmentation.append({ 'role': 'system', - 'content': system_prompt_search + 'content': system_prompt_search, + 'documents': combined_documents }) + # Reorder hybrid citations list in descending order based on page_number hybrid_citations_list.sort(key=lambda x: x.get('page_number', 0), reverse=True) # Update message chat type diff --git a/application/single_app/route_frontend_chats.py b/application/single_app/route_frontend_chats.py index f13770867..73988694c 100644 --- a/application/single_app/route_frontend_chats.py +++ b/application/single_app/route_frontend_chats.py @@ -31,6 +31,10 @@ def chats(): group_doc = find_group_by_id(active_group_id) if group_doc: active_group_name = group_doc.get("name", "") + + # Get active public workspace ID from user settings + active_public_workspace_id = user_settings["settings"].get("activePublicWorkspaceOid", "") + categories_list = public_settings.get("document_classification_categories","") if not user_id: @@ -45,6 +49,7 @@ def chats(): enable_user_feedback=enable_user_feedback, active_group_id=active_group_id, active_group_name=active_group_name, + active_public_workspace_id=active_public_workspace_id, enable_enhanced_citations=enable_enhanced_citations, enable_document_classification=enable_document_classification, document_classification_categories=categories_list, diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index a0fb393f3..4c10817b0 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -1164,6 +1164,9 @@ export function actuallySendMessage(finalMessageToSend) { const finalGroupId = group_id || window.activeGroupId || null; // Prepare message data object + // Get active public workspace ID from user settings (similar to active_group_id) + const finalPublicWorkspaceId = window.activePublicWorkspaceId || null; + const messageData = { message: finalMessageToSend, conversation_id: currentConversationId, @@ -1174,6 +1177,7 @@ export function actuallySendMessage(finalMessageToSend) { doc_scope: effectiveDocScope, chat_type: chat_type, active_group_id: finalGroupId, + active_public_workspace_id: finalPublicWorkspaceId, model_deployment: modelDeployment, prompt_info: promptInfo, agent_info: agentInfo, @@ -1964,6 +1968,18 @@ function formatMetadataForDrawer(metadata) {
`; } + if (metadata.model_selection.reasoning_effort) { + content += `
+ Reasoning Effort: ${escapeHtml(metadata.model_selection.reasoning_effort)} +
`; + } + + if (metadata.model_selection.streaming) { + content += `
+ Streaming: ${createStatusBadge(metadata.model_selection.streaming)} +
`; + } + content += '
'; } diff --git a/application/single_app/static/js/chat/chat-streaming.js b/application/single_app/static/js/chat/chat-streaming.js index e4cac069b..4b8ab50c3 100644 --- a/application/single_app/static/js/chat/chat-streaming.js +++ b/application/single_app/static/js/chat/chat-streaming.js @@ -292,38 +292,28 @@ function finalizeStreamingMessage(messageId, userMessageId, finalData) { const messageElement = document.querySelector(`[data-message-id="${messageId}"]`); if (!messageElement) return; - // Remove streaming cursor - const contentElement = messageElement.querySelector('.message-text'); - if (contentElement) { - const cursor = contentElement.querySelector('.streaming-cursor'); - if (cursor) cursor.remove(); - - // Parse markdown for final content - if (typeof marked !== 'undefined' && typeof DOMPurify !== 'undefined') { - contentElement.innerHTML = DOMPurify.sanitize(marked.parse(finalData.full_content || '')); - } - } - - // Update message ID - messageElement.setAttribute('data-message-id', finalData.message_id); - - // Update user message ID + // Update user message ID first if (finalData.user_message_id && userMessageId) { updateUserMessageId(userMessageId, finalData.user_message_id); } - // Add citations if present - if (finalData.hybrid_citations && finalData.hybrid_citations.length > 0) { - // Import and call citation rendering - import('./chat-citations.js').then(module => { - module.renderCitations( - messageElement, - finalData.hybrid_citations, - [], - finalData.agent_citations || [] - ); - }); - } + // Remove the temporary streaming message + messageElement.remove(); + + // Create proper message with all metadata using appendMessage + appendMessage( + 'AI', + finalData.full_content || '', + finalData.model_deployment_name, + finalData.message_id, + finalData.augmented, + finalData.hybrid_citations || [], + [], + finalData.agent_citations || [], + null, + null, + null + ); // Update conversation if needed if (finalData.conversation_id && window.currentConversationId !== finalData.conversation_id) { diff --git a/application/single_app/templates/chats.html b/application/single_app/templates/chats.html index eef62268d..c522797a3 100644 --- a/application/single_app/templates/chats.html +++ b/application/single_app/templates/chats.html @@ -672,6 +672,7 @@
window.enableUserFeedback = "{{ enable_user_feedback }}"; window.activeGroupId = "{{ active_group_id }}"; window.activeGroupName = "{{ active_group_name }}"; + window.activePublicWorkspaceId = "{{ active_public_workspace_id }}"; window.enableEnhancedCitations = "{{ enable_enhanced_citations }}"; window.enable_document_classification = "{{ enable_document_classification }}"; window.classification_categories = JSON.parse('{{ settings.document_classification_categories|tojson(indent=None)|safe }}' || '[]'); From 4929ae1cf0e4e9c1b28b1c64be15d1d43f878733 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Wed, 3 Dec 2025 16:01:20 -0500 Subject: [PATCH 12/34] fix bug with sidebar update --- application/single_app/config.py | 2 +- application/single_app/static/js/chat/chat-streaming.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 1bbc59625..8ba1c14c2 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.199" +VERSION = "0.233.200" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/static/js/chat/chat-streaming.js b/application/single_app/static/js/chat/chat-streaming.js index 4b8ab50c3..848f56d25 100644 --- a/application/single_app/static/js/chat/chat-streaming.js +++ b/application/single_app/static/js/chat/chat-streaming.js @@ -3,6 +3,7 @@ import { appendMessage, updateUserMessageId } from './chat-messages.js'; import { hideLoadingIndicatorInChatbox, showLoadingIndicatorInChatbox } from './chat-loading-indicator.js'; import { loadUserSettings, saveUserSetting } from './chat-layout.js'; import { showToast } from './chat-toast.js'; +import { updateSidebarConversationTitle } from './chat-sidebar-conversations.js'; let streamingEnabled = false; let currentEventSource = null; @@ -325,6 +326,9 @@ function finalizeStreamingMessage(messageId, userMessageId, finalData) { if (titleElement && titleElement.textContent === 'New Conversation') { titleElement.textContent = finalData.conversation_title; } + + // Update sidebar conversation title in real-time + updateSidebarConversationTitle(finalData.conversation_id, finalData.conversation_title); } showToast('Response complete', 'success'); From d14957b314b7925ba22971104fb2341a14605ee8 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Thu, 4 Dec 2025 13:22:42 -0500 Subject: [PATCH 13/34] fixed gpt-5 vision processing bug --- application/single_app/app.py | 2 +- application/single_app/config.py | 8 +- application/single_app/functions_chat.py | 4 +- application/single_app/functions_content.py | 16 +- application/single_app/functions_debug.py | 14 +- application/single_app/functions_documents.py | 211 ++++++++++-- application/single_app/functions_search.py | 24 +- .../single_app/route_backend_documents.py | 9 +- .../route_backend_group_documents.py | 1 + .../route_backend_public_documents.py | 1 + .../single_app/route_backend_settings.py | 24 +- application/single_app/route_backend_users.py | 2 +- .../single_app/route_enhanced_citations.py | 8 +- .../single_app/route_frontend_chats.py | 1 + .../single_app/static/js/agents_common.js | 10 +- .../static/js/chat/chat-messages.js | 12 +- .../single_app/templates/admin_settings.html | 2 +- application/single_app/utils_cache.py | 62 ++-- .../DEBUG_LOGGING_TOGGLE_FEATURE.md | 8 +- .../v0.230.001/WORKFLOW_PDF_IFRAME_CSP_FIX.md | 2 +- docs/fixes/VISION_ANALYSIS_DEBUG_LOGGING.md | 318 ++++++++++++++++++ docs/fixes/VISION_DEBUG_QUICK_REFERENCE.md | 79 +++++ docs/fixes/VISION_MODEL_PARAMETER_FIX.md | 257 ++++++++++++++ ...ud_analysis_actual_document_content_fix.py | 20 +- .../test_vision_model_parameter_fix.py | 199 +++++++++++ .../test_workflow_pdf_iframe_fix.py | 8 +- 26 files changed, 1162 insertions(+), 140 deletions(-) create mode 100644 docs/fixes/VISION_ANALYSIS_DEBUG_LOGGING.md create mode 100644 docs/fixes/VISION_DEBUG_QUICK_REFERENCE.md create mode 100644 docs/fixes/VISION_MODEL_PARAMETER_FIX.md create mode 100644 functional_tests/test_vision_model_parameter_fix.py diff --git a/application/single_app/app.py b/application/single_app/app.py index 6b17e3654..62611f44e 100644 --- a/application/single_app/app.py +++ b/application/single_app/app.py @@ -199,7 +199,7 @@ def check_logging_timers(): turnoff_time = None if turnoff_time and current_time >= turnoff_time: - debug_print(f"[DEBUG]: logging timer expired at {turnoff_time}. Disabling debug logging.") + debug_print(f"logging timer expired at {turnoff_time}. Disabling debug logging.") settings['enable_debug_logging'] = False settings['debug_logging_timer_enabled'] = False settings['debug_logging_turnoff_time'] = None diff --git a/application/single_app/config.py b/application/single_app/config.py index 8ba1c14c2..06699233a 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.200" +VERSION = "0.233.207" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') @@ -687,11 +687,11 @@ def initialize_clients(settings): try: container_client = blob_service_client.get_container_client(container_name) if not container_client.exists(): - print(f"[DEBUG]: Container '{container_name}' does not exist. Creating...") + print(f"Container '{container_name}' does not exist. Creating...") container_client.create_container() - print(f"[DEBUG]: Container '{container_name}' created successfully.") + print(f"Container '{container_name}' created successfully.") else: - print(f"[DEBUG]: Container '{container_name}' already exists.") + print(f"Container '{container_name}' already exists.") except Exception as container_error: print(f"Error creating container {container_name}: {str(container_error)}") except Exception as e: diff --git a/application/single_app/functions_chat.py b/application/single_app/functions_chat.py index ad55da18f..3f768ed51 100644 --- a/application/single_app/functions_chat.py +++ b/application/single_app/functions_chat.py @@ -26,7 +26,7 @@ def load_user_kernel(user_id, redis_client): ) try: kernel_state = json.loads(kernel_state_json) - log_event(f"[SK Loader][DEBUG] Loaded kernel state from Redis for user {user_id}.") + log_event(f"[SK Loader] Loaded kernel state from Redis for user {user_id}.") kernel = Kernel() # Restore kernel config if possible kernel_config = kernel_state.get('kernel_config') @@ -154,7 +154,7 @@ def save_user_kernel(user_id, kernel, kernel_agents, redis_client): } redis_client.set(f"sk:state:{user_id}", json.dumps(state, default=str)) log_event( - f"[SK Loader][DEBUG] Saved kernel state snapshot to Redis for user {user_id}.", + f"[SK Loader] Saved kernel state snapshot to Redis for user {user_id}.", extra={ "user_id": user_id, 'services': kernel_services, diff --git a/application/single_app/functions_content.py b/application/single_app/functions_content.py index 9cd2a8355..b49e732f9 100644 --- a/application/single_app/functions_content.py +++ b/application/single_app/functions_content.py @@ -22,12 +22,12 @@ def extract_content_with_azure_di(file_path): document_intelligence_client = CLIENTS['document_intelligence_client'] # Ensure CLIENTS is populated # Debug logging for troubleshooting - debug_print(f"[DEBUG] Starting Azure DI extraction for: {os.path.basename(file_path)}") - debug_print(f"[DEBUG] AZURE_ENVIRONMENT: {AZURE_ENVIRONMENT}") + debug_print(f"Starting Azure DI extraction for: {os.path.basename(file_path)}") + debug_print(f"AZURE_ENVIRONMENT: {AZURE_ENVIRONMENT}") if AZURE_ENVIRONMENT in ("usgovernment", "custom"): # Required format for Document Intelligence API version 2024-11-30 - debug_print("[DEBUG] Using US Government/Custom environment with base64Source") + debug_print("Using US Government/Custom environment with base64Source") with open(file_path, 'rb') as f: file_bytes = f.read() base64_source = base64.b64encode(file_bytes).decode('utf-8') @@ -38,9 +38,9 @@ def extract_content_with_azure_di(file_path): model_id="prebuilt-read", body=analyze_request ) - debug_print("[DEBUG] Successfully started analysis with base64Source") + debug_print("Successfully started analysis with base64Source") else: - debug_print("[DEBUG] Using Public cloud environment") + debug_print("Using Public cloud environment") with open(file_path, 'rb') as f: # For stable API 1.0.2, the file needs to be passed as part of the body file_content = f.read() @@ -53,9 +53,9 @@ def extract_content_with_azure_di(file_path): body=file_content, content_type="application/pdf" ) - debug_print("[DEBUG] Successfully started analysis with body as bytes") + debug_print("Successfully started analysis with body as bytes") except Exception as e1: - debug_print(f"[DEBUG] Method 1 failed: {e1}") + debug_print(f"Method 1 failed: {e1}") try: # Method 2: Use base64 format for consistency @@ -65,7 +65,7 @@ def extract_content_with_azure_di(file_path): model_id="prebuilt-read", body=analyze_request ) - debug_print("[DEBUG] Successfully started analysis with base64Source in body") + debug_print("Successfully started analysis with base64Source in body") except Exception as e2: debug_print(f"[ERROR] Both methods failed. Method 1: {e1}, Method 2: {e2}") raise e1 diff --git a/application/single_app/functions_debug.py b/application/single_app/functions_debug.py index 5b9f20d1f..c0e2bf093 100644 --- a/application/single_app/functions_debug.py +++ b/application/single_app/functions_debug.py @@ -1,6 +1,7 @@ # functions_debug.py # from app_settings_cache import get_settings_cache +from functions_settings import * def debug_print(message): """ @@ -9,15 +10,16 @@ def debug_print(message): Args: message (str): The debug message to print """ + #print(f"DEBUG_PRINT CALLED WITH MESSAGE: {message}") try: cache = get_settings_cache() - if cache and cache.get('enable_debug_logging', False): - print(f"DEBUG: {message}") - + if cache.get('enable_debug_logging', False): + print(f"[DEBUG]: {message}") except Exception: - # If there's any error getting settings, don't print debug messages - # This prevents crashes in case of configuration issues - pass + settings = get_settings() + if settings.get('enable_debug_logging', False): + print(f"[DEBUG]: {message}") + def is_debug_enabled(): """ diff --git a/application/single_app/functions_documents.py b/application/single_app/functions_documents.py index b6432f4eb..d7d83296c 100644 --- a/application/single_app/functions_documents.py +++ b/application/single_app/functions_documents.py @@ -6,6 +6,7 @@ from functions_search import * from functions_logging import * from functions_authentication import * +from functions_debug import * def allowed_file(filename, allowed_extensions=None): if not allowed_extensions: @@ -2989,8 +2990,8 @@ def analyze_image_with_vision_model(image_path, user_id, document_id, settings): 'analysis': 'detailed analysis' } or None if vision analysis is disabled or fails """ - if not settings.get('enable_multimodal_vision', False): - return None + debug_print(f"[VISION_ANALYSIS_V2] Function entry - document_id: {document_id}, user_id: {user_id}") + try: # Convert image to base64 @@ -2998,11 +2999,20 @@ def analyze_image_with_vision_model(image_path, user_id, document_id, settings): image_bytes = img_file.read() base64_image = base64.b64encode(image_bytes).decode('utf-8') + image_size = len(image_bytes) + base64_size = len(base64_image) + debug_print(f"[VISION_ANALYSIS] Image conversion for {document_id}:") + debug_print(f" Image path: {image_path}") + debug_print(f" Original size: {image_size:,} bytes ({image_size / 1024 / 1024:.2f} MB)") + debug_print(f" Base64 size: {base64_size:,} characters") + # Determine image mime type mime_type = mimetypes.guess_type(image_path)[0] or 'image/jpeg' + debug_print(f" MIME type: {mime_type}") # Get vision model settings vision_model = settings.get('multimodal_vision_model', 'gpt-4o') + debug_print(f"[VISION_ANALYSIS] Vision model selected: {vision_model}") if not vision_model: print(f"Warning: Multi-modal vision enabled but no model selected") @@ -3010,45 +3020,76 @@ def analyze_image_with_vision_model(image_path, user_id, document_id, settings): # Initialize client (reuse GPT configuration) enable_gpt_apim = settings.get('enable_gpt_apim', False) + debug_print(f"[VISION_ANALYSIS] Using APIM: {enable_gpt_apim}") if enable_gpt_apim: + api_version = settings.get('azure_apim_gpt_api_version') + endpoint = settings.get('azure_apim_gpt_endpoint') + debug_print(f"[VISION_ANALYSIS] APIM Configuration:") + debug_print(f" Endpoint: {endpoint}") + debug_print(f" API Version: {api_version}") + gpt_client = AzureOpenAI( - api_version=settings.get('azure_apim_gpt_api_version'), - azure_endpoint=settings.get('azure_apim_gpt_endpoint'), + api_version=api_version, + azure_endpoint=endpoint, api_key=settings.get('azure_apim_gpt_subscription_key') ) else: # Use managed identity or key auth_type = settings.get('azure_openai_gpt_authentication_type', 'key') + api_version = settings.get('azure_openai_gpt_api_version') + endpoint = settings.get('azure_openai_gpt_endpoint') + + debug_print(f"[VISION_ANALYSIS] Direct Azure OpenAI Configuration:") + debug_print(f" Endpoint: {endpoint}") + debug_print(f" API Version: {api_version}") + debug_print(f" Auth Type: {auth_type}") + if auth_type == 'managed_identity': token_provider = get_bearer_token_provider( DefaultAzureCredential(), cognitive_services_scope ) gpt_client = AzureOpenAI( - api_version=settings.get('azure_openai_gpt_api_version'), - azure_endpoint=settings.get('azure_openai_gpt_endpoint'), + api_version=api_version, + azure_endpoint=endpoint, azure_ad_token_provider=token_provider ) else: gpt_client = AzureOpenAI( - api_version=settings.get('azure_openai_gpt_api_version'), - azure_endpoint=settings.get('azure_openai_gpt_endpoint'), + api_version=api_version, + azure_endpoint=endpoint, api_key=settings.get('azure_openai_gpt_key') ) # Create vision prompt print(f"Analyzing image with vision model: {vision_model}") - response = gpt_client.chat.completions.create( - model=vision_model, - messages=[ - { - "role": "user", - "content": [ - { - "type": "text", - "text": """Analyze this image and provide: + # Determine which token parameter to use based on model type + # o-series and gpt-5 models require max_completion_tokens instead of max_tokens + vision_model_lower = vision_model.lower() + + debug_print(f"[VISION_ANALYSIS] Building API request parameters:") + debug_print(f" Model (lowercase): {vision_model_lower}") + + # Check which parameter will be used + uses_completion_tokens = ('o1' in vision_model_lower or 'o3' in vision_model_lower or 'gpt-5' in vision_model_lower) + debug_print(f" Uses max_completion_tokens: {uses_completion_tokens}") + debug_print(f" Detection: o1={('o1' in vision_model_lower)}, o3={('o3' in vision_model_lower)}, gpt-5={('gpt-5' in vision_model_lower)}") + + # Build prompt - GPT-5/reasoning models need explicit JSON instruction when using response_format + if uses_completion_tokens: + prompt_text = """Analyze this image and respond in JSON format with the following structure: +{ + "description": "A detailed description of what you see in the image", + "objects": ["list", "of", "objects", "people", "or", "notable", "elements"], + "text": "Any visible text extracted from the image (OCR)", + "analysis": "Contextual analysis, insights, or interpretation" +} + +Ensure your entire response is valid JSON. Include all four keys even if some are empty strings or empty arrays.""" + else: + prompt_text = """Analyze this image and provide: 1. A detailed description of what you see 2. List any objects, people, or notable elements 3. Extract any visible text (OCR) @@ -3061,6 +3102,16 @@ def analyze_image_with_vision_model(image_path, user_id, document_id, settings): "text": "...", "analysis": "..." }""" + + api_params = { + "model": vision_model, + "messages": [ + { + "role": "user", + "content": [ + { + "type": "text", + "text": prompt_text }, { "type": "image_url", @@ -3070,37 +3121,129 @@ def analyze_image_with_vision_model(image_path, user_id, document_id, settings): } ] } - ], - max_tokens=1000 - ) + ] + } + + debug_print(f"[VISION_ANALYSIS_V2] ⚡ About to send request to Azure OpenAI with {vision_model}") + debug_print(f"[VISION_ANALYSIS_V2] ⚡ Using parameter: {'max_completion_tokens' if uses_completion_tokens else 'max_tokens'} = 1000") + debug_print(f"[VISION_ANALYSIS] Sending request to Azure OpenAI...") + debug_print(f" Message content types: text + image_url") + debug_print(f" Image data URL prefix: data:{mime_type};base64,... ({base64_size} chars)") + + response = gpt_client.chat.completions.create(**api_params) + + debug_print(f"[VISION_ANALYSIS_V2] ⚡ Response received successfully from {vision_model}") + + debug_print(f"[VISION_ANALYSIS] Response received from {vision_model}") + debug_print(f" Response ID: {response.id if hasattr(response, 'id') else 'N/A'}") + debug_print(f" Model used: {response.model if hasattr(response, 'model') else 'N/A'}") + if hasattr(response, 'usage'): + debug_print(f" Token usage: prompt={response.usage.prompt_tokens if hasattr(response.usage, 'prompt_tokens') else 'N/A'}, completion={response.usage.completion_tokens if hasattr(response.usage, 'completion_tokens') else 'N/A'}, total={response.usage.total_tokens if hasattr(response.usage, 'total_tokens') else 'N/A'}") + + # Debug the response structure to understand why content might be empty + debug_print(f"[VISION_ANALYSIS] Response object inspection:") + debug_print(f" Response type: {type(response)}") + debug_print(f" Has choices: {hasattr(response, 'choices')}") + if hasattr(response, 'choices') and len(response.choices) > 0: + debug_print(f" Number of choices: {len(response.choices)}") + debug_print(f" First choice type: {type(response.choices[0])}") + debug_print(f" Has message: {hasattr(response.choices[0], 'message')}") + if hasattr(response.choices[0], 'message'): + debug_print(f" Message type: {type(response.choices[0].message)}") + debug_print(f" Message content type: {type(response.choices[0].message.content)}") + debug_print(f" Message content is None: {response.choices[0].message.content is None}") + # Check for refusal + if hasattr(response.choices[0].message, 'refusal'): + debug_print(f" Message refusal: {response.choices[0].message.refusal}") + # Check finish reason + if hasattr(response.choices[0], 'finish_reason'): + debug_print(f" Finish reason: {response.choices[0].finish_reason}") # Parse response content = response.choices[0].message.content - debug_print(f"[VISION_ANALYSIS] Raw response for {document_id}: {content[:500]}...") + # Handle None content + if content is None: + print(f"[VISION_ANALYSIS_V2] ⚠️ Response content is None!") + debug_print(f"[VISION_ANALYSIS] ⚠️ Content is None - checking for refusal or error") + if hasattr(response.choices[0].message, 'refusal') and response.choices[0].message.refusal: + error_msg = f"Model refused to respond: {response.choices[0].message.refusal}" + else: + error_msg = "Model returned empty content with no refusal message" + + return { + 'description': error_msg, + 'error': error_msg, + 'model': vision_model, + 'parse_failed': True + } + + # Additional debugging for empty string case + print(f"[VISION_ANALYSIS_V2] ⚡ Content length: {len(content)}, repr: {repr(content[:200])}") + debug_print(f"[VISION_ANALYSIS] Raw response received:") + debug_print(f" Length: {len(content)} characters") + debug_print(f" Content repr: {repr(content)}") + debug_print(f" First 500 chars: {content[:500]}...") + debug_print(f" Last 100 chars: ...{content[-100:] if len(content) > 100 else content}") + + # Check if response looks like JSON + is_json_like = content.strip().startswith('{') or content.strip().startswith('[') + has_code_fence = '```' in content + debug_print(f" Starts with JSON bracket: {is_json_like}") + debug_print(f" Contains code fence: {has_code_fence}") # Try to parse as JSON, fallback to raw text try: # Clean up potential markdown code fences + debug_print(f"[VISION_ANALYSIS] Attempting to clean JSON code fences...") content_cleaned = clean_json_codeFence(content) + debug_print(f" Cleaned length: {len(content_cleaned)} characters") + debug_print(f" Cleaned first 200 chars: {content_cleaned[:200]}...") + + debug_print(f"[VISION_ANALYSIS] Attempting to parse as JSON...") vision_analysis = json.loads(content_cleaned) - debug_print(f"[VISION_ANALYSIS] Parsed JSON successfully for {document_id}") + debug_print(f"[VISION_ANALYSIS] ✅ Successfully parsed JSON response!") + debug_print(f" JSON keys: {list(vision_analysis.keys())}") + except Exception as parse_error: - debug_print(f"[VISION_ANALYSIS] Vision response not valid JSON: {parse_error}") + debug_print(f"[VISION_ANALYSIS] ❌ JSON parsing failed!") + debug_print(f" Error type: {type(parse_error).__name__}") + debug_print(f" Error message: {str(parse_error)}") + debug_print(f" Content that failed to parse (first 1000 chars): {content[:1000]}") print(f"Vision response not valid JSON, using raw text") + vision_analysis = { 'description': content, - 'raw_response': content + 'raw_response': content, + 'parse_error': str(parse_error), + 'parse_failed': True } + debug_print(f"[VISION_ANALYSIS] Created fallback structure with raw response") # Add model info to analysis vision_analysis['model'] = vision_model - debug_print(f"[VISION_ANALYSIS] Complete analysis for {document_id}:") + debug_print(f"[VISION_ANALYSIS] Final analysis structure for {document_id}:") debug_print(f" Model: {vision_model}") - debug_print(f" Description: {vision_analysis.get('description', 'N/A')[:200]}...") - debug_print(f" Objects: {vision_analysis.get('objects', [])}") - debug_print(f" Text: {vision_analysis.get('text', 'N/A')[:100]}...") + debug_print(f" Has 'description': {'description' in vision_analysis}") + debug_print(f" Has 'objects': {'objects' in vision_analysis}") + debug_print(f" Has 'text': {'text' in vision_analysis}") + debug_print(f" Has 'analysis': {'analysis' in vision_analysis}") + + if 'description' in vision_analysis: + desc = vision_analysis['description'] + debug_print(f" Description length: {len(desc)} chars") + debug_print(f" Description preview: {desc[:200]}...") + + if 'objects' in vision_analysis: + objs = vision_analysis['objects'] + debug_print(f" Objects count: {len(objs) if isinstance(objs, list) else 'not a list'}") + debug_print(f" Objects: {objs}") + + if 'text' in vision_analysis: + txt = vision_analysis['text'] + debug_print(f" Text length: {len(txt) if txt else 0} chars") + debug_print(f" Text preview: {txt[:100] if txt else 'None'}...") print(f"Vision analysis completed for document: {document_id}") return vision_analysis @@ -4478,7 +4621,7 @@ def _split_audio_file(input_path: str, chunk_seconds: int = 540) -> List[str]: if not chunks: print(f"[Error] No WAV chunks produced for '{input_path}'.") raise RuntimeError(f"No chunks produced by ffmpeg for file '{input_path}'") - print(f"[Debug] Produced {len(chunks)} WAV chunks: {chunks}") + print(f"Produced {len(chunks)} WAV chunks: {chunks}") return chunks def process_audio_document( @@ -4509,7 +4652,7 @@ def process_audio_document( # 1) size guard file_size = os.path.getsize(temp_file_path) - print(f"[Debug] File size: {file_size} bytes") + print(f"File size: {file_size} bytes") if file_size > 300 * 1024 * 1024: raise ValueError("Audio exceeds 300 MB limit.") @@ -4527,7 +4670,7 @@ def process_audio_document( all_phrases: List[str] = [] for idx, chunk_path in enumerate(chunk_paths, start=1): update_callback(current_file_chunk=idx, status=f"Transcribing chunk {idx}/{len(chunk_paths)}…") - print(f"[Debug] Transcribing WAV chunk: {chunk_path}") + print(f"Transcribing WAV chunk: {chunk_path}") with open(chunk_path, 'rb') as audio_f: files = { @@ -4544,14 +4687,14 @@ def process_audio_document( result = resp.json() phrases = result.get('combinedPhrases', []) - print(f"[Debug] Received {len(phrases)} phrases") + print(f"Received {len(phrases)} phrases") all_phrases += [p.get('text','').strip() for p in phrases if p.get('text')] # 4) cleanup WAV chunks for p in chunk_paths: try: os.remove(p) - print(f"[Debug] Removed chunk: {p}") + print(f"Removed chunk: {p}") except Exception as e: print(f"[Warning] Could not remove chunk {p}: {e}") @@ -4560,7 +4703,7 @@ def process_audio_document( words = full_text.split() chunk_size = 400 total_pages = max(1, math.ceil(len(words) / chunk_size)) - print(f"[Debug] Creating {total_pages} transcript pages") + print(f"Creating {total_pages} transcript pages") for i in range(total_pages): page_text = ' '.join(words[i*chunk_size:(i+1)*chunk_size]) diff --git a/application/single_app/functions_search.py b/application/single_app/functions_search.py index 7261de0be..c899b65c4 100644 --- a/application/single_app/functions_search.py +++ b/application/single_app/functions_search.py @@ -9,9 +9,9 @@ generate_search_cache_key, get_cached_search_results, cache_search_results, - debug_print, DEBUG_ENABLED ) +from functions_debug import * logger = logging.getLogger(__name__) @@ -32,7 +32,7 @@ def normalize_scores(results: List[Dict[str, Any]], index_name: str = "unknown") Same results list with normalized scores (original score preserved) """ if not results or len(results) == 0: - debug_print(f"[DEBUG] No results to normalize from {index_name}", "NORMALIZE") + debug_print(f"No results to normalize from {index_name}", "NORMALIZE") return results scores = [r['score'] for r in results] @@ -63,7 +63,7 @@ def normalize_scores(results: List[Dict[str, Any]], index_name: str = "unknown") # Log normalized distribution normalized_scores = [r['score'] for r in results] debug_print( - f"[DEBUG] Score distribution AFTER normalization ({index_name})", + f"Score distribution AFTER normalization ({index_name})", "NORMALIZE", index=index_name, count=len(results), @@ -107,7 +107,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a ) if cached_results is not None: debug_print( - "[DEBUG] Returning CACHED search results", + "Returning CACHED search results", "SEARCH", query=query[:40], scope=doc_scope, @@ -118,7 +118,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a # Cache miss - proceed with search debug_print( - "[DEBUG] Cache MISS - Executing Azure AI Search", + "Cache MISS - Executing Azure AI Search", "SEARCH", query=query[:40], scope=doc_scope, @@ -261,7 +261,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a public_results_final = extract_search_results(public_results, top_n) debug_print( - "[DEBUG] Extracted raw results from indexes", + "Extracted raw results from indexes", "SEARCH", user_count=len(user_results_final), group_count=len(group_results_final), @@ -277,7 +277,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a results = user_results_normalized + group_results_normalized + public_results_normalized debug_print( - "[DEBUG] Merged results from all indexes", + "Merged results from all indexes", "SEARCH", total_count=len(results) ) @@ -403,7 +403,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a if results: scores = [r['score'] for r in results] debug_print( - "[DEBUG] Results BEFORE final sorting", + "Results BEFORE final sorting", "SORT", total_results=len(results), min_score=f"{min(scores):.4f}", @@ -417,7 +417,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a if os.environ.get('DEBUG_SEARCH_CACHE', '0') == '1': for i, r in enumerate(results[:5]): debug_print( - f"[DEBUG] Pre-sort #{i+1}", + f"Pre-sort #{i+1}", "SORT", file=r['file_name'][:30], score=f"{r['score']:.4f}", @@ -441,7 +441,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a # Log post-sort results debug_print( - f"[DEBUG] Results AFTER sorting (top {top_n})", + f"Results AFTER sorting (top {top_n})", "SORT", final_count=len(results) ) @@ -452,7 +452,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a if os.environ.get('DEBUG_SEARCH_CACHE', '0') == '1': for i, r in enumerate(results[:5]): debug_print( - f"[DEBUG] Final #{i+1}", + f"Final #{i+1}", "SORT", file=r['file_name'][:30], score=f"{r['score']:.4f}", @@ -472,7 +472,7 @@ def hybrid_search(query, user_id, document_id=None, top_n=12, doc_scope="all", a ) debug_print( - "[DEBUG] Search complete - returning results", + "Search complete - returning results", "SEARCH", query=query[:40], final_result_count=len(results) diff --git a/application/single_app/route_backend_documents.py b/application/single_app/route_backend_documents.py index 0bb51718b..748467931 100644 --- a/application/single_app/route_backend_documents.py +++ b/application/single_app/route_backend_documents.py @@ -5,6 +5,7 @@ from functions_documents import * from functions_settings import * from utils_cache import invalidate_personal_search_cache +from functions_debug import * from functions_activity_logging import log_document_upload import os import requests @@ -355,8 +356,8 @@ def api_get_user_documents(): # --- 3) First query: get total count based on filters --- try: count_query_str = f"SELECT VALUE COUNT(1) FROM c WHERE {where_clause}" - # debug_print(f"[DEBUG]: Count Query: {count_query_str}") # Optional Debugging - # debug_print(f"[DEBUG]: Count Params: {query_params}") # Optional Debugging + # debug_print(f"Count Query: {count_query_str}") # Optional Debugging + # debug_print(f"Count Params: {query_params}") # Optional Debugging count_items = list(cosmos_user_documents_container.query_items( query=count_query_str, parameters=query_params, @@ -380,8 +381,8 @@ def api_get_user_documents(): ORDER BY c._ts DESC OFFSET {offset} LIMIT {page_size} """ - # debug_print(f"[DEBUG]: Data Query: {data_query_str}") # Optional Debugging - # debug_print(f"[DEBUG]: Data Params: {query_params}") # Optional Debugging + # debug_print(f"Data Query: {data_query_str}") # Optional Debugging + # debug_print(f"Data Params: {query_params}") # Optional Debugging docs = list(cosmos_user_documents_container.query_items( query=data_query_str, parameters=query_params, diff --git a/application/single_app/route_backend_group_documents.py b/application/single_app/route_backend_group_documents.py index 5d20b8ce6..805cf3c25 100644 --- a/application/single_app/route_backend_group_documents.py +++ b/application/single_app/route_backend_group_documents.py @@ -6,6 +6,7 @@ from functions_group import * from functions_documents import * from utils_cache import invalidate_group_search_cache +from functions_debug import * from functions_activity_logging import log_document_upload from flask import current_app from swagger_wrapper import swagger_route, get_auth_security diff --git a/application/single_app/route_backend_public_documents.py b/application/single_app/route_backend_public_documents.py index 630e01c61..319a1e1b4 100644 --- a/application/single_app/route_backend_public_documents.py +++ b/application/single_app/route_backend_public_documents.py @@ -8,6 +8,7 @@ from functions_documents import * from utils_cache import invalidate_public_workspace_search_cache from flask import current_app +from functions_debug import * from swagger_wrapper import swagger_route, get_auth_security def register_route_backend_public_documents(app): diff --git a/application/single_app/route_backend_settings.py b/application/single_app/route_backend_settings.py index 54914e9e7..9f6b31028 100644 --- a/application/single_app/route_backend_settings.py +++ b/application/single_app/route_backend_settings.py @@ -342,10 +342,12 @@ def _test_multimodal_vision_connection(payload): api_key=api_key ) - # Test vision analysis with simple prompt - response = gpt_client.chat.completions.create( - model=vision_model, - messages=[ + # Determine which token parameter to use based on model type + # o-series and gpt-5 models require max_completion_tokens instead of max_tokens + vision_model_lower = vision_model.lower() + api_params = { + "model": vision_model, + "messages": [ { "role": "user", "content": [ @@ -361,9 +363,17 @@ def _test_multimodal_vision_connection(payload): } ] } - ], - max_tokens=50 - ) + ] + } + + # Use max_completion_tokens for o-series and gpt-5 models, max_tokens for others + if ('o1' in vision_model_lower or 'o3' in vision_model_lower or 'gpt-5' in vision_model_lower): + api_params["max_completion_tokens"] = 50 + else: + api_params["max_tokens"] = 50 + + # Test vision analysis with simple prompt + response = gpt_client.chat.completions.create(**api_params) result = response.choices[0].message.content diff --git a/application/single_app/route_backend_users.py b/application/single_app/route_backend_users.py index ee5a77663..0ee7cc135 100644 --- a/application/single_app/route_backend_users.py +++ b/application/single_app/route_backend_users.py @@ -91,7 +91,7 @@ def api_get_user_info(user_id): item=user_id, partition_key=user_id ) - print(f"[DEBUG] /api/user/info/{user_id} → doc: {user_doc}", flush=True) + print(f"/api/user/info/{user_id} → doc: {user_doc}", flush=True) return jsonify({ "user_id": user_id, "email": user_doc.get("email", ""), diff --git a/application/single_app/route_enhanced_citations.py b/application/single_app/route_enhanced_citations.py index 5007344bc..684559db7 100644 --- a/application/single_app/route_enhanced_citations.py +++ b/application/single_app/route_enhanced_citations.py @@ -155,7 +155,7 @@ def get_enhanced_citation_pdf(): if not doc_id: return jsonify({"error": "doc_id is required"}), 400 - debug_print(f"[DEBUG]:: Enhanced citations PDF request - doc_id: {doc_id}, page: {page_number}, show_all: {show_all}") + debug_print(f"Enhanced citations PDF request - doc_id: {doc_id}, page: {page_number}, show_all: {show_all}") user_id = get_current_user_id() if not user_id: @@ -339,7 +339,7 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False): page_number: Current page number show_all: If True, show all pages instead of just ±1 pages around current """ - debug_print(f"[DEBUG]:: serve_enhanced_citation_pdf_content called with show_all: {show_all}") + debug_print(f"serve_enhanced_citation_pdf_content called with show_all: {show_all}") import io import uuid @@ -437,7 +437,7 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False): # When show_all is True, allow iframe embedding if show_all: - debug_print(f"[DEBUG]:: Setting CSP headers for iframe embedding (show_all={show_all})") + debug_print(f"Setting CSP headers for iframe embedding (show_all={show_all})") headers['Content-Security-Policy'] = ( "default-src 'self'; " "frame-ancestors 'self'; " # Allow embedding in same origin @@ -445,7 +445,7 @@ def serve_enhanced_citation_pdf_content(raw_doc, page_number, show_all=False): ) headers['X-Frame-Options'] = 'SAMEORIGIN' # Allow same-origin framing else: - debug_print(f"[DEBUG]:: NOT setting CSP headers for iframe embedding (show_all={show_all})") + debug_print(f"NOT setting CSP headers for iframe embedding (show_all={show_all})") response = Response( extracted_content, diff --git a/application/single_app/route_frontend_chats.py b/application/single_app/route_frontend_chats.py index 73988694c..2035b3eba 100644 --- a/application/single_app/route_frontend_chats.py +++ b/application/single_app/route_frontend_chats.py @@ -8,6 +8,7 @@ from functions_group import find_group_by_id from functions_appinsights import log_event from swagger_wrapper import swagger_route, get_auth_security +from functions_debug import debug_print def register_route_frontend_chats(app): @app.route('/chats', methods=['GET']) diff --git a/application/single_app/static/js/agents_common.js b/application/single_app/static/js/agents_common.js index 8ae1333be..0aed81f60 100644 --- a/application/single_app/static/js/agents_common.js +++ b/application/single_app/static/js/agents_common.js @@ -205,19 +205,19 @@ export async function loadGlobalModelsForModal({ export function setupApimToggle(apimToggle, apimFields, gptFields, onToggle) { if (!apimToggle || !apimFields || !gptFields) return; function updateApimFieldsVisibility() { - console.log('[DEBUG] updateApimFieldsVisibility fired. apimToggle.checked:', apimToggle.checked); + console.log('updateApimFieldsVisibility fired. apimToggle.checked:', apimToggle.checked); if (apimToggle.checked) { apimFields.style.display = 'block'; gptFields.style.display = 'none'; apimFields.classList.remove('d-none'); gptFields.classList.add('d-none'); - console.log('[DEBUG] Showing APIM fields, hiding GPT fields.'); + console.log('Showing APIM fields, hiding GPT fields.'); } else { apimFields.style.display = 'none'; gptFields.style.display = 'block'; gptFields.classList.remove('d-none'); apimFields.classList.add('d-none'); - console.log('[DEBUG] Hiding APIM fields, showing GPT fields.'); + console.log('Hiding APIM fields, showing GPT fields.'); } if (typeof onToggle === 'function') { onToggle(); @@ -368,7 +368,7 @@ export function getAvailableModels({ apimEnabled, settings, agent }) { } else { // Otherwise use gpt_model.selected (array) let rawModels = (settings && settings.gpt_model && settings.gpt_model.selected) ? settings.gpt_model.selected : []; - console.log('[DEBUG] Raw models:', rawModels); + console.log('Raw models:', rawModels); // Normalize: map deploymentName/modelName to deployment/name if present models = rawModels.map(m => { if (m.deploymentName || m.modelName) { @@ -381,7 +381,7 @@ export function getAvailableModels({ apimEnabled, settings, agent }) { return m; }); selectedModel = agent && agent.azure_openai_gpt_deployment ? agent.azure_openai_gpt_deployment : null; - console.log('[DEBUG] Available models:', selectedModel); + console.log('Available models:', selectedModel); } return { models, selectedModel }; } diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index 4c10817b0..2db37fe7e 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -2595,7 +2595,17 @@ function maskSelection(messageDiv, messageId, selection, messageText, maskBtn) { span.setAttribute('data-display-name', userDisplayName); span.title = `Masked by ${userDisplayName}`; - range.surroundContents(span); + // Use extractContents and insertNode to handle complex selections + try { + const contents = range.extractContents(); + span.appendChild(contents); + range.insertNode(span); + } catch (e) { + console.error('Error wrapping selection:', e); + // Fallback: reload the message to show the masked content + location.reload(); + return; + } selection.removeAllRanges(); // Update mask button diff --git a/application/single_app/templates/admin_settings.html b/application/single_app/templates/admin_settings.html index 3abb4bb2d..e8dc1fe26 100644 --- a/application/single_app/templates/admin_settings.html +++ b/application/single_app/templates/admin_settings.html @@ -1994,7 +1994,7 @@
{% endfor %} {% endif %} -
Select a GPT model with vision capabilities (e.g., gpt-4o, gpt-4-vision). Only vision-capable models are shown.
+
Select a GPT model with vision capabilities (e.g., gpt-4o, gpt-4-vision, gpt-5, gpt-5-nano, etc.). Only vision-capable models are shown.
+
`; // Build AI message inner HTML messageDiv.innerHTML = ` @@ -701,6 +709,7 @@ export function appendMessage(
${senderLabel}
${mainMessageHtml} ${citationContentContainerHtml} + ${metadataContainerHtml} ${footerContentHtml} `; @@ -728,6 +737,30 @@ export function appendMessage( // --- Attach Event Listeners specifically for AI message --- attachCodeBlockCopyButtons(messageDiv.querySelector(".message-text")); + const metadataBtn = messageDiv.querySelector(".metadata-info-btn"); + if (metadataBtn) { + metadataBtn.addEventListener("click", () => { + const metadataContainer = messageDiv.querySelector('.metadata-container'); + if (metadataContainer) { + const isVisible = metadataContainer.style.display !== 'none'; + metadataContainer.style.display = isVisible ? 'none' : 'block'; + metadataBtn.setAttribute('aria-expanded', !isVisible); + metadataBtn.title = isVisible ? 'Show metadata' : 'Hide metadata'; + + // Toggle icon + const icon = metadataBtn.querySelector('i'); + if (icon) { + icon.className = isVisible ? 'bi bi-info-circle' : 'bi bi-chevron-up'; + } + + // Load metadata if container is empty (first open) + if (!isVisible && metadataContainer.innerHTML.includes('Loading metadata')) { + loadMessageMetadataForDisplay(messageId, metadataContainer); + } + } + }); + } + const maskBtn = messageDiv.querySelector(".mask-btn"); if (maskBtn) { // Update tooltip dynamically on hover @@ -799,6 +832,11 @@ export function appendMessage( // --- Handle ALL OTHER message types --- } else { + // Declare variables for image metadata checks (needed for footer logic) + let isUserUpload = false; + let hasExtractedText = false; + let hasVisionAnalysis = false; + // Determine variables based on sender type if (sender === "You") { messageClass = "user-message"; @@ -839,9 +877,9 @@ export function appendMessage( } // Check if this is a user-uploaded image with metadata - const isUserUpload = fullMessageObject?.metadata?.is_user_upload || false; - const hasExtractedText = fullMessageObject?.extracted_text || false; - const hasVisionAnalysis = fullMessageObject?.vision_analysis || false; + isUserUpload = fullMessageObject?.metadata?.is_user_upload || false; + hasExtractedText = fullMessageObject?.extracted_text || false; + hasVisionAnalysis = fullMessageObject?.vision_analysis || false; // Use agent display name if available, otherwise show AI with model if (isUserUpload) { @@ -860,20 +898,6 @@ export function appendMessage( // Validate image URL before creating img tag if (messageContent && messageContent !== 'null' && messageContent.trim() !== '') { messageContentHtml = `${isUserUpload ? 'Uploaded' : 'Generated'} Image`; - - // Add info button for uploaded images with extracted text or vision analysis - if (isUserUpload && (hasExtractedText || hasVisionAnalysis)) { - const infoContainerId = `image-info-${messageId || Date.now()}`; - messageContentHtml += ` -
- -
- `; - } } else { messageContentHtml = `
Failed to ${isUserUpload ? 'load' : 'generate'} image - invalid response from image service
`; } @@ -909,7 +933,7 @@ export function appendMessage( // This runs for "You", "File", "image", "safety", "Error", and the fallback "unknown" messageDiv.classList.add(messageClass); // Add the determined class - // Create user message footer if this is a user message + // Create message footer for user, image, and file messages let messageFooterHtml = ""; let metadataContainerHtml = ""; if (sender === "You") { @@ -928,11 +952,32 @@ export function appendMessage( - `; metadataContainerHtml = ``; + } else if (sender === "image" || sender === "File") { + // Image and file messages get metadata button on right side + const metadataContainerId = `metadata-${messageId || Date.now()}`; + + // For images with extracted text or vision analysis, add View Text button like citation button + let imageInfoToggleHtml = ''; + let imageInfoContainerHtml = ''; + if (sender === "image" && isUserUpload && (hasExtractedText || hasVisionAnalysis)) { + const infoContainerId = `image-info-${messageId || Date.now()}`; + imageInfoToggleHtml = `
`; + imageInfoContainerHtml = ``; + } + + messageFooterHtml = ` +
+
${imageInfoToggleHtml}
+ +
`; + metadataContainerHtml = imageInfoContainerHtml + ``; } // Set innerHTML using the variables determined above @@ -988,6 +1033,33 @@ export function appendMessage( }); } } + + // Add event listener for metadata button (image and file messages) + if (sender === "image" || sender === "File") { + const metadataBtn = messageDiv.querySelector('.metadata-info-btn'); + if (metadataBtn) { + metadataBtn.addEventListener('click', () => { + const metadataContainer = messageDiv.querySelector('.metadata-container'); + if (metadataContainer) { + const isVisible = metadataContainer.style.display !== 'none'; + metadataContainer.style.display = isVisible ? 'none' : 'block'; + metadataBtn.setAttribute('aria-expanded', !isVisible); + metadataBtn.title = isVisible ? 'Show metadata' : 'Hide metadata'; + + // Toggle icon + const icon = metadataBtn.querySelector('i'); + if (icon) { + icon.className = isVisible ? 'bi bi-info-circle' : 'bi bi-chevron-up'; + } + + // Load metadata if container is empty (first open) + if (!isVisible && metadataContainer.innerHTML.includes('Loading metadata')) { + loadMessageMetadataForDisplay(messageId, metadataContainer); + } + } + }); + } + } scrollChatToBottom(); } // End of the large 'else' block for non-AI messages @@ -1829,6 +1901,34 @@ function formatMetadataForDrawer(metadata) { content += ''; } + // Thread Information Section (priority display) + if (metadata.thread_info) { + const ti = metadata.thread_info; + content += '
'; + content += '
Thread Information
'; + + content += `
+ Thread ID: ${escapeHtml(ti.thread_id || 'N/A')} +
`; + + content += `
+ Previous Thread: ${escapeHtml(ti.previous_thread_id || 'None')} +
`; + + const activeThreadBadge = ti.active_thread ? + 'Active' : + 'Inactive'; + content += `
+ Active Thread: ${activeThreadBadge} +
`; + + content += `
+ Thread Attempt: ${createInfoBadge(ti.thread_attempt || 0, 'info')} +
`; + + content += '
'; + } + // Button States Section if (metadata.button_states) { content += '
'; @@ -2132,14 +2232,14 @@ function toggleImageInfo(messageDiv, messageId, fullMessageObject) { // Hide the info infoContainer.style.display = "none"; toggleBtn.setAttribute("aria-expanded", false); - toggleBtn.title = "View extracted text & analysis"; - toggleBtn.innerHTML = ' View Text'; + toggleBtn.title = "View extracted text"; + toggleBtn.innerHTML = ''; } else { // Show the info infoContainer.style.display = "block"; toggleBtn.setAttribute("aria-expanded", true); - toggleBtn.title = "Hide extracted text & analysis"; - toggleBtn.innerHTML = ' Hide Text'; + toggleBtn.title = "Hide extracted text"; + toggleBtn.innerHTML = ''; // Load image info if not already loaded const contentDiv = infoContainer.querySelector('.image-info-content'); @@ -2158,6 +2258,121 @@ function toggleImageInfo(messageDiv, messageId, fullMessageObject) { }, 10); } +/** + * Toggle the metadata drawer for AI, image, and file messages + */ +function toggleMessageMetadata(messageDiv, messageId) { + const existingDrawer = messageDiv.querySelector('.message-metadata-drawer'); + + if (existingDrawer) { + // Drawer exists, remove it + existingDrawer.remove(); + return; + } + + // Create new drawer + const drawerDiv = document.createElement('div'); + drawerDiv.className = 'message-metadata-drawer mt-2 p-3 border rounded bg-light'; + drawerDiv.innerHTML = ''; + + messageDiv.appendChild(drawerDiv); + + // Load metadata + loadMessageMetadataForDisplay(messageId, drawerDiv); +} + +/** + * Load message metadata into the drawer for AI/image/file messages + */ +function loadMessageMetadataForDisplay(messageId, container) { + fetch(`/api/message/${messageId}/metadata`) + .then(response => { + if (!response.ok) { + throw new Error('Failed to load metadata'); + } + return response.json(); + }) + .then(data => { + if (!data) { + container.innerHTML = '

No metadata available

'; + return; + } + + const metadata = data; + let html = '
'; + + // Thread Information (check both locations for backward compatibility) + const threadInfo = metadata.metadata?.thread_info || { + thread_id: metadata.thread_id, + previous_thread_id: metadata.previous_thread_id, + active_thread: metadata.active_thread, + thread_attempt: metadata.thread_attempt + }; + + if (threadInfo.thread_id) { + html += '
'; + html += '
Thread Information
'; + html += '
'; + html += `
Thread ID: ${threadInfo.thread_id}
`; + html += `
Previous Thread: ${threadInfo.previous_thread_id || 'None (first message)'}
`; + html += `
Active: ${threadInfo.active_thread ? 'Yes' : 'No'}
`; + html += `
Attempt: ${threadInfo.thread_attempt || 1}
`; + html += '
'; + } + + // Message Details + html += '
'; + html += '
Message Details
'; + html += '
'; + if (metadata.id) html += `
Message ID: ${metadata.id}
`; + if (metadata.conversation_id) html += `
Conversation ID: ${metadata.conversation_id}
`; + if (metadata.role) html += `
Role: ${metadata.role}
`; + if (metadata.timestamp) html += `
Timestamp: ${new Date(metadata.timestamp).toLocaleString()}
`; + if (metadata.model_deployment_name) html += `
Model: ${metadata.model_deployment_name}
`; + if (metadata.agent_name) html += `
Agent: ${metadata.agent_name}
`; + if (metadata.agent_display_name) html += `
Agent Display Name: ${metadata.agent_display_name}
`; + html += '
'; + + // Image/File specific info + if (metadata.role === 'image') { + html += '
'; + html += '
Image Details
'; + html += '
'; + if (metadata.filename) html += `
Filename: ${metadata.filename}
`; + if (metadata.prompt) html += `
Prompt: ${metadata.prompt}
`; + if (metadata.metadata?.is_chunked !== undefined) html += `
Chunked: ${metadata.metadata.is_chunked ? 'Yes' : 'No'}
`; + if (metadata.metadata?.is_user_upload !== undefined) html += `
User Upload: ${metadata.metadata.is_user_upload ? 'Yes' : 'No'}
`; + html += '
'; + } else if (metadata.role === 'file') { + html += '
'; + html += '
File Details
'; + html += '
'; + if (metadata.filename) html += `
Filename: ${metadata.filename}
`; + if (metadata.is_table !== undefined) html += `
Table Data: ${metadata.is_table ? 'Yes' : 'No'}
`; + html += '
'; + } + + // Assistant message specific info + if (metadata.role === 'assistant') { + html += '
'; + html += '
Generation Details
'; + html += '
'; + if (metadata.augmented !== undefined) html += `
Augmented: ${metadata.augmented ? 'Yes' : 'No'}
`; + if (metadata.metadata?.reasoning_effort) html += `
Reasoning Effort: ${metadata.metadata.reasoning_effort}
`; + if (metadata.hybrid_citations && metadata.hybrid_citations.length > 0) html += `
Document Citations: ${metadata.hybrid_citations.length}
`; + if (metadata.agent_citations && metadata.agent_citations.length > 0) html += `
Agent Citations: ${metadata.agent_citations.length}
`; + html += '
'; + } + + html += '
'; + container.innerHTML = html; + }) + .catch(error => { + console.error('Error loading message metadata:', error); + container.innerHTML = '
Failed to load metadata
'; + }); +} + /** * Load image extracted text and vision analysis into the info drawer */ diff --git a/docs/features/MESSAGE_METADATA_DISPLAY.md b/docs/features/MESSAGE_METADATA_DISPLAY.md new file mode 100644 index 000000000..fed8c8c45 --- /dev/null +++ b/docs/features/MESSAGE_METADATA_DISPLAY.md @@ -0,0 +1,243 @@ +# Message Metadata Display Feature + +**Version:** 0.233.209 +**Implemented in:** 0.233.209 +**Date:** January 2025 + +## Overview + +Extension of the message threading system to expose message metadata through the user interface. This feature adds metadata display capabilities for assistant (AI), image, and file messages, and enhances user message metadata to include thread information. + +## Purpose + +- **User Visibility**: Provide users with access to message metadata including thread relationships +- **Debugging Support**: Enable users to understand conversation flow and message connections +- **Transparency**: Show technical details like model information, timestamps, and threading data +- **Thread Navigation**: Allow users to see how messages are linked through thread IDs + +## Implementation Details + +### Frontend Changes (chat-messages.js) + +#### 1. Metadata Display Buttons + +**AI Messages:** +- Added metadata button with gear icon after copy/feedback buttons +- Button triggers metadata drawer toggle +- Location: Lines 615-623 + +**Image Messages:** +- Added metadata button after image content +- Works for both generated and uploaded images +- Location: Lines 897-903 + +**File Messages:** +- Added metadata button after file link +- Displays threading and upload information +- Location: Lines 843-848 + +#### 2. Metadata Display Functions + +**toggleMessageMetadata(messageDiv, messageId):** +- Creates and manages metadata drawer for assistant/image/file messages +- Dynamically creates drawer on first click +- Toggles visibility with appropriate ARIA attributes +- Location: Lines 2320-2346 + +**loadMessageMetadataForDisplay(messageId, container):** +- Fetches metadata from backend API endpoint +- Formats and displays comprehensive metadata information +- Handles thread info, role, timestamps, model, agent, citations, tokens +- Location: Lines 2348-2413 + +#### 3. Enhanced User Message Metadata + +**formatMetadataForDrawer(metadata):** +- Added thread information section at priority position +- Displays thread_id, previous_thread_id, active_thread, thread_attempt +- Uses badges and icons for visual clarity +- Location: Lines 1869-1897 + +#### 4. Event Listeners + +- Unified event listener for AI, image, and file metadata buttons +- Checks sender type and attaches click handler +- Location: Lines 1020-1028 + +### Backend Integration + +Uses existing backend endpoints and metadata structure: +- `/api/message//metadata` - Fetch message metadata +- Thread info added to user_metadata in route_backend_chats.py (v0.233.208) + +## Metadata Display Format + +### Thread Information Section +``` +Thread Information +├── Thread ID: [UUID] +├── Previous Thread: [UUID or None] +├── Active Thread: [Active/Inactive badge] +└── Thread Attempt: [Number badge] +``` + +### Additional Metadata (AI/Image/File messages) +``` +Role: [badge] +Timestamp: [formatted date/time] +Model: [model name] +Agent: [agent name if applicable] +Agent Display Name: [display name if applicable] +Citations: [count if applicable] +Token Usage: Input: X, Output: Y +``` + +### User Message Metadata +``` +User Information +├── User: [display name] +├── Email: [email] +├── Username: [username] +└── Timestamp: [date/time] + +Thread Information +├── Thread ID: [UUID] +├── Previous Thread: [UUID or None] +├── Active Thread: [Active/Inactive] +└── Thread Attempt: [Number] + +[... other existing sections ...] +``` + +## UI Components + +### Button Styling +- **Class:** `btn btn-sm btn-outline-secondary metadata-info-btn` +- **Icon:** `` for AI/image/file messages +- **Icon:** `` for user messages (existing) +- **Title:** "View message metadata" + +### Drawer Styling +- **Class:** `message-metadata-drawer mt-2 pt-2 border-top` +- **Display:** Toggle between `none` and `block` +- **Loading State:** "Loading metadata..." text while fetching + +### Badge Components +- **Active Thread:** Green badge (bg-success) or gray (bg-secondary) +- **Thread Attempt:** Blue badge (bg-info) +- **Role:** Primary badge (bg-primary) + +## User Workflow + +### Viewing AI Message Metadata +1. User sees gear icon next to AI message +2. User clicks gear icon +3. Drawer opens showing metadata +4. Thread info displayed at top +5. Click again to close drawer + +### Viewing Image Message Metadata +1. User sees image generated or uploaded +2. Metadata button appears below image +3. Click to view metadata including thread info +4. Works alongside existing "View Text" button for uploads + +### Viewing File Message Metadata +1. User uploads file to conversation +2. File link displayed with metadata button +3. Click to view file message metadata +4. Shows thread connection to related messages + +### Viewing User Message Thread Info +1. User clicks info icon on their message +2. Existing metadata drawer opens +3. **New:** Thread Information section appears first +4. Shows how message connects in conversation flow + +## Benefits + +### For Users +- **Understand Conversations:** See how messages connect through threads +- **Debug Issues:** Identify which agent/model generated responses +- **Track Context:** View thread chains and message relationships +- **Transparency:** Access to technical details when needed + +### For Developers +- **Testing:** Validate threading implementation through UI +- **Debugging:** Inspect message structure without database queries +- **Monitoring:** See token usage and model information +- **Support:** Help users understand system behavior + +## Technical Notes + +### API Integration +- Uses existing `/api/message//metadata` endpoint +- Fetches metadata on-demand (not preloaded) +- Credentials included for authentication +- Error handling with user-friendly messages + +### Performance Considerations +- Metadata loaded only when drawer opened +- Cached in DOM after first load +- Minimal impact on page load time +- Drawer created dynamically on first click + +### Browser Compatibility +- Uses modern JavaScript (ES6) +- Bootstrap 5 icons for UI elements +- ARIA attributes for accessibility +- Works across modern browsers + +## Testing + +### Manual Testing Checklist +- [ ] AI message metadata button appears and works +- [ ] Image message metadata button appears for generated images +- [ ] Image message metadata button appears for uploaded images +- [ ] File message metadata button appears +- [ ] User message metadata shows thread information +- [ ] Thread info displays correctly for chained messages +- [ ] Metadata drawers toggle properly +- [ ] Loading states display correctly +- [ ] Error handling works for failed fetches +- [ ] Thread badges show correct status + +### Test Scenarios +1. **Create new conversation** - Verify first message has no previous_thread_id +2. **Continue thread** - Verify subsequent messages link correctly +3. **Generate image** - Check metadata button and thread info +4. **Upload file** - Verify file metadata displays threading +5. **View user message** - Confirm thread info in drawer + +## Future Enhancements + +### Potential Improvements +1. **Thread Navigation:** Click thread ID to jump to previous message +2. **Visual Thread Map:** Graph view showing thread relationships +3. **Export Metadata:** Download metadata as JSON +4. **Filter by Thread:** Show only messages in specific thread +5. **Thread Analytics:** Statistics about thread depth and branching + +### API Enhancements +1. **Bulk Metadata Fetch:** Get metadata for multiple messages +2. **Thread History:** Fetch entire thread chain in one request +3. **Metadata Search:** Find messages by thread properties + +## Related Documentation + +- **MESSAGE_THREADING_SYSTEM.md** - Core threading implementation +- **route_backend_chats.py** - Backend message creation with threading +- **functions_chat.py** - sort_messages_by_thread() function + +## Version History + +- **0.233.208:** Added thread_info to user_metadata in backend +- **0.233.209:** Added metadata display buttons and UI components + +## Support + +For issues or questions about message metadata display: +1. Verify backend threading is working correctly +2. Check browser console for JavaScript errors +3. Verify API endpoint `/api/message//metadata` is accessible +4. Confirm user has proper permissions to view messages diff --git a/docs/features/MESSAGE_THREADING_SYSTEM.md b/docs/features/MESSAGE_THREADING_SYSTEM.md new file mode 100644 index 000000000..589261ac5 --- /dev/null +++ b/docs/features/MESSAGE_THREADING_SYSTEM.md @@ -0,0 +1,299 @@ +# Message Threading System + +## Overview +Version: **0.233.208** +Implemented: December 4, 2025 + +This feature implements a linked-list threading system for chat messages that establishes proper relationships between user messages, system messages, AI responses, image generations, and file uploads. Messages are now ordered by thread chains rather than just timestamps, ensuring proper conversation flow and message association. + +## Purpose +The threading system solves several key problems: +- **Message Association**: Links user messages to their corresponding AI responses and system augmentations +- **Proper Ordering**: Ensures messages are displayed in logical conversation order, not just temporal order +- **File Upload Tracking**: Properly sequences uploaded files within the conversation flow +- **Image Generation Tracking**: Associates generated images with the messages that requested them +- **Legacy Support**: Gracefully handles existing messages without thread information + +## Thread Fields + +Each message now includes four new fields: + +### `thread_id` +- **Type**: String (UUID) +- **Purpose**: Unique identifier for this message in the thread chain +- **Generated**: For every new message (user, system, assistant, image, file) + +### `previous_thread_id` +- **Type**: String (UUID) or `None` +- **Purpose**: Links to the previous message's `thread_id` +- **Value**: `None` for the first message in a conversation or when following a legacy message + +### `active_thread` +- **Type**: Boolean +- **Purpose**: Indicates if this thread is currently active +- **Value**: Always `True` in current implementation (reserved for future retry/edit functionality) + +### `thread_attempt` +- **Type**: Integer +- **Purpose**: Tracks the attempt number for retries or edits +- **Value**: Always `1` in current implementation (reserved for future retry functionality) + +## Message Flow Examples + +### Standard Chat Interaction + +``` +User Message (Thread 1) +├─ thread_id: "abc-123" +├─ previous_thread_id: None +├─ active_thread: True +└─ thread_attempt: 1 + │ + ↓ +System Message (Thread 2) [Optional - if RAG/search enabled] +├─ thread_id: "def-456" +├─ previous_thread_id: "abc-123" +├─ active_thread: True +└─ thread_attempt: 1 + │ + ↓ +AI Response (Thread 3) +├─ thread_id: "ghi-789" +├─ previous_thread_id: "def-456" (or "abc-123" if no system message) +├─ active_thread: True +└─ thread_attempt: 1 +``` + +### Image Generation + +``` +User Message (Thread 1) +├─ thread_id: "aaa-111" +├─ previous_thread_id: None +├─ active_thread: True +└─ thread_attempt: 1 + │ + ↓ +Image Message (Thread 2) +├─ thread_id: "bbb-222" +├─ previous_thread_id: "aaa-111" +├─ active_thread: True +├─ thread_attempt: 1 +└─ role: "image" +``` + +### File Upload + +``` +(Previous conversation messages...) + │ + ↓ +File Upload (New Thread) +├─ thread_id: "ccc-333" +├─ previous_thread_id: "zzz-999" (last message in conversation) +├─ active_thread: True +├─ thread_attempt: 1 +├─ role: "image" (for images) or "file" (for documents) +└─ filename: "document.pdf" +``` + +## Implementation Details + +### Modified Files + +1. **functions_chat.py** + - Added `sort_messages_by_thread()` function + - Implements linked-list traversal algorithm + - Handles both legacy (timestamp-ordered) and threaded messages + +2. **route_backend_chats.py** + - Updated `chat_api()` endpoint + - Updated `chat_stream_api()` endpoint + - Added threading to user messages, system messages, and assistant messages + - Added threading to generated images (chunked and non-chunked) + - Queries last message's `thread_id` before creating new messages + +3. **route_frontend_chats.py** + - Updated file upload handler (`/upload`) + - Added threading to uploaded images (chunked and non-chunked) + - Added threading to uploaded files + +4. **route_frontend_conversations.py** + - Updated `get_conversation_messages()` endpoint + - Applies `sort_messages_by_thread()` before returning messages + +5. **config.py** + - Updated version to `0.233.208` + +### Sorting Algorithm + +The `sort_messages_by_thread()` function: + +1. **Separates messages** into legacy (no `thread_id`) and threaded messages +2. **Sorts legacy messages** by timestamp +3. **Builds thread chain**: + - Creates a map of `thread_id` → message + - Creates a map of `previous_thread_id` → children +4. **Finds root messages**: Messages with no `previous_thread_id` or where `previous_thread_id` doesn't exist in current set +5. **Traverses chains**: Recursively follows the linked list structure +6. **Returns ordered list**: Legacy messages first, then threaded messages in chain order + +### Thread Chain Establishment + +When creating a new message: + +```python +# Query for the last message's thread_id +last_msg_query = """ + SELECT TOP 1 c.thread_id + FROM c + WHERE c.conversation_id = '{conversation_id}' + ORDER BY c.timestamp DESC +""" +last_msgs = list(cosmos_messages_container.query_items( + query=last_msg_query, + partition_key=conversation_id +)) +previous_thread_id = last_msgs[0].get('thread_id') if last_msgs else None + +# Generate new thread_id and create message +current_thread_id = str(uuid.uuid4()) +message = { + 'thread_id': current_thread_id, + 'previous_thread_id': previous_thread_id, + 'active_thread': True, + 'thread_attempt': 1, + # ... other message fields +} +``` + +## Legacy Message Support + +The system is fully backward compatible: + +- **Existing messages** without `thread_id` are sorted by timestamp +- **Legacy messages** are placed **before** threaded messages +- **No migration required** - threading applies only to new messages +- **Gradual adoption** - conversations naturally transition to threaded ordering + +## Frontend Impact + +**No frontend changes required.** The frontend continues to: +- Fetch messages from the backend +- Display them in the order received +- The backend now returns messages in thread order instead of timestamp order + +## Performance Considerations + +### Database Queries +- Single additional query per message creation (to get last `thread_id`) +- Query is optimized: `SELECT TOP 1` with `ORDER BY timestamp DESC` +- Uses partition key for efficient lookup + +### Sorting Performance +- O(n log n) for legacy message sorting (timestamp-based) +- O(n) for building thread chain maps +- O(n) for traversing chains +- Overall complexity: O(n log n) where n = number of messages + +### Indexing Recommendations +Consider adding indexes for: +- `conversation_id` + `timestamp` (DESC) - for last message lookup +- `conversation_id` + `thread_id` - for thread chain traversal + +## Future Enhancements + +### Retry/Edit Support +The `thread_attempt` field enables future retry functionality: +``` +User Message (Thread 1, Attempt 1) - active_thread: False + │ + ↓ +Assistant Response (Thread 2, Attempt 1) - active_thread: False + │ + ↓ +User Message (Thread 1, Attempt 2) - active_thread: True + │ + ↓ +Assistant Response (Thread 2, Attempt 2) - active_thread: True +``` + +### Branching Conversations +The linked-list structure supports conversation branches: +- Multiple messages can share the same `previous_thread_id` +- UI could display conversation tree +- Users could explore different conversation paths + +### Thread Metadata +Additional thread-level metadata could include: +- Thread creation timestamp +- Thread type (chat, image generation, file upload) +- Thread tags or labels +- Thread-level citations or sources + +## Testing + +### Functional Tests Needed +1. **New conversation** - verify first message has `previous_thread_id = None` +2. **Multi-turn conversation** - verify thread chain is established +3. **Image generation** - verify image links to user message +4. **File upload** - verify file links to previous message +5. **Legacy messages** - verify old messages sort by timestamp +6. **Mixed conversation** - verify legacy + threaded messages sort correctly +7. **Message retrieval** - verify frontend receives correctly ordered messages + +### Test Scenarios +- Create new conversation → verify threading +- Upload file mid-conversation → verify threading +- Generate image → verify threading +- Load conversation with 50+ messages → verify performance +- Load legacy conversation → verify backward compatibility + +## Troubleshooting + +### Messages Out of Order +**Symptom**: Messages appear in wrong order +**Check**: Verify `sort_messages_by_thread()` is called before returning messages +**Solution**: Ensure all message retrieval endpoints apply sorting + +### Broken Thread Chain +**Symptom**: Messages missing or duplicated +**Check**: Verify `previous_thread_id` references exist in database +**Solution**: Check thread chain integrity with query: +```sql +SELECT m.thread_id, m.previous_thread_id, m.timestamp, m.role +FROM c m +WHERE m.conversation_id = '{conversation_id}' +ORDER BY m.timestamp ASC +``` + +### Performance Issues +**Symptom**: Slow message loading +**Check**: Number of messages in conversation +**Solution**: +- Add database indexes +- Implement pagination for large conversations +- Cache sorted message lists + +## Configuration + +No configuration changes required. The feature is enabled by default for all new messages. + +## Security Considerations + +- Thread IDs use UUIDs - not guessable +- Thread relationships maintained per conversation +- No cross-conversation thread linking +- Thread fields included in normal message access control + +## Related Documentation + +- [Message Management Architecture](./MESSAGE_MANAGEMENT_ARCHITECTURE.md) +- [Conversation Metadata](./CONVERSATION_METADATA.md) +- [Message Masking](../fixes/MESSAGE_MASKING_FIX.md) + +## References + +- Implementation: `functions_chat.py::sort_messages_by_thread()` +- Usage: `route_backend_chats.py`, `route_frontend_chats.py`, `route_frontend_conversations.py` +- Version: `config.py::VERSION` diff --git a/functional_tests/test_message_threading_system.py b/functional_tests/test_message_threading_system.py new file mode 100644 index 000000000..5e0cbadb6 --- /dev/null +++ b/functional_tests/test_message_threading_system.py @@ -0,0 +1,205 @@ +#!/usr/bin/env python3 +""" +Functional test for message threading system. +Version: 0.233.208 +Implemented in: 0.233.208 + +This test ensures that the message threading system correctly orders messages +and establishes thread chains between related messages. +""" + +import sys +import os +sys.path.append(os.path.dirname(os.path.abspath(__file__))) + +# Add parent directory to path to import from single_app +parent_dir = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +app_dir = os.path.join(parent_dir, 'single_app') +sys.path.insert(0, app_dir) + +def test_sort_messages_by_thread(): + """Test the sort_messages_by_thread function with various message configurations.""" + from functions_chat import sort_messages_by_thread + + print("🧪 Testing sort_messages_by_thread function...") + + # Test 1: Legacy messages only (no thread_id) + print("\n📝 Test 1: Legacy messages (timestamp-based sorting)") + legacy_messages = [ + {'id': '3', 'timestamp': '2024-01-03T10:00:00', 'content': 'Third'}, + {'id': '1', 'timestamp': '2024-01-01T10:00:00', 'content': 'First'}, + {'id': '2', 'timestamp': '2024-01-02T10:00:00', 'content': 'Second'}, + ] + sorted_legacy = sort_messages_by_thread(legacy_messages) + assert sorted_legacy[0]['id'] == '1', "First message should be oldest" + assert sorted_legacy[1]['id'] == '2', "Second message should be middle" + assert sorted_legacy[2]['id'] == '3', "Third message should be newest" + print("✅ Legacy messages sorted correctly by timestamp") + + # Test 2: Threaded messages only + print("\n📝 Test 2: Threaded messages (chain-based sorting)") + threaded_messages = [ + {'id': '3', 'thread_id': 'thread-3', 'previous_thread_id': 'thread-2', 'timestamp': '2024-01-03T10:00:00', 'role': 'assistant'}, + {'id': '1', 'thread_id': 'thread-1', 'previous_thread_id': None, 'timestamp': '2024-01-01T10:00:00', 'role': 'user'}, + {'id': '2', 'thread_id': 'thread-2', 'previous_thread_id': 'thread-1', 'timestamp': '2024-01-02T10:00:00', 'role': 'system'}, + ] + sorted_threaded = sort_messages_by_thread(threaded_messages) + assert sorted_threaded[0]['id'] == '1', "User message should be first (root)" + assert sorted_threaded[1]['id'] == '2', "System message should be second (child of user)" + assert sorted_threaded[2]['id'] == '3', "Assistant message should be third (child of system)" + print("✅ Threaded messages sorted correctly by chain") + + # Test 3: Mixed legacy and threaded messages + print("\n📝 Test 3: Mixed legacy and threaded messages") + mixed_messages = [ + {'id': '5', 'thread_id': 'thread-5', 'previous_thread_id': 'thread-4', 'timestamp': '2024-01-05T10:00:00', 'role': 'assistant'}, + {'id': '2', 'timestamp': '2024-01-02T10:00:00', 'content': 'Legacy second'}, + {'id': '4', 'thread_id': 'thread-4', 'previous_thread_id': None, 'timestamp': '2024-01-04T10:00:00', 'role': 'user'}, + {'id': '1', 'timestamp': '2024-01-01T10:00:00', 'content': 'Legacy first'}, + ] + sorted_mixed = sort_messages_by_thread(mixed_messages) + assert sorted_mixed[0]['id'] == '1', "Legacy messages should come first" + assert sorted_mixed[1]['id'] == '2', "Legacy messages should be sorted by timestamp" + assert sorted_mixed[2]['id'] == '4', "Threaded messages should come after legacy" + assert sorted_mixed[3]['id'] == '5', "Threaded chain should be maintained" + print("✅ Mixed messages sorted correctly (legacy first, then threaded)") + + # Test 4: Multiple thread chains + print("\n📝 Test 4: Multiple independent thread chains") + multi_chain = [ + {'id': '2', 'thread_id': 'thread-2', 'previous_thread_id': 'thread-1', 'timestamp': '2024-01-02T10:00:00', 'role': 'assistant'}, + {'id': '4', 'thread_id': 'thread-4', 'previous_thread_id': 'thread-3', 'timestamp': '2024-01-04T10:00:00', 'role': 'assistant'}, + {'id': '1', 'thread_id': 'thread-1', 'previous_thread_id': None, 'timestamp': '2024-01-01T10:00:00', 'role': 'user'}, + {'id': '3', 'thread_id': 'thread-3', 'previous_thread_id': None, 'timestamp': '2024-01-03T10:00:00', 'role': 'user'}, + ] + sorted_multi = sort_messages_by_thread(multi_chain) + # First chain (older timestamp): thread-1 -> thread-2 + # Second chain (newer timestamp): thread-3 -> thread-4 + assert sorted_multi[0]['id'] == '1', "First chain root (older)" + assert sorted_multi[1]['id'] == '2', "First chain child" + assert sorted_multi[2]['id'] == '3', "Second chain root (newer)" + assert sorted_multi[3]['id'] == '4', "Second chain child" + print("✅ Multiple thread chains sorted correctly") + + # Test 5: Empty list + print("\n📝 Test 5: Empty message list") + empty_messages = [] + sorted_empty = sort_messages_by_thread(empty_messages) + assert len(sorted_empty) == 0, "Empty list should return empty list" + print("✅ Empty list handled correctly") + + # Test 6: Complex conversation with system messages + print("\n📝 Test 6: Complex conversation (user -> system -> assistant)") + complex_conversation = [ + {'id': '3', 'thread_id': 'thread-3', 'previous_thread_id': 'thread-2', 'timestamp': '2024-01-03T10:00:00', 'role': 'assistant'}, + {'id': '1', 'thread_id': 'thread-1', 'previous_thread_id': None, 'timestamp': '2024-01-01T10:00:00', 'role': 'user'}, + {'id': '2', 'thread_id': 'thread-2', 'previous_thread_id': 'thread-1', 'timestamp': '2024-01-02T10:00:00', 'role': 'system'}, + ] + sorted_complex = sort_messages_by_thread(complex_conversation) + assert sorted_complex[0]['role'] == 'user', "User message first" + assert sorted_complex[1]['role'] == 'system', "System message second" + assert sorted_complex[2]['role'] == 'assistant', "Assistant message third" + print("✅ Complex conversation flow maintained correctly") + + # Test 7: Image generation thread + print("\n📝 Test 7: Image generation thread (user -> image)") + image_thread = [ + {'id': '2', 'thread_id': 'thread-2', 'previous_thread_id': 'thread-1', 'timestamp': '2024-01-02T10:00:00', 'role': 'image'}, + {'id': '1', 'thread_id': 'thread-1', 'previous_thread_id': None, 'timestamp': '2024-01-01T10:00:00', 'role': 'user'}, + ] + sorted_image = sort_messages_by_thread(image_thread) + assert sorted_image[0]['role'] == 'user', "User request first" + assert sorted_image[1]['role'] == 'image', "Generated image second" + print("✅ Image generation thread ordered correctly") + + # Test 8: File upload thread + print("\n📝 Test 8: File upload mid-conversation") + file_upload = [ + {'id': '3', 'thread_id': 'thread-3', 'previous_thread_id': 'thread-2', 'timestamp': '2024-01-03T10:00:00', 'role': 'file', 'filename': 'doc.pdf'}, + {'id': '1', 'thread_id': 'thread-1', 'previous_thread_id': None, 'timestamp': '2024-01-01T10:00:00', 'role': 'user'}, + {'id': '2', 'thread_id': 'thread-2', 'previous_thread_id': 'thread-1', 'timestamp': '2024-01-02T10:00:00', 'role': 'assistant'}, + ] + sorted_file = sort_messages_by_thread(file_upload) + assert sorted_file[0]['role'] == 'user', "User message first" + assert sorted_file[1]['role'] == 'assistant', "Assistant response second" + assert sorted_file[2]['role'] == 'file', "File upload third" + print("✅ File upload thread ordered correctly") + + print("\n✅ All sort_messages_by_thread tests passed!") + return True + +def test_thread_field_structure(): + """Test that thread fields have the correct structure.""" + print("\n🧪 Testing thread field structure...") + + # Example message with threading fields + test_message = { + 'id': 'msg-123', + 'conversation_id': 'conv-456', + 'role': 'user', + 'content': 'Test message', + 'timestamp': '2024-01-01T10:00:00', + 'thread_id': 'thread-abc-123', + 'previous_thread_id': 'thread-xyz-789', + 'active_thread': True, + 'thread_attempt': 1 + } + + # Verify required fields exist + assert 'thread_id' in test_message, "thread_id field should exist" + assert 'previous_thread_id' in test_message, "previous_thread_id field should exist" + assert 'active_thread' in test_message, "active_thread field should exist" + assert 'thread_attempt' in test_message, "thread_attempt field should exist" + + # Verify field types + assert isinstance(test_message['thread_id'], str), "thread_id should be string" + assert isinstance(test_message['previous_thread_id'], (str, type(None))), "previous_thread_id should be string or None" + assert isinstance(test_message['active_thread'], bool), "active_thread should be boolean" + assert isinstance(test_message['thread_attempt'], int), "thread_attempt should be integer" + + # Verify field values + assert test_message['active_thread'] == True, "active_thread should be True" + assert test_message['thread_attempt'] == 1, "thread_attempt should be 1" + + print("✅ Thread field structure validated correctly") + return True + +def main(): + """Run all threading system tests.""" + print("=" * 60) + print("MESSAGE THREADING SYSTEM - FUNCTIONAL TESTS") + print("Version: 0.233.208") + print("=" * 60) + + try: + # Run tests + test_sort_messages_by_thread() + test_thread_field_structure() + + print("\n" + "=" * 60) + print("✅ ALL TESTS PASSED") + print("=" * 60) + print("\n📊 Test Summary:") + print(" ✓ Message sorting algorithm validated") + print(" ✓ Thread field structure validated") + print(" ✓ Legacy message support confirmed") + print(" ✓ Multiple thread chains handled correctly") + print(" ✓ Complex conversation flows maintained") + print(" ✓ Image and file upload threading verified") + + return True + + except AssertionError as e: + print(f"\n❌ Test failed: {e}") + import traceback + traceback.print_exc() + return False + except Exception as e: + print(f"\n❌ Unexpected error: {e}") + import traceback + traceback.print_exc() + return False + +if __name__ == "__main__": + success = main() + sys.exit(0 if success else 1) From 269076a36f04b27efbfa077c5f1db5146e5f3d94 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Fri, 5 Dec 2025 09:38:45 -0500 Subject: [PATCH 15/34] fixed debug_print bug --- application/single_app/config.py | 2 +- application/single_app/functions_debug.py | 16 +- .../static/js/chat/chat-messages.js | 227 +++++++----------- 3 files changed, 102 insertions(+), 143 deletions(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index dde9347fc..d76367b1c 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.218" +VERSION = "0.233.221" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/functions_debug.py b/application/single_app/functions_debug.py index c0e2bf093..5cbf6a2ea 100644 --- a/application/single_app/functions_debug.py +++ b/application/single_app/functions_debug.py @@ -3,22 +3,32 @@ from app_settings_cache import get_settings_cache from functions_settings import * -def debug_print(message): +def debug_print(message, category="INFO", **kwargs): """ Print debug message only if debug logging is enabled in settings. Args: message (str): The debug message to print + category (str): Optional category for the debug message + **kwargs: Additional key-value pairs to include in debug output """ #print(f"DEBUG_PRINT CALLED WITH MESSAGE: {message}") try: cache = get_settings_cache() if cache.get('enable_debug_logging', False): - print(f"[DEBUG]: {message}") + debug_msg = f"[DEBUG] [{category}]: {message}" + if kwargs: + kwargs_str = ", ".join(f"{k}={v}" for k, v in kwargs.items()) + debug_msg += f" ({kwargs_str})" + print(debug_msg) except Exception: settings = get_settings() if settings.get('enable_debug_logging', False): - print(f"[DEBUG]: {message}") + debug_msg = f"[DEBUG] [{category}]: {message}" + if kwargs: + kwargs_str = ", ".join(f"{k}={v}" for k, v in kwargs.items()) + debug_msg += f" ({kwargs_str})" + print(debug_msg) def is_debug_enabled(): diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index 3282a5342..1030675ca 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -1870,223 +1870,174 @@ function formatMetadataForDrawer(metadata) { // User Information Section if (metadata.user_info) { - content += '
'; - content += '
User Information
'; + content += '
'; + content += '
User Information
'; + content += '
'; if (metadata.user_info.display_name) { - content += `
- User: ${escapeHtml(metadata.user_info.display_name)} -
`; + content += `
User: ${escapeHtml(metadata.user_info.display_name)}
`; } if (metadata.user_info.email) { - content += `
- Email: ${escapeHtml(metadata.user_info.email)} -
`; + content += `
Email: ${escapeHtml(metadata.user_info.email)}
`; } if (metadata.user_info.username) { - content += `
- Username: ${escapeHtml(metadata.user_info.username)} -
`; + content += `
Username: ${escapeHtml(metadata.user_info.username)}
`; } if (metadata.user_info.timestamp) { const date = new Date(metadata.user_info.timestamp); - content += `
- Timestamp: ${escapeHtml(date.toLocaleString())} -
`; + content += `
Timestamp: ${escapeHtml(date.toLocaleString())}
`; } - content += '
'; + content += '
'; } // Thread Information Section (priority display) if (metadata.thread_info) { const ti = metadata.thread_info; - content += '
'; - content += '
Thread Information
'; + content += '
'; + content += '
Thread Information
'; + content += '
'; - content += `
- Thread ID: ${escapeHtml(ti.thread_id || 'N/A')} -
`; + content += `
Thread ID: ${escapeHtml(ti.thread_id || 'N/A')}
`; - content += `
- Previous Thread: ${escapeHtml(ti.previous_thread_id || 'None')} -
`; + content += `
Previous Thread: ${escapeHtml(ti.previous_thread_id || 'None')}
`; const activeThreadBadge = ti.active_thread ? - 'Active' : - 'Inactive'; - content += `
- Active Thread: ${activeThreadBadge} -
`; + 'Yes' : + 'No'; + content += `
Active: ${activeThreadBadge}
`; - content += `
- Thread Attempt: ${createInfoBadge(ti.thread_attempt || 0, 'info')} -
`; + content += `
Attempt: ${ti.thread_attempt || 1}
`; - content += '
'; + content += '
'; } // Button States Section if (metadata.button_states) { - content += '
'; - content += '
Button States
'; + content += '
'; + content += '
Button States
'; + content += '
'; if (metadata.button_states.image_generation !== undefined) { - content += `
- Image Generation: ${createStatusBadge(metadata.button_states.image_generation)} -
`; + content += `
Image Generation: ${createStatusBadge(metadata.button_states.image_generation)}
`; } if (metadata.button_states.web_search !== undefined) { - content += `
- Web Search: ${createStatusBadge(metadata.button_states.web_search)} -
`; + content += `
Web Search: ${createStatusBadge(metadata.button_states.web_search)}
`; } if (metadata.button_states.document_search !== undefined) { - content += `
- Document Search: ${createStatusBadge(metadata.button_states.document_search)} -
`; + content += `
Document Search: ${createStatusBadge(metadata.button_states.document_search)}
`; } - content += '
'; + content += '
'; } // Workspace Search Section if (metadata.workspace_search) { - content += '
'; - content += '
Workspace & Document Selection
'; + content += '
'; + content += '
Workspace & Document Selection
'; + content += '
'; if (metadata.workspace_search.search_enabled !== undefined) { - content += `
- Search Enabled: ${createStatusBadge(metadata.workspace_search.search_enabled)} -
`; + content += `
Search Enabled: ${createStatusBadge(metadata.workspace_search.search_enabled)}
`; } if (metadata.workspace_search.document_name) { - content += `
- Selected Document: ${escapeHtml(metadata.workspace_search.document_name)} -
`; + content += `
Selected Document: ${escapeHtml(metadata.workspace_search.document_name)}
`; } else if (metadata.workspace_search.selected_document_id && metadata.workspace_search.selected_document_id !== 'None' && metadata.workspace_search.selected_document_id !== 'all') { - content += `
- Document ID: ${escapeHtml(metadata.workspace_search.selected_document_id)} -
`; + content += `
Document ID: ${escapeHtml(metadata.workspace_search.selected_document_id)}
`; } if (metadata.workspace_search.document_scope) { - content += `
- Search Scope: ${createInfoBadge(metadata.workspace_search.document_scope, 'primary')} -
`; + content += `
Search Scope: ${createInfoBadge(metadata.workspace_search.document_scope, 'primary')}
`; } if (metadata.workspace_search.classification && metadata.workspace_search.classification !== 'None') { - content += `
- Classification: ${createClassificationBadge(metadata.workspace_search.classification)} -
`; + content += `
Classification: ${createClassificationBadge(metadata.workspace_search.classification)}
`; } if (metadata.workspace_search.group_name) { - content += `
- Group: ${escapeHtml(metadata.workspace_search.group_name)} -
`; + content += `
Group: ${escapeHtml(metadata.workspace_search.group_name)}
`; } - content += '
'; + content += '
'; } // Prompt Selection Section if (metadata.prompt_selection) { - content += '
'; - content += '
Prompt Selection
'; + content += '
'; + content += '
Prompt Selection
'; + content += '
'; if (metadata.prompt_selection.prompt_name) { - content += `
- Prompt Name: ${createInfoBadge(metadata.prompt_selection.prompt_name, 'success')} -
`; + content += `
Prompt Name: ${createInfoBadge(metadata.prompt_selection.prompt_name, 'success')}
`; } if (metadata.prompt_selection.selected_prompt_index !== undefined) { - content += `
- Prompt Index: ${escapeHtml(metadata.prompt_selection.selected_prompt_index)} -
`; + content += `
Prompt Index: ${escapeHtml(metadata.prompt_selection.selected_prompt_index)}
`; } if (metadata.prompt_selection.selected_prompt_text) { - content += `
- Content: -
- ${escapeHtml(metadata.prompt_selection.selected_prompt_text)} -
-
`; + content += `
Content:
${escapeHtml(metadata.prompt_selection.selected_prompt_text)}
`; } - content += '
'; + content += '
'; } // Agent Selection Section if (metadata.agent_selection) { - content += '
'; - content += '
Agent Selection
'; + content += '
'; + content += '
Agent Selection
'; + content += '
'; if (metadata.agent_selection.agent_display_name) { - content += `
- Agent: ${createInfoBadge(metadata.agent_selection.agent_display_name, 'success')} -
`; + content += `
Agent: ${createInfoBadge(metadata.agent_selection.agent_display_name, 'success')}
`; } else if (metadata.agent_selection.selected_agent) { - content += `
- Selected Agent: ${createInfoBadge(metadata.agent_selection.selected_agent, 'success')} -
`; + content += `
Selected Agent: ${createInfoBadge(metadata.agent_selection.selected_agent, 'success')}
`; } if (metadata.agent_selection.is_global !== undefined) { - content += `
- Global Agent: ${createStatusBadge(metadata.agent_selection.is_global)} -
`; + content += `
Global Agent: ${createStatusBadge(metadata.agent_selection.is_global)}
`; } - content += '
'; + content += '
'; } // Model Selection Section if (metadata.model_selection) { - content += '
'; - content += '
Model Selection
'; + content += '
'; + content += '
Model Selection
'; + content += '
'; if (metadata.model_selection.selected_model) { - content += `
- Selected Model: ${escapeHtml(metadata.model_selection.selected_model)} -
`; + content += `
Selected Model: ${escapeHtml(metadata.model_selection.selected_model)}
`; } if (metadata.model_selection.frontend_requested_model && metadata.model_selection.frontend_requested_model !== metadata.model_selection.selected_model) { - content += `
- Frontend Model: ${escapeHtml(metadata.model_selection.frontend_requested_model)} -
`; + content += `
Frontend Model: ${escapeHtml(metadata.model_selection.frontend_requested_model)}
`; } if (metadata.model_selection.reasoning_effort) { - content += `
- Reasoning Effort: ${escapeHtml(metadata.model_selection.reasoning_effort)} -
`; + content += `
Reasoning Effort: ${escapeHtml(metadata.model_selection.reasoning_effort)}
`; } - if (metadata.model_selection.streaming) { - content += `
- Streaming: ${createStatusBadge(metadata.model_selection.streaming)} -
`; + if (metadata.model_selection.streaming !== undefined) { + content += `
Streaming: ${createStatusBadge(metadata.model_selection.streaming)}
`; } - content += '
'; + content += '
'; } // Uploaded Images Section if (metadata.uploaded_images && metadata.uploaded_images.length > 0) { - content += '
'; - content += '
Uploaded Image
'; + content += '
'; + content += '
Uploaded Image
'; + content += '
'; metadata.uploaded_images.forEach((image, index) => { const imageId = `image-${messageId || Date.now()}-${index}`; @@ -2133,50 +2084,41 @@ function formatMetadataForDrawer(metadata) { content += `
`; // End card-body content += `
`; // End card - content += `
`; // End metadata-item + content += `
`; // End item wrapper }); - content += ''; + content += ''; // End ms-3 small and mb-3 } // Chat Context Section if (metadata.chat_context) { - content += '
'; - content += '
Chat Context
'; + content += '
'; + content += '
Chat Context
'; + content += '
'; if (metadata.chat_context.conversation_id) { - content += `
- Conversation ID: ${escapeHtml(metadata.chat_context.conversation_id)} -
`; + content += `
Conversation ID: ${escapeHtml(metadata.chat_context.conversation_id)}
`; } if (metadata.chat_context.chat_type) { - content += `
- Chat Type: ${createInfoBadge(metadata.chat_context.chat_type, 'primary')} -
`; + content += `
Chat Type: ${createInfoBadge(metadata.chat_context.chat_type, 'primary')}
`; } // Show context-specific information based on chat type if (metadata.chat_context.chat_type === 'group') { if (metadata.chat_context.group_name) { - content += `
- Group: ${escapeHtml(metadata.chat_context.group_name)} -
`; + content += `
Group: ${escapeHtml(metadata.chat_context.group_name)}
`; } else if (metadata.chat_context.group_id && metadata.chat_context.group_id !== 'None') { - content += `
- Group ID: ${escapeHtml(metadata.chat_context.group_id)} -
`; + content += `
Group ID: ${escapeHtml(metadata.chat_context.group_id)}
`; } } else if (metadata.chat_context.chat_type === 'public') { if (metadata.chat_context.workspace_context) { - content += `
- Workspace: ${createInfoBadge(metadata.chat_context.workspace_context, 'info')} -
`; + content += `
Workspace: ${createInfoBadge(metadata.chat_context.workspace_context, 'info')}
`; } } // For 'personal' chat type, no additional context needed - content += '
'; + content += '
'; } if (!content) { @@ -2328,9 +2270,6 @@ function loadMessageMetadataForDisplay(messageId, container) { if (metadata.conversation_id) html += `
Conversation ID: ${metadata.conversation_id}
`; if (metadata.role) html += `
Role: ${metadata.role}
`; if (metadata.timestamp) html += `
Timestamp: ${new Date(metadata.timestamp).toLocaleString()}
`; - if (metadata.model_deployment_name) html += `
Model: ${metadata.model_deployment_name}
`; - if (metadata.agent_name) html += `
Agent: ${metadata.agent_name}
`; - if (metadata.agent_display_name) html += `
Agent Display Name: ${metadata.agent_display_name}
`; html += ''; // Image/File specific info @@ -2352,15 +2291,25 @@ function loadMessageMetadataForDisplay(messageId, container) { html += ''; } - // Assistant message specific info - if (metadata.role === 'assistant') { + // Generation Details (for assistant, image, and file messages) + if (metadata.role === 'assistant' || metadata.role === 'image' || metadata.role === 'file') { html += '
'; html += '
Generation Details
'; html += '
'; - if (metadata.augmented !== undefined) html += `
Augmented: ${metadata.augmented ? 'Yes' : 'No'}
`; - if (metadata.metadata?.reasoning_effort) html += `
Reasoning Effort: ${metadata.metadata.reasoning_effort}
`; - if (metadata.hybrid_citations && metadata.hybrid_citations.length > 0) html += `
Document Citations: ${metadata.hybrid_citations.length}
`; - if (metadata.agent_citations && metadata.agent_citations.length > 0) html += `
Agent Citations: ${metadata.agent_citations.length}
`; + + // Model and Agent info (for all types) + if (metadata.model_deployment_name) html += `
Model: ${metadata.model_deployment_name}
`; + if (metadata.agent_name) html += `
Agent: ${metadata.agent_name}
`; + if (metadata.agent_display_name) html += `
Agent Display Name: ${metadata.agent_display_name}
`; + + // Assistant-specific info + if (metadata.role === 'assistant') { + if (metadata.augmented !== undefined) html += `
Augmented: ${metadata.augmented ? 'Yes' : 'No'}
`; + if (metadata.metadata?.reasoning_effort) html += `
Reasoning Effort: ${metadata.metadata.reasoning_effort}
`; + if (metadata.hybrid_citations && metadata.hybrid_citations.length > 0) html += `
Document Citations: ${metadata.hybrid_citations.length}
`; + if (metadata.agent_citations && metadata.agent_citations.length > 0) html += `
Agent Citations: ${metadata.agent_citations.length}
`; + } + html += '
'; } From 4bda013a24125071cc2f50b159bfebde1593b04b Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Sat, 6 Dec 2025 11:14:14 -0500 Subject: [PATCH 16/34] added reasoning effort to agents and fixed agent validation --- application/single_app/app.py | 6 +- application/single_app/config.py | 2 +- .../single_app/functions_global_agents.py | 10 +++ .../single_app/functions_group_agents.py | 7 ++ .../single_app/functions_personal_agents.py | 10 +++ application/single_app/functions_settings.py | 13 ++- .../semantic_kernel_plugins/openapi_plugin.py | 61 ++++++++------ .../static/js/agent_modal_stepper.js | 77 +++++++++++++++++ .../single_app/static/js/agents_common.js | 6 ++ .../static/js/chat/chat-messages.js | 82 +++++++++++++------ .../static/js/plugin_modal_stepper.js | 8 +- .../static/json/schemas/agent.schema.json | 5 ++ 12 files changed, 229 insertions(+), 58 deletions(-) diff --git a/application/single_app/app.py b/application/single_app/app.py index 62611f44e..77b93447c 100644 --- a/application/single_app/app.py +++ b/application/single_app/app.py @@ -165,8 +165,10 @@ def before_first_request(): settings = get_settings(use_cosmos=True) app_settings_cache.configure_app_cache(settings, get_redis_cache_infrastructure_endpoint(settings.get('redis_url', '').strip().split('.')[0])) app_settings_cache.update_settings_cache(settings) - print(f"DEBUG:Application settings: {settings}") - print(f"DEBUG:App settings cache initialized: {'Using Redis cache:' + str(app_settings_cache.app_cache_is_using_redis)} {app_settings_cache.get_settings_cache()}") + sanitized_settings = sanitize_settings_for_logging(settings) + debug_print(f"DEBUG:Application settings: {sanitized_settings}") + sanitized_settings_cache = sanitize_settings_for_logging(app_settings_cache.get_settings_cache()) + debug_print(f"DEBUG:App settings cache initialized: {'Using Redis cache:' + str(app_settings_cache.app_cache_is_using_redis)} {sanitized_settings_cache}") initialize_clients(settings) ensure_custom_logo_file_exists(app, settings) diff --git a/application/single_app/config.py b/application/single_app/config.py index d76367b1c..8898bcdc7 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.221" +VERSION = "0.233.229" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/functions_global_agents.py b/application/single_app/functions_global_agents.py index 720a1b6cc..2ffd9d8fa 100644 --- a/application/single_app/functions_global_agents.py +++ b/application/single_app/functions_global_agents.py @@ -110,6 +110,9 @@ def get_global_agents(): agent.setdefault('is_global', True) agent.setdefault('is_group', False) agent.setdefault('agent_type', 'local') + # Remove empty reasoning_effort to prevent validation errors + if agent.get('reasoning_effort') == '': + agent.pop('reasoning_effort', None) return agents except Exception as e: log_event( @@ -143,6 +146,9 @@ def get_global_agent(agent_id): agent.setdefault('is_global', True) agent.setdefault('is_group', False) agent.setdefault('agent_type', 'local') + # Remove empty reasoning_effort to prevent validation errors + if agent.get('reasoning_effort') == '': + agent.pop('reasoning_effort', None) print(f"Found global agent: {agent_id}") return agent except Exception as e: @@ -187,6 +193,10 @@ def save_global_agent(agent_data): agent_data = keyvault_agent_save_helper(agent_data, agent_data['id'], scope="global") if agent_data.get('max_completion_tokens') is None: agent_data['max_completion_tokens'] = -1 # Default value + + # Remove empty reasoning_effort to avoid schema validation errors + if agent_data.get('reasoning_effort') == '': + agent_data.pop('reasoning_effort', None) result = cosmos_global_agents_container.upsert_item(body=agent_data) log_event( diff --git a/application/single_app/functions_group_agents.py b/application/single_app/functions_group_agents.py index e9cbf242f..e8d34df45 100644 --- a/application/single_app/functions_group_agents.py +++ b/application/single_app/functions_group_agents.py @@ -93,6 +93,10 @@ def save_group_agent(group_id: str, agent_data: Dict[str, Any]) -> Dict[str, Any payload.setdefault("azure_agent_apim_gpt_subscription_key", "") payload.setdefault("azure_agent_apim_gpt_deployment", "") payload.setdefault("azure_agent_apim_gpt_api_version", "") + + # Remove empty reasoning_effort to avoid schema validation errors + if payload.get("reasoning_effort") == "": + payload.pop("reasoning_effort", None) # Remove user-specific residue if present payload.pop("user_id", None) @@ -197,4 +201,7 @@ def _clean_agent(agent: Dict[str, Any]) -> Dict[str, Any]: cleaned.setdefault("is_global", False) cleaned.setdefault("is_group", True) cleaned.setdefault("agent_type", "local") + # Remove empty reasoning_effort to prevent validation errors + if cleaned.get("reasoning_effort") == "": + cleaned.pop("reasoning_effort", None) return cleaned diff --git a/application/single_app/functions_personal_agents.py b/application/single_app/functions_personal_agents.py index aeb5e9b19..3f2cc6eac 100644 --- a/application/single_app/functions_personal_agents.py +++ b/application/single_app/functions_personal_agents.py @@ -49,6 +49,9 @@ def get_personal_agents(user_id): cleaned_agent.setdefault('is_global', False) cleaned_agent.setdefault('is_group', False) cleaned_agent.setdefault('agent_type', 'local') + # Remove empty reasoning_effort to prevent validation errors + if cleaned_agent.get('reasoning_effort') == '': + cleaned_agent.pop('reasoning_effort', None) cleaned_agents.append(cleaned_agent) return cleaned_agents @@ -84,6 +87,9 @@ def get_personal_agent(user_id, agent_id): cleaned_agent.setdefault('is_global', False) cleaned_agent.setdefault('is_group', False) cleaned_agent.setdefault('agent_type', 'local') + # Remove empty reasoning_effort to prevent validation errors + if cleaned_agent.get('reasoning_effort') == '': + cleaned_agent.pop('reasoning_effort', None) return cleaned_agent except exceptions.CosmosResourceNotFoundError: current_app.logger.warning(f"Agent {agent_id} not found for user {user_id}") @@ -126,6 +132,10 @@ def save_personal_agent(user_id, agent_data): agent_data.setdefault('reasoning_effort', '') agent_data.setdefault('actions_to_load', []) agent_data.setdefault('other_settings', {}) + + # Remove empty reasoning_effort to avoid schema validation errors + if agent_data.get('reasoning_effort') == '': + agent_data.pop('reasoning_effort', None) agent_data['is_global'] = False agent_data['is_group'] = False agent_data.setdefault('agent_type', 'local') diff --git a/application/single_app/functions_settings.py b/application/single_app/functions_settings.py index 108c17f29..7c43e71d5 100644 --- a/application/single_app/functions_settings.py +++ b/application/single_app/functions_settings.py @@ -553,7 +553,8 @@ def update_user_settings(user_id, settings_to_update): bool: True if the update was successful, False otherwise. """ log_prefix = f"User settings update for {user_id}:" - log_event("[UserSettings] Update Attempt", {"user_id": user_id, "settings_to_update": settings_to_update}) + sanitized_settings_to_update = sanitize_settings_for_logging(settings_to_update) + log_event("[UserSettings] Update Attempt", {"user_id": user_id, "settings_to_update": sanitized_settings_to_update}) try: @@ -707,8 +708,14 @@ def wrapper(*args, **kwargs): return decorator def sanitize_settings_for_user(full_settings: dict) -> dict: - # Exclude any key containing the substring "key" or specific sensitive URLs - return {k: v for k, v in full_settings.items() if "key" not in k and k != "office_docs_storage_account_url"} + # Exclude any key containing "key", "base64", "storage_account_url" + return {k: v for k, v in full_settings.items() + if "key" not in k.lower() and "storage_account_url" not in k.lower()} + +def sanitize_settings_for_logging(full_settings: dict) -> dict: + # Exclude any key containing "key", "base64", "storage_account_url" + return {k: v for k, v in full_settings.items() + if "key" not in k.lower() and "base64" not in k.lower() and "image" not in k.lower() and "storage_account_url" not in k.lower()} # Search history management functions def get_user_search_history(user_id): diff --git a/application/single_app/semantic_kernel_plugins/openapi_plugin.py b/application/single_app/semantic_kernel_plugins/openapi_plugin.py index 1356d8178..81e8fbc44 100644 --- a/application/single_app/semantic_kernel_plugins/openapi_plugin.py +++ b/application/single_app/semantic_kernel_plugins/openapi_plugin.py @@ -892,46 +892,53 @@ def _call_api_operation(self, operation_id: str, path: str, method: str, operati api_key = self.auth.get("key", "") debug_print(f"Key auth - api_key: {api_key[:10]}...") - # Check OpenAPI spec for security schemes + # Check OpenAPI spec for security schemes (OpenAPI 3.0+) or securityDefinitions (OpenAPI 2.0/Swagger) + security_schemes = None + + # Try OpenAPI 3.0+ format first if self.openapi and "components" in self.openapi and "securitySchemes" in self.openapi["components"]: security_schemes = self.openapi["components"]["securitySchemes"] - debug_print(f"Found security schemes: {list(security_schemes.keys())}") - - # Look for apiKey scheme (query parameter) - if "apiKey" in security_schemes: - scheme = security_schemes["apiKey"] - debug_print(f"Found apiKey scheme: {scheme}") + debug_print(f"Found OpenAPI 3.0 security schemes: {list(security_schemes.keys())}") + # Fall back to OpenAPI 2.0/Swagger format + elif self.openapi and "securityDefinitions" in self.openapi: + security_schemes = self.openapi["securityDefinitions"] + debug_print(f"Found OpenAPI 2.0 securityDefinitions: {list(security_schemes.keys())}") + + if security_schemes: + # Look for any apiKey scheme with type=apiKey and in=query + auth_applied = False + for scheme_name, scheme in security_schemes.items(): if scheme.get("type") == "apiKey" and scheme.get("in") == "query": - key_name = scheme.get("name", "api-key") + key_name = scheme.get("name", "api_key") query_params[key_name] = api_key - debug_print(f"Added query parameter auth: {key_name}={api_key[:10]}...") + debug_print(f"Added query parameter auth from '{scheme_name}': {key_name}={api_key[:10]}...") logging.info(f"[OpenAPI Plugin] Using query parameter auth: {key_name}") - - # Look for headerApiKey scheme as fallback - elif "headerApiKey" in security_schemes: - scheme = security_schemes["headerApiKey"] - debug_print(f"Found headerApiKey scheme: {scheme}") - if scheme.get("type") == "apiKey" and scheme.get("in") == "header": + auth_applied = True + break + elif scheme.get("type") == "apiKey" and scheme.get("in") == "header": key_name = scheme.get("name", "x-api-key") headers[key_name] = api_key - debug_print(f"Added header auth: {key_name}={api_key[:10]}...") + debug_print(f"Added header auth from '{scheme_name}': {key_name}={api_key[:10]}...") logging.info(f"[OpenAPI Plugin] Using header auth: {key_name}") - else: + auth_applied = True + break + + if not auth_applied: debug_print(f"No matching security scheme found!") # Fallback if no security schemes found - if api_key and not any(k in query_params for k in ["api-key", "apikey"]) and not any(k.lower() in [h.lower() for h in headers.keys()] for k in ["x-api-key", "api-key"]): - # Default to query parameter - query_params["api-key"] = api_key - debug_print(f"Using fallback query parameter auth: api-key={api_key[:10]}...") - logging.info(f"[OpenAPI Plugin] Using fallback query parameter auth: api-key") + if api_key and not any(k in query_params for k in ["api-key", "api_key", "apikey"]) and not any(k.lower() in [h.lower() for h in headers.keys()] for k in ["x-api-key", "api-key"]): + # Default to query parameter with underscore + query_params["api_key"] = api_key + debug_print(f"Using fallback query parameter auth: api_key={api_key[:10]}...") + logging.info(f"[OpenAPI Plugin] Using fallback query parameter auth: api_key") else: debug_print(f"No security schemes found in OpenAPI spec") # Fallback if no security schemes found - if api_key and not any(k in query_params for k in ["api-key", "apikey"]) and not any(k.lower() in [h.lower() for h in headers.keys()] for k in ["x-api-key", "api-key"]): - # Default to query parameter - query_params["api-key"] = api_key - debug_print(f"Using fallback query parameter auth: api-key={api_key[:10]}...") - logging.info(f"[OpenAPI Plugin] Using fallback query parameter auth: api-key") + if api_key and not any(k in query_params for k in ["api-key", "api_key", "apikey"]) and not any(k.lower() in [h.lower() for h in headers.keys()] for k in ["x-api-key", "api-key"]): + # Default to query parameter with underscore + query_params["api_key"] = api_key + debug_print(f"Using fallback query parameter auth: api_key={api_key[:10]}...") + logging.info(f"[OpenAPI Plugin] Using fallback query parameter auth: api_key") elif auth_type == "bearer": token = self.auth.get("token", "") headers["Authorization"] = f"Bearer {token}" diff --git a/application/single_app/static/js/agent_modal_stepper.js b/application/single_app/static/js/agent_modal_stepper.js index eb5736240..30cf31fc0 100644 --- a/application/single_app/static/js/agent_modal_stepper.js +++ b/application/single_app/static/js/agent_modal_stepper.js @@ -2,6 +2,7 @@ // Multi-step modal functionality for agent creation import { showToast } from "./chat/chat-toast.js"; import * as agentsCommon from "./agents_common.js"; +import { getModelSupportedLevels } from "./chat/chat-reasoning.js"; export class AgentModalStepper { constructor(isAdmin = false) { @@ -42,6 +43,9 @@ export class AgentModalStepper { // Set up display name to generated name conversion this.setupNameGeneration(); + + // Set up model change listener for reasoning effort + this.setupModelChangeListener(); } setupNameGeneration() { @@ -57,6 +61,70 @@ export class AgentModalStepper { } } + setupModelChangeListener() { + const globalModelSelect = document.getElementById('agent-global-model-select'); + if (globalModelSelect) { + globalModelSelect.addEventListener('change', () => { + this.updateReasoningEffortForModel(); + }); + } + } + + updateReasoningEffortForModel() { + const globalModelSelect = document.getElementById('agent-global-model-select'); + const reasoningEffortSelect = document.getElementById('agent-reasoning-effort'); + const reasoningEffortGroup = reasoningEffortSelect?.closest('.mb-3'); + + if (!globalModelSelect || !reasoningEffortSelect || !reasoningEffortGroup) { + return; + } + + const selectedModel = globalModelSelect.value; + if (!selectedModel) { + // No model selected, hide reasoning effort + reasoningEffortGroup.style.display = 'none'; + return; + } + + // Get supported levels for the selected model + const supportedLevels = getModelSupportedLevels(selectedModel); + + // If model only supports 'none', hide the field + if (supportedLevels.length === 1 && supportedLevels[0] === 'none') { + reasoningEffortGroup.style.display = 'none'; + reasoningEffortSelect.value = ''; // Clear selection + return; + } + + // Show the field + reasoningEffortGroup.style.display = 'block'; + + // Update available options based on supported levels + const currentValue = reasoningEffortSelect.value; + const allOptions = reasoningEffortSelect.querySelectorAll('option'); + + // Show/hide options based on supported levels + allOptions.forEach(option => { + const value = option.value; + if (value === '') { + // Always show the "inherit" option + option.style.display = ''; + option.disabled = false; + } else if (supportedLevels.includes(value)) { + option.style.display = ''; + option.disabled = false; + } else { + option.style.display = 'none'; + option.disabled = true; + } + }); + + // If current value is not supported, reset to inherit + if (currentValue && currentValue !== '' && !supportedLevels.includes(currentValue)) { + reasoningEffortSelect.value = ''; + } + } + togglePowerUserMode(isEnabled) { console.log('Toggling power user mode:', isEnabled); const powerUserSection = document.getElementById('agent-power-user-settings'); @@ -192,6 +260,9 @@ export class AgentModalStepper { if (globalModelSelect) { agentsCommon.populateGlobalModelDropdown(globalModelSelect, models, selectedModel); + + // Update reasoning effort options based on selected model + this.updateReasoningEffortForModel(); } } catch (error) { console.error('Failed to load models for agent modal:', error); @@ -1188,6 +1259,11 @@ export class AgentModalStepper { agentData.other_settings = JSON.parse(agentData.other_settings) || {}; } + // Clean up empty reasoning_effort (inherit from model default) + if (!agentData.reasoning_effort || agentData.reasoning_effort === '') { + delete agentData.reasoning_effort; + } + // Clean up form-specific fields that shouldn't be sent to backend const formOnlyFields = ['custom_connection', 'model']; formOnlyFields.forEach(field => { @@ -1237,6 +1313,7 @@ export class AgentModalStepper { custom_connection: document.getElementById('agent-custom-connection')?.checked || false, other_settings: document.getElementById('agent-additional-settings')?.value || '{}', max_completion_tokens: parseInt(document.getElementById('agent-max-completion-tokens')?.value.trim()) || null, + reasoning_effort: document.getElementById('agent-reasoning-effort')?.value || '', agent_type: 'local' }; diff --git a/application/single_app/static/js/agents_common.js b/application/single_app/static/js/agents_common.js index 0aed81f60..e3543a0d2 100644 --- a/application/single_app/static/js/agents_common.js +++ b/application/single_app/static/js/agents_common.js @@ -48,6 +48,12 @@ export function setAgentModalFields(agent, opts = {}) { root.getElementById('agent-instructions').value = agent.instructions || ''; root.getElementById('agent-additional-settings').value = agent.other_settings ? JSON.stringify(agent.other_settings, null, 2) : '{}'; root.getElementById('agent-max-completion-tokens').value = agent.max_completion_tokens || ''; + + // Set reasoning effort if available + const reasoningEffortSelect = root.getElementById('agent-reasoning-effort'); + if (reasoningEffortSelect) { + reasoningEffortSelect.value = agent.reasoning_effort || ''; + } // Actions handled separately } diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index 1030675ca..b089f4942 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -610,21 +610,21 @@ export function appendMessage( const maskIcon = isMasked ? 'bi-front' : 'bi-back'; const maskTitle = isMasked ? 'Unmask all masked content' : 'Mask entire message'; - const maskButtonHtml = ` - - `; - const copyButtonHtml = ` - `; - const copyAndFeedbackHtml = `
${maskButtonHtml}${copyButtonHtml}${feedbackHtml}
`; + + const maskButtonHtml = ` + + `; + const copyAndFeedbackHtml = `
${copyButtonHtml}${maskButtonHtml}${feedbackHtml}
`; const citationsButtonsHtml = createCitationsHtml( hybridCitations, @@ -683,7 +683,7 @@ export function appendMessage( if (shouldShowCitations) { console.log(">>> Will generate and include citation elements."); const citationsContainerId = `citations-${messageId || Date.now()}`; - citationToggleHtml = `
`; + citationToggleHtml = ``; // citationsButtonsHtml already contains a
wrapper // Just add ID and display style by wrapping minimally citationContentContainerHtml = ``; @@ -695,10 +695,11 @@ export function appendMessage( const metadataContainerHtml = ``; const footerContentHtml = `
-
${copyAndFeedbackHtml}${citationToggleHtml}
- +
`; // Build AI message inner HTML @@ -944,38 +945,51 @@ export function appendMessage( messageFooterHtml = `
-
- -
- +
+
+ +
`; metadataContainerHtml = ``; } else if (sender === "image" || sender === "File") { - // Image and file messages get metadata button on right side + // Image and file messages get mask button on left, metadata button on right side const metadataContainerId = `metadata-${messageId || Date.now()}`; + // Check if message is masked + const isMasked = fullMessageObject?.metadata?.masked || (fullMessageObject?.metadata?.masked_ranges && fullMessageObject.metadata.masked_ranges.length > 0); + const maskIcon = isMasked ? 'bi-front' : 'bi-back'; + const maskTitle = isMasked ? 'Unmask all masked content' : 'Mask entire message'; + // For images with extracted text or vision analysis, add View Text button like citation button let imageInfoToggleHtml = ''; let imageInfoContainerHtml = ''; if (sender === "image" && isUserUpload && (hasExtractedText || hasVisionAnalysis)) { const infoContainerId = `image-info-${messageId || Date.now()}`; - imageInfoToggleHtml = `
`; + imageInfoToggleHtml = ``; imageInfoContainerHtml = ``; } messageFooterHtml = `
-
${imageInfoToggleHtml}
- +
+
+
${imageInfoToggleHtml} +
`; metadataContainerHtml = imageInfoContainerHtml + ``; } @@ -1034,6 +1048,28 @@ export function appendMessage( } } + // Add event listener for mask button (image and file messages) + if (sender === "image" || sender === "File") { + const maskBtn = messageDiv.querySelector('.mask-btn'); + if (maskBtn) { + // Update tooltip dynamically on hover + maskBtn.addEventListener("mouseenter", () => { + updateMaskButtonTooltip(maskBtn, messageDiv); + }); + + // Handle mask button click + maskBtn.addEventListener("click", () => { + handleMaskButtonClick(messageDiv, messageId, messageContent); + }); + } + + // Apply masked state if message has masking + if (fullMessageObject?.metadata) { + console.log('Applying masked state for image/file message:', messageId, fullMessageObject.metadata); + applyMaskedState(messageDiv, fullMessageObject.metadata); + } + } + // Add event listener for metadata button (image and file messages) if (sender === "image" || sender === "File") { const metadataBtn = messageDiv.querySelector('.metadata-info-btn'); diff --git a/application/single_app/static/js/plugin_modal_stepper.js b/application/single_app/static/js/plugin_modal_stepper.js index 8904ec817..d017f4c28 100644 --- a/application/single_app/static/js/plugin_modal_stepper.js +++ b/application/single_app/static/js/plugin_modal_stepper.js @@ -1513,6 +1513,7 @@ export class PluginModalStepper { } // Store the OpenAPI spec content directly in the plugin config + // IMPORTANT: Set these BEFORE collecting additional fields so they don't get overwritten additionalFields.openapi_spec_content = JSON.parse(specContent); additionalFields.openapi_source_type = 'content'; // Changed from 'file' additionalFields.base_url = endpoint; @@ -1686,9 +1687,12 @@ export class PluginModalStepper { } } - // Collect additional fields from the dynamic UI + // Collect additional fields from the dynamic UI and MERGE with existing additionalFields + // This preserves OpenAPI spec content and other auto-populated fields try { - additionalFields = this.collectAdditionalFields(); + const dynamicFields = this.collectAdditionalFields(); + // Merge dynamicFields into additionalFields (preserving existing values) + additionalFields = { ...additionalFields, ...dynamicFields }; } catch (e) { throw new Error('Invalid additional fields input'); } diff --git a/application/single_app/static/json/schemas/agent.schema.json b/application/single_app/static/json/schemas/agent.schema.json index 69652a155..7ec0eaa6a 100644 --- a/application/single_app/static/json/schemas/agent.schema.json +++ b/application/single_app/static/json/schemas/agent.schema.json @@ -57,6 +57,11 @@ "enable_agent_gpt_apim": { "type": "boolean" }, + "reasoning_effort": { + "type": "string", + "enum": ["none", "minimal", "low", "medium", "high"], + "description": "Reasoning effort level for models that support it (e.g., gpt-5, o1, o3)" + }, "default_agent": { "type": "boolean", "description": "(deprecated) Use selected_agent for agent selection." From f76296515fb4d7ffd108b59bd4170cd646dc4c1c Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Sat, 6 Dec 2025 12:32:02 -0500 Subject: [PATCH 17/34] fixed file metadata loading bug --- application/single_app/config.py | 2 +- application/single_app/static/css/styles.css | 28 ++ .../static/js/chat/chat-messages.js | 7 +- .../FILE_MESSAGE_METADATA_LOADING_FIX.md | 102 +++++++ .../test_file_message_metadata_fix.py | 273 ++++++++++++++++++ 5 files changed, 408 insertions(+), 4 deletions(-) create mode 100644 docs/fixes/FILE_MESSAGE_METADATA_LOADING_FIX.md create mode 100644 functional_tests/test_file_message_metadata_fix.py diff --git a/application/single_app/config.py b/application/single_app/config.py index 8898bcdc7..13aea67b8 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.229" +VERSION = "0.233.232" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/static/css/styles.css b/application/single_app/static/css/styles.css index eb881066a..fb5b7ca7f 100644 --- a/application/single_app/static/css/styles.css +++ b/application/single_app/static/css/styles.css @@ -735,11 +735,39 @@ main { position: absolute; left: 50%; transform: translateX(-50%); + white-space: nowrap; + max-width: calc(100% - 1rem); + overflow: hidden; } .message-exclusion-badge i { font-size: 1rem; color: #5c4503 !important; + flex-shrink: 0; +} + +.message-exclusion-badge .badge-text { + overflow: hidden; + text-overflow: clip; + white-space: nowrap; +} + +/* Hide badge text on narrow message footers - show icon only */ +@container footer (max-width: 350px) { + .message-exclusion-badge .badge-text { + display: none; + } + + .message-exclusion-badge { + gap: 0; + padding: 0.25rem 0.5rem; + } +} + +/* Ensure message footer supports absolute positioning and container queries */ +.message-footer { + container-type: inline-size; + container-name: footer; } /* Ensure message footer supports absolute positioning */ diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index b089f4942..ff5a0873f 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -487,7 +487,8 @@ export function loadMessages(conversationId) { appendMessage(senderType, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10, msg); console.log(`[loadMessages Loop] -------- END Message ID: ${msg.id} --------`); } else if (msg.role === "file") { - appendMessage("File", msg); + // Pass file message with proper parameters including message ID + appendMessage("File", msg, null, msg.id, false, [], [], [], null, null, msg); } else if (msg.role === "image") { // Validate image URL before calling appendMessage if (msg.content && msg.content !== 'null' && msg.content.trim() !== '') { @@ -2551,7 +2552,7 @@ function applyMaskedState(messageDiv, metadata) { if (messageFooter && !messageFooter.querySelector('.message-exclusion-badge')) { const badge = document.createElement('div'); badge.className = 'message-exclusion-badge text-warning small'; - badge.innerHTML = ' Excluded from conversation'; + badge.innerHTML = 'Excluded from conversation'; messageFooter.appendChild(badge); } return; @@ -2715,7 +2716,7 @@ function maskEntireMessage(messageDiv, messageId, maskBtn) { if (messageFooter && !messageFooter.querySelector('.message-exclusion-badge')) { const badge = document.createElement('div'); badge.className = 'message-exclusion-badge text-warning small'; - badge.innerHTML = ' Excluded from conversation'; + badge.innerHTML = 'Excluded from conversation'; messageFooter.appendChild(badge); } diff --git a/docs/fixes/FILE_MESSAGE_METADATA_LOADING_FIX.md b/docs/fixes/FILE_MESSAGE_METADATA_LOADING_FIX.md new file mode 100644 index 000000000..49e0c5430 --- /dev/null +++ b/docs/fixes/FILE_MESSAGE_METADATA_LOADING_FIX.md @@ -0,0 +1,102 @@ +# File Message Metadata Loading Fix + +**Fixed in version: 0.233.232** + +## Issue Description + +When clicking the metadata info button (ℹ️) on file messages in the chat interface, the system was failing to load metadata with a 404 error: + +``` +GET https://127.0.0.1:5000/api/message/null/metadata 404 (NOT FOUND) +Error loading message metadata: Error: Failed to load metadata +``` + +The error occurred because the message ID was not being properly passed when loading file messages, resulting in `null` being used in the API endpoint URL. + +## Root Cause + +In the `loadMessages` function in `chat-messages.js`, file messages were being loaded with only 2 parameters: + +```javascript +} else if (msg.role === "file") { + appendMessage("File", msg); +} +``` + +This contrasts with other message types (user, assistant, image) which properly pass the message ID as the 4th parameter to `appendMessage`. Without the message ID parameter, the metadata button's event listener couldn't retrieve the correct message ID, causing it to be `null` when constructing the API URL. + +## Solution + +Updated the file message loading to pass all required parameters, including the message ID: + +```javascript +} else if (msg.role === "file") { + // Pass file message with proper parameters including message ID + appendMessage("File", msg, null, msg.id, false, [], [], [], null, null, msg); +} +``` + +### Parameters passed: +1. `"File"` - sender type +2. `msg` - the full message object (contains filename and id) +3. `null` - model name (not applicable for files) +4. `msg.id` - **the message ID** (critical for metadata loading) +5. `false` - augmented flag +6. `[]` - hybrid citations +7. `[]` - web citations +8. `[]` - agent citations +9. `null` - agent display name +10. `null` - agent name +11. `msg` - full message object for additional context + +## Files Modified + +- **application/single_app/static/js/chat/chat-messages.js** (line ~489) + - Updated file message loading to include message ID parameter + +- **application/single_app/config.py** + - Updated VERSION from "0.233.231" to "0.233.232" + +## Testing + +To verify the fix: + +1. Upload a file to a conversation +2. Click the info button (ℹ️) on the file message +3. Verify that metadata loads successfully showing: + - Thread Information (thread ID, previous thread, active status, attempt) + - Message Details (message ID, conversation ID, role, timestamp) + - File Details (filename, table data status) + +## Sample Working Metadata + +```json +{ + "id": "bbf4ba02-f75b-4323-bfa2-6e7cea78b95b_file_1765039677_2894", + "conversation_id": "bbf4ba02-f75b-4323-bfa2-6e7cea78b95b", + "role": "file", + "filename": "Connect-2025-05.pdf", + "is_table": false, + "timestamp": "2025-12-06T16:47:57.048838", + "metadata": { + "thread_info": { + "thread_id": "8f0c3b8d-6770-4569-aafd-f20cbe7ce3ed", + "previous_thread_id": "17074c81-ee9a-4a2e-8505-0665252313e1", + "active_thread": true, + "thread_attempt": 1 + } + } +} +``` + +## Impact + +- **User Experience**: Users can now successfully view file message metadata +- **Debugging**: Proper metadata access enables better troubleshooting of file upload and processing issues +- **Consistency**: File messages now behave consistently with other message types (images, user messages, assistant messages) + +## Related Features + +- File upload system +- Message metadata display system +- Thread tracking and management diff --git a/functional_tests/test_file_message_metadata_fix.py b/functional_tests/test_file_message_metadata_fix.py new file mode 100644 index 000000000..c2105a519 --- /dev/null +++ b/functional_tests/test_file_message_metadata_fix.py @@ -0,0 +1,273 @@ +#!/usr/bin/env python3 +""" +Functional test for file message metadata loading fix. +Version: 0.233.232 +Implemented in: 0.233.232 + +This test ensures that file messages properly store and can retrieve their metadata, +including message ID, thread information, and file details. This prevents the 404 +error that occurred when the message ID was null. +""" + +import sys +import os + +# Add the application directory to the path +sys.path.append(os.path.join(os.path.dirname(__file__), '..')) + +def test_file_message_metadata_structure(): + """ + Test that file messages have the correct structure for metadata retrieval. + + This test verifies: + 1. File messages have an 'id' field + 2. File messages have 'role' set to 'file' + 3. File messages have required metadata fields + 4. Thread information is properly stored in metadata + """ + print("🔍 Testing File Message Metadata Structure...") + + # Sample file message structure based on the Cosmos DB record + test_file_message = { + "id": "bbf4ba02-f75b-4323-bfa2-6e7cea78b95b_file_1765039677_2894", + "conversation_id": "bbf4ba02-f75b-4323-bfa2-6e7cea78b95b", + "role": "file", + "filename": "Connect-2025-05.pdf", + "file_content": "[Page 1]\nYear Performance Review...", + "is_table": False, + "timestamp": "2025-12-06T16:47:57.048838", + "model_deployment_name": None, + "metadata": { + "thread_info": { + "thread_id": "8f0c3b8d-6770-4569-aafd-f20cbe7ce3ed", + "previous_thread_id": "17074c81-ee9a-4a2e-8505-0665252313e1", + "active_thread": True, + "thread_attempt": 1 + } + }, + "thread_id": "8f0c3b8d-6770-4569-aafd-f20cbe7ce3ed", + "previous_thread_id": "17074c81-ee9a-4a2e-8505-0665252313e1", + "active_thread": True, + "thread_attempt": 1 + } + + try: + # Test 1: Verify message has an ID + assert "id" in test_file_message, "File message must have an 'id' field" + assert test_file_message["id"] is not None, "File message ID cannot be None" + assert test_file_message["id"] != "", "File message ID cannot be empty" + print("✅ Test 1 passed: File message has valid ID") + + # Test 2: Verify role is 'file' + assert test_file_message["role"] == "file", "File message role must be 'file'" + print("✅ Test 2 passed: File message has correct role") + + # Test 3: Verify required metadata fields + assert "conversation_id" in test_file_message, "File message must have conversation_id" + assert "filename" in test_file_message, "File message must have filename" + assert "timestamp" in test_file_message, "File message must have timestamp" + print("✅ Test 3 passed: File message has required metadata fields") + + # Test 4: Verify thread information in metadata + assert "metadata" in test_file_message, "File message must have metadata object" + assert "thread_info" in test_file_message["metadata"], "Metadata must have thread_info" + + thread_info = test_file_message["metadata"]["thread_info"] + assert "thread_id" in thread_info, "Thread info must have thread_id" + assert "previous_thread_id" in thread_info, "Thread info must have previous_thread_id" + assert "active_thread" in thread_info, "Thread info must have active_thread" + assert "thread_attempt" in thread_info, "Thread info must have thread_attempt" + print("✅ Test 4 passed: File message has complete thread information") + + # Test 5: Verify thread info values are also at root level (backward compatibility) + assert test_file_message["thread_id"] == thread_info["thread_id"], "Root thread_id must match metadata" + assert test_file_message["active_thread"] == thread_info["active_thread"], "Root active_thread must match metadata" + assert test_file_message["thread_attempt"] == thread_info["thread_attempt"], "Root thread_attempt must match metadata" + print("✅ Test 5 passed: Thread information properly duplicated at root level") + + # Test 6: Verify ID structure (conversation_id_file_timestamp_random) + id_parts = test_file_message["id"].split("_file_") + assert len(id_parts) == 2, "File message ID should have format: conversation_id_file_timestamp_random" + assert id_parts[0] == test_file_message["conversation_id"], "ID should start with conversation_id" + print("✅ Test 6 passed: File message ID follows correct format") + + print("\n✅ All tests passed! File message metadata structure is correct.") + return True + + except AssertionError as e: + print(f"\n❌ Test failed: {e}") + import traceback + traceback.print_exc() + return False + except Exception as e: + print(f"\n❌ Unexpected error: {e}") + import traceback + traceback.print_exc() + return False + + +def test_metadata_api_url_construction(): + """ + Test that the metadata API URL is constructed correctly with a valid message ID. + + This simulates what happens in the JavaScript when the info button is clicked. + """ + print("\n🔍 Testing Metadata API URL Construction...") + + try: + # Simulate the JavaScript variables + message_id = "bbf4ba02-f75b-4323-bfa2-6e7cea78b95b_file_1765039677_2894" + + # Simulate the API URL construction from chat-messages.js:2266 + api_url = f"/api/message/{message_id}/metadata" + + # Test 1: URL should not contain 'null' + assert "null" not in api_url, "API URL should not contain 'null'" + print("✅ Test 1 passed: API URL does not contain 'null'") + + # Test 2: URL should have correct structure + expected_url = f"/api/message/{message_id}/metadata" + assert api_url == expected_url, f"API URL should be {expected_url}" + print("✅ Test 2 passed: API URL has correct structure") + + # Test 3: Message ID should not be None or empty + assert message_id is not None, "Message ID should not be None" + assert message_id != "", "Message ID should not be empty" + print("✅ Test 3 passed: Message ID is valid") + + print("\n✅ All URL construction tests passed!") + return True + + except AssertionError as e: + print(f"\n❌ Test failed: {e}") + import traceback + traceback.print_exc() + return False + except Exception as e: + print(f"\n❌ Unexpected error: {e}") + import traceback + traceback.print_exc() + return False + + +def test_append_message_parameters(): + """ + Test that appendMessage receives correct parameters for file messages. + + This simulates the fix where file messages now pass all 11 parameters + including the message ID as the 4th parameter. + """ + print("\n🔍 Testing appendMessage Parameter Passing...") + + try: + # Simulate the message object from loadMessages + msg = { + "id": "bbf4ba02-f75b-4323-bfa2-6e7cea78b95b_file_1765039677_2894", + "conversation_id": "bbf4ba02-f75b-4323-bfa2-6e7cea78b95b", + "role": "file", + "filename": "Connect-2025-05.pdf", + "timestamp": "2025-12-06T16:47:57.048838", + "metadata": { + "thread_info": { + "thread_id": "8f0c3b8d-6770-4569-aafd-f20cbe7ce3ed", + "previous_thread_id": "17074c81-ee9a-4a2e-8505-0665252313e1", + "active_thread": True, + "thread_attempt": 1 + } + } + } + + # Simulate the corrected appendMessage call from line 489 + # appendMessage("File", msg, null, msg.id, false, [], [], [], null, null, msg) + + params = { + "sender": "File", + "messageContent": msg, + "modelName": None, + "messageId": msg["id"], # This is the critical 4th parameter + "augmented": False, + "hybridCitations": [], + "webCitations": [], + "agentCitations": [], + "agentDisplayName": None, + "agentName": None, + "fullMessageObject": msg + } + + # Test 1: Verify sender is correct + assert params["sender"] == "File", "Sender should be 'File'" + print("✅ Test 1 passed: Sender parameter is correct") + + # Test 2: Verify messageContent is the full message object + assert params["messageContent"] == msg, "messageContent should be the full message object" + assert "filename" in params["messageContent"], "messageContent should contain filename" + assert "id" in params["messageContent"], "messageContent should contain id" + print("✅ Test 2 passed: messageContent parameter is correct") + + # Test 3: Verify messageId is explicitly passed (THE FIX) + assert params["messageId"] is not None, "messageId should not be None" + assert params["messageId"] == msg["id"], "messageId should match msg.id" + assert params["messageId"] != "", "messageId should not be empty" + print("✅ Test 3 passed: messageId parameter is explicitly passed (FIX VERIFIED)") + + # Test 4: Verify fullMessageObject is passed for metadata access + assert params["fullMessageObject"] is not None, "fullMessageObject should not be None" + assert params["fullMessageObject"] == msg, "fullMessageObject should be the message object" + print("✅ Test 4 passed: fullMessageObject parameter is passed") + + # Test 5: Simulate what happens when metadata button is clicked + # In the event listener, it uses the messageId from the data-message-id attribute + # which is set from the messageId parameter + data_message_id = params["messageId"] + + # This is what would be used to construct the API URL + metadata_api_url = f"/api/message/{data_message_id}/metadata" + + assert "null" not in metadata_api_url, "Metadata API URL should not contain 'null'" + assert data_message_id in metadata_api_url, "Metadata API URL should contain the message ID" + print("✅ Test 5 passed: Metadata button will use correct message ID") + + print("\n✅ All parameter passing tests passed!") + return True + + except AssertionError as e: + print(f"\n❌ Test failed: {e}") + import traceback + traceback.print_exc() + return False + except Exception as e: + print(f"\n❌ Unexpected error: {e}") + import traceback + traceback.print_exc() + return False + + +if __name__ == "__main__": + print("=" * 70) + print("FILE MESSAGE METADATA LOADING FIX - FUNCTIONAL TEST") + print("Version: 0.233.232") + print("=" * 70) + + tests = [ + test_file_message_metadata_structure, + test_metadata_api_url_construction, + test_append_message_parameters + ] + + results = [] + for test in tests: + print() + result = test() + results.append(result) + print() + + print("=" * 70) + print(f"📊 RESULTS: {sum(results)}/{len(results)} tests passed") + print("=" * 70) + + if all(results): + print("✅ ALL TESTS PASSED - Fix verified!") + sys.exit(0) + else: + print("❌ SOME TESTS FAILED - Please review") + sys.exit(1) From 1cebd795e9ceef97e1d9ab0d370e07b2a55e7060 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Mon, 8 Dec 2025 16:47:10 -0500 Subject: [PATCH 18/34] fixed llm streaming when working with group workspace data --- application/single_app/config.py | 2 +- application/single_app/route_backend_chats.py | 12 ++++++--- .../single_app/route_frontend_chats.py | 25 ++++++++++++++++++- .../static/js/chat/chat-input-actions.js | 10 ++++++++ 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 13aea67b8..6aba542e7 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.232" +VERSION = "0.233.234" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/route_backend_chats.py b/application/single_app/route_backend_chats.py index 4f1fd0a0e..b4105d975 100644 --- a/application/single_app/route_backend_chats.py +++ b/application/single_app/route_backend_chats.py @@ -2642,11 +2642,16 @@ def generate(): file_name = doc.get('file_name', 'Unknown') doc_group_id = doc.get('group_id', None) + # Map document_scope to correct parameter names for the function + metadata_params = {'user_id': user_id} + if document_scope == 'group': + metadata_params['group_id'] = active_group_id + elif document_scope == 'public': + metadata_params['public_workspace_id'] = active_public_workspace_id + metadata = get_document_metadata_for_citations( doc_id, - user_id, - doc_scope=document_scope, - active_group_id=active_group_id + **metadata_params ) if metadata: @@ -2981,6 +2986,7 @@ def generate(): yield f"data: {json.dumps({'error': error_msg, 'partial_content': accumulated_content})}\n\n" except Exception as e: + import traceback error_traceback = traceback.format_exc() print(f"[STREAM API ERROR] Unhandled exception: {str(e)}") print(f"[STREAM API ERROR] Full traceback:\n{error_traceback}") diff --git a/application/single_app/route_frontend_chats.py b/application/single_app/route_frontend_chats.py index 93ec605c6..b9f8b7868 100644 --- a/application/single_app/route_frontend_chats.py +++ b/application/single_app/route_frontend_chats.py @@ -410,6 +410,28 @@ def upload_file(): cosmos_messages_container.upsert_item(file_message) conversation_item['last_updated'] = datetime.utcnow().isoformat() + + # Check if this is the first message in the conversation (excluding the current file upload) + # and update conversation title based on filename if it's still "New Conversation" + try: + if conversation_item.get('title') == 'New Conversation': + # Query to count existing messages (excluding the one we just created) + count_query = f"SELECT VALUE COUNT(1) FROM c WHERE c.conversation_id = '{conversation_id}'" + message_counts = list(cosmos_messages_container.query_items(query=count_query, partition_key=conversation_id)) + message_count = message_counts[0] if message_counts else 0 + + # If this is the first or only message, set title based on filename + if message_count <= 1: + # Remove file extension and create a clean title + base_filename = os.path.splitext(filename)[0] + # Limit title length to 50 characters + new_title = base_filename[:50] if len(base_filename) > 50 else base_filename + conversation_item['title'] = new_title + print(f"Auto-generated conversation title from filename: {new_title}") + except Exception as title_error: + # Don't fail the upload if title generation fails + print(f"Warning: Failed to auto-generate conversation title: {title_error}") + cosmos_conversations_container.upsert_item(conversation_item) except Exception as e: @@ -419,7 +441,8 @@ def upload_file(): return jsonify({ 'message': 'File added to the conversation successfully', - 'conversation_id': conversation_id + 'conversation_id': conversation_id, + 'title': conversation_item.get('title', 'New Conversation') }), 200 # THIS IS THE OLD ROUTE, KEEPING IT FOR REFERENCE, WILL DELETE LATER diff --git a/application/single_app/static/js/chat/chat-input-actions.js b/application/single_app/static/js/chat/chat-input-actions.js index 02d511f3a..0325812f5 100644 --- a/application/single_app/static/js/chat/chat-input-actions.js +++ b/application/single_app/static/js/chat/chat-input-actions.js @@ -86,6 +86,16 @@ export function uploadFileToConversation(file) { .then((data) => { if (data.conversation_id) { currentConversationId = data.conversation_id; + + // If a title was returned and it's different from "New Conversation", + // update the conversation title in the UI + if (data.title && data.title !== "New Conversation") { + const currentConversationTitleEl = document.getElementById("current-conversation-title"); + if (currentConversationTitleEl) { + currentConversationTitleEl.textContent = data.title; + } + } + loadMessages(currentConversationId); loadConversations(); } else { From 9aec72aa3a2719b872430e7257653c60956537e7 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Tue, 9 Dec 2025 18:14:48 -0500 Subject: [PATCH 19/34] fixed cosmos container config error --- application/single_app/config.py | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 6aba542e7..8cbfa2b45 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -236,6 +236,17 @@ def get_redis_cache_infrastructure_endpoint(redis_hostname: str) -> str: partition_key=PartitionKey(path="/conversation_id") ) +cosmos_group_conversations_container_name = "group_conversations" +cosmos_group_conversations_container = cosmos_database.create_container_if_not_exists( + id=cosmos_group_conversations_container_name, + partition_key=PartitionKey(path="/id") +) + +cosmos_group_messages_container_name = "group_messages" +cosmos_group_messages_container = cosmos_database.create_container_if_not_exists( + id=cosmos_group_messages_container_name, + partition_key=PartitionKey(path="/conversation_id") +) cosmos_settings_container_name = "settings" cosmos_settings_container = cosmos_database.create_container_if_not_exists( @@ -339,18 +350,6 @@ def get_redis_cache_infrastructure_endpoint(redis_hostname: str) -> str: partition_key=PartitionKey(path="/user_id") ) -cosmos_file_processing_container_name = "group_messages" -cosmos_file_processing_container = cosmos_database.create_container_if_not_exists( - id=cosmos_file_processing_container_name, - partition_key=PartitionKey(path="/conversation_id") -) - -cosmos_file_processing_container_name = "group_conversations" -cosmos_file_processing_container = cosmos_database.create_container_if_not_exists( - id=cosmos_file_processing_container_name, - partition_key=PartitionKey(path="/id") -) - cosmos_group_agents_container_name = "group_agents" cosmos_group_agents_container = cosmos_database.create_container_if_not_exists( id=cosmos_group_agents_container_name, @@ -385,7 +384,6 @@ def get_redis_cache_infrastructure_endpoint(redis_hostname: str) -> str: cosmos_search_cache_container = cosmos_database.create_container_if_not_exists( id=cosmos_search_cache_container_name, partition_key=PartitionKey(path="/user_id") - # No default_ttl - TTL controlled by app logic via admin settings for flexibility ) cosmos_activity_logs_container_name = "activity_logs" From fb8a521fd622c0de440b405ebd5a1a9ffe8b5230 Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Wed, 10 Dec 2025 12:42:39 -0500 Subject: [PATCH 20/34] added delete message and fixed message threading --- application/single_app/config.py | 2 +- application/single_app/route_backend_chats.py | 191 ++++++++++++------ .../single_app/route_backend_conversations.py | 155 +++++++++++++- .../single_app/route_frontend_chats.py | 24 +-- application/single_app/static/css/chats.css | 5 +- .../static/js/chat/chat-messages.js | 155 +++++++++++++- application/single_app/templates/chats.html | 54 +++++ 7 files changed, 501 insertions(+), 85 deletions(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 8cbfa2b45..fea23e036 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.234" +VERSION = "0.233.244" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/route_backend_chats.py b/application/single_app/route_backend_chats.py index b4105d975..e2e6a93ab 100644 --- a/application/single_app/route_backend_chats.py +++ b/application/single_app/route_backend_chats.py @@ -423,7 +423,7 @@ def chat_api(): try: # Query for the last message in this conversation last_msg_query = f""" - SELECT TOP 1 c.thread_id + SELECT TOP 1 c.metadata.thread_info.thread_id as thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC @@ -458,11 +458,7 @@ def chat_api(): 'content': user_message, 'timestamp': datetime.utcnow().isoformat(), 'model_deployment_name': None, # Model not used for user message - 'metadata': user_metadata, - 'thread_id': current_user_thread_id, - 'previous_thread_id': previous_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + 'metadata': user_metadata } # Debug: Print the complete metadata being saved @@ -1115,7 +1111,21 @@ def chat_api(): # Create main image document with metadata - current_image_thread_id = str(uuid.uuid4()) + + # Get user_info and thread_id from the user message for ownership tracking and threading + user_info_for_chunked_image = None + user_thread_id = None + user_previous_thread_id = None + try: + user_msg = cosmos_messages_container.read_item( + item=user_message_id, + partition_key=conversation_id + ) + user_info_for_chunked_image = user_msg.get('metadata', {}).get('user_info') + user_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('thread_id') + user_previous_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('previous_thread_id') + except Exception as e: + print(f"Warning: Could not retrieve user_info from user message for chunked image: {e}") main_image_doc = { 'id': image_message_id, @@ -1127,24 +1137,20 @@ def chat_api(): 'timestamp': datetime.utcnow().isoformat(), 'model_deployment_name': image_gen_model, 'metadata': { + 'user_info': user_info_for_chunked_image, # Track which user created this image 'is_chunked': True, 'total_chunks': total_chunks, 'chunk_index': 0, 'original_size': len(generated_image_url), 'thread_info': { - 'thread_id': current_image_thread_id, - 'previous_thread_id': latest_thread_id, + 'thread_id': user_thread_id, # Same thread as user message + 'previous_thread_id': user_previous_thread_id, # Same previous_thread_id as user message 'active_thread': True, 'thread_attempt': 1 } - }, - 'thread_id': current_image_thread_id, - 'previous_thread_id': latest_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + } } - # Update tip - latest_thread_id = current_image_thread_id + # Image message shares the same thread as user message # Create additional chunk documents chunk_docs = [] @@ -1185,7 +1191,20 @@ def chat_api(): # Small image - store normally in single document debug_print(f"Small image ({len(generated_image_url)} bytes), storing in single document") - current_image_thread_id = str(uuid.uuid4()) + # Get user_info and thread_id from the user message for ownership tracking and threading + user_info_for_image = None + user_thread_id = None + user_previous_thread_id = None + try: + user_msg = cosmos_messages_container.read_item( + item=user_message_id, + partition_key=conversation_id + ) + user_info_for_image = user_msg.get('metadata', {}).get('user_info') + user_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('thread_id') + user_previous_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('previous_thread_id') + except Exception as e: + print(f"Warning: Could not retrieve user_info from user message for image: {e}") image_doc = { 'id': image_message_id, @@ -1197,24 +1216,20 @@ def chat_api(): 'timestamp': datetime.utcnow().isoformat(), 'model_deployment_name': image_gen_model, 'metadata': { + 'user_info': user_info_for_image, # Track which user created this image 'is_chunked': False, 'original_size': len(generated_image_url), 'thread_info': { - 'thread_id': current_image_thread_id, - 'previous_thread_id': latest_thread_id, + 'thread_id': user_thread_id, # Same thread as user message + 'previous_thread_id': user_previous_thread_id, # Same previous_thread_id as user message 'active_thread': True, 'thread_attempt': 1 } - }, - 'thread_id': current_image_thread_id, - 'previous_thread_id': latest_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + } } cosmos_messages_container.upsert_item(image_doc) response_image_url = generated_image_url - # Update tip - latest_thread_id = current_image_thread_id + # Image message shares the same thread as user message conversation_item['last_updated'] = datetime.utcnow().isoformat() cosmos_conversations_container.upsert_item(conversation_item) @@ -1332,7 +1347,21 @@ def chat_api(): # 5. Create the final system_doc dictionary for Cosmos DB upsert system_message_id = f"{conversation_id}_system_aug_{int(time.time())}_{random.randint(1000,9999)}" - current_system_thread_id = str(uuid.uuid4()) + + # Get user_info and thread_id from the user message for ownership tracking and threading + user_info_for_system = None + user_thread_id = None + user_previous_thread_id = None + try: + user_msg = cosmos_messages_container.read_item( + item=user_message_id, + partition_key=conversation_id + ) + user_info_for_system = user_msg.get('metadata', {}).get('user_info') + user_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('thread_id') + user_previous_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('previous_thread_id') + except Exception as e: + print(f"Warning: Could not retrieve user_info from user message for system message: {e}") system_doc = { 'id': system_message_id, @@ -1343,16 +1372,19 @@ def chat_api(): 'user_message': user_message, # Include the original user message for context 'model_deployment_name': None, # As per your original structure 'timestamp': datetime.utcnow().isoformat(), - 'metadata': {}, - 'thread_id': current_system_thread_id, - 'previous_thread_id': latest_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + 'metadata': { + 'user_info': user_info_for_system, + 'thread_info': { + 'thread_id': user_thread_id, # Same thread as user message + 'previous_thread_id': user_previous_thread_id, # Same previous_thread_id as user message + 'active_thread': True, + 'thread_attempt': 1 + } + } } cosmos_messages_container.upsert_item(system_doc) conversation_history_for_api.append(aug_msg) # Add to API context - # Update tip so assistant links to system message - latest_thread_id = current_system_thread_id + # System message shares the same thread as user message, no thread update needed # --- NEW: Save plugin output as agent citation --- agent_citations_list.append({ @@ -2072,8 +2104,24 @@ def gpt_error(e): agent_name = selected_agent.name assistant_message_id = f"{conversation_id}_assistant_{int(time.time())}_{random.randint(1000,9999)}" - current_assistant_thread_id = str(uuid.uuid4()) + # Get user_info and thread_id from the user message for ownership tracking and threading + user_info_for_assistant = None + user_thread_id = None + user_previous_thread_id = None + try: + user_msg = cosmos_messages_container.read_item( + item=user_message_id, + partition_key=conversation_id + ) + user_info_for_assistant = user_msg.get('metadata', {}).get('user_info') + user_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('thread_id') + user_previous_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('previous_thread_id') + except Exception as e: + print(f"Warning: Could not retrieve user_info from user message: {e}") + + # Assistant message should be part of the same thread as the user message + # Only system/augmentation messages create new threads within a conversation assistant_doc = { 'id': assistant_message_id, 'conversation_id': conversation_id, @@ -2089,18 +2137,15 @@ def gpt_error(e): 'agent_display_name': agent_display_name, 'agent_name': agent_name, 'metadata': { + 'user_info': user_info_for_assistant, # Track which user created this assistant message 'reasoning_effort': reasoning_effort, 'thread_info': { - 'thread_id': current_assistant_thread_id, - 'previous_thread_id': latest_thread_id, + 'thread_id': user_thread_id, # Same thread as user message + 'previous_thread_id': user_previous_thread_id, # Same previous_thread_id as user message 'active_thread': True, 'thread_attempt': 1 } - }, # Used by SK and reasoning effort - 'thread_id': current_assistant_thread_id, - 'previous_thread_id': latest_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + } # Used by SK and reasoning effort } cosmos_messages_container.upsert_item(assistant_doc) @@ -2490,7 +2535,7 @@ def generate(): previous_thread_id = None try: last_msg_query = f""" - SELECT TOP 1 c.thread_id + SELECT TOP 1 c.metadata.thread_info.thread_id as thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC @@ -2522,11 +2567,7 @@ def generate(): 'content': user_message, 'timestamp': datetime.utcnow().isoformat(), 'model_deployment_name': None, - 'metadata': user_metadata, - 'thread_id': current_user_thread_id, - 'previous_thread_id': previous_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + 'metadata': user_metadata } cosmos_messages_container.upsert_item(user_message_doc) @@ -2873,7 +2914,18 @@ def generate(): yield f"data: {json.dumps({'content': delta.content})}\n\n" # Stream complete - save message and send final metadata - current_assistant_thread_id = str(uuid.uuid4()) + # Get user thread info to maintain thread consistency + user_thread_id = None + user_previous_thread_id = None + try: + user_msg = cosmos_messages_container.read_item( + item=user_message_id, + partition_key=conversation_id + ) + user_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('thread_id') + user_previous_thread_id = user_msg.get('metadata', {}).get('thread_info', {}).get('previous_thread_id') + except Exception as e: + print(f"Warning: Could not retrieve thread_id from user message: {e}") assistant_doc = { 'id': assistant_message_id, @@ -2892,16 +2944,12 @@ def generate(): 'metadata': { 'reasoning_effort': reasoning_effort, 'thread_info': { - 'thread_id': current_assistant_thread_id, - 'previous_thread_id': latest_thread_id, + 'thread_id': user_thread_id, + 'previous_thread_id': user_previous_thread_id, 'active_thread': True, 'thread_attempt': 1 } - }, - 'thread_id': current_assistant_thread_id, - 'previous_thread_id': latest_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + } } cosmos_messages_container.upsert_item(assistant_doc) @@ -2971,12 +3019,14 @@ def generate(): 'metadata': { 'incomplete': True, 'error': error_msg, - 'reasoning_effort': reasoning_effort - }, - 'thread_id': current_assistant_thread_id, - 'previous_thread_id': latest_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + 'reasoning_effort': reasoning_effort, + 'thread_info': { + 'thread_id': user_thread_id, + 'previous_thread_id': user_previous_thread_id, + 'active_thread': True, + 'thread_attempt': 1 + } + } } try: cosmos_messages_container.upsert_item(assistant_doc) @@ -3050,6 +3100,23 @@ def mask_message_api(message_id): message_doc = message_results[0] conversation_id = message_doc.get('conversation_id') + # Verify ownership - only the message author can mask their message + message_user_id = message_doc.get('metadata', {}).get('user_info', {}).get('user_id') + if not message_user_id: + # Fallback: check conversation ownership for backwards compatibility + # All messages in a conversation (user, assistant, system) belong to the conversation owner + try: + conversation = cosmos_conversations_container.read_item( + item=conversation_id, + partition_key=conversation_id + ) + if conversation.get('user_id') != user_id: + return jsonify({'error': 'You can only mask messages from your own conversations'}), 403 + except: + return jsonify({'error': 'Conversation not found'}), 404 + elif message_user_id != user_id: + return jsonify({'error': 'You can only mask your own messages'}), 403 + except Exception as e: print(f"Error fetching message {message_id}: {str(e)}") return jsonify({'error': f'Error fetching message: {str(e)}'}), 500 diff --git a/application/single_app/route_backend_conversations.py b/application/single_app/route_backend_conversations.py index 22e12749c..c924b0c28 100644 --- a/application/single_app/route_backend_conversations.py +++ b/application/single_app/route_backend_conversations.py @@ -980,4 +980,157 @@ def clear_search_history(): return jsonify({'error': 'Failed to clear search history'}), 500 except Exception as e: print(f"Error clearing search history: {e}") - return jsonify({'error': 'Failed to clear search history'}), 500 \ No newline at end of file + return jsonify({'error': 'Failed to clear search history'}), 500 + + @app.route('/api/message/', methods=['DELETE']) + @swagger_route(security=get_auth_security()) + @login_required + @user_required + def delete_message(message_id): + """ + Delete a message or entire thread. Only the message author can delete their messages. + If archiving is enabled, messages are marked with is_deleted=true and masked. + If archiving is disabled, messages are permanently deleted. + """ + user_id = get_current_user_id() + if not user_id: + return jsonify({'error': 'User not authenticated'}), 401 + + try: + data = request.get_json() or {} + delete_thread = data.get('delete_thread', False) + + settings = get_settings() + archiving_enabled = settings.get('enable_conversation_archiving', False) + + # Find the message using cross-partition query + query = "SELECT * FROM c WHERE c.id = @message_id" + params = [{"name": "@message_id", "value": message_id}] + message_results = list(cosmos_messages_container.query_items( + query=query, + parameters=params, + enable_cross_partition_query=True + )) + + if not message_results: + return jsonify({'error': 'Message not found'}), 404 + + message_doc = message_results[0] + conversation_id = message_doc.get('conversation_id') + + # Verify ownership - only the message author can delete their message + message_user_id = message_doc.get('metadata', {}).get('user_info', {}).get('user_id') + if not message_user_id: + # Fallback: check conversation ownership for backwards compatibility + # All messages in a conversation (user, assistant, system) belong to the conversation owner + try: + conversation = cosmos_conversations_container.read_item( + item=conversation_id, + partition_key=conversation_id + ) + if conversation.get('user_id') != user_id: + return jsonify({'error': 'You can only delete messages from your own conversations'}), 403 + except: + return jsonify({'error': 'Conversation not found'}), 404 + elif message_user_id != user_id: + return jsonify({'error': 'You can only delete your own messages'}), 403 + + # Collect messages to delete + messages_to_delete = [] + + if delete_thread and message_doc.get('role') == 'user': + # Delete entire thread: user message + system message + assistant/image messages + thread_id = message_doc.get('metadata', {}).get('thread_info', {}).get('thread_id') + thread_previous_id = message_doc.get('metadata', {}).get('thread_info', {}).get('previous_thread_id') + + if thread_id: + # Query all messages in this thread exchange (user, system, assistant messages with same thread_id) + # Do NOT include subsequent threads that reference this thread_id as previous_thread_id + thread_query = f""" + SELECT * FROM c + WHERE c.conversation_id = '{conversation_id}' + AND c.metadata.thread_info.thread_id = '{thread_id}' + """ + thread_messages = list(cosmos_messages_container.query_items( + query=thread_query, + partition_key=conversation_id + )) + messages_to_delete = thread_messages + + # THREAD CHAIN REPAIR: Update subsequent threads to maintain chain integrity + # Find messages where previous_thread_id points to the thread we're deleting + subsequent_query = f""" + SELECT * FROM c + WHERE c.conversation_id = '{conversation_id}' + AND c.metadata.thread_info.previous_thread_id = '{thread_id}' + """ + subsequent_messages = list(cosmos_messages_container.query_items( + query=subsequent_query, + partition_key=conversation_id + )) + + # Update each subsequent message to skip over the deleted thread + # Point their previous_thread_id to the deleted thread's previous_thread_id + for subsequent_msg in subsequent_messages: + # Skip messages that are being deleted (they're in the same thread) + if subsequent_msg['id'] in [m['id'] for m in messages_to_delete]: + continue + + # Update previous_thread_id to maintain chain + if 'metadata' not in subsequent_msg: + subsequent_msg['metadata'] = {} + if 'thread_info' not in subsequent_msg['metadata']: + subsequent_msg['metadata']['thread_info'] = {} + + subsequent_msg['metadata']['thread_info']['previous_thread_id'] = thread_previous_id + + # Upsert the updated message + cosmos_messages_container.upsert_item(subsequent_msg) + print(f"Repaired thread chain: Message {subsequent_msg['id']} now points to thread {thread_previous_id}") + else: + messages_to_delete = [message_doc] + else: + # Delete only the specified message + messages_to_delete = [message_doc] + + deleted_message_ids = [] + + for msg in messages_to_delete: + msg_id = msg['id'] + + if archiving_enabled: + # Mark as deleted and mask the message + if 'metadata' not in msg: + msg['metadata'] = {} + + msg['metadata']['is_deleted'] = True + msg['metadata']['deleted_by_user_id'] = user_id + msg['metadata']['deleted_timestamp'] = datetime.utcnow().isoformat() + msg['metadata']['masked'] = True + msg['metadata']['masked_by_user_id'] = user_id + msg['metadata']['masked_timestamp'] = datetime.utcnow().isoformat() + + # Archive the message + archived_msg = dict(msg) + archived_msg['archived_at'] = datetime.utcnow().isoformat() + cosmos_archived_messages_container.upsert_item(archived_msg) + + # Update the message in the main container (for conversation history exclusion) + cosmos_messages_container.upsert_item(msg) + else: + # Permanently delete the message + cosmos_messages_container.delete_item(msg_id, partition_key=conversation_id) + + deleted_message_ids.append(msg_id) + + return jsonify({ + 'success': True, + 'deleted_message_ids': deleted_message_ids, + 'archived': archiving_enabled + }), 200 + + except Exception as e: + print(f"Error deleting message: {str(e)}") + import traceback + traceback.print_exc() + return jsonify({'error': 'Failed to delete message'}), 500 \ No newline at end of file diff --git a/application/single_app/route_frontend_chats.py b/application/single_app/route_frontend_chats.py index b9f8b7868..601f7bc07 100644 --- a/application/single_app/route_frontend_chats.py +++ b/application/single_app/route_frontend_chats.py @@ -250,7 +250,7 @@ def upload_file(): # Threading logic for file upload previous_thread_id = None try: - last_msg_query = f"SELECT TOP 1 c.thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC" + last_msg_query = f"SELECT TOP 1 c.metadata.thread_info.thread_id as thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC" last_msgs = list(cosmos_messages_container.query_items(query=last_msg_query, partition_key=conversation_id)) if last_msgs: previous_thread_id = last_msgs[0].get('thread_id') @@ -282,11 +282,7 @@ def upload_file(): 'active_thread': True, 'thread_attempt': 1 } - }, - 'thread_id': current_thread_id, - 'previous_thread_id': previous_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + } } # Add vision analysis and extracted text if available @@ -322,7 +318,7 @@ def upload_file(): # Threading logic for file upload previous_thread_id = None try: - last_msg_query = f"SELECT TOP 1 c.thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC" + last_msg_query = f"SELECT TOP 1 c.metadata.thread_info.thread_id as thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC" last_msgs = list(cosmos_messages_container.query_items(query=last_msg_query, partition_key=conversation_id)) if last_msgs: previous_thread_id = last_msgs[0].get('thread_id') @@ -351,11 +347,7 @@ def upload_file(): 'active_thread': True, 'thread_attempt': 1 } - }, - 'thread_id': current_thread_id, - 'previous_thread_id': previous_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + } } # Add vision analysis and extracted text if available @@ -371,7 +363,7 @@ def upload_file(): # Threading logic for file upload previous_thread_id = None try: - last_msg_query = f"SELECT TOP 1 c.thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC" + last_msg_query = f"SELECT TOP 1 c.metadata.thread_info.thread_id as thread_id FROM c WHERE c.conversation_id = '{conversation_id}' ORDER BY c.timestamp DESC" last_msgs = list(cosmos_messages_container.query_items(query=last_msg_query, partition_key=conversation_id)) if last_msgs: previous_thread_id = last_msgs[0].get('thread_id') @@ -396,11 +388,7 @@ def upload_file(): 'active_thread': True, 'thread_attempt': 1 } - }, - 'thread_id': current_thread_id, - 'previous_thread_id': previous_thread_id, - 'active_thread': True, - 'thread_attempt': 1 + } } # Add vision analysis if available diff --git a/application/single_app/static/css/chats.css b/application/single_app/static/css/chats.css index b436b439d..5775f0284 100644 --- a/application/single_app/static/css/chats.css +++ b/application/single_app/static/css/chats.css @@ -850,8 +850,8 @@ a.citation-link:hover { /* Message bubble */ .message-bubble { max-width: 90%; - min-width: 0; /* <-- This is crucial for flex children to shrink! */ - width: 100%; + min-width: 250px; /* Ensure enough width for footer buttons to display properly */ + width: auto; /* Let content determine width, but respect min-width */ padding: 10px; border-radius: 15px; position: relative; @@ -864,6 +864,7 @@ a.citation-link:hover { background-color: #c8e0fa; /* Blue */ color: black; border-bottom-right-radius: 0; + min-width: 250px !important; /* Ensure enough width for footer buttons */ } diff --git a/application/single_app/static/js/chat/chat-messages.js b/application/single_app/static/js/chat/chat-messages.js index ff5a0873f..6f3c46b05 100644 --- a/application/single_app/static/js/chat/chat-messages.js +++ b/application/single_app/static/js/chat/chat-messages.js @@ -459,6 +459,11 @@ export function loadMessages(conversationId) { chatbox.innerHTML = ""; console.log(`--- Loading messages for ${conversationId} ---`); data.messages.forEach((msg) => { + // Skip deleted messages (when conversation archiving is enabled) + if (msg.metadata && msg.metadata.is_deleted === true) { + console.log(`Skipping deleted message: ${msg.id}`); + return; + } console.log(`[loadMessages Loop] -------- START Message ID: ${msg.id} --------`); console.log(`[loadMessages Loop] Role: ${msg.role}`); if (msg.role === "user") { @@ -625,7 +630,12 @@ export function appendMessage( `; - const copyAndFeedbackHtml = `
${copyButtonHtml}${maskButtonHtml}${feedbackHtml}
`; + const deleteButtonHtml = ` + + `; + const copyAndFeedbackHtml = `
${copyButtonHtml}${maskButtonHtml}${deleteButtonHtml}${feedbackHtml}
`; const citationsButtonsHtml = createCitationsHtml( hybridCitations, @@ -776,6 +786,13 @@ export function appendMessage( }); } + const deleteBtn = messageDiv.querySelector(".delete-msg-btn"); + if (deleteBtn) { + deleteBtn.addEventListener("click", () => { + handleDeleteButtonClick(messageDiv, messageId, 'assistant'); + }); + } + const copyBtn = messageDiv.querySelector(".copy-btn"); copyBtn?.addEventListener("click", () => { /* ... copy logic ... */ @@ -953,6 +970,9 @@ export function appendMessage( +
@@ -986,6 +1006,9 @@ export function appendMessage( +
${imageInfoToggleHtml}
+ + + + + + + + + + + +
+
+
+
+
+ Token Usage +
+
+
+
+ +
+
+
+
+
@@ -900,6 +966,93 @@
No Public Workspaces Found
+ + +
+
+
+ Activity Logs +
+
+ + +
+
+
+ + +
+
+
+ +
+
+ +
+
+ + +
+
+ + +
+
+
+ + + + + + + + + + + + + + + +
TimestampActivity TypeUserDetailsWorkspace Type
+ +
Loading activity logs...
+
+
+ + +
+
+ +
+ +
+
+
+
@@ -1094,6 +1247,12 @@
Select Charts to Export:
Public Documents +
+ + +
@@ -1139,6 +1298,7 @@
Select Time Window:
  • Personal Documents: Display name, email, user ID, personal document details, sizes, upload date
  • Group Documents: Display name, email, user ID, group document details, sizes, upload date
  • Public Documents: Display name, email, user ID, public document details, sizes, upload date
    • +
  • Token Usage: Display name, email, user ID, token type (chat/embedding), model name, prompt tokens, completion tokens, total tokens, timestamp
    • From 4c042593927431cc1d03af4c3ecacb2115df4b6c Mon Sep 17 00:00:00 2001 From: Paul Lizer Date: Fri, 19 Dec 2025 14:33:06 -0500 Subject: [PATCH 34/34] added support for agents in edit and retry messages --- application/single_app/config.py | 2 +- application/single_app/route_backend_chats.py | 24 ++- .../single_app/route_backend_conversations.py | 24 +++ .../single_app/semantic_kernel_loader.py | 15 ++ .../single_app/static/js/chat/chat-edit.js | 20 +- .../single_app/static/js/chat/chat-retry.js | 190 ++++++++++++++---- application/single_app/templates/chats.html | 33 ++- 7 files changed, 267 insertions(+), 41 deletions(-) diff --git a/application/single_app/config.py b/application/single_app/config.py index 0ad230e4c..e12f5f073 100644 --- a/application/single_app/config.py +++ b/application/single_app/config.py @@ -88,7 +88,7 @@ EXECUTOR_TYPE = 'thread' EXECUTOR_MAX_WORKERS = 30 SESSION_TYPE = 'filesystem' -VERSION = "0.233.313" +VERSION = "0.233.318" SECRET_KEY = os.getenv('SECRET_KEY', 'dev-secret-key-change-in-production') diff --git a/application/single_app/route_backend_chats.py b/application/single_app/route_backend_chats.py index f892d5651..f9dae599f 100644 --- a/application/single_app/route_backend_chats.py +++ b/application/single_app/route_backend_chats.py @@ -1784,7 +1784,19 @@ async def run_sk_call(callable_obj, *args, **kwargs): user_settings = get_user_settings(user_id).get('settings', {}) per_user_semantic_kernel = settings.get('per_user_semantic_kernel', False) enable_semantic_kernel = settings.get('enable_semantic_kernel', False) + + # Check if agent_info is provided in request (e.g., from retry with agent selection) + request_agent_info = data.get('agent_info') + force_enable_agents = bool(request_agent_info) # Force enable agents if agent_info provided + user_enable_agents = user_settings.get('enable_agents', True) # Default to True for backward compatibility + # Override user setting if agent explicitly requested via agent_info + if force_enable_agents: + user_enable_agents = True + g.force_enable_agents = True # Store in Flask g for SK loader to check + g.request_agent_name = request_agent_info.get('name') if isinstance(request_agent_info, dict) else request_agent_info + log_event(f"[SKChat] agent_info provided in request - forcing agent enablement for this request", level=logging.INFO) + enable_key_vault_secret_storage = settings.get('enable_key_vault_secret_storage', False) redis_client = None # --- Semantic Kernel state management (per-user mode) --- @@ -1818,9 +1830,19 @@ async def run_sk_call(callable_obj, *args, **kwargs): if enable_semantic_kernel and user_enable_agents: # PATCH: Use new agent selection logic agent_name_to_select = None - if per_user_semantic_kernel: + + # Priority 1: Use agent_info from request if provided (e.g., retry with specific agent) + if request_agent_info: + # Extract agent name or create dict format expected by selection logic + agent_name_to_select = request_agent_info if isinstance(request_agent_info, dict) else {'name': request_agent_info} + if isinstance(agent_name_to_select, dict): + agent_name_to_select = agent_name_to_select.get('name') + log_event(f"[SKChat] Using agent from request agent_info: {agent_name_to_select}") + # Priority 2: Use user settings + elif per_user_semantic_kernel: agent_name_to_select = user_settings.get('selected_agent') log_event(f"[SKChat] Per-user mode: selected_agent from user_settings: {agent_name_to_select}") + # Priority 3: Use global settings else: global_selected_agent_info = settings.get('global_selected_agent') if global_selected_agent_info: diff --git a/application/single_app/route_backend_conversations.py b/application/single_app/route_backend_conversations.py index c02aed4ad..179b7885f 100644 --- a/application/single_app/route_backend_conversations.py +++ b/application/single_app/route_backend_conversations.py @@ -1367,6 +1367,7 @@ def retry_message(message_id): data = request.get_json() or {} selected_model = data.get('model') reasoning_effort = data.get('reasoning_effort') + agent_info = data.get('agent_info') # Get agent info if provided # Find the original message query = "SELECT * FROM c WHERE c.id = @message_id" @@ -1530,6 +1531,15 @@ def retry_message(message_id): 'retry_thread_attempt': new_attempt # Pass attempt number } + # Add agent_info to chat request if provided (for agent-based retry) + if agent_info: + chat_request['agent_info'] = agent_info + print(f"🤖 Retry - Using agent: {agent_info.get('display_name')} ({agent_info.get('name')})") + elif original_metadata.get('agent_selection'): + # Use original agent selection if no new agent specified + chat_request['agent_info'] = original_metadata.get('agent_selection') + print(f"🤖 Retry - Using original agent from metadata") + print(f"🔍 Retry - Chat request params: retry_user_message_id={new_user_message_id}, retry_thread_id={thread_id}, retry_thread_attempt={new_attempt}") # Make internal request to chat API @@ -1739,6 +1749,20 @@ def edit_message(message_id): 'retry_thread_attempt': new_attempt # Pass attempt number } + # Include agent_info from original metadata if present (for agent-based edits) + if original_metadata.get('agent_selection'): + agent_selection = original_metadata.get('agent_selection') + chat_request['agent_info'] = { + 'name': agent_selection.get('selected_agent'), + 'display_name': agent_selection.get('agent_display_name'), + 'id': agent_selection.get('agent_id'), + 'is_global': agent_selection.get('is_global', False), + 'is_group': agent_selection.get('is_group', False), + 'group_id': agent_selection.get('group_id'), + 'group_name': agent_selection.get('group_name') + } + print(f"🤖 Edit - Using agent: {chat_request['agent_info'].get('display_name')} ({chat_request['agent_info'].get('name')})") + print(f"🔍 Edit - Chat request params: edited_user_message_id={new_user_message_id}, retry_thread_id={thread_id}, retry_thread_attempt={new_attempt}") # Return success with chat_request for frontend to call chat API diff --git a/application/single_app/semantic_kernel_loader.py b/application/single_app/semantic_kernel_loader.py index ea1e59319..70ed5efaa 100644 --- a/application/single_app/semantic_kernel_loader.py +++ b/application/single_app/semantic_kernel_loader.py @@ -1109,8 +1109,23 @@ def load_user_semantic_kernel(kernel: Kernel, settings, user_id: str, redis_clie # Early check: Get user settings to see if agents are enabled and if an agent is selected user_settings = get_user_settings(user_id).get('settings', {}) enable_agents = user_settings.get('enable_agents', True) # Default to True for backward compatibility + + # Check if request has forced agent enablement (e.g., retry with specific agent) + from flask import g + force_enable_agents = getattr(g, 'force_enable_agents', False) + request_agent_name = getattr(g, 'request_agent_name', None) + + if force_enable_agents: + enable_agents = True + log_event(f"[SK Loader] Force enabling agents due to request agent_info (agent: {request_agent_name})", level=logging.INFO) + selected_agent = user_settings.get('selected_agent') + # Override selected_agent if request specifies one + if request_agent_name: + selected_agent = request_agent_name + log_event(f"[SK Loader] Using agent from request: {request_agent_name}", level=logging.INFO) + # If agents are disabled or no agent is selected, skip agent loading entirely if not enable_agents: print(f"[SK Loader] User {user_id} has agents disabled. Proceeding in model-only mode.") diff --git a/application/single_app/static/js/chat/chat-edit.js b/application/single_app/static/js/chat/chat-edit.js index 47dbdfc52..0e09b0d68 100644 --- a/application/single_app/static/js/chat/chat-edit.js +++ b/application/single_app/static/js/chat/chat-edit.js @@ -33,14 +33,28 @@ export function handleEditButtonClick(messageDiv, messageId, messageType) { .then(metadata => { console.log('📊 Original message metadata:', metadata); + // Store metadata for later use in executeMessageEdit + window.pendingMessageEdit.metadata = metadata; + // Display original settings in modal const settingsInfoDiv = document.getElementById('edit-original-settings-info'); if (settingsInfoDiv) { - const modelName = metadata?.model_selection?.selected_model || 'Default model'; + const agentSelection = metadata?.agent_selection; + const modelName = metadata?.model_selection?.selected_model; const reasoningEffort = metadata?.reasoning_effort; const docSearchEnabled = metadata?.document_search?.enabled || false; - let settingsHtml = `Original settings: ${modelName}`; + let settingsHtml = 'Original settings: '; + + // Show agent if used, otherwise show model + if (agentSelection && (agentSelection.agent_display_name || agentSelection.selected_agent)) { + const agentName = agentSelection.agent_display_name || agentSelection.selected_agent; + settingsHtml += `🤖 ${agentName}`; + } else if (modelName) { + settingsHtml += `${modelName}`; + } else { + settingsHtml += 'Default model'; + } if (reasoningEffort) { settingsHtml += `, Reasoning: ${reasoningEffort}`; @@ -50,7 +64,7 @@ export function handleEditButtonClick(messageDiv, messageId, messageType) { settingsHtml += `, Document search enabled`; } - settingsHtml += ``; + settingsHtml += ''; settingsInfoDiv.innerHTML = settingsHtml; } }) diff --git a/application/single_app/static/js/chat/chat-retry.js b/application/single_app/static/js/chat/chat-retry.js index 0a9d85a5a..55cfbf8ef 100644 --- a/application/single_app/static/js/chat/chat-retry.js +++ b/application/single_app/static/js/chat/chat-retry.js @@ -4,10 +4,45 @@ import { showToast } from './chat-toast.js'; import { showLoadingIndicatorInChatbox, hideLoadingIndicatorInChatbox } from './chat-loading-indicator.js'; +/** + * Populate retry agent dropdown with available agents + */ +async function populateRetryAgentDropdown() { + const retryAgentSelect = document.getElementById('retry-agent-select'); + if (!retryAgentSelect) return; + + try { + // Import agent functions dynamically + const agentsModule = await import('../agents_common.js'); + const { fetchUserAgents, fetchGroupAgentsForActiveGroup, fetchSelectedAgent, populateAgentSelect } = agentsModule; + + // Fetch available agents + const [userAgents, selectedAgent] = await Promise.all([ + fetchUserAgents(), + fetchSelectedAgent() + ]); + const groupAgents = await fetchGroupAgentsForActiveGroup(); + + // Combine and order agents + const combinedAgents = [...userAgents, ...groupAgents]; + const personalAgents = combinedAgents.filter(agent => !agent.is_global && !agent.is_group); + const activeGroupAgents = combinedAgents.filter(agent => agent.is_group); + const globalAgents = combinedAgents.filter(agent => agent.is_global); + const orderedAgents = [...personalAgents, ...activeGroupAgents, ...globalAgents]; + + // Populate retry agent select using shared function + populateAgentSelect(retryAgentSelect, orderedAgents, selectedAgent); + + console.log(`✅ Populated retry agent dropdown with ${orderedAgents.length} agents`); + } catch (error) { + console.error('❌ Error populating retry agent dropdown:', error); + } +} + /** * Handle retry button click - opens retry modal */ -export function handleRetryButtonClick(messageDiv, messageId, messageType) { +export async function handleRetryButtonClick(messageDiv, messageId, messageType) { console.log(`🔄 Retry button clicked for ${messageType} message: ${messageId}`); // Store message info for retry execution @@ -27,18 +62,78 @@ export function handleRetryButtonClick(messageDiv, messageId, messageType) { retryModelSelect.value = modelSelect.value; // Set to currently selected model } - // Handle reasoning effort for o1 models - const selectedModel = retryModelSelect ? retryModelSelect.value : null; - const retryReasoningContainer = document.getElementById('retry-reasoning-container'); - const retryReasoningLevels = document.getElementById('retry-reasoning-levels'); + // Populate retry modal with agent options (always load fresh from API) + const retryAgentSelect = document.getElementById('retry-agent-select'); + if (retryAgentSelect) { + await populateRetryAgentDropdown(); + } + + // Determine if original message used agents or models + const enableAgentsBtn = document.getElementById('enable-agents-btn'); + const agentSelectContainer = document.getElementById('agent-select-container'); + const isAgentMode = enableAgentsBtn && enableAgentsBtn.classList.contains('active') && + agentSelectContainer && agentSelectContainer.style.display !== 'none'; + + // Set retry mode based on current state + const retryModeModel = document.getElementById('retry-mode-model'); + const retryModeAgent = document.getElementById('retry-mode-agent'); + const retryModelContainer = document.getElementById('retry-model-container'); + const retryAgentContainer = document.getElementById('retry-agent-container'); + + if (isAgentMode && retryModeAgent) { + retryModeAgent.checked = true; + if (retryModelContainer) retryModelContainer.style.display = 'none'; + if (retryAgentContainer) retryAgentContainer.style.display = 'block'; + } else if (retryModeModel) { + retryModeModel.checked = true; + if (retryModelContainer) retryModelContainer.style.display = 'block'; + if (retryAgentContainer) retryAgentContainer.style.display = 'none'; + } + + // Add event listeners for mode toggle + if (retryModeModel) { + retryModeModel.addEventListener('change', function() { + if (this.checked) { + if (retryModelContainer) retryModelContainer.style.display = 'block'; + if (retryAgentContainer) retryAgentContainer.style.display = 'none'; + updateReasoningVisibility(); + } + }); + } + + if (retryModeAgent) { + retryModeAgent.addEventListener('change', function() { + if (this.checked) { + if (retryModelContainer) retryModelContainer.style.display = 'none'; + if (retryAgentContainer) retryAgentContainer.style.display = 'block'; + updateReasoningVisibility(); + } + }); + } - if (selectedModel && selectedModel.includes('o1')) { - // Show reasoning effort for o1 models + // Function to update reasoning visibility based on selected model or agent + function updateReasoningVisibility() { + const retryReasoningContainer = document.getElementById('retry-reasoning-container'); + const retryReasoningLevels = document.getElementById('retry-reasoning-levels'); + + let showReasoning = false; + + if (retryModeModel && retryModeModel.checked) { + const selectedModel = retryModelSelect ? retryModelSelect.value : null; + showReasoning = selectedModel && selectedModel.includes('o1'); + } else if (retryModeAgent && retryModeAgent.checked) { + // Check if agent uses o1 model (you could enhance this by checking agent config) + const selectedAgent = retryAgentSelect ? retryAgentSelect.value : null; + // For now, we'll show reasoning for agents too if they use o1 models + // This could be enhanced by fetching agent model info + showReasoning = false; // Default to false for agents unless we can determine model + } + if (retryReasoningContainer) { - retryReasoningContainer.style.display = 'block'; + retryReasoningContainer.style.display = showReasoning ? 'block' : 'none'; - // Populate reasoning levels if empty - if (retryReasoningLevels && !retryReasoningLevels.hasChildNodes()) { + // Populate reasoning levels if empty and showing + if (showReasoning && retryReasoningLevels && !retryReasoningLevels.hasChildNodes()) { const levels = [ { value: 'low', label: 'Low', description: 'Faster responses' }, { value: 'medium', label: 'Medium', description: 'Balanced' }, @@ -60,21 +155,19 @@ export function handleRetryButtonClick(messageDiv, messageId, messageType) { }); } } - } else { - // Hide reasoning effort for non-o1 models - if (retryReasoningContainer) { - retryReasoningContainer.style.display = 'none'; - } } + // Initial reasoning visibility + updateReasoningVisibility(); + // Update reasoning visibility when model changes in retry modal if (retryModelSelect) { - retryModelSelect.addEventListener('change', function() { - const model = this.value; - if (retryReasoningContainer) { - retryReasoningContainer.style.display = model && model.includes('o1') ? 'block' : 'none'; - } - }); + retryModelSelect.addEventListener('change', updateReasoningVisibility); + } + + // Update reasoning visibility when agent changes in retry modal + if (retryAgentSelect) { + retryAgentSelect.addEventListener('change', updateReasoningVisibility); } // Show the retry modal @@ -96,18 +189,48 @@ window.executeMessageRetry = function() { console.log(`🚀 Executing retry for ${messageType} message: ${messageId}`); - // Get selected model and reasoning effort from retry modal - const retryModelSelect = document.getElementById('retry-model-select'); - const selectedModel = retryModelSelect ? retryModelSelect.value : null; + // Determine retry mode (model or agent) + const retryModeModel = document.getElementById('retry-mode-model'); + const retryModeAgent = document.getElementById('retry-mode-agent'); + const isAgentMode = retryModeAgent && retryModeAgent.checked; - let reasoningEffort = null; - const retryReasoningContainer = document.getElementById('retry-reasoning-container'); - if (retryReasoningContainer && retryReasoningContainer.style.display !== 'none') { - const selectedReasoning = document.querySelector('input[name="retry-reasoning-effort"]:checked'); - reasoningEffort = selectedReasoning ? selectedReasoning.value : null; - } + // Prepare retry request body + const requestBody = {}; - console.log(`📊 Retry settings - Model: ${selectedModel}, Reasoning: ${reasoningEffort}`); + if (isAgentMode) { + // Agent mode - get agent info + const retryAgentSelect = document.getElementById('retry-agent-select'); + if (retryAgentSelect) { + const selectedOption = retryAgentSelect.options[retryAgentSelect.selectedIndex]; + if (selectedOption) { + requestBody.agent_info = { + id: selectedOption.dataset.agentId || null, + name: selectedOption.dataset.name || '', + display_name: selectedOption.dataset.displayName || selectedOption.textContent || '', + is_global: selectedOption.dataset.isGlobal === 'true', + is_group: selectedOption.dataset.isGroup === 'true', + group_id: selectedOption.dataset.groupId || null, + group_name: selectedOption.dataset.groupName || null + }; + console.log(`🤖 Retry with agent:`, requestBody.agent_info); + } + } + } else { + // Model mode - get model and reasoning effort + const retryModelSelect = document.getElementById('retry-model-select'); + const selectedModel = retryModelSelect ? retryModelSelect.value : null; + requestBody.model = selectedModel; + + let reasoningEffort = null; + const retryReasoningContainer = document.getElementById('retry-reasoning-container'); + if (retryReasoningContainer && retryReasoningContainer.style.display !== 'none') { + const selectedReasoning = document.querySelector('input[name="retry-reasoning-effort"]:checked'); + reasoningEffort = selectedReasoning ? selectedReasoning.value : null; + } + requestBody.reasoning_effort = reasoningEffort; + + console.log(`🧠 Retry with model: ${selectedModel}, Reasoning: ${reasoningEffort}`); + } // Close the modal explicitly const modalElement = document.getElementById('retry-message-modal'); @@ -132,10 +255,7 @@ window.executeMessageRetry = function() { headers: { 'Content-Type': 'application/json', }, - body: JSON.stringify({ - model: selectedModel, - reasoning_effort: reasoningEffort - }) + body: JSON.stringify(requestBody) }) .then(response => { if (!response.ok) { diff --git a/application/single_app/templates/chats.html b/application/single_app/templates/chats.html index 552a1de10..0ec65b1d6 100644 --- a/application/single_app/templates/chats.html +++ b/application/single_app/templates/chats.html @@ -525,12 +525,43 @@