citrascope 0.4.0__py3-none-any.whl → 0.5.0__py3-none-any.whl

citrascope/web/static/config.js

@@ -10,26 +10,6 @@ const DEFAULT_API_PORT = 443;
 let currentAdapterSchema = [];
 export let currentConfig = {};
 
-/**
- * Initialize configuration management
- */
-async function fetchVersion() {
-    try {
-        const response = await fetch('/api/version');
-        const data = await response.json();
-        const versionEl = document.getElementById('citraScopeVersion');
-        if (versionEl && data.version) {
-            versionEl.textContent = data.version;
-        }
-    } catch (error) {
-        console.error('Error fetching version:', error);
-        const versionEl = document.getElementById('citraScopeVersion');
-        if (versionEl) {
-            versionEl.textContent = 'unknown';
-        }
-    }
-}
-
 export async function initConfig() {
     // Populate hardware adapter dropdown
     await loadAdapterOptions();
@@ -69,7 +49,6 @@ export async function initConfig() {
     // Load initial config
     await loadConfiguration();
     checkConfigStatus();
-    fetchVersion();
 }
 
 /**
@@ -372,9 +351,23 @@ async function saveConfiguration(event) {
         const result = await saveConfig(config);
 
         if (result.ok) {
-            showConfigSuccess(result.data.message || 'Configuration saved and applied successfully!');
+            // After config saved successfully, save any modified filter focus positions
+            const filterResults = await saveModifiedFilters();
+
+            // Build success message based on results
+            let message = result.data.message || 'Configuration saved and applied successfully!';
+            if (filterResults.success > 0) {
+                message += ` Updated ${filterResults.success} filter focus position${filterResults.success > 1 ? 's' : ''}.`;
+            }
+            if (filterResults.failed > 0) {
+                message += ` Warning: ${filterResults.failed} filter update${filterResults.failed > 1 ? 's' : ''} failed.`;
+            }
+
+            showConfigSuccess(message);
         } else {
-            showConfigError(result.data.error || result.data.message || 'Failed to save configuration');
+            // Check for specific error codes
+            const errorMsg = result.data.error || result.data.message || 'Failed to save configuration';
+            showConfigError(errorMsg);
         }
     } catch (error) {
         showConfigError('Failed to save configuration: ' + error.message);
@@ -434,5 +427,175 @@ export function showConfigSection() {
     }
 }
 
+/**
+ * Load and display filter configuration
+ */
+async function loadFilterConfig() {
+    const filterSection = document.getElementById('filterConfigSection');
+
+    try {
+        const response = await fetch('/api/adapter/filters');
+
+        if (response.status === 404 || response.status === 503) {
+            // Adapter doesn't support filters or isn't available
+            if (filterSection) filterSection.style.display = 'none';
+            return;
+        }
+
+        const data = await response.json();
+
+        if (response.ok && data.filters) {
+            // Show the filter section
+            if (filterSection) filterSection.style.display = 'block';
+
+            // Populate filter table
+            const tbody = document.getElementById('filterTableBody');
+            const noFiltersMsg = document.getElementById('noFiltersMessage');
+
+            if (tbody) {
+                tbody.innerHTML = '';
+                const filters = data.filters;
+                const filterIds = Object.keys(filters).sort();
+
+                if (filterIds.length === 0) {
+                    if (noFiltersMsg) noFiltersMsg.style.display = 'block';
+                } else {
+                    if (noFiltersMsg) noFiltersMsg.style.display = 'none';
+
+                    filterIds.forEach(filterId => {
+                        const filter = filters[filterId];
+                        const row = document.createElement('tr');
+                        row.innerHTML = `
+                            <td>${filterId}</td>
+                            <td>${filter.name}</td>
+                            <td>
+                                <input type="number"
+                                       class="form-control form-control-sm filter-focus-input"
+                                       data-filter-id="${filterId}"
+                                       value="${filter.focus_position}"
+                                       min="0"
+                                       step="1">
+                            </td>
+                        `;
+                        tbody.appendChild(row);
+                    });
+                }
+            }
+        } else {
+            if (filterSection) filterSection.style.display = 'none';
+        }
+    } catch (error) {
+        console.error('Error loading filter config:', error);
+        if (filterSection) filterSection.style.display = 'none';
+    }
+}
+
+/**
+ * Save all filter focus positions (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
+
+    let successCount = 0;
+    let failedCount = 0;
+
+    // Save all filter values
+    for (const input of inputs) {
+        const filterId = input.dataset.filterId;
+        const focusPosition = parseInt(input.value);
+
+        if (isNaN(focusPosition) || focusPosition < 0) {
+            failedCount++;
+            continue;
+        }
+
+        try {
+            const response = await fetch(`/api/adapter/filters/${filterId}`, {
+                method: 'PATCH',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ focus_position: focusPosition })
+            });
+
+            if (response.ok) {
+                successCount++;
+            } else {
+                failedCount++;
+                console.error(`Failed to save filter ${filterId}: HTTP ${response.status}`);
+            }
+        } catch (error) {
+            failedCount++;
+            console.error(`Error saving filter ${filterId}:`, error);
+        }
+    }
+
+    return { success: successCount, failed: failedCount };
+}
+
+/**
+ * Trigger autofocus routine
+ */
+async function triggerAutofocus() {
+    const button = document.getElementById('runAutofocusButton');
+    const buttonText = document.getElementById('autofocusButtonText');
+    const buttonSpinner = document.getElementById('autofocusButtonSpinner');
+
+    if (!button || !buttonText || !buttonSpinner) return;
+
+    // Clear any previous messages
+    hideConfigMessages();
+
+    // Disable button and show spinner
+    button.disabled = true;
+    buttonText.textContent = 'Running Autofocus...';
+    buttonSpinner.style.display = 'inline-block';
+
+    try {
+        const response = await fetch('/api/adapter/autofocus', {
+            method: 'POST'
+        });
+
+        const data = await response.json();
+
+        if (response.ok) {
+            showConfigSuccess('Autofocus completed successfully');
+            // Reload filter config to show updated focus positions
+            await loadFilterConfig();
+        } else {
+            // Show clear error message (e.g., if autofocus already running or other conflict)
+            showConfigError(data.error || 'Autofocus failed');
+        }
+    } catch (error) {
+        console.error('Error triggering autofocus:', error);
+        showConfigError('Failed to trigger autofocus');
+    } finally {
+        // Re-enable button
+        button.disabled = false;
+        buttonText.textContent = 'Run Autofocus';
+        buttonSpinner.style.display = 'none';
+    }
+}
+
+/**
+ * Initialize filter configuration on page load
+ */
+export async function initFilterConfig() {
+    // Load filter config when config section is visible
+    await loadFilterConfig();
+}
+
+/**
+ * Setup autofocus button event listener (call once during init)
+ */
+export function setupAutofocusButton() {
+    const autofocusBtn = document.getElementById('runAutofocusButton');
+    if (autofocusBtn) {
+        autofocusBtn.addEventListener('click', triggerAutofocus);
+    }
+}
+
 // Make showConfigSection available globally for onclick handlers in HTML
 window.showConfigSection = showConfigSection;

citrascope/web/templates/dashboard.html

@@ -20,13 +20,13 @@
     <div class="container">
         <header class="d-flex flex-wrap justify-content-center py-3 mb-4 border-bottom align-items-center">
             <span class="d-flex align-items-center mb-3 mb-md-0 me-md-auto link-body-emphasis text-decoration-none">
-                <span class="fs-4 d-flex align-items-center gap-2">
+                <span class="fs-4 d-flex align-items-baseline gap-2">
                     <img src="/static/img/citra.png" alt="CitraScope Logo" class="logo-img" />
                     CitraScope
-
-                </span>
-                <span class="ms-2 me-3 d-flex align-items-center status-badge-container">
-                    <span id="wsStatus"><span class="badge rounded-pill bg-secondary" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Dashboard connection status">Connecting...</span></span>
+                    <small class="text-muted" style="font-size: 0.875rem;">
+                        <span id="headerVersion" style="cursor: pointer; user-select: none;" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Click to check for updates">v...</span>
+                        <span id="updateIndicator" class="badge bg-info text-dark ms-1" style="display: none; font-size: 0.7rem;"></span>
+                    </small>
                 </span>
             </span>
 
@@ -58,8 +58,8 @@
                         </div>
                         <div class="card-body">
                             <div class="row mb-2">
-                                <div class="col-6 fw-semibold">Hardware</div>
-                                <div class="col-6" id="hardwareAdapter">-</div>
+                                <div class="col-6 fw-semibold">Daemon</div>
+                                <div class="col-6" id="wsStatus"><span class="badge rounded-pill bg-secondary" data-bs-toggle="tooltip" data-bs-placement="bottom" title="Dashboard connection status">Connecting...</span></div>
                             </div>
                             <div class="row mb-2">
                                 <div class="col-6 fw-semibold">Telescope</div>
@@ -69,6 +69,15 @@
                                 <div class="col-6 fw-semibold">Camera</div>
                                 <div class="col-6" id="cameraConnected"><span class="badge rounded-pill bg-secondary">Unknown</span></div>
                             </div>
+                            <div class="row">
+                                <div class="col-6 fw-semibold">Task Processing</div>
+                                <div class="col-6 d-flex align-items-center gap-2">
+                                    <span id="processingStatus"><span class="badge rounded-pill bg-success">Active</span></span>
+                                    <button id="toggleProcessingButton" class="btn btn-sm btn-secondary" title="Pause task processing">
+                                        <span id="processingButtonIcon">Pause</span>
+                                    </button>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -78,6 +87,10 @@
                             Telescope
                         </div>
                         <div class="card-body">
+                            <div class="row mb-2">
+                                <div class="col-6 fw-semibold">Adapter</div>
+                                <div class="col-6" id="hardwareAdapter">-</div>
+                            </div>
                             <div class="row mb-2">
                                 <div class="col-6 fw-semibold">Right Ascension</div>
                                 <div class="col-6" id="telescopeRA">-</div>
@@ -225,6 +238,38 @@
 
                             <!-- Dynamic Adapter Settings Container -->
                             <div id="adapter-settings-container"></div>
+
+                            <!-- 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>
+                                    </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.
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                     </div>
                 </div>
@@ -304,15 +349,6 @@
                     </small>
                 </div>
             </div>
-
-            <!-- Version Info -->
-            <div class="row mt-3">
-                <div class="col">
-                    <small class="text-muted">
-                        CitraScope Version: <span id="citraScopeVersion" class="text-secondary">Loading...</span>
-                    </small>
-                </div>
-            </div>
         </form>
     </div>
 
@@ -399,6 +435,53 @@
     </div>
 
 
+    <!-- Version Check Modal -->
+    <div class="modal fade" id="versionModal" tabindex="-1" aria-labelledby="versionModalLabel" aria-hidden="true">
+        <div class="modal-dialog modal-dialog-centered">
+            <div class="modal-content bg-dark text-light border-secondary">
+                <div class="modal-header border-secondary">
+                    <h5 class="modal-title" id="versionModalLabel">Version Check</h5>
+                    <button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal" aria-label="Close"></button>
+                </div>
+                <div class="modal-body">
+                    <div id="versionCheckLoading" style="text-align: center;">
+                        <div class="spinner-border text-primary" role="status">
+                            <span class="visually-hidden">Checking...</span>
+                        </div>
+                        <p class="mt-2">Checking for updates...</p>
+                    </div>
+                    <div id="versionCheckUpToDate" style="display: none;">
+                        <p class="text-success">✓ You're up to date!</p>
+                        <p>
+                            <strong>Current version:</strong> <span id="modalCurrentVersionUpToDate">-</span>
+                        </p>
+                    </div>
+                    <div id="versionCheckUpdateAvailable" style="display: none;">
+                        <p class="text-warning">A new version of CitraScope is available!</p>
+                        <p class="mb-3">
+                            <strong>Current:</strong> <span id="modalCurrentVersion">-</span><br>
+                            <strong>Latest:</strong> <span id="modalLatestVersion">-</span>
+                        </p>
+                        <p class="mb-2">To upgrade, run:</p>
+                        <pre class="bg-secondary p-2 rounded"><code>pip install -U citrascope</code></pre>
+                        <p class="mb-0">
+                            <a href="#" id="releaseNotesLink" target="_blank" class="text-info">View release notes on GitHub →</a>
+                        </p>
+                    </div>
+                    <div id="versionCheckError" style="display: none;">
+                        <p class="text-muted">Unable to check for updates. You may be offline or GitHub is unreachable.</p>
+                        <p>
+                            <strong>Current version:</strong> <span id="modalCurrentVersionError">-</span>
+                        </p>
+                    </div>
+                </div>
+                <div class="modal-footer border-secondary">
+                    <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+                </div>
+            </div>
+        </div>
+    </div>
+
     <script type="module" src="/static/app.js"></script>
 
 

{citrascope-0.4.0.dist-info → citrascope-0.5.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: citrascope
-Version: 0.4.0
+Version: 0.5.0
 Summary: Remotely control a telescope while it polls for tasks, collects and edge processes data, and delivers results and data for further processing.
 Author-email: Patrick McDavid <patrick@citra.space>
 License-Expression: MIT

{citrascope-0.4.0.dist-info → citrascope-0.5.0.dist-info}/RECORD

@@ -1,38 +1,38 @@
 citrascope/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 citrascope/__main__.py,sha256=W7uY30MOuIlmhzVEoiZ_6BMmKrsqIvxcAxqw4-pOT3k,596
-citrascope/citra_scope_daemon.py,sha256=mw7U2gEgfDc3TuXVUHZAkHjSwY2T259FW02LAjz7vWU,10315
+citrascope/citra_scope_daemon.py,sha256=XPskPbtenx-WNenlnbb5QhvvH_amK4vST-Uw6Pg2cts,13567
 citrascope/constants.py,sha256=Mc7SLzCelUMDV96BIwP684fFLGANCOEO_mM3GCeRDVY,968
 citrascope/api/abstract_api_client.py,sha256=gjmA9mw1O-TK16nYahOWClAwqPc_L1E3F2llZJeKTPw,624
 citrascope/api/citra_api_client.py,sha256=8rpz25Diy8YhuCiQ9HqMi4TIqxAc6BbrvqoFu8u-orQ,6007
-citrascope/hardware/abstract_astro_hardware_adapter.py,sha256=BdQrZkLSh2siszG8fGNEWpknC5wyZXZWgbaq7Zc7cAo,6131
+citrascope/hardware/abstract_astro_hardware_adapter.py,sha256=Xc1zNuvlyYapWto37dzFfaKM62pKDN7VC8r4oGF8Up4,8140
 citrascope/hardware/adapter_registry.py,sha256=fFIZhXYphZ_p480c6hICpcx9fNOeX-EG2tvLHm372dM,3170
 citrascope/hardware/indi_adapter.py,sha256=uNrjkfxD0zjOPfar6J-frb6A87VkEjsL7SD9N9bEsC8,29903
 citrascope/hardware/kstars_dbus_adapter.py,sha256=Nv6ijVDvgTCTZUmRFh3Wh-YS7ChiztiXF17OWlzJwoo,7001
-citrascope/hardware/nina_adv_http_adapter.py,sha256=2McglZprEJQ8OKnqFXDrZCcl2AylkWO8Y1kGrS_nwtY,26261
+citrascope/hardware/nina_adv_http_adapter.py,sha256=Jzg9j74bEFdY77XX-O-UE-e3Q3Y8PQ-xL7-igXMqbwg,27637
 citrascope/hardware/nina_adv_http_survey_template.json,sha256=beg4H6Bzby-0x5uDc_eRJQ_rKs8VT64sDJyAzS_q1l4,14424
 citrascope/logging/__init__.py,sha256=YU38HLMWfbXh_H-s7W7Zx2pbCR4f_tRk7z0G8xqz4_o,179
 citrascope/logging/_citrascope_logger.py,sha256=GkqNpFJWiatqrBr8t4o2nHt7V9bBDJ8mysM0F4AXMa8,3479
 citrascope/logging/web_log_handler.py,sha256=d0XQzHJZ5M1v3H351tdkBYg7EOwFzXpp7PA9nYejIV0,2659
 citrascope/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-citrascope/settings/citrascope_settings.py,sha256=yBDlM5uCnhUQgIrNDMTPX6cmgKnKl-lvra41-7XN40E,5966
+citrascope/settings/citrascope_settings.py,sha256=C9BgX3vKDnsbwZF1NskUmkczB5ESdOSWPaHrq4rA0aQ,5635
 citrascope/settings/settings_file_manager.py,sha256=Yijb-I9hbbVJ2thkr7OrfkNknSPt1RDpsE7VvqAs0a8,4193
-citrascope/tasks/runner.py,sha256=xVnGWe_iYutBYqIhgOOriPjPcYUJ8IRbYRYKiAbehAQ,12584
+citrascope/tasks/runner.py,sha256=-1xSrM2Kvckmn2dg3rs2w-ljsKAbCgrftdvEkZrGaKs,13697
 citrascope/tasks/task.py,sha256=0u0oN56E6KaNz19ba_7WuY43Sk4CTXc8UPT7sdUpRXo,1287
 citrascope/tasks/scope/base_telescope_task.py,sha256=wIdyUxplFNhf_YMdCXOK6pG7HF7tZn_id59TvYyWZAY,9674
 citrascope/tasks/scope/static_telescope_task.py,sha256=XP53zYVcyLHLvebDU06Jx0ghPK3tb0c_XmO60yj_XSA,1132
 citrascope/tasks/scope/tracking_telescope_task.py,sha256=k5LEmEi_xnFHNjqPNYb8_tqDdCFD3YGe25Wh_brJXHk,1130
 citrascope/web/__init__.py,sha256=CgU36fyNSxGXjUy3hsHwx7UxF8UO4Qsb7PjC9-6tRmY,38
-citrascope/web/app.py,sha256=OfBur9oM06NakrA30MOk9CgX0ewJ7IZl4kn0gtQgHJ4,20261
+citrascope/web/app.py,sha256=LGimBCHWmaPrLkh6JDpJ7IoC__423lhO7NldQGTFzKI,26181
 citrascope/web/server.py,sha256=IJJk4HgEwcsjHercL-Q5z39NmJRbkNk_51HIUKKhtRE,5242
 citrascope/web/static/api.js,sha256=s-b1FIw-pTo3A8kLlLINVqHhIvfHwTWA7cEvz4N8Gqc,1924
-citrascope/web/static/app.js,sha256=xwKBzLB2uWytyUDdzrT6qsQBwIfESypjf8jSLnrQRZg,17820
-citrascope/web/static/config.js,sha256=4pjMH8yS24JkH62OpklEdPC0EAmd7e5c21WWETz1EO0,15701
+citrascope/web/static/app.js,sha256=yvthXW68B0JedxuE8cF6HYfcH7ukDQ7g959o0DNhY80,26214
+citrascope/web/static/config.js,sha256=l0brTgkQ4UW-C9a2wabkvVGwb-wPnJSmM4lb63s0KbY,21500
 citrascope/web/static/style.css,sha256=haVMnKlULZ-SL_qmLyqnrwHdX28s6KzVK9uE_R5nlLo,2877
 citrascope/web/static/websocket.js,sha256=UITw1DDfehOKpjlltn5MXhewZYGKzPFmaTtMFtC0-Ps,3931
 citrascope/web/static/img/citra.png,sha256=Bq8dPWB6fNz7a_H0FuEtNmZWcPHH2iV2OC-fMg4REbQ,205570
 citrascope/web/static/img/favicon.png,sha256=zrbUlpFXDB_zmsIdhhn8_klnc2Ma3N6Q8ouBMAxFjbM,24873
-citrascope/web/templates/dashboard.html,sha256=4ChTsnMMP6VyfdQT9bM4rRruYHJorAeZFOMDhI-j3fA,24155
-citrascope-0.4.0.dist-info/METADATA,sha256=eombd_1rHdc9ubLY6PM7M2UKBqLMeT8aOQDUtqqWMP0,6481
-citrascope-0.4.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-citrascope-0.4.0.dist-info/entry_points.txt,sha256=fP22Lt8bNZ_whBowDnOWSADf_FUrgAWnIhqqPf5Xo2g,55
-citrascope-0.4.0.dist-info/RECORD,,
+citrascope/web/templates/dashboard.html,sha256=7N5JPlihK3WNDe8fnFMfIRfCgp4ZZJLbl2TVc_nY0SU,30119
+citrascope-0.5.0.dist-info/METADATA,sha256=dgATUjmZWMhRrItDYeCkZ-oy-AQz63BDdbeZHsWY12A,6481
+citrascope-0.5.0.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+citrascope-0.5.0.dist-info/entry_points.txt,sha256=fP22Lt8bNZ_whBowDnOWSADf_FUrgAWnIhqqPf5Xo2g,55
+citrascope-0.5.0.dist-info/RECORD,,