local-deep-research 0.4.3__py3-none-any.whl → 0.5.0__py3-none-any.whl

local_deep_research/web/static/js/components/settings.js

@@ -395,16 +395,28 @@
                 shouldSaveImmediately = true;
             }
         }
-         // Handle range/slider (save on change/input or blur)
-         else if (input.type === 'range') {
+        // Handle range/slider (save on change/input or blur)
+        else if (input.type === 'range') {
             value = input.value;
             if (eventType === 'change' || eventType === 'input' || eventType === 'blur') {
                 shouldSaveImmediately = true;
             }
-         }
+        }
         // Handle other inputs (text, number, textarea) - Save on Enter or Blur
         else {
             value = input.value;
+
+            // Handle JSON.
+            if (input.classList.contains('json-content'))  {
+                try {
+                    // Validate
+                    value = JSON.parse(input.value);
+                } catch (e) {
+                    markInvalidInput(input, 'Invalid JSON');
+                    return;
+                }
+            }
+
             // Basic validation for number
             if (input.type === 'number') {
                try {
@@ -1429,31 +1441,32 @@
         // Generate the appropriate input element based on UI element type
         switch(setting.ui_element) {
             case 'textarea':
-                // Check if it's JSON
-                let isJson = false;
-                let jsonClass = '';
+                inputElement = `
+                    <textarea id="${settingId}" name="${setting.key}"
+                        class="settings-textarea"
+                        ${!setting.editable ? 'disabled' : ''}
+                    >${setting.value !== null ? setting.value : ''}</textarea>
+                `;
+                break;
+
+            case 'json':
+                let jsonClass = ' json-content';
 
-                if (typeof setting.value === 'string' &&
-                    (setting.value.startsWith('{') || setting.value.startsWith('['))) {
-                    isJson = true;
-                    jsonClass = ' json-content';
+                // Try to format the JSON for better display
+                try {
+                    setting.value = JSON.stringify(JSON.parse(setting.value), null, 2);
+                } catch (e) {
+                    // If parsing fails, keep the original value
+                    console.log('Error formatting JSON:', e);
+                }
 
-                    // Try to format the JSON for better display
+                // If it's an object (not an array), render individual controls
+                if (setting.value.startsWith('{')) {
                     try {
-                        setting.value = JSON.stringify(JSON.parse(setting.value), null, 2);
+                        const jsonObj = JSON.parse(setting.value);
+                        return renderExpandedJsonControls(setting, settingId, jsonObj);
                     } catch (e) {
-                        // If parsing fails, keep the original value
-                        console.log('Error formatting JSON:', e);
-                    }
-
-                    // If it's an object (not an array), render individual controls
-                    if (setting.value.startsWith('{')) {
-                        try {
-                            const jsonObj = JSON.parse(setting.value);
-                            return renderExpandedJsonControls(setting, settingId, jsonObj);
-                        } catch (e) {
-                            console.log('Error parsing JSON for controls:', e);
-                        }
+                        console.log('Error parsing JSON for controls:', e);
                     }
                 }
 
@@ -1581,26 +1594,15 @@
 
             default:
                 // Handle llm.model here explicitly if not handled by ui_element
-                if (typeof setting.value === 'string' &&
-                    (setting.value.startsWith('{') || setting.value.startsWith('['))) {
-                    // Handle JSON objects/arrays rendered as textareas if not expanded
-                    inputElement = `
-                        <textarea id="${settingId}" name="${setting.key}"
-                            class="settings-textarea json-content"
-                            ${!setting.editable ? 'disabled' : ''}
-                        >${setting.value}</textarea>
-                    `;
-                } else {
-                    // Default to text input
-                    inputElement = `
-                        <input type="${setting.ui_element === 'password' ? 'password' : 'text'}"
-                            id="${settingId}" name="${setting.key}"
-                            class="settings-input form-control"
-                            value="${setting.value !== null ? setting.value : ''}"
-                            ${!setting.editable ? 'disabled' : ''}
-                        >
-                    `;
-                }
+                // Default to text input
+                inputElement = `
+                    <input type="${setting.ui_element === 'password' ? 'password' : 'text'}"
+                        id="${settingId}" name="${setting.key}"
+                        class="settings-input form-control"
+                        value="${setting.value !== null ? setting.value : ''}"
+                        ${!setting.editable ? 'disabled' : ''}
+                    >
+                `;
                 break;
         }
 
@@ -1945,6 +1947,22 @@
         }, 1500);
     }
 
+    /**
+     * Validates user-specified JSON data and shows and error if it is not
+     * valid JSON.
+     * @param content The content to validate.
+     * @return True if the content is valid.
+     */
+    function validateJsonContent(content) {
+        try {
+            JSON.parse(content);
+            return true;
+        } catch (e) {
+            showMessage('Setting value must be valid JSON.', 'error', 5000);
+            return false;
+        }
+    }
+
     /**
      * Submit settings data to the API
      * @param {Object} formData - The settings to save
@@ -1962,6 +1980,11 @@
             } else if (sourceElement.classList.contains('json-property-control')) {
                 // For JSON property controls, use the property item
                 loadingContainer = sourceElement.closest('.json-property-item') || sourceElement;
+            } else if (sourceElement.classList.contains('json-content')) {
+                // For JSON content, validate it before saving.
+                if (!validateJsonContent(sourceElement.value)) {
+                    return;
+                }
             } else {
                 // For other inputs, use the form-group or settings-item
                 loadingContainer = sourceElement.closest('.form-group') ||
@@ -3688,16 +3711,16 @@
 
                 return false;
             }
-            
+
             if (providerUpper === 'OPENAI_ENDPOINT') {
                 if (model.provider && model.provider.toUpperCase() === 'OPENAI_ENDPOINT') {
                     return true;
                 }
-                
+
                 if (model.label && model.label.toLowerCase().includes('custom')) {
                     return true;
                 }
-                
+
                 return false;
             }
 

local_deep_research/web/static/js/main.js

@@ -12,7 +12,7 @@
         'page-history': ['history.js'],
         'page-settings': ['settings.js']
     };
-    
+
     // Core services to always load
     const coreServices = [
         'formatting.js',
@@ -21,53 +21,53 @@
         'socket.js'
         // 'audio.js' - Removed from here, loaded separately
     ];
-    
+
     // Optional services to load when needed
     const optionalServices = {
         'page-results': ['pdf.js'],
         'page-detail': ['pdf.js']
     };
-    
+
     /**
      * Initialize the application
      */
     function initializeApp() {
         // Detect current page
         const currentPage = detectCurrentPage();
-        
+
         if (!currentPage) {
             console.error('Cannot detect current page type');
             return;
         }
-        
+
         console.log('Current page detected:', currentPage);
-        
+
         // IMPORTANT: Load audio.js first, before ANY other scripts
         loadAudioServiceFirst(() => {
             // Continue loading other scripts after audio service is loaded
             console.log('Audio service script loaded, continuing with other scripts');
-            
+
             // Load UI and formatting utils
             loadScripts('utils', coreServices.filter(s => s.includes('formatting') || s.includes('ui')));
-            
+
             // Then load the rest
             loadScripts('services', coreServices.filter(s => s.includes('api') || s.includes('socket')));
-            
+
             // Load optional services for this page
             if (optionalServices[currentPage]) {
                 loadScripts('services', optionalServices[currentPage]);
             }
-            
+
             // Load components for this page AFTER all services
             if (pageComponents[currentPage]) {
                 loadScripts('components', pageComponents[currentPage]);
             }
-            
+
             // Initialize tooltips and other global UI elements
             initializeGlobalUI();
         });
     }
-    
+
     /**
      * Load audio service first and separately to ensure it's fully loaded before other scripts
      * @param {Function} callback - Function to call after audio service is loaded
@@ -77,11 +77,11 @@
         const audioScript = document.createElement('script');
         audioScript.src = `/research/static/js/services/audio.js?t=${new Date().getTime()}`; // Add timestamp to avoid cache
         audioScript.async = false;
-        
+
         // Set up callback for when script loads
         audioScript.onload = function() {
             console.log('Audio service script loaded successfully');
-            
+
             // Check if audio service is available in window object
             setTimeout(() => {
                 if (window.audio) {
@@ -89,39 +89,39 @@
                 } else {
                     console.warn('Audio service not available in window object after script load');
                 }
-                
+
                 // Continue regardless
                 callback();
             }, 100); // Small delay to ensure script executes
         };
-        
+
         // Error handling
         audioScript.onerror = function() {
             console.error('Failed to load audio service script');
             // Continue with other scripts even if audio fails
             callback();
         };
-        
+
         // Add to document
         document.body.appendChild(audioScript);
     }
-    
+
     /**
      * Detect the current page based on body class
      * @returns {string|null} The page identifier or null if not found
      */
     function detectCurrentPage() {
         const bodyClasses = document.body.classList;
-        
+
         for (const pageId in pageComponents) {
             if (bodyClasses.contains(pageId)) {
                 return pageId;
             }
         }
-        
+
         // Check URL patterns as fallback
         const path = window.location.pathname;
-        
+
         if (path === '/' || path === '/index' || path === '/home' || path === '/research/') {
             return 'page-home';
         } else if (path.includes('/research/progress')) {
@@ -135,10 +135,10 @@
         } else if (path.includes('/research/settings')) {
             return 'page-settings';
         }
-        
+
         return null;
     }
-    
+
     /**
      * Load scripts dynamically
      * @param {string} folder - The folder containing the scripts
@@ -146,7 +146,7 @@
      */
     function loadScripts(folder, scripts) {
         if (!scripts || !scripts.length) return;
-        
+
         scripts.forEach(script => {
             const scriptElement = document.createElement('script');
             scriptElement.src = `/research/static/js/${folder}/${script}`;
@@ -154,7 +154,7 @@
             document.body.appendChild(scriptElement);
         });
     }
-    
+
     /**
      * Initialize global UI elements
      */
@@ -164,7 +164,7 @@
             // Only ask for permission when user interacts with the page
             document.addEventListener('click', requestNotificationPermission, { once: true });
         }
-        
+
         // Initialize theme toggle
         const themeToggle = document.getElementById('theme-toggle');
         if (themeToggle) {
@@ -172,42 +172,42 @@
             const savedTheme = localStorage.getItem('theme');
             const systemDarkMode = window.matchMedia('(prefers-color-scheme: dark)').matches;
             const isDarkMode = savedTheme === 'dark' || (savedTheme === null && systemDarkMode);
-            
+
             // Set initial theme
             document.documentElement.setAttribute('data-theme', isDarkMode ? 'dark' : 'light');
-            themeToggle.innerHTML = isDarkMode ? 
-                '<i class="fas fa-sun"></i>' : 
+            themeToggle.innerHTML = isDarkMode ?
+                '<i class="fas fa-sun"></i>' :
                 '<i class="fas fa-moon"></i>';
-            
+
             // Listen for theme toggle click
             themeToggle.addEventListener('click', function() {
                 const currentTheme = document.documentElement.getAttribute('data-theme');
                 const newTheme = currentTheme === 'dark' ? 'light' : 'dark';
-                
+
                 document.documentElement.setAttribute('data-theme', newTheme);
                 localStorage.setItem('theme', newTheme);
-                
-                themeToggle.innerHTML = newTheme === 'dark' ? 
-                    '<i class="fas fa-sun"></i>' : 
+
+                themeToggle.innerHTML = newTheme === 'dark' ?
+                    '<i class="fas fa-sun"></i>' :
                     '<i class="fas fa-moon"></i>';
             });
         }
-        
+
         // Initialize mobile menu toggle
         const mobileMenuToggle = document.getElementById('mobile-menu-toggle');
         const navMenu = document.getElementById('main-nav');
-        
+
         if (mobileMenuToggle && navMenu) {
             mobileMenuToggle.addEventListener('click', function() {
                 navMenu.classList.toggle('open');
                 mobileMenuToggle.setAttribute(
-                    'aria-expanded', 
+                    'aria-expanded',
                     navMenu.classList.contains('open') ? 'true' : 'false'
                 );
             });
         }
     }
-    
+
     /**
      * Request notification permission
      */
@@ -216,11 +216,11 @@
             Notification.requestPermission();
         }
     }
-    
+
     // Initialize when DOM is ready
     if (document.readyState === 'loading') {
         document.addEventListener('DOMContentLoaded', initializeApp);
     } else {
         initializeApp();
     }
-})(); 
+})();

local_deep_research/web/static/js/services/audio.js

@@ -28,4 +28,4 @@ window.audio = {
 };
 
 // Log that audio is disabled
-console.log('Audio service is currently disabled - notifications will be implemented later'); 
+console.log('Audio service is currently disabled - notifications will be implemented later');

local_deep_research/web/static/js/services/formatting.js

@@ -38,31 +38,31 @@ function formatMode(mode) {
  */
 function formatDate(date, duration = null) {
     if (!date) return 'Unknown';
-    
+
     try {
         const dateObj = new Date(date);
-        const options = { 
-            year: 'numeric', 
-            month: 'short', 
+        const options = {
+            year: 'numeric',
+            month: 'short',
             day: 'numeric',
             hour: '2-digit',
             minute: '2-digit'
         };
-        
+
         let formattedDate = dateObj.toLocaleDateString('en-US', options);
-        
+
         if (duration) {
             // Format the duration
             const minutes = Math.floor(duration / 60);
             const seconds = duration % 60;
-            
+
             if (minutes > 0) {
                 formattedDate += ` (${minutes}m ${seconds}s)`;
             } else {
                 formattedDate += ` (${seconds}s)`;
             }
         }
-        
+
         return formattedDate;
     } catch (e) {
         console.error('Error formatting date:', e);
@@ -77,10 +77,10 @@ function formatDate(date, duration = null) {
  */
 function formatDuration(seconds) {
     if (!seconds || isNaN(seconds)) return 'Unknown';
-    
+
     const minutes = Math.floor(seconds / 60);
     const remainingSeconds = Math.floor(seconds % 60);
-    
+
     if (minutes === 0) {
         return `${remainingSeconds}s`;
     } else {
@@ -116,4 +116,4 @@ window.formatting = {
     formatDuration,
     formatNumber,
     capitalizeFirstLetter
-}; 
+};

local_deep_research/web/static/js/services/keyboard.js

@@ -0,0 +1,157 @@
+/**
+ * Global Keyboard Shortcuts Service
+ * Provides consistent keyboard shortcuts across the application
+ */
+(function() {
+    'use strict';
+
+    // Keyboard shortcut registry - simplified to just the essential ones
+    const shortcuts = {
+        'newSearch': {
+            keys: ['ctrl+enter', 'cmd+enter'],
+            description: 'Return to main search',
+            handler: () => {
+                // Always navigate to main research page
+                window.location.href = '/';
+            }
+        }
+    };
+
+    /**
+     * Check if a keyboard event matches a shortcut pattern
+     */
+    function matchesShortcut(event, pattern) {
+        const parts = pattern.toLowerCase().split('+');
+        const key = parts[parts.length - 1];
+
+        // Check modifiers
+        const requiresCtrl = parts.includes('ctrl');
+        const requiresCmd = parts.includes('cmd');
+        const requiresShift = parts.includes('shift');
+        const requiresAlt = parts.includes('alt');
+
+        // For single key shortcuts, ensure NO modifiers are pressed
+        if (parts.length === 1) {
+            if (event.ctrlKey || event.metaKey || event.shiftKey || event.altKey) {
+                return false;
+            }
+        }
+
+        // Match key
+        const eventKey = event.key.toLowerCase();
+        if (eventKey !== key && event.code.toLowerCase() !== `key${key}`) {
+            // Special handling for special keys
+            if (key === '/' && eventKey !== '/') return false;
+            else if (key === ',' && eventKey !== ',') return false;
+            else if (key !== '/' && key !== ',' && eventKey !== key) return false;
+        }
+
+        // Match modifiers (only if required)
+        if (requiresCtrl && !event.ctrlKey) return false;
+        if (requiresCmd && !event.metaKey) return false;
+        if (requiresShift && !event.shiftKey) return false;
+        if (requiresAlt && !event.altKey) return false;
+
+        return true;
+    }
+
+    /**
+     * Initialize keyboard shortcuts
+     */
+    function initializeKeyboardShortcuts() {
+        console.log('Keyboard shortcuts initialized');
+
+        document.addEventListener('keydown', function(event) {
+            // Skip if user is typing in an input field
+            const activeElement = document.activeElement;
+            const isTyping = activeElement && (
+                activeElement.tagName === 'INPUT' ||
+                activeElement.tagName === 'TEXTAREA' ||
+                activeElement.contentEditable === 'true'
+            );
+
+            // Allow Escape even when typing
+            if (isTyping && event.key !== 'Escape') {
+                return;
+            }
+
+            // Debug log
+            if (event.key.length === 1 && !event.ctrlKey && !event.metaKey && !event.altKey) {
+                console.log('Key pressed:', event.key, 'Code:', event.code);
+            }
+
+            // Check each shortcut
+            for (const [name, shortcut] of Object.entries(shortcuts)) {
+                for (const pattern of shortcut.keys) {
+                    if (matchesShortcut(event, pattern)) {
+                        console.log('Shortcut matched:', name, pattern);
+                        event.preventDefault();
+                        shortcut.handler(event);
+                        return;
+                    }
+                }
+            }
+        });
+
+        // Add help text to footer if on main pages
+        addKeyboardHints();
+    }
+
+    /**
+     * Add subtle keyboard hints to the UI
+     */
+    function addKeyboardHints() {
+        // Keyboard hints disabled
+    }
+
+    /**
+     * Get list of available shortcuts for current page
+     */
+    function getAvailableShortcuts() {
+        const currentPath = window.location.pathname;
+        const allShortcuts = { ...shortcuts };
+
+        // Add page-specific shortcuts
+        if (currentPath.includes('/research/progress/')) {
+            allShortcuts.viewResults = {
+                keys: ['enter'],
+                description: 'View results (when complete)',
+                handler: () => {
+                    const viewBtn = document.getElementById('view-results-btn');
+                    if (viewBtn && viewBtn.style.display !== 'none') {
+                        window.location.href = viewBtn.href;
+                    }
+                }
+            };
+        }
+
+        if (currentPath.includes('/research/results/')) {
+            allShortcuts.escape = {
+                keys: ['escape'],
+                description: 'Back to new search',
+                handler: () => window.location.href = '/'
+            };
+        }
+
+        return allShortcuts;
+    }
+
+    // Initialize keyboard shortcuts on all pages
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', initializeKeyboardShortcuts);
+    } else {
+        initializeKeyboardShortcuts();
+    }
+
+    // Expose API for other components
+    window.KeyboardService = {
+        shortcuts: getAvailableShortcuts,
+        addShortcut: (name, config) => {
+            shortcuts[name] = config;
+        },
+        removeShortcut: (name) => {
+            delete shortcuts[name];
+        }
+    };
+
+})();