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

dtSpark/web/endpoints/main_menu.py

@@ -80,50 +80,17 @@ async def get_account_info(
     """
     try:
         app_instance = request.app.state.app_instance
-
-        # Get LLM manager to determine active provider
         llm_manager = getattr(app_instance, 'llm_manager', None)
         user_guid = getattr(app_instance, 'user_guid', 'unknown')
 
         if llm_manager and llm_manager.active_provider:
-            active_provider = llm_manager.active_provider.lower()
-
-            # AWS Bedrock
-            if 'bedrock' in active_provider or 'aws' in active_provider:
-                auth = getattr(app_instance, 'authenticator', None)
-                if auth:
-                    account_info = auth.get_account_info()
-                    if account_info:
-                        return AccountInfo(
-                            provider='aws',
-                            user_arn=account_info.get('user_arn'),
-                            account_id=account_info.get('account_id'),
-                            region=account_info.get('region'),
-                            user_guid=user_guid,
-                            auth_method=account_info.get('auth_method'),
-                        )
-
-            # Anthropic
-            elif 'anthropic' in active_provider:
-                return AccountInfo(
-                    provider='anthropic',
-                    user_guid=user_guid,
-                    auth_method='api_key',
-                )
-
-            # Ollama
-            elif 'ollama' in active_provider:
-                return AccountInfo(
-                    provider='ollama',
-                    user_guid=user_guid,
-                    auth_method='local',
-                )
+            result = _build_account_info_for_provider(
+                app_instance, llm_manager.active_provider.lower(), user_guid
+            )
+            if result:
+                return result
 
-        # No provider configured - return basic info
-        return AccountInfo(
-            provider='none',
-            user_guid=user_guid,
-        )
+        return AccountInfo(provider='none', user_guid=user_guid)
 
     except HTTPException:
         raise
@@ -132,6 +99,40 @@ async def get_account_info(
         raise HTTPException(status_code=500, detail=str(e))
 
 
+def _build_account_info_for_provider(
+    app_instance, active_provider: str, user_guid: str
+) -> Optional[AccountInfo]:
+    """Build AccountInfo for the given active provider, or return None if unavailable."""
+    if 'bedrock' in active_provider or 'aws' in active_provider:
+        return _build_aws_account_info(app_instance, user_guid)
+
+    if 'anthropic' in active_provider:
+        return AccountInfo(provider='anthropic', user_guid=user_guid, auth_method='api_key')
+
+    if 'ollama' in active_provider:
+        return AccountInfo(provider='ollama', user_guid=user_guid, auth_method='local')
+
+    return None
+
+
+def _build_aws_account_info(app_instance, user_guid: str) -> Optional[AccountInfo]:
+    """Build AccountInfo from the AWS authenticator, or return None."""
+    auth = getattr(app_instance, 'authenticator', None)
+    if not auth:
+        return None
+    account_info = auth.get_account_info()
+    if not account_info:
+        return None
+    return AccountInfo(
+        provider='aws',
+        user_arn=account_info.get('user_arn'),
+        account_id=account_info.get('account_id'),
+        region=account_info.get('region'),
+        user_guid=user_guid,
+        auth_method=account_info.get('auth_method'),
+    )
+
+
 @router.get("/providers")
 async def get_providers(
     request: Request,
@@ -147,71 +148,11 @@ async def get_providers(
         app_instance = request.app.state.app_instance
         providers = []
 
-        # Get LLM manager which has all registered providers
         llm_manager = getattr(app_instance, 'llm_manager', None)
-
         if llm_manager and hasattr(llm_manager, 'providers'):
             for provider_name, service in llm_manager.providers.items():
-                models = []
-                status = 'connected'
-                provider_type = 'unknown'
-                auth_method = None
-                region = None
-                base_url = None
-
-                # Determine provider type
-                provider_name_lower = provider_name.lower()
-                if 'bedrock' in provider_name_lower or 'aws' in provider_name_lower:
-                    provider_type = 'aws'
-                    auth = getattr(app_instance, 'authenticator', None)
-                    if auth:
-                        account_info = auth.get_account_info()
-                        if account_info:
-                            auth_method = account_info.get('auth_method')
-                            region = account_info.get('region')
-                elif 'anthropic' in provider_name_lower:
-                    provider_type = 'anthropic'
-                    auth_method = 'api_key'
-                elif 'ollama' in provider_name_lower:
-                    provider_type = 'ollama'
-                    auth_method = 'local'
-                    base_url = getattr(service, 'base_url', 'http://localhost:11434')
-
-                # Get available models
-                try:
-                    if hasattr(service, 'list_available_models'):
-                        available_models = service.list_available_models()
-                    elif hasattr(service, 'list_models'):
-                        available_models = service.list_models()
-                    else:
-                        available_models = []
-
-                    for model in available_models:
-                        if isinstance(model, dict):
-                            model_id = model.get('id') or model.get('modelId') or model.get('name') or str(model)
-                            display_name = model.get('display_name') or model.get('modelName') or model_id
-                        else:
-                            model_id = str(model)
-                            display_name = model_id
-
-                        models.append(ProviderModelInfo(
-                            model_id=model_id,
-                            display_name=display_name,
-                        ))
-                except Exception as e:
-                    logger.warning(f"Failed to list models from {provider_name}: {e}")
-                    status = 'error'
-
-                providers.append(ProviderInfo(
-                    name=provider_name,
-                    type=provider_type,
-                    enabled=True,
-                    status=status,
-                    models=models,
-                    auth_method=auth_method,
-                    region=region,
-                    base_url=base_url,
-                ))
+                provider_info = _build_provider_info(app_instance, provider_name, service)
+                providers.append(provider_info)
 
         return providers
 
@@ -220,6 +161,88 @@ async def get_providers(
         raise HTTPException(status_code=500, detail=str(e))
 
 
+def _build_provider_info(app_instance, provider_name: str, service) -> ProviderInfo:
+    """Build a ProviderInfo for a single registered provider."""
+    provider_type, auth_method, region, base_url = _detect_provider_type(
+        app_instance, provider_name, service
+    )
+
+    models, status = _list_provider_models(provider_name, service)
+
+    return ProviderInfo(
+        name=provider_name,
+        type=provider_type,
+        enabled=True,
+        status=status,
+        models=models,
+        auth_method=auth_method,
+        region=region,
+        base_url=base_url,
+    )
+
+
+def _detect_provider_type(app_instance, provider_name: str, service) -> tuple:
+    """Detect the provider type, auth method, region, and base URL from the provider name."""
+    provider_name_lower = provider_name.lower()
+    auth_method = None
+    region = None
+    base_url = None
+
+    if 'bedrock' in provider_name_lower or 'aws' in provider_name_lower:
+        provider_type = 'aws'
+        auth = getattr(app_instance, 'authenticator', None)
+        if auth:
+            account_info = auth.get_account_info()
+            if account_info:
+                auth_method = account_info.get('auth_method')
+                region = account_info.get('region')
+    elif 'anthropic' in provider_name_lower:
+        provider_type = 'anthropic'
+        auth_method = 'api_key'
+    elif 'ollama' in provider_name_lower:
+        provider_type = 'ollama'
+        auth_method = 'local'
+        base_url = getattr(service, 'base_url', 'http://localhost:11434')
+    else:
+        provider_type = 'unknown'
+
+    return provider_type, auth_method, region, base_url
+
+
+def _list_provider_models(provider_name: str, service) -> tuple:
+    """List available models from a provider service. Returns (models, status)."""
+    models = []
+    status = 'connected'
+
+    try:
+        if hasattr(service, 'list_available_models'):
+            available_models = service.list_available_models()
+        elif hasattr(service, 'list_models'):
+            available_models = service.list_models()
+        else:
+            available_models = []
+
+        for model in available_models:
+            models.append(_parse_model_info(model))
+    except Exception as e:
+        logger.warning(f"Failed to list models from {provider_name}: {e}")
+        status = 'error'
+
+    return models, status
+
+
+def _parse_model_info(model) -> ProviderModelInfo:
+    """Parse a model entry (dict or string) into a ProviderModelInfo."""
+    if isinstance(model, dict):
+        model_id = model.get('id') or model.get('modelId') or model.get('name') or str(model)
+        display_name = model.get('display_name') or model.get('modelName') or model_id
+    else:
+        model_id = str(model)
+        display_name = model_id
+
+    return ProviderModelInfo(model_id=model_id, display_name=display_name)
+
+
 @router.get("/costs/last-month")
 async def get_last_month_costs(
     request: Request,
@@ -607,14 +630,18 @@ async def get_daemon_status(request: Request):
         except Exception:
             pass
 
+        if not daemon_running and scheduled_count > 0:
+            warning_message = (
+                f"Daemon is not running - {scheduled_count} scheduled action(s) will not execute"
+            )
+        else:
+            warning_message = None
+
         return {
             'daemon_running': daemon_running,
             'daemon_pid': daemon_pid,
             'scheduled_actions_count': scheduled_count,
-            'warning': None if daemon_running else (
-                f"Daemon is not running - {scheduled_count} scheduled action(s) will not execute"
-                if scheduled_count > 0 else None
-            )
+            'warning': warning_message,
         }
 
     except Exception as e:

dtSpark/web/endpoints/streaming.py

@@ -151,7 +151,7 @@ class StreamingManager:
                                         "content": result.get('content', ''),
                                     }),
                                 }
-                        except:
+                        except ValueError:
                             pass
 
                     elif role == 'assistant' and content.strip().startswith('['):
@@ -179,7 +179,7 @@ class StreamingManager:
                                                 "input": block.get('input', {}),
                                             }),
                                         }
-                        except:
+                        except ValueError:
                             pass
 
                 last_message_count = len(current_messages)

dtSpark/web/server.py

@@ -9,6 +9,7 @@ import os
 import sys
 import socket
 import logging
+import time
 import webbrowser
 import signal
 import asyncio
@@ -252,6 +253,48 @@ def create_app(
             loop = asyncio.get_running_loop()
             loop.set_exception_handler(_suppress_connection_reset_errors)
 
+    # Set to hold references to background tasks (prevents garbage collection)
+    _background_tasks = set()
+
+    # Browser heartbeat state
+    app.state.last_heartbeat = 0.0
+
+    @app.post("/api/heartbeat")
+    async def heartbeat():
+        """Receive browser heartbeat ping."""
+        app.state.last_heartbeat = time.time()
+        return JSONResponse({"status": "ok"})
+
+    @app.on_event("startup")
+    async def start_heartbeat_monitor():
+        """Start background task to monitor browser heartbeat."""
+        if not heartbeat_enabled:
+            return
+
+        async def _monitor_heartbeat():
+            # Initial grace period - wait for browser to connect and send first heartbeat
+            grace_period = heartbeat_timeout * 2
+            logger.info(
+                f"Browser heartbeat monitor started (interval={heartbeat_interval}s, "
+                f"timeout={heartbeat_timeout}s, grace={grace_period}s)"
+            )
+            await asyncio.sleep(grace_period)
+
+            while True:
+                await asyncio.sleep(heartbeat_interval)
+                last = app.state.last_heartbeat
+                if last > 0 and (time.time() - last) > heartbeat_timeout:
+                    logger.info(
+                        f"No browser heartbeat for {heartbeat_timeout}s - "
+                        f"shutting down (browser likely closed)"
+                    )
+                    os.kill(os.getpid(), signal.SIGTERM)
+                    return
+
+        task = asyncio.create_task(_monitor_heartbeat())
+        _background_tasks.add(task)
+        task.add_done_callback(_background_tasks.discard)
+
     # Get template and static directories
     web_dir = Path(__file__).parent
     templates_dir = web_dir / "templates"
@@ -260,11 +303,24 @@ def create_app(
     # Setup templates
     templates = Jinja2Templates(directory=str(templates_dir))
 
+    # Determine feature flags from app instance
+    actions_enabled = getattr(app_instance, 'actions_enabled', False)
+
+    # Read heartbeat configuration
+    from dtPyAppFramework.settings import Settings as _Settings
+    _hb_settings = _Settings()
+    heartbeat_enabled = _hb_settings.get('interface.web.browser_heartbeat.enabled', True)
+    heartbeat_interval = _hb_settings.get('interface.web.browser_heartbeat.interval_seconds', 15)
+    heartbeat_timeout = _hb_settings.get('interface.web.browser_heartbeat.timeout_seconds', 60)
+
     # Add global template variables for app name and version
     templates.env.globals['app_name'] = full_name()
     templates.env.globals['app_version'] = version()
     templates.env.globals['app_description'] = description()
     templates.env.globals['agent_name'] = agent_name()
+    templates.env.globals['actions_enabled'] = actions_enabled
+    templates.env.globals['heartbeat_enabled'] = heartbeat_enabled
+    templates.env.globals['heartbeat_interval_ms'] = heartbeat_interval * 1000
 
     # Mount static files
     app.mount("/static", StaticFiles(directory=str(static_dir)), name="static")
@@ -428,13 +484,14 @@ def create_app(
         logger.info("Shutdown request received via API")
         # Send shutdown signal to the process
         # Use a background task to allow the response to be sent first
-        import asyncio
         async def shutdown_server():
             await asyncio.sleep(0.5)  # Give time for response to be sent
             logger.info("Shutting down web server...")
             os.kill(os.getpid(), signal.SIGTERM)
 
-        asyncio.create_task(shutdown_server())
+        task = asyncio.create_task(shutdown_server())
+        _background_tasks.add(task)
+        task.add_done_callback(_background_tasks.discard)
         return JSONResponse({"status": "shutdown initiated"})
 
     @app.get("/menu", response_class=HTMLResponse)
@@ -456,13 +513,14 @@ def create_app(
         chat_router,
         streaming_router,
     )
-    from .endpoints.autonomous_actions import router as autonomous_actions_router
-
     app.include_router(main_menu_router, prefix="/api", tags=["Main Menu"])
     app.include_router(conversations_router, prefix="/api", tags=["Conversations"])
     app.include_router(chat_router, prefix="/api", tags=["Chat"])
     app.include_router(streaming_router, prefix="/api", tags=["Streaming"])
-    app.include_router(autonomous_actions_router, prefix="/api", tags=["Autonomous Actions"])
+
+    if actions_enabled:
+        from .endpoints.autonomous_actions import router as autonomous_actions_router
+        app.include_router(autonomous_actions_router, prefix="/api", tags=["Autonomous Actions"])
 
     # Add template routes for conversations and chat
     @app.get("/conversations", response_class=HTMLResponse)
@@ -515,6 +573,8 @@ def create_app(
     @app.get("/actions", response_class=HTMLResponse)
     async def actions_page(request: Request, session_id: str = Depends(get_session)):
         """Display autonomous actions management page."""
+        if not actions_enabled:
+            return RedirectResponse(url="/menu", status_code=303)
         return templates.TemplateResponse(
             "actions.html",
             {

dtSpark/web/ssl_utils.py

@@ -10,7 +10,7 @@ import os.path
 import socket
 import ipaddress
 from pathlib import Path
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Tuple, Optional
 
 from dtPyAppFramework.paths import ApplicationPaths
@@ -72,8 +72,8 @@ def generate_self_signed_certificate(
             .issuer_name(issuer)
             .public_key(private_key.public_key())
             .serial_number(x509.random_serial_number())
-            .not_valid_before(datetime.utcnow())
-            .not_valid_after(datetime.utcnow() + timedelta(days=validity_days))
+            .not_valid_before(datetime.now(timezone.utc))
+            .not_valid_after(datetime.now(timezone.utc) + timedelta(days=validity_days))
             .add_extension(
                 x509.SubjectAlternativeName([
                     x509.DNSName(hostname),

dtSpark/web/static/css/dark-theme.css

@@ -94,7 +94,8 @@ body {
 }
 
 .chat-message .message-content pre {
-    background-color: rgba(0, 0, 0, 0.5);
+    background-color: #0d1117;
+    border: 1px solid #30363d;
     padding: 1rem;
     border-radius: 0.5rem;
     overflow-x: auto;
@@ -195,16 +196,19 @@ body {
 
 /* Code blocks in markdown */
 .markdown-content pre {
-    background-color: rgba(0, 0, 0, 0.5);
+    background-color: #0d1117;
+    border: 1px solid #30363d;
     padding: 1rem;
     border-radius: 0.5rem;
     overflow-x: auto;
+    margin: 1rem 0;
 }
 
 .markdown-content code {
-    background-color: rgba(0, 0, 0, 0.3);
+    background-color: rgba(110, 118, 129, 0.3);
     padding: 0.2rem 0.4rem;
     border-radius: 0.25rem;
+    font-size: 0.875em;
 }
 
 /* Alerts */
@@ -324,7 +328,7 @@ body {
     border: 1px solid #f44336;
     border-radius: 0.5rem;
     padding: 1rem;
-    color: #ff8a80;
+    color: #ffd7d3;
 }
 
 .mermaid-error .text-danger {
@@ -339,14 +343,6 @@ body {
     padding: 0;
 }
 
-.chat-message .message-content pre {
-    background-color: #0d1117;
-    border: 1px solid #30363d;
-    border-radius: 0.5rem;
-    padding: 1rem;
-    overflow-x: auto;
-}
-
 .chat-message .message-content code:not(.hljs) {
     background-color: rgba(110, 118, 129, 0.3);
     padding: 0.2rem 0.4rem;
@@ -354,29 +350,12 @@ body {
     font-size: 0.875em;
 }
 
-/* Markdown content styling */
-.markdown-content pre {
-    background-color: #0d1117;
-    border: 1px solid #30363d;
-    border-radius: 0.5rem;
-    padding: 1rem;
-    overflow-x: auto;
-    margin: 1rem 0;
-}
-
 .markdown-content pre code {
     background-color: transparent;
     padding: 0;
     border-radius: 0;
 }
 
-.markdown-content code {
-    background-color: rgba(110, 118, 129, 0.3);
-    padding: 0.2rem 0.4rem;
-    border-radius: 0.25rem;
-    font-size: 0.875em;
-}
-
 .markdown-content blockquote {
     border-left: 4px solid var(--spark-cyan);
     padding-left: 1rem;

dtSpark/web/static/js/chat.js

@@ -50,8 +50,6 @@ async function loadChatHistory(conversationId) {
  * @param {string} timestamp - Message timestamp (optional)
  */
 function appendMessage(role, content, timestamp = null) {
-    const messagesContainer = document.getElementById('chat-messages');
-
     // Check if content contains tool results
     if (content.startsWith('[TOOL_RESULTS]')) {
         appendToolResults(content, timestamp);
@@ -107,7 +105,7 @@ function appendRegularMessage(role, content, timestamp = null) {
     messageDiv.className = `chat-message ${role}`;
 
     // Generate unique ID for the copy button
-    const copyBtnId = 'copy-btn-' + Date.now() + '-' + Math.random().toString(36).substr(2, 9);
+    const copyBtnId = 'copy-btn-' + Date.now() + '-' + Math.random().toString(36).substring(2, 11);
 
     // Create message header with copy icon
     const header = document.createElement('div');
@@ -308,8 +306,8 @@ function removeStatus(idOrElement) {
         document.getElementById(idOrElement) :
         idOrElement;
 
-    if (element && element.parentNode) {
-        element.parentNode.removeChild(element);
+    if (element?.parentNode) {
+        element.remove();
     }
 }
 
@@ -360,7 +358,7 @@ function updateStreamingMessage(content, messageElement = null) {
         messageElement.className = 'chat-message assistant';
 
         // Generate unique ID for the copy button
-        const copyBtnId = 'stream-copy-btn-' + Date.now() + '-' + Math.random().toString(36).substr(2, 9);
+        const copyBtnId = 'stream-copy-btn-' + Date.now() + '-' + Math.random().toString(36).substring(2, 11);
 
         messageElement.innerHTML = `
             <div class="message-header d-flex justify-content-between align-items-center">
@@ -463,7 +461,7 @@ function showToast(message, type = 'info') {
     const toast = document.createElement('div');
     toast.id = toastId;
     toast.className = 'toast';
-    toast.setAttribute('role', 'alert');
+    toast.role = 'alert';
 
     let bgClass = 'bg-primary';
     if (type === 'success') bgClass = 'bg-success';
@@ -550,7 +548,7 @@ async function showToolPermissionDialog(requestId, toolName, toolDescription) {
     const buttons = modalElement.querySelectorAll('.permission-btn');
     buttons.forEach(button => {
         button.addEventListener('click', async () => {
-            const response = button.getAttribute('data-response');
+            const response = button.dataset.response;
 
             // Send response to server
             try {

dtSpark/web/static/js/main.js

@@ -74,7 +74,7 @@ if (typeof marked !== 'undefined') {
 
         // Handle mermaid diagrams
         if (lang === 'mermaid') {
-            const id = 'mermaid-' + Math.random().toString(36).substr(2, 9);
+            const id = 'mermaid-' + Math.random().toString(36).substring(2, 11);
             return `<div class="mermaid-container"><pre class="mermaid" id="${id}">${escapeHtmlForMermaid(code)}</pre></div>`;
         }
 
@@ -157,7 +157,7 @@ async function copySvgToClipboard(svgElement, button) {
         bgRect.setAttribute('width', '100%');
         bgRect.setAttribute('height', '100%');
         bgRect.setAttribute('fill', '#1a1a1a');
-        svgClone.insertBefore(bgRect, svgClone.firstChild);
+        svgClone.prepend(bgRect);
 
         // Serialise SVG to string
         const serializer = new XMLSerializer();
@@ -255,7 +255,7 @@ async function renderMermaidDiagrams(container) {
 
     for (const block of mermaidBlocks) {
         try {
-            const id = block.id || 'mermaid-' + Math.random().toString(36).substr(2, 9);
+            const id = block.id || 'mermaid-' + Math.random().toString(36).substring(2, 11);
             const code = block.textContent;
 
             // Render the diagram
@@ -287,7 +287,7 @@ async function renderMermaidDiagrams(container) {
                 }
             };
 
-            block.parentNode.replaceChild(wrapper, block);
+            block.replaceWith(wrapper);
         } catch (e) {
             console.error('Mermaid rendering error:', e);
             // Show error message in the block
@@ -370,9 +370,9 @@ function showToast(message, type = 'info') {
     // Create toast
     const toast = document.createElement('div');
     toast.className = `toast align-items-center text-white bg-${type === 'error' ? 'danger' : type} border-0`;
-    toast.setAttribute('role', 'alert');
-    toast.setAttribute('aria-live', 'assertive');
-    toast.setAttribute('aria-atomic', 'true');
+    toast.role = 'alert';
+    toast.ariaLive = 'assertive';
+    toast.ariaAtomic = 'true';
 
     toast.innerHTML = `
         <div class="d-flex">
@@ -432,7 +432,7 @@ function downloadFile(content, filename, mimeType = 'text/plain') {
     link.download = filename;
     document.body.appendChild(link);
     link.click();
-    document.body.removeChild(link);
+    link.remove();
     URL.revokeObjectURL(url);
 }