local-deep-research 0.5.9__py3-none-any.whl → 0.6.1__py3-none-any.whl

local_deep_research/web/static/js/components/research.js

@@ -139,36 +139,18 @@
         advancedToggle = document.querySelector('.advanced-options-toggle');
         advancedPanel = document.querySelector('.advanced-options-panel');
 
-        // First, try to load settings from localStorage for immediate display
-        const lastProvider = localStorage.getItem('lastUsedProvider');
-        const lastModel = localStorage.getItem('lastUsedModel');
-        const lastSearchEngine = localStorage.getItem('lastUsedSearchEngine');
-        const lastStrategy = localStorage.getItem('lastUsedStrategy') || 'source-based';
-
-        console.log('Local storage values:', { provider: lastProvider, model: lastModel, searchEngine: lastSearchEngine, strategy: lastStrategy });
-
-        // Apply local storage values if available
-        if (lastProvider && modelProviderSelect) {
-            console.log('Setting provider from localStorage:', lastProvider);
-            modelProviderSelect.value = lastProvider;
-            // Show/hide endpoint container as needed
-            if (endpointContainer) {
-                endpointContainer.style.display = lastProvider === 'OPENAI_ENDPOINT' ? 'block' : 'none';
-            }
-        }
-
-        // Apply saved strategy
-        const strategySelect = document.getElementById('strategy');
-        if (strategySelect && lastStrategy) {
-            console.log('Setting strategy from localStorage:', lastStrategy);
-            strategySelect.value = lastStrategy;
-        }
+        // Note: Settings are now loaded from the database via the template
+        // The form values are already set by the server-side rendering
+        // We just need to initialize the UI components
 
         // Initialize the UI first (immediate operations)
         setupEventListeners();
         populateModelProviders();
         initializeDropdowns();
 
+        // Also set initial values here for immediate feedback
+        setInitialFormValues();
+
         // Auto-focus the query input
         if (queryInput) {
             queryInput.focus();
@@ -179,14 +161,17 @@
         }
 
         // Set initial state of the advanced options panel based on localStorage
-        const savedState = localStorage.getItem('advancedOptionsOpen') === 'true';
+        const savedState = localStorage.getItem('advancedMenuOpen') === 'true';
         if (savedState && advancedPanel) {
             advancedPanel.style.display = 'block';
             advancedPanel.classList.add('expanded');
             if (advancedToggle) {
                 advancedToggle.classList.add('open');
+                advancedToggle.setAttribute('aria-expanded', 'true');
                 const icon = advancedToggle.querySelector('i');
                 if (icon) icon.className = 'fas fa-chevron-up';
+                const srText = advancedToggle.querySelector('.sr-only');
+                if (srText) srText.textContent = 'Click to collapse advanced options';
             }
         }
 
@@ -195,16 +180,13 @@
             loadModelOptions(false),
             loadSearchEngineOptions(false)
         ]).then(([modelData, searchEngineData]) => {
-            console.log('Data loaded successfully');
-
             // After loading model data, update the UI with the loaded data
-            const currentProvider = modelProviderSelect ? modelProviderSelect.value : (lastProvider || 'OLLAMA');
+            const currentProvider = modelProviderSelect ? modelProviderSelect.value : 'OLLAMA';
             updateModelOptionsForProvider(currentProvider, false);
 
             // Update search engine options
             if (searchEngineData && Array.isArray(searchEngineData)) {
                 searchEngineOptions = searchEngineData;
-                console.log('Loaded search engines:', searchEngineData.length);
 
                 // Force search engine dropdown to update with new data
                 if (searchEngineDropdownList && window.setupCustomDropdown) {
@@ -214,7 +196,6 @@
                         searchEngineDropdownList,
                         () => searchEngineOptions.length > 0 ? searchEngineOptions : [{ value: '', label: 'No search engines available' }],
                         (value, item) => {
-                            console.log('Search engine selected:', value, item);
                             selectedSearchEngineValue = value;
 
                             // Update the input field
@@ -235,13 +216,11 @@
 
                     // If we have a last selected search engine, try to select it
                     if (lastSearchEngine) {
-                        console.log('Trying to select last search engine:', lastSearchEngine);
                         // Find the matching engine
                         const matchingEngine = searchEngineOptions.find(engine =>
                             engine.value === lastSearchEngine || engine.id === lastSearchEngine);
 
                         if (matchingEngine) {
-                            console.log('Found matching search engine:', matchingEngine);
                             searchEngineInput.value = matchingEngine.label;
                             selectedSearchEngineValue = matchingEngine.value;
 
@@ -255,11 +234,17 @@
                 }
             }
 
+            // Set initial form values from data attributes
+            setInitialFormValues();
+
             // Finally, load settings after data is available
             loadSettings();
         }).catch(error => {
             console.error('Failed to load options:', error);
 
+            // Set initial form values even if data loading fails
+            setInitialFormValues();
+
             // Still load settings even if data loading fails
             loadSettings();
 
@@ -423,6 +408,65 @@
         }
     }
 
+    /**
+     * Set initial form values from data attributes
+     */
+    function setInitialFormValues() {
+        console.log('Setting initial form values...');
+
+        // Set initial model value if available
+        if (modelInput) {
+            const initialModel = modelInput.getAttribute('data-initial-value');
+            console.log('Initial model value from data attribute:', initialModel);
+            if (initialModel) {
+                // Find the matching model in the options
+                const matchingModel = modelOptions.find(m =>
+                    m.value === initialModel || m.id === initialModel
+                );
+
+                if (matchingModel) {
+                    modelInput.value = matchingModel.label;
+                    selectedModelValue = matchingModel.value;
+                } else {
+                    // If not found in options, set it as custom value
+                    modelInput.value = initialModel;
+                    selectedModelValue = initialModel;
+                }
+
+                // Update hidden input
+                const hiddenInput = document.getElementById('model_hidden');
+                if (hiddenInput) {
+                    hiddenInput.value = selectedModelValue;
+                }
+            }
+        }
+
+        // Set initial search engine value if available
+        if (searchEngineInput) {
+            const initialSearchEngine = searchEngineInput.getAttribute('data-initial-value');
+            if (initialSearchEngine) {
+                // Find the matching search engine in the options
+                const matchingEngine = searchEngineOptions.find(e =>
+                    e.value === initialSearchEngine || e.id === initialSearchEngine
+                );
+
+                if (matchingEngine) {
+                    searchEngineInput.value = matchingEngine.label;
+                    selectedSearchEngineValue = matchingEngine.value;
+                } else {
+                    searchEngineInput.value = initialSearchEngine;
+                    selectedSearchEngineValue = initialSearchEngine;
+                }
+
+                // Update hidden input
+                const hiddenInput = document.getElementById('search_engine_hidden');
+                if (hiddenInput) {
+                    hiddenInput.value = selectedSearchEngineValue;
+                }
+            }
+        }
+    }
+
     /**
      * Setup event listeners
      */
@@ -432,23 +476,19 @@
         // INITIALIZE ADVANCED OPTIONS FIRST - before any async operations
         // Advanced options toggle - make immediately responsive
         if (advancedToggle && advancedPanel) {
-            // Set initial state based on localStorage, relying only on CSS classes
-            const savedState = localStorage.getItem('advancedOptionsOpen') === 'true';
+            // Set initial state based on localStorage
+            const savedState = localStorage.getItem('advancedMenuOpen') === 'true';
 
             if (savedState) {
                 advancedToggle.classList.add('open');
                 advancedPanel.classList.add('expanded');
-
-                // Update ARIA attributes
                 advancedToggle.setAttribute('aria-expanded', 'true');
 
-                // Update screen reader text
                 const srText = advancedToggle.querySelector('.sr-only');
                 if (srText) {
                     srText.textContent = 'Click to collapse advanced options';
                 }
 
-                // Update icon immediately
                 const icon = advancedToggle.querySelector('i');
                 if (icon) {
                     icon.className = 'fas fa-chevron-up';
@@ -456,17 +496,13 @@
             } else {
                 advancedToggle.classList.remove('open');
                 advancedPanel.classList.remove('expanded');
-
-                // Update ARIA attributes
                 advancedToggle.setAttribute('aria-expanded', 'false');
 
-                // Update screen reader text
                 const srText = advancedToggle.querySelector('.sr-only');
                 if (srText) {
                     srText.textContent = 'Click to expand advanced options';
                 }
 
-                // Ensure icon is correct
                 const icon = advancedToggle.querySelector('i');
                 if (icon) {
                     icon.className = 'fas fa-chevron-down';
@@ -489,7 +525,7 @@
                 }
 
                 // Save state to localStorage
-                localStorage.setItem('advancedOptionsOpen', isOpen);
+                localStorage.setItem('advancedMenuOpen', isOpen.toString());
 
                 // Update icon
                 const icon = this.querySelector('i');
@@ -622,6 +658,33 @@
             });
         }
 
+        // Search engine change - save to settings manager
+        if (searchEngineInput) {
+            searchEngineInput.addEventListener('change', function() {
+                const searchEngine = this.value;
+                console.log('Search engine changed to:', searchEngine);
+                saveSearchSetting('search.tool', searchEngine);
+            });
+        }
+
+        // Iterations change - save to settings manager
+        if (iterationsInput) {
+            iterationsInput.addEventListener('change', function() {
+                const iterations = parseInt(this.value);
+                console.log('Iterations changed to:', iterations);
+                saveSearchSetting('search.iterations', iterations);
+            });
+        }
+
+        // Questions per iteration change - save to settings manager
+        if (questionsPerIterationInput) {
+            questionsPerIterationInput.addEventListener('change', function() {
+                const questions = parseInt(this.value);
+                console.log('Questions per iteration changed to:', questions);
+                saveSearchSetting('search.questions_per_iteration', questions);
+            });
+        }
+
         // Load options data from APIs
         Promise.all([
             loadModelOptions(false),
@@ -678,11 +741,21 @@
             modelProviderSelect.appendChild(option);
         });
 
-        // Default to Ollama
-        modelProviderSelect.value = 'OLLAMA';
+        // Set initial value from data attribute or default to Ollama
+        const initialProvider = modelProviderSelect.getAttribute('data-initial-value') || 'OLLAMA';
+        console.log('Initial provider from data attribute:', initialProvider);
+        modelProviderSelect.value = initialProvider.toUpperCase();
+
+        // Show custom endpoint input if OpenAI endpoint is selected
+        if (endpointContainer) {
+            console.log('Setting endpoint container display for provider:', initialProvider.toUpperCase());
+            endpointContainer.style.display = initialProvider.toUpperCase() === 'OPENAI_ENDPOINT' ? 'block' : 'none';
+        } else {
+            console.warn('Endpoint container not found');
+        }
 
         // Initial update of model options
-        updateModelOptionsForProvider('OLLAMA');
+        updateModelOptionsForProvider(initialProvider.toUpperCase());
     }
 
     /**
@@ -932,10 +1005,10 @@
             console.log(`Updated model options for provider ${provider}: ${modelOptions.length} models`);
 
         // Check for stored last model before deciding what to select
-            let lastSelectedModel = localStorage.getItem('lastUsedModel');
+            let lastSelectedModel = null; // Don't use localStorage
 
             // Also check the database setting
-            fetch('/research/settings/api/llm.model', {
+            fetch(URLS.SETTINGS_API.LLM_MODEL, {
                 method: 'GET',
                 headers: {
                     'Content-Type': 'application/json'
@@ -1063,7 +1136,7 @@
             const controller = new AbortController();
             const timeoutId = setTimeout(() => controller.abort(), 5000); // 5 second timeout
 
-            const response = await fetch('/research/settings/api/ollama-status', {
+            const response = await fetch(URLS.SETTINGS_API.OLLAMA_STATUS, {
                 signal: controller.signal
             });
 
@@ -1144,7 +1217,7 @@
             const controller = new AbortController();
             const timeoutId = setTimeout(() => controller.abort(), 5000);
 
-            const response = await fetch(`/research/api/check/ollama_model?model=${encodeURIComponent(model)}`, {
+            const response = await fetch(`/api/check/ollama_model?model=${encodeURIComponent(model)}`, {
                 signal: controller.signal
             });
 
@@ -1186,8 +1259,11 @@
         console.log('Loading settings from database...');
         let numApiCallsPending = 1;
 
+        // Increase the API calls counter to include strategy loading
+        numApiCallsPending = 3;
+
         // Fetch the current settings from the settings API
-        fetch('/research/settings/api', {
+        fetch(URLS.SETTINGS_API.LLM_CONFIG, {
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json'
@@ -1223,7 +1299,7 @@
                         console.log('Found matching provider option:', matchingOption.value);
                         modelProviderSelect.value = matchingOption.value;
                         // Also save to localStorage
-                        localStorage.setItem('lastUsedProvider', matchingOption.value);
+                        // Provider saved to DB: matchingOption.value);
                     } else {
                         // If no match, try to find case-insensitive or partial match
                         const caseInsensitiveMatch = Array.from(modelProviderSelect.options).find(
@@ -1235,7 +1311,7 @@
                             console.log('Found case-insensitive provider match:', caseInsensitiveMatch.value);
                             modelProviderSelect.value = caseInsensitiveMatch.value;
                             // Also save to localStorage
-                            localStorage.setItem('lastUsedProvider', caseInsensitiveMatch.value);
+                            // Provider saved to DB: caseInsensitiveMatch.value);
                         } else {
                             console.warn(`No matching provider option found for '${providerValue}'`);
                         }
@@ -1266,7 +1342,7 @@
                         console.log('Setting model to:', modelValue);
 
                         // Save to localStorage
-                        localStorage.setItem('lastUsedModel', modelValue);
+                        // Model saved to DB
 
                         // Find the model in our loaded options
                         const matchingModel = modelOptions.find(m =>
@@ -1308,7 +1384,7 @@
                     console.log('Setting search engine to:', engineValue);
 
                     // Save to localStorage
-                    localStorage.setItem('lastUsedSearchEngine', engineValue);
+                    // Search engine saved to DB
 
                     // Find the engine in our loaded options
                     const matchingEngine = searchEngineOptions.find(e =>
@@ -1361,13 +1437,59 @@
             numApiCallsPending--;
             isInitializing = (numApiCallsPending === 0);
         });
+
+        // Load search strategy setting
+        fetch(URLS.SETTINGS_API.SEARCH_TOOL, {
+            method: 'GET',
+            headers: {
+                'Content-Type': 'application/json'
+            }
+        })
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error(`API error: ${response.status}`);
+                }
+                return response.json();
+            })
+            .then(data => {
+                console.log('Loaded strategy from database:', data);
+
+                const strategySelect = document.getElementById('strategy');
+                if (data && data.setting && data.setting.value && strategySelect) {
+                    const strategyValue = data.setting.value;
+                    console.log('Setting strategy to:', strategyValue);
+
+                    // Update the select element
+                    strategySelect.value = strategyValue;
+
+                    // Save to localStorage
+                    // Strategy saved to DB
+                }
+
+                numApiCallsPending--;
+                isInitializing = (numApiCallsPending === 0);
+            })
+            .catch(error => {
+                console.error('Error loading strategy:', error);
+
+                // Fallback to localStorage
+                const lastStrategy = null; // Strategy loaded from DB
+                const strategySelect = document.getElementById('strategy');
+                if (lastStrategy && strategySelect) {
+                    strategySelect.value = lastStrategy;
+                }
+
+                numApiCallsPending--;
+                isInitializing = (numApiCallsPending === 0);
+            });
     }
 
     // Add a fallback function to use localStorage settings
     function fallbackToLocalStorageSettings() {
-        const provider = localStorage.getItem('lastUsedProvider');
-        const model = localStorage.getItem('lastUsedModel');
-        const searchEngine = localStorage.getItem('lastUsedSearchEngine');
+        // Settings are loaded from database, not localStorage
+        const provider = null;
+        const model = null;
+        const searchEngine = null;
 
         console.log('Falling back to localStorage settings:', { provider, model, searchEngine });
 
@@ -1440,7 +1562,11 @@
             }
 
             // Fetch from API if cache is invalid or refresh is forced
-            fetch('/research/settings/api/available-models')
+            const url = forceRefresh
+                ? `${URLS.SETTINGS_API.AVAILABLE_MODELS}?force_refresh=true`
+                : URLS.SETTINGS_API.AVAILABLE_MODELS;
+
+            fetch(url)
                 .then(response => {
                     if (!response.ok) {
                         throw new Error(`API error: ${response.status}`);
@@ -1578,23 +1704,23 @@
         ];
     }
 
-    // Cache and retrieve data in localStorage
+    // In-memory cache to avoid excessive API calls within a session
+    const memoryCache = {};
+    const CACHE_DURATION = 5 * 60 * 1000; // 5 minutes
+
     function cacheData(key, data) {
-        try {
-            localStorage.setItem(key, JSON.stringify(data));
-        } catch (e) {
-            console.error('Error caching data:', e);
-        }
+        memoryCache[key] = {
+            data: data,
+            timestamp: Date.now()
+        };
     }
 
     function getCachedData(key) {
-        try {
-            const item = localStorage.getItem(key);
-            return item ? JSON.parse(item) : null;
-        } catch (e) {
-            console.error('Error retrieving cached data:', e);
-            return null;
+        const cached = memoryCache[key];
+        if (cached && (Date.now() - cached.timestamp < CACHE_DURATION)) {
+            return cached.data;
         }
+        return null;
     }
 
     // Load search engine options
@@ -1622,7 +1748,7 @@
             console.log('Fetching search engines from API...');
 
             // Fetch from API
-            fetch('/research/settings/api/available-search-engines')
+            fetch(URLS.SETTINGS_API.AVAILABLE_SEARCH_ENGINES)
                 .then(response => {
                     if (!response.ok) {
                         throw new Error(`API error: ${response.status}`);
@@ -1739,8 +1865,7 @@
 
     // Save model settings to database
     function saveModelSettings(modelValue) {
-        // Save selection to localStorage for persistence between sessions
-        localStorage.setItem('lastUsedModel', modelValue);
+        // Only save to database, not localStorage
 
         // Update any hidden input with the same settings key that might exist in other forms
         const hiddenInputs = document.querySelectorAll('input[id$="_hidden"][name="llm.model"]');
@@ -1749,7 +1874,7 @@
         });
 
         // Save to the database using the settings API
-        fetch('/research/settings/api/llm.model', {
+        fetch(URLBuilder.updateSetting('llm.model'), {
             method: 'PUT',
             headers: {
                 'Content-Type': 'application/json',
@@ -1778,8 +1903,7 @@
 
     // Save search engine settings to database
     function saveSearchEngineSettings(engineValue) {
-        // Save to localStorage
-        localStorage.setItem('lastUsedSearchEngine', engineValue);
+        // Only save to database, not localStorage
 
         // Update any hidden input with the same settings key that might exist in other forms
         const hiddenInputs = document.querySelectorAll('input[id$="_hidden"][name="search.tool"]');
@@ -1788,7 +1912,7 @@
         });
 
         // Save to the database using the settings API
-        fetch('/research/settings/api/search.tool', {
+        fetch(URLS.SETTINGS_API.SEARCH_TOOL, {
             method: 'PUT',
             headers: {
                 'Content-Type': 'application/json',
@@ -1817,8 +1941,7 @@
 
     // Save provider setting to database
     function saveProviderSetting(providerValue) {
-        // Save to localStorage
-        localStorage.setItem('lastUsedProvider', providerValue);
+        // Only save to database, not localStorage
 
         // Update any hidden input with the same settings key that might exist in other forms
         const hiddenInputs = document.querySelectorAll('input[id$="_hidden"][name="llm.provider"]');
@@ -1827,7 +1950,7 @@
         });
 
         // Save to the database using the settings API
-        fetch('/research/settings/api/llm.provider', {
+        fetch(URLS.SETTINGS_API.LLM_PROVIDER, {
             method: 'PUT',
             headers: {
                 'Content-Type': 'application/json',
@@ -1839,6 +1962,14 @@
         .then(data => {
             console.log('Provider setting saved to database:', data);
 
+            // If the response includes warnings, display them directly
+            if (data.warnings && typeof window.displayWarnings === 'function') {
+                window.displayWarnings(data.warnings);
+            } else if (typeof window.refetchSettingsAndUpdateWarnings === 'function') {
+                // Fallback: trigger warning system update
+                window.refetchSettingsAndUpdateWarnings();
+            }
+
             // Optionally show a notification
             if (window.ui && window.ui.showMessage) {
                 window.ui.showMessage(`Provider updated to: ${providerValue}`, 'success', 2000);
@@ -1854,6 +1985,41 @@
         });
     }
 
+    // Save search setting to database
+    function saveSearchSetting(settingKey, value) {
+        // Save to the database using the settings API
+        fetch(`/settings/api/${settingKey}`, {
+            method: 'PUT',
+            headers: {
+                'Content-Type': 'application/json',
+                'X-CSRFToken': document.querySelector('meta[name="csrf-token"]').getAttribute('content')
+            },
+            body: JSON.stringify({ value: value })
+        })
+        .then(response => response.json())
+        .then(data => {
+            console.log(`Search setting ${settingKey} saved to database:`, data);
+
+            // If the response includes warnings, display them directly
+            if (data.warnings && typeof window.displayWarnings === 'function') {
+                window.displayWarnings(data.warnings);
+            }
+
+            // Optionally show a notification
+            if (window.ui && window.ui.showMessage) {
+                window.ui.showMessage(`${settingKey.split('.').pop()} updated to: ${value}`, 'success', 2000);
+            }
+        })
+        .catch(error => {
+            console.error(`Error saving search setting ${settingKey} to database:`, error);
+
+            // Show error notification if available
+            if (window.ui && window.ui.showMessage) {
+                window.ui.showMessage(`Error updating ${settingKey}: ${error.message}`, 'error', 3000);
+            }
+        });
+    }
+
     // Research form submission handler
     function handleResearchSubmit(event) {
         event.preventDefault();
@@ -1918,7 +2084,7 @@
         const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content;
 
         // Submit the form data to the backend
-        fetch('/research/api/start_research', {
+        fetch(URLS.API.START_RESEARCH, {
             method: 'POST',
             headers: {
                 'Content-Type': 'application/json',
@@ -1932,15 +2098,10 @@
                 console.log('Research started successfully:', data);
 
                 // Store research preferences in localStorage
-                localStorage.setItem('lastResearchMode', mode);
-                localStorage.setItem('lastModelProvider', modelProvider);
-                localStorage.setItem('lastModel', model);
-                localStorage.setItem('lastSearchEngine', searchEngine);
-                localStorage.setItem('enableNotifications', enableNotifications);
-                localStorage.setItem('lastUsedStrategy', strategy);
+                // Settings are saved to database via the API, not localStorage
 
                 // Redirect to the progress page
-                window.location.href = `/research/progress/${data.research_id}`;
+                window.location.href = URLBuilder.progressPage(data.research_id);
             } else {
                 // Show error message
                 showAlert(data.message || 'Failed to start research.', 'error');

local_deep_research/web/static/js/components/results.js

@@ -55,7 +55,7 @@
         const metricsBtn = document.getElementById('view-metrics-btn');
         if (metricsBtn) {
             metricsBtn.addEventListener('click', () => {
-                window.location.href = `/research/details/${researchId}`;
+                window.location.href = URLBuilder.detailsPage(researchId);
             });
         }
 
@@ -73,20 +73,18 @@
         const backBtn = document.getElementById('back-to-history');
         if (backBtn) {
             backBtn.addEventListener('click', () => {
-                window.location.href = '/research/history';
+                window.location.href = URLS.PAGES.HISTORY;
             });
         }
 
     }
 
     /**
-     * Get research ID from URL
+     * Get research ID from URL using centralized URL system
      * @returns {string|null} Research ID
      */
     function getResearchIdFromUrl() {
-        const path = window.location.pathname;
-        const match = path.match(/\/research\/results\/(\d+)/);
-        return match ? match[1] : null;
+        return URLBuilder.extractResearchIdFromPattern('results');
     }
 
     /**
@@ -98,7 +96,7 @@
             resultsContainer.innerHTML = '<div class="text-center my-5"><i class="fas fa-spinner fa-pulse"></i><p class="mt-3">Loading research results...</p></div>';
 
             // Fetch result from API
-            const response = await fetch(`/research/api/history/report/${researchId}`);
+            const response = await fetch(`/api/report/${researchId}`);
 
             if (!response.ok) {
                 throw new Error(`HTTP error ${response.status}`);