A summary intro was requested, '
+ 'but could not be generated for this export.
'
+ f'Error: {error_text}
No user or assistant transcript messages were available for export.
' + ) + else: + for message in transcript_messages: + role = message.get('role', '') + bubble_class = _pdf_bubble_class(role) + label = message.get('label', '') + speaker = message.get('speaker_label', '') + timestamp = message.get('timestamp', '') + content = message.get('content_text', '') or 'No content recorded.' + + parts.append(f'{_escape_html(label)} — ' + f'{_escape_html(speaker)}{ts_str}
' + ) + content_html = markdown2.markdown( + content, + extras=['fenced-code-blocks', 'tables', 'break-on-newline'] + ) + parts.append(content_html) + parts.append('No data available.
') + return + + parts.append('| Property | Value |
|---|---|
| {_escape_html(label)} | {formatted} |
No citations were recorded for this message.
') + return + + doc_citations = [c for c in citations if c.get('citation_type') == 'document'] + web_citations = [c for c in citations if c.get('citation_type') == 'web'] + agent_citations = [c for c in citations if c.get('citation_type') == 'agent_tool'] + legacy_citations = [c for c in citations if c.get('citation_type') == 'legacy'] + + if doc_citations: + parts.append('{_escape_html(code_text)}')
diff --git a/application/single_app/route_backend_conversations.py b/application/single_app/route_backend_conversations.py
index f267d729..58c2fd41 100644
--- a/application/single_app/route_backend_conversations.py
+++ b/application/single_app/route_backend_conversations.py
@@ -3,11 +3,14 @@
from config import *
from functions_authentication import *
from functions_settings import *
-from functions_conversation_metadata import get_conversation_metadata
+from functions_conversation_metadata import get_conversation_metadata, update_conversation_with_metadata
+from functions_conversation_unread import clear_conversation_unread, normalize_conversation_unread_state
+from functions_notifications import mark_chat_response_notifications_read_for_conversation
from flask import Response, request
from functions_debug import debug_print
from swagger_wrapper import swagger_route, get_auth_security
from functions_activity_logging import log_conversation_creation, log_conversation_deletion, log_conversation_archival
+from functions_thoughts import archive_thoughts_for_conversation, delete_thoughts_for_conversation
def register_route_backend_conversations(app):
@@ -287,8 +290,9 @@ def get_conversations():
return jsonify({'error': 'User not authenticated'}), 401
query = f"SELECT * FROM c WHERE c.user_id = '{user_id}' ORDER BY c.last_updated DESC"
items = list(cosmos_conversations_container.query_items(query=query, enable_cross_partition_query=True))
+ normalized_items = [normalize_conversation_unread_state(item) for item in items]
return jsonify({
- 'conversations': items
+ 'conversations': normalized_items
}), 200
@@ -311,7 +315,10 @@ def create_conversation():
'tags': [],
'strict': False,
'is_pinned': False,
- 'is_hidden': False
+ 'is_hidden': False,
+ 'has_unread_assistant_response': False,
+ 'last_unread_assistant_message_id': None,
+ 'last_unread_assistant_at': None,
}
cosmos_conversations_container.upsert_item(conversation_item)
@@ -430,7 +437,14 @@ def delete_conversation(conversation_id):
cosmos_archived_messages_container.upsert_item(archived_doc)
cosmos_messages_container.delete_item(doc['id'], partition_key=conversation_id)
-
+
+ # Archive/delete thoughts for conversation
+ user_id_for_thoughts = conversation_item.get('user_id')
+ if archiving_enabled:
+ archive_thoughts_for_conversation(conversation_id, user_id_for_thoughts)
+ else:
+ delete_thoughts_for_conversation(conversation_id, user_id_for_thoughts)
+
# Log conversation deletion before actual deletion
log_conversation_deletion(
user_id=conversation_item.get('user_id'),
@@ -530,7 +544,13 @@ def delete_multiple_conversations():
cosmos_archived_messages_container.upsert_item(archived_message)
cosmos_messages_container.delete_item(message['id'], partition_key=conversation_id)
-
+
+ # Archive/delete thoughts for conversation
+ if archiving_enabled:
+ archive_thoughts_for_conversation(conversation_id, user_id)
+ else:
+ delete_thoughts_for_conversation(conversation_id, user_id)
+
# Log conversation deletion before actual deletion
log_conversation_deletion(
user_id=user_id,
@@ -779,6 +799,7 @@ def get_conversation_metadata_api(conversation_id):
item=conversation_id,
partition_key=conversation_id
)
+ conversation_item = normalize_conversation_unread_state(conversation_item)
# Ensure that the conversation belongs to the current user
if conversation_item.get('user_id') != user_id:
@@ -796,9 +817,13 @@ def get_conversation_metadata_api(conversation_id):
"strict": conversation_item.get('strict', False),
"is_pinned": conversation_item.get('is_pinned', False),
"is_hidden": conversation_item.get('is_hidden', False),
+ "has_unread_assistant_response": conversation_item.get('has_unread_assistant_response', False),
+ "last_unread_assistant_message_id": conversation_item.get('last_unread_assistant_message_id'),
+ "last_unread_assistant_at": conversation_item.get('last_unread_assistant_at'),
"scope_locked": conversation_item.get('scope_locked'),
"locked_contexts": conversation_item.get('locked_contexts', []),
- "chat_type": conversation_item.get('chat_type')
+ "chat_type": conversation_item.get('chat_type'),
+ "summary": conversation_item.get('summary')
}), 200
except CosmosResourceNotFoundError:
@@ -807,6 +832,135 @@ def get_conversation_metadata_api(conversation_id):
print(f"Error retrieving conversation metadata: {e}")
return jsonify({'error': 'Failed to retrieve conversation metadata'}), 500
+ @app.route('/api/conversations/${escapeHtml(summary.content)}
+No summary has been generated for this conversation yet.
+Loading data preview...
| ${escaped} | `; + } + html += '
|---|
| ${escaped} | `; + } + html += '
Select the format for your exported conversations.
Print-ready format with chat bubbles. Ideal for archiving and printing.
+Add a short abstract before the exported transcript. ${perConversationText}
+${this.escapeHtml(truncatedDescription)} ${needsTruncation ? ` @@ -538,43 +555,52 @@ export class PluginModalStepper { } if (stepNumber === 4) { - // Load additional settings schema for selected type - let options = {forceReload: true}; - this.getAdditionalSettingsSchema(this.selectedType, options); + const isSqlType = this.selectedType === 'sql_query' || this.selectedType === 'sql_schema'; const additionalFieldsDiv = document.getElementById('plugin-additional-fields-div'); - if (additionalFieldsDiv) { - // Only clear and rebuild if type changes - if (this.selectedType !== this.lastAdditionalFieldsType) { - additionalFieldsDiv.innerHTML = ''; - additionalFieldsDiv.classList.remove('d-none'); - if (this.selectedType) { - this.getAdditionalSettingsSchema(this.selectedType) - .then(schema => { - if (schema) { - this.buildAdditionalFieldsUI(schema, additionalFieldsDiv); - try { - if (this.isEditMode && this.originalPlugin && this.originalPlugin.additionalFields) { - this.populateDynamicAdditionalFields(this.originalPlugin.additionalFields); + + // For SQL types, hide additional fields entirely since Step 3 covers all SQL config + if (isSqlType && additionalFieldsDiv) { + additionalFieldsDiv.innerHTML = ''; + additionalFieldsDiv.classList.add('d-none'); + this.lastAdditionalFieldsType = this.selectedType; + } else { + // Load additional settings schema for selected type + let options = {forceReload: true}; + this.getAdditionalSettingsSchema(this.selectedType, options); + if (additionalFieldsDiv) { + // Only clear and rebuild if type changes + if (this.selectedType !== this.lastAdditionalFieldsType) { + additionalFieldsDiv.innerHTML = ''; + additionalFieldsDiv.classList.remove('d-none'); + if (this.selectedType) { + this.getAdditionalSettingsSchema(this.selectedType) + .then(schema => { + if (schema) { + this.buildAdditionalFieldsUI(schema, additionalFieldsDiv); + try { + if (this.isEditMode && this.originalPlugin && this.originalPlugin.additionalFields) { + this.populateDynamicAdditionalFields(this.originalPlugin.additionalFields); + } + } catch (error) { + console.error('Error populating dynamic additional fields:', error); } - } catch (error) { - console.error('Error populating dynamic additional fields:', error); + } else { + console.log('No additional settings schema found'); + additionalFieldsDiv.classList.add('d-none'); } - } else { - console.log('No additional settings schema found'); + }) + .catch(error => { + console.error(`Error fetching additional settings schema for type: ${this.selectedType} -- ${error}`); additionalFieldsDiv.classList.add('d-none'); - } - }) - .catch(error => { - console.error(`Error fetching additional settings schema for type: ${this.selectedType} -- ${error}`); - additionalFieldsDiv.classList.add('d-none'); - }); - } else { - console.warn('No plugin type selected'); - additionalFieldsDiv.classList.add('d-none'); + }); + } else { + console.warn('No plugin type selected'); + additionalFieldsDiv.classList.add('d-none'); + } + this.lastAdditionalFieldsType = this.selectedType; } - this.lastAdditionalFieldsType = this.selectedType; + // Otherwise, preserve user data and do not redraw } - // Otherwise, preserve user data and do not redraw } if (!this.isEditMode) { @@ -1230,6 +1256,110 @@ export class PluginModalStepper { this.updateSqlAuthInfo(); } + getSqlTestPluginContext() { + if (!this.isEditMode || !this.originalPlugin) { + return null; + } + + const originalPlugin = this.originalPlugin; + let scope = originalPlugin.scope; + + if (!scope) { + if (originalPlugin.is_group) { + scope = 'group'; + } else if (originalPlugin.is_global || window.location.pathname.includes('admin')) { + scope = 'global'; + } else { + scope = 'user'; + } + } + + return { + id: originalPlugin.id || '', + name: originalPlugin.name || '', + scope + }; + } + + async testSqlConnection() { + const btn = document.getElementById('sql-test-connection-btn'); + const resultDiv = document.getElementById('sql-test-connection-result'); + const alertDiv = document.getElementById('sql-test-connection-alert'); + if (!btn || !resultDiv || !alertDiv) return; + + // Collect current SQL config from Step 3 + const databaseType = document.querySelector('input[name="sql-database-type"]:checked')?.value; + const connectionMethod = document.querySelector('input[name="sql-connection-method"]:checked')?.value || 'parameters'; + const authType = document.getElementById('sql-auth-type')?.value || 'username_password'; + + if (!databaseType) { + resultDiv.classList.remove('d-none'); + alertDiv.className = 'alert alert-warning mb-0 py-2 px-3 small'; + alertDiv.textContent = 'Please select a database type first.'; + return; + } + + const payload = { + database_type: databaseType, + connection_method: connectionMethod, + auth_type: authType + }; + + if (connectionMethod === 'connection_string') { + payload.connection_string = document.getElementById('sql-connection-string')?.value?.trim() || ''; + } else { + payload.server = document.getElementById('sql-server')?.value?.trim() || ''; + payload.database = document.getElementById('sql-database')?.value?.trim() || ''; + payload.port = document.getElementById('sql-port')?.value?.trim() || ''; + if (databaseType === 'sqlserver' || databaseType === 'azure_sql') { + payload.driver = document.getElementById('sql-driver')?.value || ''; + } + } + + if (authType === 'username_password') { + payload.username = document.getElementById('sql-username')?.value?.trim() || ''; + payload.password = document.getElementById('sql-password')?.value?.trim() || ''; + } + + payload.timeout = parseInt(document.getElementById('sql-timeout')?.value) || 10; + + const existingPluginContext = this.getSqlTestPluginContext(); + if (existingPluginContext) { + payload.existing_plugin = existingPluginContext; + } + + // Show loading state + const originalText = btn.innerHTML; + btn.innerHTML = 'Testing...'; + btn.disabled = true; + resultDiv.classList.add('d-none'); + + try { + const response = await fetch('/api/plugins/test-sql-connection', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(payload) + }); + const data = await response.json(); + + resultDiv.classList.remove('d-none'); + if (data.success) { + alertDiv.className = 'alert alert-success mb-0 py-2 px-3 small'; + alertDiv.innerHTML = '' + (data.message || 'Connection successful!'); + } else { + alertDiv.className = 'alert alert-danger mb-0 py-2 px-3 small'; + alertDiv.innerHTML = '' + (data.error || 'Connection failed.'); + } + } catch (error) { + resultDiv.classList.remove('d-none'); + alertDiv.className = 'alert alert-danger mb-0 py-2 px-3 small'; + alertDiv.innerHTML = 'Test failed: ' + (error.message || 'Network error'); + } finally { + btn.innerHTML = originalText; + btn.disabled = false; + } + } + updateSqlConnectionExamples() { const selectedType = document.querySelector('input[name="sql-database-type"]:checked')?.value; const examplesDiv = document.getElementById('sql-connection-examples'); @@ -1432,6 +1562,13 @@ export class PluginModalStepper { } else if (plugin.type && (plugin.type.toLowerCase().includes('sql') || plugin.type.toLowerCase() === 'sql_schema' || plugin.type.toLowerCase() === 'sql_query')) { // Populate SQL fields const additionalFields = plugin.additionalFields || {}; + const auth = plugin.auth || {}; + + const pluginVariant = plugin.type.toLowerCase() === 'sql_schema' ? 'schema' : 'query'; + const pluginTypeRadio = document.querySelector(`input[name="sql-plugin-type"][value="${pluginVariant}"]`); + if (pluginTypeRadio) { + pluginTypeRadio.checked = true; + } // Database type - select the appropriate radio button const databaseType = additionalFields.database_type || 'sqlserver'; @@ -1440,56 +1577,40 @@ export class PluginModalStepper { dbTypeRadio.checked = true; } - // Connection method (default to connection string) - // Note: The connection method might not be saved in the data, so we'll default to connection_string - const connectionMethodRadio = document.querySelector('input[name="sql-connection-method"][value="connection_string"]'); + const hasConnectionString = typeof additionalFields.connection_string === 'string' && additionalFields.connection_string.length > 0; + const connectionMethodValue = hasConnectionString ? 'connection_string' : 'parameters'; + const connectionMethodRadio = document.querySelector(`input[name="sql-connection-method"][value="${connectionMethodValue}"]`); if (connectionMethodRadio) { connectionMethodRadio.checked = true; } - - // Build connection string from individual parameters if needed - let connectionString = plugin.endpoint || ''; - if (!connectionString && additionalFields.server) { - // Build connection string from components - const server = additionalFields.server; - const database = additionalFields.database; - const driver = additionalFields.driver || 'ODBC Driver 17 for SQL Server'; - - if (databaseType === 'azure_sql' || databaseType === 'sqlserver') { - connectionString = `Server=${server};Database=${database};Driver={${driver}};`; - if (additionalFields.username && additionalFields.password) { - connectionString += `Uid=${additionalFields.username};Pwd=${additionalFields.password};`; - } - } else if (databaseType === 'postgresql') { - connectionString = `Host=${server};Database=${database};`; - if (additionalFields.username && additionalFields.password) { - connectionString += `Username=${additionalFields.username};Password=${additionalFields.password};`; - } - } else if (databaseType === 'mysql') { - connectionString = `Server=${server};Database=${database};`; - if (additionalFields.username && additionalFields.password) { - connectionString += `Uid=${additionalFields.username};Pwd=${additionalFields.password};`; - } - } - } - - document.getElementById('sql-connection-string').value = connectionString; - - // Authentication - const auth = plugin.auth || {}; - let sqlAuthType = 'username_password'; // Default for SQL plugins - - if (auth.type === 'user' || auth.type === 'username_password') { + + document.getElementById('sql-connection-string').value = additionalFields.connection_string || ''; + document.getElementById('sql-server').value = additionalFields.server || ''; + document.getElementById('sql-database').value = additionalFields.database || ''; + document.getElementById('sql-port').value = additionalFields.port || ''; + document.getElementById('sql-driver').value = additionalFields.driver || 'ODBC Driver 17 for SQL Server'; + + let sqlAuthType = hasConnectionString ? 'connection_string_only' : 'username_password'; + + if (auth.type === 'servicePrincipal') { + sqlAuthType = 'service_principal'; + document.getElementById('sql-client-id').value = auth.identity || auth.client_id || ''; + document.getElementById('sql-client-secret').value = auth.key || auth.client_secret || ''; + document.getElementById('sql-tenant-id').value = auth.tenantId || auth.tenant_id || ''; + } else if (auth.type === 'user' || auth.type === 'username_password' || additionalFields.username || additionalFields.password) { sqlAuthType = 'username_password'; document.getElementById('sql-username').value = additionalFields.username || ''; document.getElementById('sql-password').value = additionalFields.password || ''; } else if (auth.type === 'integrated' || auth.type === 'windows') { sqlAuthType = 'integrated'; - } else if (auth.type === 'connection_string') { - sqlAuthType = 'connection_string'; + } else if (auth.type === 'identity') { + sqlAuthType = databaseType === 'azure_sql' ? 'managed_identity' : 'integrated'; } document.getElementById('sql-auth-type').value = sqlAuthType; + this.handleSqlDatabaseTypeChange(); + this.handleSqlConnectionMethodChange(); + this.handleSqlAuthTypeChange(); } else { // Populate generic fields document.getElementById('plugin-endpoint-generic').value = plugin.endpoint || ''; @@ -1672,9 +1793,9 @@ export class PluginModalStepper { if (!clientId || !clientSecret || !tenantId) { throw new Error('Please enter client ID, client secret, and tenant ID'); } - auth.client_id = clientId; - auth.client_secret = clientSecret; - auth.tenant_id = tenantId; + auth.identity = clientId; + auth.key = clientSecret; + auth.tenantId = tenantId; break; case 'integrated': @@ -1720,12 +1841,17 @@ export class PluginModalStepper { // Collect additional fields from the dynamic UI and MERGE with existing additionalFields // This preserves OpenAPI spec content and other auto-populated fields - try { - const dynamicFields = this.collectAdditionalFields(); - // Merge dynamicFields into additionalFields (preserving existing values) - additionalFields = { ...additionalFields, ...dynamicFields }; - } catch (e) { - throw new Error('Invalid additional fields input'); + // For SQL types, Step 3 already provides all necessary config — skip dynamic field merge + // to prevent empty Step 4 fields from overwriting populated Step 3 values + const isSqlType = this.selectedType === 'sql_query' || this.selectedType === 'sql_schema'; + if (!isSqlType) { + try { + const dynamicFields = this.collectAdditionalFields(); + // Merge dynamicFields into additionalFields (preserving existing values) + additionalFields = { ...additionalFields, ...dynamicFields }; + } catch (e) { + throw new Error('Invalid additional fields input'); + } } let metadata = {}; @@ -2106,6 +2232,7 @@ export class PluginModalStepper { populateAdvancedSummary() { const advancedSection = document.getElementById('summary-advanced-section'); + const isSqlType = this.selectedType === 'sql_query' || this.selectedType === 'sql_schema'; // Check if there's any metadata or additional fields const metadata = document.getElementById('plugin-metadata').value.trim(); @@ -2123,9 +2250,33 @@ export class PluginModalStepper { hasMetadata = metadata.length > 0 && metadata !== '{}'; } - // DRY: Use private helper to collect additional fields - let additionalFieldsObj = this.collectAdditionalFields(); - hasAdditionalFields = Object.keys(additionalFieldsObj).length > 0; + // For SQL types, additional fields are already shown in the SQL Database Configuration + // summary section, so skip showing them again in Advanced to avoid redundancy + if (!isSqlType) { + // DRY: Use private helper to collect additional fields + let additionalFieldsObj = this.collectAdditionalFields(); + hasAdditionalFields = Object.keys(additionalFieldsObj).length > 0; + + // Show/hide additional fields preview + const additionalFieldsPreview = document.getElementById('summary-additional-fields-preview'); + if (hasAdditionalFields) { + let previewContent = ''; + if (typeof additionalFieldsObj === 'object' && additionalFieldsObj !== null) { + previewContent = JSON.stringify(additionalFieldsObj, null, 2); + } else { + previewContent = ''; + } + document.getElementById('summary-additional-fields-content').textContent = previewContent; + additionalFieldsPreview.style.display = ''; + } else { + additionalFieldsPreview.style.display = 'none'; + } + } else { + // Hide additional fields for SQL types + const additionalFieldsPreview = document.getElementById('summary-additional-fields-preview'); + if (additionalFieldsPreview) additionalFieldsPreview.style.display = 'none'; + hasAdditionalFields = false; + } // Update has metadata/additional fields indicators document.getElementById('summary-has-metadata').textContent = hasMetadata ? 'Yes' : 'No'; @@ -2140,21 +2291,6 @@ export class PluginModalStepper { metadataPreview.style.display = 'none'; } - // Show/hide additional fields preview - const additionalFieldsPreview = document.getElementById('summary-additional-fields-preview'); - if (hasAdditionalFields) { - let previewContent = ''; - if (typeof additionalFieldsObj === 'object' && additionalFieldsObj !== null) { - previewContent = JSON.stringify(additionalFieldsObj, null, 2); - } else { - previewContent = ''; - } - document.getElementById('summary-additional-fields-content').textContent = previewContent; - additionalFieldsPreview.style.display = ''; - } else { - additionalFieldsPreview.style.display = 'none'; - } - // Show advanced section if there's any advanced content if (hasMetadata || hasAdditionalFields) { advancedSection.style.display = ''; diff --git a/application/single_app/static/js/public/public_workspace.js b/application/single_app/static/js/public/public_workspace.js index 995fb51c..fb1133a7 100644 --- a/application/single_app/static/js/public/public_workspace.js +++ b/application/single_app/static/js/public/public_workspace.js @@ -199,8 +199,6 @@ document.addEventListener('DOMContentLoaded', ()=>{ if (activePublicId) fetchPublicDocs(); }); - Array.from(publicDropdownItems.children).forEach(()=>{}); // placeholder - // --- Document selection event listeners --- // Event delegation for document checkboxes document.addEventListener('change', function(event) { @@ -266,8 +264,7 @@ function updatePublicRoleDisplay(){ if (nameRoleEl) nameRoleEl.textContent = activePublicName; if (display) display.style.display = 'block'; if (uploadSection) uploadSection.style.display = ['Owner','Admin','DocumentManager'].includes(userRoleInActivePublic) ? 'block' : 'none'; - // uploadHr was removed from template, so skip - + // Control visibility of Settings tab (only for Owners and Admins) const settingsTabNav = document.getElementById('public-settings-tab-nav'); const canManageSettings = ['Owner', 'Admin'].includes(userRoleInActivePublic); @@ -491,6 +488,7 @@ function renderPublicDocumentRow(doc) {
Citations: ${getCitationBadge(doc.enhanced_citations)}
Publication Date: ${escapeHtml(doc.publication_date || 'N/A')}
Keywords: ${escapeHtml(doc.keywords || 'N/A')}
+Tags: ${renderPublicTagBadges(doc.tags || [])}
Abstract: ${escapeHtml(doc.abstract || 'N/A')}
Advanced settings are typically not required. Expand below if you need to customize metadata or additional fields.
| Display Name | Description | Actions |
|---|
| Display Name | Description | Actions |
|---|