citrascope 0.5.2__py3-none-any.whl → 0.7.0__py3-none-any.whl

citrascope/web/static/config.js

@@ -9,6 +9,7 @@ const DEFAULT_API_PORT = 443;
 
 let currentAdapterSchema = [];
 export let currentConfig = {};
+let savedAdapter = null; // Track the currently saved adapter
 
 export async function initConfig() {
     // Populate hardware adapter dropdown
@@ -21,8 +22,11 @@ export async function initConfig() {
             const adapter = e.target.value;
             if (adapter) {
                 await loadAdapterSchema(adapter);
+                await loadFilterConfig();
             } else {
                 document.getElementById('adapter-settings-container').innerHTML = '';
+                const filterSection = document.getElementById('filterConfigSection');
+                if (filterSection) filterSection.style.display = 'none';
             }
         });
     }
@@ -106,6 +110,7 @@ async function loadConfiguration() {
     try {
         const config = await getConfig();
         currentConfig = config; // Save for reuse when saving
+        savedAdapter = config.hardware_adapter; // Track saved adapter
 
         // Display config file path
         const configPathElement = document.getElementById('configFilePath');
@@ -158,6 +163,16 @@ async function loadConfiguration() {
         document.getElementById('keep_images').checked = config.keep_images || false;
         document.getElementById('file_logging_enabled').checked = config.file_logging_enabled !== undefined ? config.file_logging_enabled : true;
 
+        // Load autofocus settings (top-level)
+        const scheduledAutofocusEnabled = document.getElementById('scheduled_autofocus_enabled');
+        const autofocusInterval = document.getElementById('autofocus_interval_minutes');
+        if (scheduledAutofocusEnabled) {
+            scheduledAutofocusEnabled.checked = config.scheduled_autofocus_enabled || false;
+        }
+        if (autofocusInterval) {
+            autofocusInterval.value = config.autofocus_interval_minutes || 60;
+        }
+
         // Load adapter-specific settings if adapter is selected
         if (config.hardware_adapter) {
             await loadAdapterSchema(config.hardware_adapter);
@@ -196,6 +211,11 @@ function renderAdapterSettings(schema) {
     let html = '<h5 class="mb-3">Adapter Settings</h5><div class="row g-3 mb-4">';
 
     schema.forEach(field => {
+        // Skip readonly fields (handled elsewhere in UI)
+        if (field.readonly) {
+            return;
+        }
+
         const isRequired = field.required ? '<span class="text-danger">*</span>' : '';
         const placeholder = field.placeholder || '';
         const description = field.description || '';
@@ -275,16 +295,18 @@ function collectAdapterSettings() {
             value = input.value;
         }
 
+        // Skip empty values for non-checkbox fields (will use backend defaults)
+        if (input.type !== 'checkbox' && (value === '' || value === null || value === undefined)) {
+            return;
+        }
+
         // Type conversion
-        if (value !== '' && value !== null) {
-            if (fieldType === 'int') {
-                value = parseInt(value, 10);
-            } else if (fieldType === 'float') {
-                value = parseFloat(value);
-            } else if (fieldType === 'bool') {
-                // Already handled above
-            }
+        if (fieldType === 'int') {
+            value = parseInt(value, 10);
+        } else if (fieldType === 'float') {
+            value = parseFloat(value);
         }
+        // bool type already handled above
 
         settings[fieldName] = value;
     });
@@ -336,6 +358,9 @@ async function saveConfiguration(event) {
         log_level: document.getElementById('logLevel').value,
         keep_images: document.getElementById('keep_images').checked,
         file_logging_enabled: document.getElementById('file_logging_enabled').checked,
+        // Autofocus settings (top-level)
+        scheduled_autofocus_enabled: document.getElementById('scheduled_autofocus_enabled')?.checked || false,
+        autofocus_interval_minutes: parseInt(document.getElementById('autofocus_interval_minutes')?.value || 60, 10),
         // API settings from endpoint selector
         host: host,
         port: port,
@@ -345,12 +370,27 @@ async function saveConfiguration(event) {
         initial_retry_delay_seconds: currentConfig.initial_retry_delay_seconds || 30,
         max_retry_delay_seconds: currentConfig.max_retry_delay_seconds || 300,
         log_retention_days: currentConfig.log_retention_days || 30,
+        last_autofocus_timestamp: currentConfig.last_autofocus_timestamp, // Preserve timestamp
     };
 
     try {
+        // Validate filters BEFORE saving main config (belt and suspenders)
+        const inputs = document.querySelectorAll('.filter-focus-input');
+        if (inputs.length > 0) {
+            const checkboxes = document.querySelectorAll('.filter-enabled-checkbox');
+            const enabledCount = Array.from(checkboxes).filter(cb => cb.checked).length;
+            if (enabledCount === 0) {
+                showConfigMessage('At least one filter must be enabled', 'danger');
+                return; // Exit early without saving anything
+            }
+        }
+
         const result = await saveConfig(config);
 
         if (result.ok) {
+            // Update saved adapter to match newly saved config
+            savedAdapter = config.hardware_adapter;
+
             // After config saved successfully, save any modified filter focus positions
             const filterResults = await saveModifiedFilters();
 
@@ -364,6 +404,9 @@ async function saveConfiguration(event) {
             }
 
             showConfigSuccess(message);
+
+            // Reload filters to re-enable editing for the new adapter
+            await loadFilterConfig();
         } else {
             // Check for specific error codes
             const errorMsg = result.data.error || result.data.message || 'Failed to save configuration';
@@ -379,35 +422,82 @@ async function saveConfiguration(event) {
     }
 }
 
+/**
+ * Create and show a Bootstrap toast notification
+ * @param {string} message - The message to display
+ * @param {string} type - 'danger' for errors, 'success' for success messages
+ * @param {boolean} autohide - Whether to auto-hide the toast
+ */
+function createToast(message, type = 'danger', autohide = false) {
+    const toastContainer = document.getElementById('toastContainer');
+    if (!toastContainer) {
+        console.error('Toast container not found');
+        return;
+    }
+
+    // Create toast element
+    const toastId = `toast-${Date.now()}`;
+    const toastHTML = `
+        <div id="${toastId}" class="toast text-bg-${type}" role="alert" aria-live="assertive" aria-atomic="true">
+            <div class="toast-header text-bg-${type}">
+                <strong class="me-auto">CitraScope</strong>
+                <button type="button" class="btn-close btn-close-white" data-bs-dismiss="toast" aria-label="Close"></button>
+            </div>
+            <div class="toast-body">
+                ${message}
+            </div>
+        </div>
+    `;
+
+    // Insert toast into container
+    toastContainer.insertAdjacentHTML('beforeend', toastHTML);
+
+    // Get the toast element and initialize Bootstrap toast
+    const toastElement = document.getElementById(toastId);
+    const toast = new bootstrap.Toast(toastElement, {
+        autohide: autohide,
+        delay: 5000
+    });
+
+    // Remove toast element from DOM after it's hidden
+    toastElement.addEventListener('hidden.bs.toast', () => {
+        toastElement.remove();
+    });
+
+    // Show the toast
+    toast.show();
+}
+
 /**
  * Show configuration error message
  */
 function showConfigError(message) {
-    const errorDiv = document.getElementById('configError');
-    errorDiv.textContent = message;
-    errorDiv.style.display = 'block';
+    createToast(message, 'danger', false);
+}
+
+/**
+ * Show configuration message (can be error or success)
+ */
+function showConfigMessage(message, type = 'danger') {
+    if (type === 'danger') {
+        showConfigError(message);
+    } else {
+        showConfigSuccess(message);
+    }
 }
 
 /**
  * Show configuration success message
  */
 function showConfigSuccess(message) {
-    const successDiv = document.getElementById('configSuccess');
-    successDiv.textContent = message;
-    successDiv.style.display = 'block';
-
-    // Auto-hide after 5 seconds
-    setTimeout(() => {
-        successDiv.style.display = 'none';
-    }, 5000);
+    createToast(message, 'success', true);
 }
 
 /**
- * Hide all configuration messages
+ * Hide all configuration messages (no-op for toast compatibility)
  */
 function hideConfigMessages() {
-    document.getElementById('configError').style.display = 'none';
-    document.getElementById('configSuccess').style.display = 'none';
+    // No-op - toasts handle their own hiding
 }
 
 /**
@@ -432,6 +522,24 @@ export function showConfigSection() {
  */
 async function loadFilterConfig() {
     const filterSection = document.getElementById('filterConfigSection');
+    const changeMessage = document.getElementById('filterAdapterChangeMessage');
+    const tableContainer = document.getElementById('filterTableContainer');
+
+    // Check if selected adapter matches saved adapter
+    const adapterSelect = document.getElementById('hardwareAdapterSelect');
+    const selectedAdapter = adapterSelect ? adapterSelect.value : null;
+
+    if (selectedAdapter && savedAdapter && selectedAdapter !== savedAdapter) {
+        // Adapter has changed but not saved yet - show message and hide table
+        if (filterSection) filterSection.style.display = 'block';
+        if (changeMessage) changeMessage.style.display = 'block';
+        if (tableContainer) tableContainer.style.display = 'none';
+        return;
+    }
+
+    // Hide message and show table when adapters match
+    if (changeMessage) changeMessage.style.display = 'none';
+    if (tableContainer) tableContainer.style.display = 'block';
 
     try {
         const response = await fetch('/api/adapter/filters');
@@ -464,9 +572,15 @@ async function loadFilterConfig() {
 
                     filterIds.forEach(filterId => {
                         const filter = filters[filterId];
+                        const isEnabled = filter.enabled !== undefined ? filter.enabled : true;
                         const row = document.createElement('tr');
                         row.innerHTML = `
-                            <td>${filterId}</td>
+                            <td>
+                                <input type="checkbox"
+                                       class="form-check-input filter-enabled-checkbox"
+                                       data-filter-id="${filterId}"
+                                       ${isEnabled ? 'checked' : ''}>
+                            </td>
                             <td>${filter.name}</td>
                             <td>
                                 <input type="number"
@@ -491,13 +605,21 @@ async function loadFilterConfig() {
 }
 
 /**
- * Save all filter focus positions (called during main config save)
+ * Save all filter focus positions and enabled states (called during main config save)
  * Returns: Object with { success: number, failed: number }
  */
 async function saveModifiedFilters() {
     const inputs = document.querySelectorAll('.filter-focus-input');
     if (inputs.length === 0) return { success: 0, failed: 0 }; // No filters to save
 
+    // Belt and suspenders: Validate at least one filter is enabled before saving
+    const checkboxes = document.querySelectorAll('.filter-enabled-checkbox');
+    const enabledCount = Array.from(checkboxes).filter(cb => cb.checked).length;
+    if (enabledCount === 0) {
+        showConfigMessage('At least one filter must be enabled', 'danger');
+        return { success: 0, failed: inputs.length };
+    }
+
     let successCount = 0;
     let failedCount = 0;
 
@@ -511,20 +633,29 @@ async function saveModifiedFilters() {
             continue;
         }
 
+        // Get enabled state from corresponding checkbox
+        const checkbox = document.querySelector(`.filter-enabled-checkbox[data-filter-id="${filterId}"]`);
+        const enabled = checkbox ? checkbox.checked : true;
+
         try {
             const response = await fetch(`/api/adapter/filters/${filterId}`, {
                 method: 'PATCH',
                 headers: {
                     'Content-Type': 'application/json'
                 },
-                body: JSON.stringify({ focus_position: focusPosition })
+                body: JSON.stringify({ focus_position: focusPosition, enabled: enabled })
             });
 
             if (response.ok) {
                 successCount++;
             } else {
                 failedCount++;
-                console.error(`Failed to save filter ${filterId}: HTTP ${response.status}`);
+                const data = await response.json();
+                console.error(`Failed to save filter ${filterId}: ${data.error || 'Unknown error'}`);
+                // If it's the "last enabled filter" error, show it to the user
+                if (response.status === 400 && data.error && data.error.includes('last enabled filter')) {
+                    showConfigMessage(data.error, 'danger');
+                }
             }
         } catch (error) {
             failedCount++;
@@ -536,7 +667,7 @@ async function saveModifiedFilters() {
 }
 
 /**
- * Trigger autofocus routine
+ * Trigger or cancel autofocus routine
  */
 async function triggerAutofocus() {
     const button = document.getElementById('runAutofocusButton');
@@ -545,12 +676,32 @@ async function triggerAutofocus() {
 
     if (!button || !buttonText || !buttonSpinner) return;
 
-    // Clear any previous messages
-    hideConfigMessages();
+    // Check if this is a cancel action
+    const isCancel = button.dataset.action === 'cancel';
 
-    // Disable button and show spinner
+    if (isCancel) {
+        // Cancel autofocus
+        try {
+            const response = await fetch('/api/adapter/autofocus/cancel', {
+                method: 'POST'
+            });
+            const data = await response.json();
+
+            if (response.ok && data.success) {
+                showToast('Autofocus cancelled', 'info');
+                updateAutofocusButton(false);
+            } else {
+                showToast('Nothing to cancel', 'warning');
+            }
+        } catch (error) {
+            console.error('Error cancelling autofocus:', error);
+            showToast('Failed to cancel autofocus', 'error');
+        }
+        return;
+    }
+
+    // Request autofocus
     button.disabled = true;
-    buttonText.textContent = 'Running Autofocus...';
     buttonSpinner.style.display = 'inline-block';
 
     try {
@@ -561,24 +712,78 @@ async function triggerAutofocus() {
         const data = await response.json();
 
         if (response.ok) {
-            showConfigSuccess('Autofocus completed successfully');
-            // Reload filter config to show updated focus positions
-            await loadFilterConfig();
+            showToast('Autofocus queued', 'success');
+            updateAutofocusButton(true);
         } else {
-            // Show clear error message (e.g., if autofocus already running or other conflict)
-            showConfigError(data.error || 'Autofocus failed');
+            showToast(data.error || 'Autofocus request failed', 'error');
         }
     } catch (error) {
         console.error('Error triggering autofocus:', error);
-        showConfigError('Failed to trigger autofocus');
+        showToast('Failed to trigger autofocus', 'error');
     } finally {
-        // Re-enable button
         button.disabled = false;
-        buttonText.textContent = 'Run Autofocus';
         buttonSpinner.style.display = 'none';
     }
 }
 
+/**
+ * Update autofocus button state based on whether autofocus is queued
+ */
+function updateAutofocusButton(isQueued) {
+    const button = document.getElementById('runAutofocusButton');
+    const buttonText = document.getElementById('autofocusButtonText');
+
+    if (!button || !buttonText) return;
+
+    if (isQueued) {
+        buttonText.textContent = 'Cancel Autofocus';
+        button.dataset.action = 'cancel';
+        button.classList.remove('btn-outline-primary');
+        button.classList.add('btn-outline-warning');
+    } else {
+        buttonText.textContent = 'Run Autofocus';
+        button.dataset.action = 'request';
+        button.classList.remove('btn-outline-warning');
+        button.classList.add('btn-outline-primary');
+    }
+}
+
+/**
+ * Show toast notification
+ */
+function showToast(message, type = 'info') {
+    // Use Bootstrap toast if available, otherwise fallback to alert
+    const toastContainer = document.getElementById('toastContainer');
+    if (!toastContainer) {
+        console.log(`Toast (${type}): ${message}`);
+        return;
+    }
+
+    const toastId = `toast-${Date.now()}`;
+    const bgClass = type === 'success' ? 'bg-success' :
+                    type === 'error' ? 'bg-danger' :
+                    type === 'warning' ? 'bg-warning' : 'bg-info';
+
+    const toastHtml = `
+        <div id="${toastId}" class="toast align-items-center text-white ${bgClass} border-0" role="alert" aria-live="assertive" aria-atomic="true">
+            <div class="d-flex">
+                <div class="toast-body">${message}</div>
+                <button type="button" class="btn-close btn-close-white me-2 m-auto" data-bs-dismiss="toast" aria-label="Close"></button>
+            </div>
+        </div>
+    `;
+
+    toastContainer.insertAdjacentHTML('beforeend', toastHtml);
+    const toastElement = document.getElementById(toastId);
+    const toast = new bootstrap.Toast(toastElement, { delay: 3000 });
+    toast.show();
+
+    // Remove from DOM after hidden
+    toastElement.addEventListener('hidden.bs.toast', () => {
+        toastElement.remove();
+    });
+}
+
 /**
  * Initialize filter configuration on page load
  */

citrascope/web/templates/dashboard.html

@@ -166,9 +166,6 @@
     </div>
 
     <div class="container my-4" id="configSection" style="display: none;">
-        <div id="configError" class="alert alert-danger" style="display: none;" role="alert"></div>
-        <div id="configSuccess" class="alert alert-success" style="display: none;" role="alert"></div>
-
         <form id="configForm">
             <div class="row g-3 mb-3">
                 <!-- API Configuration Card -->
@@ -242,31 +239,66 @@
                             <!-- Filter Configuration Section (shown when adapter supports filters) -->
                             <div id="filterConfigSection" style="display: none; margin-top: 1.5rem;">
                                 <hr class="border-secondary">
-                                <div class="d-flex justify-content-between align-items-center mb-3">
-                                    <h5 class="mb-0">Filter Configuration</h5>
-                                    <div class="text-end">
-                                        <button type="button" class="btn btn-sm btn-outline-primary" id="runAutofocusButton">
-                                            <span id="autofocusButtonText">Run Autofocus</span>
-                                            <span id="autofocusButtonSpinner" class="spinner-border spinner-border-sm ms-2" style="display: none;" role="status"></span>
-                                        </button>
-                                        <div><small class="text-muted">Note: Pause task processing before running autofocus</small></div>
+                                <h5 class="mb-3">Filter Configuration</h5>
+                                <p id="filterAdapterChangeMessage" class="text-muted mb-3" style="display: none;">
+                                    Save configuration to edit filter settings for this adapter
+                                </p>
+                                <div class="row">
+                                    <!-- Filter List Column -->
+                                    <div class="col-12 col-md-6">
+                                        <h6 class="mb-2">Filters</h6>
+                                        <div id="filterTableContainer">
+                                            <table class="table table-dark table-sm">
+                                                <thead>
+                                                    <tr>
+                                                        <th>Enabled</th>
+                                                        <th>Name</th>
+                                                        <th>Focus Position</th>
+                                                    </tr>
+                                                </thead>
+                                                <tbody id="filterTableBody">
+                                                    <!-- Filter rows will be populated by JavaScript -->
+                                                </tbody>
+                                            </table>
+                                            <div id="noFiltersMessage" class="text-muted small" style="display: none;">
+                                                No filters configured. Connect to hardware to discover filters.
+                                            </div>
+                                        </div>
                                     </div>
-                                </div>
-                                <div id="filterTableContainer">
-                                    <table class="table table-dark table-sm">
-                                        <thead>
-                                            <tr>
-                                                <th>Filter ID</th>
-                                                <th>Name</th>
-                                                <th>Focus Position</th>
-                                            </tr>
-                                        </thead>
-                                        <tbody id="filterTableBody">
-                                            <!-- Filter rows will be populated by JavaScript -->
-                                        </tbody>
-                                    </table>
-                                    <div id="noFiltersMessage" class="text-muted small" style="display: none;">
-                                        No filters configured. Connect to hardware to discover filters.
+
+                                    <!-- Autofocus Column -->
+                                    <div class="col-12 col-md-6">
+                                        <h6 class="mb-2">Autofocus</h6>
+                                        <div class="mb-3">
+                                            <button type="button" class="btn btn-sm btn-outline-primary w-100" id="runAutofocusButton">
+                                                <span id="autofocusButtonText">Run Autofocus</span>
+                                                <span id="autofocusButtonSpinner" class="spinner-border spinner-border-sm ms-2" style="display: none;" role="status"></span>
+                                            </button>
+                                        </div>
+                                        <div class="mb-3">
+                                            <label class="form-label small text-muted">Last Autofocus</label>
+                                            <div id="lastAutofocusDisplay" class="text-light">Never</div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <div class="form-check">
+                                                <input class="form-check-input" type="checkbox" id="scheduled_autofocus_enabled">
+                                                <label class="form-check-label" for="scheduled_autofocus_enabled">
+                                                    Enable Scheduled Autofocus
+                                                </label>
+                                            </div>
+                                        </div>
+                                        <div class="mb-3">
+                                            <label for="autofocus_interval_minutes" class="form-label small">Autofocus Interval</label>
+                                            <select id="autofocus_interval_minutes" class="form-select form-select-sm">
+                                                <option value="30">30 minutes</option>
+                                                <option value="60" selected>60 minutes</option>
+                                                <option value="120">120 minutes (2 hours)</option>
+                                                <option value="180">180 minutes (3 hours)</option>
+                                            </select>
+                                        </div>
+                                        <div id="nextAutofocusDisplay" class="small text-muted" style="display: none;">
+                                            Next autofocus in: <span id="nextAutofocusTime">--</span>
+                                        </div>
                                     </div>
                                 </div>
                             </div>
@@ -482,6 +514,9 @@
         </div>
     </div>
 
+    <!-- Toast Container for Notifications -->
+    <div class="toast-container position-fixed top-0 end-0 p-3" style="z-index: 9999;" id="toastContainer"></div>
+
     <script type="module" src="/static/app.js"></script>
 
 

{citrascope-0.5.2.dist-info → citrascope-0.7.0.dist-info}/METADATA

@@ -1,10 +1,26 @@
 Metadata-Version: 2.4
 Name: citrascope
-Version: 0.5.2
+Version: 0.7.0
 Summary: Remotely control a telescope while it polls for tasks, collects and edge processes data, and delivers results and data for further processing.
+Project-URL: Homepage, https://citra.space
+Project-URL: Documentation, https://docs.citra.space/citrascope/
+Project-URL: Repository, https://github.com/citra-space/citrascope
+Project-URL: Issues, https://github.com/citra-space/citrascope/issues
+Project-URL: Changelog, https://github.com/citra-space/citrascope/releases
 Author-email: Patrick McDavid <patrick@citra.space>
 License: MIT
 License-File: LICENSE
+Keywords: INDI,KStars,NINA,astronomy,astrophotography,imaging,observatory,remote-telescope,telescope,telescope-control
+Classifier: Development Status :: 4 - Beta
+Classifier: Intended Audience :: Science/Research
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Topic :: Scientific/Engineering :: Astronomy
+Classifier: Topic :: System :: Hardware :: Hardware Drivers
 Requires-Python: <3.13,>=3.10
 Requires-Dist: click
 Requires-Dist: fastapi>=0.104.0
@@ -51,6 +67,8 @@ Description-Content-Type: text/markdown
 # CitraScope
 [![Pytest](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/pytest.yml) [![Publish Python Package](https://github.com/citra-space/citrascope/actions/workflows/pypi-publish.yml/badge.svg)](https://github.com/citra-space/citrascope/actions/workflows/pypi-publish.yml) [![PyPI version](https://badge.fury.io/py/citrascope.svg)](https://pypi.org/project/citrascope/) [![PyPI - Downloads](https://img.shields.io/pypi/dm/citrascope)](https://pypi.org/project/citrascope/) [![License](https://img.shields.io/github/license/citra-space/citrascope)](https://github.com/citra-space/citrascope/blob/main/LICENSE)
 
+**[GitHub Repository](https://github.com/citra-space/citrascope)** | **[Documentation](https://docs.citra.space/citrascope/)** | **[Citra.space](https://citra.space)**
+
 Remotely control a telescope while it polls for tasks, collects observations, and delivers data for further processing.
 
 ## Features