dtSpark 1.1.0a3__py3-none-any.whl → 1.1.0a6__py3-none-any.whl

dtSpark/web/static/js/sse-client.js

@@ -17,151 +17,159 @@ async function sendMessageWithSSE(conversationId, message) {
     let streamingMessageElement = null;
     let accumulatedContent = '';
 
-    try {
-        // Create EventSource for SSE
-        const encodedMessage = encodeURIComponent(message);
-        const eventSource = new EventSource(
-            `/api/stream/chat?message=${encodedMessage}&conversation_id=${conversationId}`
-        );
-
-        // Handle different event types
-        eventSource.addEventListener('status', (event) => {
-            const data = JSON.parse(event.data);
-            console.log('Status:', data);
-
-            // Update typing indicator with status
-            if (typingIndicator && typingIndicator.parentNode) {
-                const statusText = data.message || '';
-                typingIndicator.querySelector('.visually-hidden').nextSibling.textContent = statusText;
-            }
-        });
+    return new Promise((resolve) => {
+        try {
+            // Create EventSource for SSE
+            const encodedMessage = encodeURIComponent(message);
+            const eventSource = new EventSource(
+                `/api/stream/chat?message=${encodedMessage}&conversation_id=${conversationId}`
+            );
+
+            // Handle different event types
+            eventSource.addEventListener('status', (event) => {
+                const data = JSON.parse(event.data);
+                console.log('Status:', data);
+
+                // Update typing indicator with status
+                if (typingIndicator && typingIndicator.parentNode) {
+                    const statusText = data.message || '';
+                    typingIndicator.querySelector('.visually-hidden').nextSibling.textContent = statusText;
+                }
+            });
 
-        eventSource.addEventListener('response', (event) => {
-            const data = JSON.parse(event.data);
-            console.log('Received response event:', data);
+            eventSource.addEventListener('response', (event) => {
+                const data = JSON.parse(event.data);
+                console.log('Received response event:', data);
 
-            // Hide typing indicator on first response
-            if (typingIndicator && typingIndicator.parentNode) {
-                console.log('Hiding typing indicator');
-                hideTypingIndicator();
-                typingIndicator = null;  // Clear reference after hiding
-            }
+                // Hide typing indicator on first response
+                if (typingIndicator && typingIndicator.parentNode) {
+                    console.log('Hiding typing indicator');
+                    hideTypingIndicator();
+                    typingIndicator = null;  // Clear reference after hiding
+                }
 
-            if (data.type === 'text') {
-                if (data.final) {
-                    // Final response - this is the main assistant response after tool execution
-                    console.log('Final response received, content length:', data.content ? data.content.length : 0);
-                    accumulatedContent += data.content;
-                    console.log('Accumulated content:', accumulatedContent);
-
-                    // Ensure we have content before displaying
-                    if (accumulatedContent.trim().length > 0) {
-                        streamingMessageElement = updateStreamingMessage(
-                            accumulatedContent,
-                            streamingMessageElement
-                        );
-                        console.log('Updated streaming message element:', streamingMessageElement);
+                if (data.type === 'text') {
+                    if (data.final) {
+                        // Final response - this is the main assistant response after tool execution
+                        console.log('Final response received, content length:', data.content ? data.content.length : 0);
+                        accumulatedContent += data.content;
+                        console.log('Accumulated content:', accumulatedContent);
+
+                        // Ensure we have content before displaying
+                        if (accumulatedContent.trim().length > 0) {
+                            streamingMessageElement = updateStreamingMessage(
+                                accumulatedContent,
+                                streamingMessageElement
+                            );
+                            console.log('Updated streaming message element:', streamingMessageElement);
+                        } else {
+                            console.warn('No content to display');
+                        }
+                        eventSource.close();
+                        resolve();
                     } else {
-                        console.warn('No content to display');
+                        // Non-final response - text that appears with tool calls
+                        // Display immediately as a separate message
+                        console.log('Non-final response, appending:', data.content);
+                        appendMessage('assistant', data.content);
                     }
-                    eventSource.close();
-                } else {
-                    // Non-final response - text that appears with tool calls
-                    // Display immediately as a separate message
-                    console.log('Non-final response, appending:', data.content);
-                    appendMessage('assistant', data.content);
                 }
-            }
-        });
-
-        eventSource.addEventListener('tool_start', (event) => {
-            const data = JSON.parse(event.data);
-            appendToolCall(data.tool_name, data.input);
-        });
-
-        eventSource.addEventListener('tool_complete', (event) => {
-            const data = JSON.parse(event.data);
-            // Display tool result
-            appendToolResult(data.tool_use_id, { content: data.content });
-        });
+            });
+
+            eventSource.addEventListener('tool_start', (event) => {
+                const data = JSON.parse(event.data);
+                appendToolCall(data.tool_name, data.input);
+            });
+
+            eventSource.addEventListener('tool_complete', (event) => {
+                const data = JSON.parse(event.data);
+                // Display tool result
+                appendToolResult(data.tool_use_id, { content: data.content });
+            });
+
+            eventSource.addEventListener('tool_error', (event) => {
+                const data = JSON.parse(event.data);
+                appendToolResult(data.tool_name, { error: data.error });
+            });
+
+            eventSource.addEventListener('permission_request', (event) => {
+                const data = JSON.parse(event.data);
+                console.log('Permission request received:', data);
+
+                // Show permission modal/dialog
+                showToolPermissionDialog(data.request_id, data.tool_name, data.tool_description);
+            });
+
+            eventSource.addEventListener('progress', (event) => {
+                const data = JSON.parse(event.data);
+                // Update progress (if we want to show a progress bar)
+                console.log('Progress:', data);
+            });
+
+            eventSource.addEventListener('complete', (event) => {
+                // Stream complete
+                console.log('Stream complete');
+                eventSource.close();
 
-        eventSource.addEventListener('tool_error', (event) => {
-            const data = JSON.parse(event.data);
-            appendToolResult(data.tool_name, { error: data.error });
-        });
+                // Hide typing indicator if still visible
+                if (typingIndicator && typingIndicator.parentNode) {
+                    console.log('Hiding typing indicator on complete');
+                    hideTypingIndicator();
+                    typingIndicator = null;
+                }
 
-        eventSource.addEventListener('permission_request', (event) => {
-            const data = JSON.parse(event.data);
-            console.log('Permission request received:', data);
+                resolve();
+            });
 
-            // Show permission modal/dialog
-            showToolPermissionDialog(data.request_id, data.tool_name, data.tool_description);
-        });
+            eventSource.addEventListener('error', (event) => {
+                console.error('SSE error:', event);
+                const data = JSON.parse(event.data);
 
-        eventSource.addEventListener('progress', (event) => {
-            const data = JSON.parse(event.data);
-            // Update progress (if we want to show a progress bar)
-            console.log('Progress:', data);
-        });
+                // Hide typing indicator
+                if (typingIndicator && typingIndicator.parentNode) {
+                    console.log('Hiding typing indicator on error');
+                    hideTypingIndicator();
+                    typingIndicator = null;
+                }
 
-        eventSource.addEventListener('complete', (event) => {
-            // Stream complete
-            console.log('Stream complete');
-            eventSource.close();
+                // Show error message
+                appendMessage('system', `Error: ${data.message}`);
 
-            // Hide typing indicator if still visible
-            if (typingIndicator && typingIndicator.parentNode) {
-                console.log('Hiding typing indicator on complete');
-                hideTypingIndicator();
-                typingIndicator = null;
-            }
-        });
+                eventSource.close();
+                resolve();
+            });
 
-        eventSource.addEventListener('error', (event) => {
-            console.error('SSE error:', event);
-            const data = JSON.parse(event.data);
+            eventSource.onerror = (error) => {
+                console.error('EventSource failed:', error);
 
-            // Hide typing indicator
-            if (typingIndicator && typingIndicator.parentNode) {
-                console.log('Hiding typing indicator on error');
-                hideTypingIndicator();
-                typingIndicator = null;
-            }
+                // Hide typing indicator
+                if (typingIndicator && typingIndicator.parentNode) {
+                    console.log('Hiding typing indicator on connection error');
+                    hideTypingIndicator();
+                    typingIndicator = null;
+                }
 
-            // Show error message
-            appendMessage('system', `Error: ${data.message}`);
+                // If we haven't received any content, show error
+                if (!streamingMessageElement) {
+                    appendMessage('system', 'Connection error. Please try again.');
+                }
 
-            eventSource.close();
-        });
+                eventSource.close();
+                resolve();
+            };
 
-        eventSource.onerror = (error) => {
-            console.error('EventSource failed:', error);
+        } catch (error) {
+            console.error('Error sending message:', error);
 
             // Hide typing indicator
-            if (typingIndicator && typingIndicator.parentNode) {
-                console.log('Hiding typing indicator on connection error');
+            if (typingIndicator) {
                 hideTypingIndicator();
-                typingIndicator = null;
-            }
-
-            // If we haven't received any content, show error
-            if (!streamingMessageElement) {
-                appendMessage('system', 'Connection error. Please try again.');
             }
 
-            eventSource.close();
-        };
-
-    } catch (error) {
-        console.error('Error sending message:', error);
-
-        // Hide typing indicator
-        if (typingIndicator) {
-            hideTypingIndicator();
+            showToast('Failed to send message', 'error');
+            resolve();
         }
-
-        showToast('Failed to send message', 'error');
-    }
+    });
 }
 
 /**

dtSpark/web/templates/actions.html

@@ -53,7 +53,7 @@
                     <tbody id="actions-tbody">
                         <tr>
                             <td colspan="9" class="text-center text-muted py-4">
-                                <div class="spinner-border spinner-border-sm" role="status"></div>
+                                <output class="spinner-border spinner-border-sm"></output>
                                 Loading actions...
                             </td>
                         </tr>
@@ -85,7 +85,7 @@
                     <tbody id="runs-tbody">
                         <tr>
                             <td colspan="7" class="text-center text-muted py-4">
-                                <div class="spinner-border spinner-border-sm" role="status"></div>
+                                <output class="spinner-border spinner-border-sm"></output>
                                 Loading recent runs...
                             </td>
                         </tr>
@@ -172,7 +172,7 @@
 
                     <!-- Tool Permissions -->
                     <div class="mb-3">
-                        <label class="form-label">Tool Permissions</label>
+                        <span class="form-label d-block">Tool Permissions</span>
                         <div class="card">
                             <div class="card-body" style="max-height: 200px; overflow-y: auto;">
                                 <div id="toolPermissions">
@@ -374,14 +374,14 @@
                         <div class="alert alert-success mb-0">
                             <i class="bi bi-check-circle-fill"></i>
                             Action created successfully!
-                            <a href="#" id="viewCreatedAction" onclick="viewCreatedAction(); return false;">View action details</a>
+                            <button type="button" id="viewCreatedAction" class="btn btn-link p-0 align-baseline" onclick="viewCreatedAction();">View action details</button>
                         </div>
                     </div>
                 </div>
 
                 <!-- Loading Indicator -->
                 <div id="aiCreateLoading" class="d-none text-center py-4">
-                    <div class="spinner-border text-primary" role="status"></div>
+                    <output class="spinner-border text-primary"></output>
                     <p class="mt-2 text-muted">AI is thinking...</p>
                 </div>
             </div>

dtSpark/web/templates/base.html

@@ -53,11 +53,13 @@
                             <i class="bi bi-plus-circle"></i> New
                         </a>
                     </li>
+                    {% if actions_enabled %}
                     <li class="nav-item">
                         <a class="nav-link" href="/actions">
                             <i class="bi bi-robot"></i> Actions
                         </a>
                     </li>
+                    {% endif %}
                 </ul>
                 <ul class="navbar-nav">
                     <li class="nav-item">
@@ -89,5 +91,16 @@
     <script src="/static/js/main.js"></script>
 
     {% block extra_scripts %}{% endblock %}
+
+    {% if heartbeat_enabled %}
+    <!-- Browser heartbeat - auto-shutdown when browser closes -->
+    <script>
+    setInterval(() => {
+        fetch('/api/heartbeat', { method: 'POST' }).catch(() => {});
+    }, {{ heartbeat_interval_ms }});
+    // Send initial heartbeat immediately
+    fetch('/api/heartbeat', { method: 'POST' }).catch(() => {});
+    </script>
+    {% endif %}
 </body>
 </html>

dtSpark/web/templates/chat.html

@@ -21,9 +21,9 @@
             <div class="card-body overflow-auto" id="chat-messages">
                 <!-- Messages will be appended here -->
                 <div class="text-center text-muted">
-                    <div class="spinner-border spinner-border-sm" role="status">
+                    <output class="spinner-border spinner-border-sm">
                         <span class="visually-hidden">Loading...</span>
-                    </div>
+                    </output>
                     <span class="ms-2">Loading chat history...</span>
                 </div>
             </div>
@@ -48,14 +48,14 @@
                         ></textarea>
                     </div>
                     <div class="d-flex justify-content-between align-items-center">
-                        <div class="btn-group" role="group">
+                        <fieldset class="btn-group">
                             <button type="button" class="btn btn-outline-secondary btn-sm" onclick="showCommandMenu()">
                                 <i class="bi bi-terminal"></i> Commands
                             </button>
                             <button type="button" class="btn btn-outline-secondary btn-sm" onclick="attachFiles()">
                                 <i class="bi bi-paperclip"></i> Attach
                             </button>
-                        </div>
+                        </fieldset>
                         <button type="submit" class="btn btn-primary" id="send-btn">
                             <i class="bi bi-send-fill"></i> Send
                         </button>
@@ -76,9 +76,9 @@
             </div>
             <div class="modal-body" id="info-content">
                 <div class="text-center">
-                    <div class="spinner-border spinner-border-sm" role="status">
+                    <output class="spinner-border spinner-border-sm">
                         <span class="visually-hidden">Loading...</span>
-                    </div>
+                    </output>
                 </div>
             </div>
         </div>
@@ -432,7 +432,7 @@ async function showMCPAuditModal() {
                     </div>
                     <div class="modal-body" id="mcp-audit-content">
                         <div class="text-center">
-                            <div class="spinner-border spinner-border-sm" role="status"></div>
+                            <output class="spinner-border spinner-border-sm"></output>
                         </div>
                     </div>
                 </div>
@@ -517,7 +517,7 @@ async function showMCPServersModal() {
                     </div>
                     <div class="modal-body" id="mcp-servers-content">
                         <div class="text-center">
-                            <div class="spinner-border spinner-border-sm" role="status"></div>
+                            <output class="spinner-border spinner-border-sm"></output>
                         </div>
                     </div>
                 </div>
@@ -611,9 +611,9 @@ async function loadConversationInfo() {
     try {
         document.getElementById('info-content').innerHTML = `
             <div class="text-center">
-                <div class="spinner-border spinner-border-sm" role="status">
+                <output class="spinner-border spinner-border-sm">
                     <span class="visually-hidden">Loading...</span>
-                </div>
+                </output>
             </div>
         `;
 

dtSpark/web/templates/conversations.html

@@ -32,9 +32,9 @@
         <div class="card">
             <div class="card-body" id="conversations-list">
                 <div class="text-center">
-                    <div class="spinner-border text-primary" role="status">
+                    <output class="spinner-border text-primary">
                         <span class="visually-hidden">Loading...</span>
-                    </div>
+                    </output>
                     <p class="mt-2">Loading conversations...</p>
                 </div>
             </div>

dtSpark/web/templates/goodbye.html

@@ -27,9 +27,9 @@
                 <div class="alert alert-info">
                     <i class="bi bi-info-circle-fill"></i> The web server is shutting down...
                     <div class="mt-2">
-                        <div class="spinner-border spinner-border-sm" role="status">
+                        <output class="spinner-border spinner-border-sm">
                             <span class="visually-hidden">Shutting down...</span>
-                        </div>
+                        </output>
                         <span class="ms-2">Please wait</span>
                     </div>
                 </div>

dtSpark/web/templates/main_menu.html

@@ -166,28 +166,28 @@
 </div>
 
 <!-- Tab Navigation -->
-<ul class="nav nav-tabs mb-4" id="mainTabs" role="tablist">
-    <li class="nav-item" role="presentation">
+<div class="nav nav-tabs mb-4" id="mainTabs" role="tablist">
+    <div class="nav-item">
         <button class="nav-link active" id="overview-tab" data-bs-toggle="tab" data-bs-target="#overview" type="button" role="tab">
             <i class="bi bi-speedometer2"></i> Overview
         </button>
-    </li>
-    <li class="nav-item" role="presentation">
+    </div>
+    <div class="nav-item">
         <button class="nav-link" id="llms-tab" data-bs-toggle="tab" data-bs-target="#llms" type="button" role="tab">
             <i class="bi bi-cpu"></i> LLMs
         </button>
-    </li>
-    <li class="nav-item" role="presentation">
+    </div>
+    <div class="nav-item">
         <button class="nav-link" id="integrations-tab" data-bs-toggle="tab" data-bs-target="#integrations" type="button" role="tab">
             <i class="bi bi-plug"></i> Integrations
         </button>
-    </li>
-    <li class="nav-item" role="presentation">
+    </div>
+    <div class="nav-item">
         <button class="nav-link" id="system-tab" data-bs-toggle="tab" data-bs-target="#system" type="button" role="tab">
             <i class="bi bi-gear"></i> System
         </button>
-    </li>
-</ul>
+    </div>
+</div>
 
 <!-- Tab Content -->
 <div class="tab-content" id="mainTabContent">
@@ -202,7 +202,7 @@
                         <h5 class="card-title mb-3"><i class="bi bi-cpu"></i> LLM Providers</h5>
                         <div id="llm-providers-overview" class="d-flex justify-content-around flex-wrap gap-2">
                             <div class="text-center py-3">
-                                <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                                <output class="spinner-border spinner-border-sm text-primary"></output>
                                 <span class="ms-2">Loading providers...</span>
                             </div>
                         </div>
@@ -258,7 +258,7 @@
         <!-- Provider Selector Icons -->
         <div class="provider-selector" id="provider-selector">
             <div class="text-center py-3 w-100">
-                <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                <output class="spinner-border spinner-border-sm text-primary"></output>
                 <span class="ms-2">Loading providers...</span>
             </div>
         </div>
@@ -283,7 +283,7 @@
                     </div>
                     <div class="card-body p-0" id="tool-sources-list">
                         <div class="text-center py-4">
-                            <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                            <output class="spinner-border spinner-border-sm text-primary"></output>
                             <span class="ms-2">Loading tools...</span>
                         </div>
                     </div>
@@ -317,7 +317,7 @@
                     </div>
                     <div class="card-body" id="user-identity">
                         <div class="text-center py-3">
-                            <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                            <output class="spinner-border spinner-border-sm text-primary"></output>
                             <span class="ms-2">Loading user identity...</span>
                         </div>
                     </div>
@@ -642,7 +642,7 @@ function selectProvider(providerType) {
                 </div>
                 <div class="card-body" id="costs-info">
                     <div class="text-center py-3">
-                        <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                        <output class="spinner-border spinner-border-sm text-primary"></output>
                         <span class="ms-2">Loading costs...</span>
                     </div>
                 </div>
@@ -799,7 +799,7 @@ async function selectToolSource(source, event) {
         headerEl.innerHTML = '<i class="bi bi-box-fill"></i> Embedded Tools';
         contentEl.innerHTML = `
             <div class="text-center py-4">
-                <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                <output class="spinner-border spinner-border-sm text-primary"></output>
                 <span class="ms-2">Loading embedded tools...</span>
             </div>
         `;
@@ -890,7 +890,7 @@ async function selectToolSource(source, event) {
         // Fetch tools from API
         contentEl.innerHTML = `
             <div class="text-center py-4">
-                <div class="spinner-border spinner-border-sm text-primary" role="status"></div>
+                <output class="spinner-border spinner-border-sm text-primary"></output>
                 <span class="ms-2">Loading tools...</span>
             </div>
         `;

dtSpark/web/web_interface.py

@@ -124,7 +124,7 @@ class WebInterface:
             True if response was accepted, False if request not found
         """
         if request_id not in self._permission_requests:
-            logger.warning(f"Permission response submitted for unknown request: {request_id}")
+            logger.warning("Permission response submitted for unknown request")
             return False
 
         # Store the response
@@ -133,5 +133,5 @@ class WebInterface:
         # Update request status
         self._permission_requests[request_id]['status'] = 'responded'
 
-        logger.info(f"Permission response submitted for {request_id}: {response}")
+        logger.info("Permission response submitted and recorded")
         return True

{dtspark-1.1.0a3.dist-info → dtspark-1.1.0a6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dtSpark
-Version: 1.1.0a3
+Version: 1.1.0a6
 Summary: Secure Personal AI Research Kit - Multi-provider LLM CLI/Web interface with MCP tool integration
 Home-page: https://github.com/digital-thought/dtSpark
 Author: Matthew Westwood-Hill
@@ -42,7 +42,7 @@ Requires-Dist: httpx>=0.24.0
 Requires-Dist: aiohttp>=3.8.0
 Requires-Dist: mcp>=0.9.0
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: dtPyAppFramework>=4.0.3
+Requires-Dist: dtPyAppFramework>=4.1.2
 Requires-Dist: tiktoken>=0.5.0
 Requires-Dist: ollama>=0.2.0
 Requires-Dist: cryptography>=41.0.0
@@ -83,6 +83,13 @@ Dynamic: requires-python
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
 [![Python 3.10+](https://img.shields.io/badge/python-3.10+-blue.svg)](https://www.python.org/downloads/)
 
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=Digital-Thought_dtSpark&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=Digital-Thought_dtSpark)
+[![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=Digital-Thought_dtSpark&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=Digital-Thought_dtSpark)
+[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=Digital-Thought_dtSpark&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=Digital-Thought_dtSpark)
+[![Maintainability Rating](https://sonarcloud.io/api/project_badges/measure?project=Digital-Thought_dtSpark&metric=sqale_rating)](https://sonarcloud.io/summary/new_code?id=Digital-Thought_dtSpark)
+[![Vulnerabilities](https://sonarcloud.io/api/project_badges/measure?project=Digital-Thought_dtSpark&metric=vulnerabilities)](https://sonarcloud.io/summary/new_code?id=Digital-Thought_dtSpark)
+[![Bugs](https://sonarcloud.io/api/project_badges/measure?project=Digital-Thought_dtSpark&metric=bugs)](https://sonarcloud.io/summary/new_code?id=Digital-Thought_dtSpark)
+
 **Spark** is a powerful, multi-provider LLM interface for conversational AI with integrated tool support. It supports AWS Bedrock, Anthropic Direct API, and Ollama local models through both CLI and Web interfaces.
 
 ## Key Features