setiastrosuitepro 1.8.0__py3-none-any.whl → 1.8.0.post3__py3-none-any.whl

setiastro/saspro/_generated/build_info.py

@@ -1,3 +1,3 @@
 # Auto-generated at build time. Do not edit.
-BUILD_TIMESTAMP = "2026-01-26T16:03:43Z"
-APP_VERSION = "1.8.0"
+BUILD_TIMESTAMP = "2026-01-26T19:14:34Z"
+APP_VERSION = "1.8.0.post3"

setiastro/saspro/cosmicclarity_engines/benchmark_engine.py

@@ -424,8 +424,8 @@ def onnx_benchmark_stellar(
             provider = "DmlExecutionProvider"
     else:
         import onnxruntime as ort
-        R = get_resources()
-        onnx_path = R.CC_STELLAR_SHARP_ONNX
+        from setiastro.saspro.model_manager import require_model
+        onnx_path = require_model("deep_sharp_stellar_cnn_AI3_5s.onnx")
 
         providers_avail = ort.get_available_providers()
 
@@ -647,6 +647,10 @@ def _legacy_results_schema(results: Dict[str, Any]) -> Dict[str, Any]:
 
     return out
 
+def _picked_backend(use_gpu: bool, status_cb=None) -> str:
+    models, tag = _get_stellar_model_for_benchmark(use_gpu=use_gpu, status_cb=status_cb)
+    return "ONNX" if models.is_onnx else "TORCH"
+
 # -----------------------------
 # One-stop runner
 # -----------------------------
@@ -690,26 +694,39 @@ def run_benchmark(
     if mode in ("GPU", "Both"):
         if status_cb: status_cb("Running Stellar model benchmark…")
 
-        # Torch (or CPU fallback if torch path)
-        avg_ms, total_ms, backend = torch_benchmark_stellar(
-            patches,
-            use_gpu=use_gpu,
-            progress_cb=progress_cb,
-            status_cb=status_cb,
-        )
-        results[f"Stellar Torch ({backend})"] = {"avg_ms": float(avg_ms), "total_ms": float(total_ms)}
-
-        # ONNX benchmark (DirectML when available; otherwise CPU/CUDA if present)
-        if platform.system() == "Windows":
-            avg_o, total_o, provider = onnx_benchmark_stellar(
+        picked = _picked_backend(use_gpu=use_gpu, status_cb=status_cb)
+
+        if picked == "TORCH":
+            avg_ms, total_ms, backend = torch_benchmark_stellar(
                 patches,
                 use_gpu=use_gpu,
                 progress_cb=progress_cb,
                 status_cb=status_cb,
             )
-            results[f"Stellar ONNX ({provider})"] = {"avg_ms": float(avg_o), "total_ms": float(total_o)}
+            results[f"Stellar Torch ({backend})"] = {"avg_ms": float(avg_ms), "total_ms": float(total_ms)}
+
+            # Optional: also run ONNX on Windows for comparison
+            if platform.system() == "Windows":
+                avg_o, total_o, provider = onnx_benchmark_stellar(
+                    patches,
+                    use_gpu=use_gpu,
+                    progress_cb=progress_cb,
+                    status_cb=status_cb,
+                )
+                results[f"Stellar ONNX ({provider})"] = {"avg_ms": float(avg_o), "total_ms": float(total_o)}
+
         else:
-            results["Stellar ONNX"] = "ONNX benchmark only available on Windows."
+            # Picked ONNX (DirectML). Run ONNX benchmark as the “GPU benchmark”.
+            if platform.system() == "Windows":
+                avg_o, total_o, provider = onnx_benchmark_stellar(
+                    patches,
+                    use_gpu=use_gpu,
+                    progress_cb=progress_cb,
+                    status_cb=status_cb,
+                )
+                results[f"Stellar ONNX ({provider})"] = {"avg_ms": float(avg_o), "total_ms": float(total_o)}
+            else:
+                results["Stellar ONNX"] = "ONNX benchmark only available on Windows."
 
     results = _legacy_results_schema(results)
     return results

setiastro/saspro/model_manager.py

@@ -17,6 +17,24 @@ APP_FOLDER_NAME = "SetiAstroSuitePro"  # keep stable
 ProgressCB = Optional[Callable[[str], None]]
 
 
+def model_path(filename: str) -> Path:
+    p = Path(models_root()) / filename
+    return p
+
+def require_model(filename: str) -> Path:
+    """
+    Return full path to a runtime-managed model file.
+    Raises FileNotFoundError with a helpful message if missing.
+    """
+    p = model_path(filename)
+    if not p.exists():
+        raise FileNotFoundError(
+            f"Model not found: {p}\n"
+            f"Expected models in: {models_root()}\n"
+            f"Please install/download the Cosmic Clarity models."
+        )
+    return p
+
 def app_data_root() -> str:
     """
     Frozen-safe persistent data root.

setiastro/saspro/model_workers.py

@@ -13,6 +13,43 @@ from setiastro.saspro.model_manager import (
     sha256_file,
 )
 
+class ModelsInstallZipWorker(QObject):
+    progress = pyqtSignal(str)
+    finished = pyqtSignal(bool, str)
+
+    def __init__(self, zip_path: str, should_cancel=None):
+        super().__init__()
+        self.zip_path = zip_path
+        self.should_cancel = should_cancel  # optional callable
+
+    def run(self):
+        try:
+            from setiastro.saspro.model_manager import install_models_zip, sha256_file
+
+            if not self.zip_path or not os.path.exists(self.zip_path):
+                raise RuntimeError("ZIP file not found.")
+
+            self.progress.emit("Verifying ZIP…")
+            # quick hash (optional but helpful for support logs)
+            zhash = sha256_file(self.zip_path)
+
+            manifest = {
+                "source": "manual_zip",
+                "file": os.path.basename(self.zip_path),
+                "sha256": zhash,
+            }
+
+            install_models_zip(
+                self.zip_path,
+                progress_cb=lambda s: self.progress.emit(s),
+                manifest=manifest,
+            )
+
+            self.finished.emit(True, "Models installed successfully from ZIP.")
+        except Exception as e:
+            self.finished.emit(False, str(e))
+
+
 class ModelsDownloadWorker(QObject):
     progress = pyqtSignal(str)
     finished = pyqtSignal(bool, str)

setiastro/saspro/ops/settings.py

@@ -1,8 +1,9 @@
 # ops.settings.py
 from PyQt6.QtWidgets import (
-    QLineEdit, QDialogButtonBox, QFileDialog, QDialog, QPushButton, QFormLayout,QApplication,
+    QLineEdit, QDialogButtonBox, QFileDialog, QDialog, QPushButton, QFormLayout,QApplication, QMenu,
     QHBoxLayout, QVBoxLayout, QWidget, QCheckBox, QComboBox, QSpinBox, QDoubleSpinBox, QLabel, QColorDialog, QFontDialog, QSlider)
 from PyQt6.QtCore import QSettings, Qt
+from PyQt6.QtGui import QAction
 import pytz  # for timezone list
 from setiastro.saspro.accel_installer import current_backend
 import sys, platform
@@ -12,6 +13,7 @@ from PyQt6.QtCore import QThread
 from setiastro.saspro.i18n import get_available_languages, get_saved_language, save_language
 import importlib.util
 import importlib.metadata
+import webbrowser
 
 class SettingsDialog(QDialog):
     """
@@ -240,7 +242,23 @@ class SettingsDialog(QDialog):
 
         self.btn_models_update = QPushButton(self.tr("Download/Update Models…"))
         self.btn_models_update.clicked.connect(self._models_update_clicked)
-        right_col.addRow(self.btn_models_update)
+
+        self.btn_models_install_zip = QPushButton(self.tr("Install from ZIP…"))
+        self.btn_models_install_zip.setToolTip(self.tr("Use a manually downloaded models .zip file"))
+        self.btn_models_install_zip.clicked.connect(self._models_install_from_zip_clicked)
+
+        self.btn_models_open_drive = QPushButton(self.tr("Open Drive…"))
+        self.btn_models_open_drive.setToolTip(self.tr("Open the models folder in your browser (Primary/Backup)"))
+        self.btn_models_open_drive.clicked.connect(self._models_open_drive_clicked)
+
+        row_models = QHBoxLayout()
+        row_models.addWidget(self.btn_models_update, 1)
+        row_models.addWidget(self.btn_models_install_zip)
+        row_models.addWidget(self.btn_models_open_drive)
+
+        w_models = QWidget()
+        w_models.setLayout(row_models)
+        right_col.addRow(w_models)
 
         # ---- Right column: WIMS + RA/Dec + Updates + Display ----
         right_col.addRow(QLabel(self.tr("<b>What's In My Sky — Defaults</b>")))
@@ -298,6 +316,86 @@ class SettingsDialog(QDialog):
         # Initial Load:
         self.refresh_ui()
 
+    def _models_open_drive_clicked(self):
+        PRIMARY_FOLDER = "https://drive.google.com/drive/folders/1-fktZb3I9l-mQimJX2fZAmJCBj_t0yAF?usp=drive_link"
+        BACKUP_FOLDER  = "https://drive.google.com/drive/folders/1j46RV6touQtOmtxkhdFWGm_LQKwEpTl9?usp=drive_link"
+
+        menu = QMenu(self)
+        act_primary = menu.addAction(self.tr("Primary"))
+        act_backup  = menu.addAction(self.tr("Backup"))
+
+        chosen = menu.exec(self.btn_models_open_drive.mapToGlobal(self.btn_models_open_drive.rect().bottomLeft()))
+        if chosen == act_primary:
+            webbrowser.open(PRIMARY_FOLDER)
+        elif chosen == act_backup:
+            webbrowser.open(BACKUP_FOLDER)
+
+
+    def _models_install_from_zip_clicked(self):
+        from PyQt6.QtWidgets import QFileDialog, QMessageBox, QProgressDialog
+        from PyQt6.QtCore import Qt, QThread
+        import os
+
+        zip_path, _ = QFileDialog.getOpenFileName(
+            self,
+            self.tr("Select models ZIP"),
+            "",
+            self.tr("ZIP files (*.zip);;All files (*)")
+        )
+        if not zip_path:
+            return
+
+        if not os.path.exists(zip_path):
+            QMessageBox.warning(self, self.tr("Models"), self.tr("File not found."))
+            return
+
+        self.btn_models_update.setEnabled(False)
+        self.btn_models_install_zip.setEnabled(False)
+
+        pd = QProgressDialog(self.tr("Preparing…"), self.tr("Cancel"), 0, 0, self)
+        pd.setWindowTitle(self.tr("Installing Models"))
+        pd.setWindowModality(Qt.WindowModality.ApplicationModal)
+        pd.setAutoClose(True)
+        pd.setMinimumDuration(0)
+        pd.show()
+
+        from setiastro.saspro.model_workers import ModelsInstallZipWorker
+
+        self._models_thread = QThread(self)
+        self._models_worker = ModelsInstallZipWorker(zip_path)
+        self._models_worker.moveToThread(self._models_thread)
+
+        self._models_thread.started.connect(self._models_worker.run, Qt.ConnectionType.QueuedConnection)
+        self._models_worker.progress.connect(pd.setLabelText, Qt.ConnectionType.QueuedConnection)
+
+        def _cancel():
+            if self._models_thread.isRunning():
+                self._models_thread.requestInterruption()
+        pd.canceled.connect(_cancel, Qt.ConnectionType.QueuedConnection)
+
+        def _done(ok: bool, msg: str):
+            pd.reset()
+            pd.deleteLater()
+
+            self._models_thread.quit()
+            self._models_thread.wait()
+
+            self.btn_models_update.setEnabled(True)
+            self.btn_models_install_zip.setEnabled(True)
+            self._refresh_models_status()
+
+            if ok:
+                QMessageBox.information(self, self.tr("Models"), self.tr("✅ {0}").format(msg))
+            else:
+                QMessageBox.warning(self, self.tr("Models"), self.tr("❌ {0}").format(msg))
+
+        self._models_worker.finished.connect(_done, Qt.ConnectionType.QueuedConnection)
+        self._models_thread.finished.connect(self._models_worker.deleteLater, Qt.ConnectionType.QueuedConnection)
+        self._models_thread.finished.connect(self._models_thread.deleteLater, Qt.ConnectionType.QueuedConnection)
+
+        self._models_thread.start()
+
+
     def _models_update_clicked(self):
         from PyQt6.QtWidgets import QMessageBox, QProgressDialog
         from PyQt6.QtCore import Qt, QThread

{setiastrosuitepro-1.8.0.dist-info → setiastrosuitepro-1.8.0.post3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: setiastrosuitepro
-Version: 1.8.0
+Version: 1.8.0.post3
 Summary: Seti Astro Suite Pro - Advanced astrophotography toolkit for image calibration, stacking, registration, photometry, and visualization
 License: GPL-3.0
 License-File: LICENSE

{setiastrosuitepro-1.8.0.dist-info → setiastrosuitepro-1.8.0.post3.dist-info}/RECORD

@@ -183,7 +183,7 @@ setiastro/qml/ResourceMonitor.qml,sha256=k9_qXKAZLi8vj-5BffJTJu_UkRnxunZKn53Hthd
 setiastro/saspro/__init__.py,sha256=6o8orhytzBWyJWBdG37xPcT6IVPZOG8d22FBVzn0Kac,902
 setiastro/saspro/__main__.py,sha256=_zAHsw4SNWYzMXlswBuiMGgTUGYrU5p5-dsxhQ3_GWk,40789
 setiastro/saspro/_generated/__init__.py,sha256=HbruQfKNbbVL4kh_t4oVG3UeUieaW8MUaqIcDCmnTvA,197
-setiastro/saspro/_generated/build_info.py,sha256=mFPmnKHJWtvKAw11r4GKWUACVB9m0Qh6jUKcikPiBoA,111
+setiastro/saspro/_generated/build_info.py,sha256=Ea9A6Yep3gVopO0qLFUmZn_oycwXYxuHkWFtp77YMsA,117
 setiastro/saspro/abe.py,sha256=l6o0klT-TqJppzEjCBb9isyIvtuf_UsuMZV8JvqbgPI,59779
 setiastro/saspro/abe_preset.py,sha256=u9t16yTb9v98tLjhvh496Fsp3Z-dNiBSs5itnAaJwh8,7750
 setiastro/saspro/aberration_ai.py,sha256=8LtDu_KuqvL-W0MTUIJq9KguMjJPiUEQjMUibY16H-4,41673
@@ -216,7 +216,7 @@ setiastro/saspro/convo.py,sha256=pAczsoS7g596mk1eI4XmVvd1EAoTZVdj12qRzFIISjg,677
 setiastro/saspro/convo_preset.py,sha256=31Fzk6ssA3lHuM5vehYOpFNVdIyRNNpL78Ts69ivWKk,20013
 setiastro/saspro/copyastro.py,sha256=ImDMrus4_LqdEXozMQMiM6SjpF0Yd3D-TzMJ2ggFrNc,7322
 setiastro/saspro/cosmicclarity.py,sha256=f-puwADkEdONV0-7KyC9wg43i3lbEXR3ZVHRxBkBYEE,60814
-setiastro/saspro/cosmicclarity_engines/benchmark_engine.py,sha256=jc7DVt26ppBeGmNBkAOHFSN526nytjigLmz1HRLLA1c,26284
+setiastro/saspro/cosmicclarity_engines/benchmark_engine.py,sha256=NgGefkc6tGO_6eOgG6yDZyrgj4el8fYyNKulu4UAS_U,27161
 setiastro/saspro/cosmicclarity_engines/darkstar_engine.py,sha256=ZstBHr8sA1p2WHg3kZyacjCi0m-agPHzIDIG8gGqT_U,21221
 setiastro/saspro/cosmicclarity_engines/denoise_engine.py,sha256=KAYyhFbFd4iiwiR5lTvmi6xc9j6YTQnwJe-xD-r9n7s,22081
 setiastro/saspro/cosmicclarity_engines/satellite_engine.py,sha256=900oiGhlgtjXMXjLpM9RUVPTLZI7Ov7IJvSzVh1mcOU,22787
@@ -296,8 +296,8 @@ setiastro/saspro/mfdeconv_earlystop.py,sha256=JCY9RV6jMtwcOxUnb9HzJHem5ygYXXiRr2
 setiastro/saspro/mfdeconvcudnn.py,sha256=Y8ThkwOs-CZdF_53N6Wu2naDQ1VIa055oGtlgo129Qk,129008
 setiastro/saspro/mfdeconvsport.py,sha256=UcDV3FP5wDIhFsOnDlLVywtk_RDrpKVOjWbJNOL-Cdk,95323
 setiastro/saspro/minorbodycatalog.py,sha256=PaOwy1T_ApEfPyGZFUD4qB1n7jyK6kuw1FjBhP2HCTw,19662
-setiastro/saspro/model_manager.py,sha256=4H6qkIFimM4M0ae1FU2aji1TMZXNvSX-pA37vWlifcY,9696
-setiastro/saspro/model_workers.py,sha256=FRomuPSqwi6VT8oMxD9iz-R0YePc01HneIcdkszUNww,2755
+setiastro/saspro/model_manager.py,sha256=s9tOUNeinsAaGiADEspkwENsrPhQ6u2K0mjhTPkXMeE,10248
+setiastro/saspro/model_workers.py,sha256=G8xKC9L5pdc_L75_4S9us0fRVjeAAZbmQqXorFwtcSs,4001
 setiastro/saspro/morphology.py,sha256=WdxA3yLdMCLsAQoRY6qmP3LB5jjZNzliFBhuNkGN_o8,16695
 setiastro/saspro/multiscale_decomp.py,sha256=GQ6iTFcTDxj0WvnO0bQjTz8G4Wli9Dl9bQNeEcBpxBw,66724
 setiastro/saspro/narrowband_normalization.py,sha256=mVzf8JJVZREbsai63GspR41iH3WnwGrYu0pywczfIi0,64036
@@ -311,7 +311,7 @@ setiastro/saspro/ops/command_runner.py,sha256=teyrnOVJcd2IVxIPhh-ud4Q8MrBMxzSNR3
 setiastro/saspro/ops/commands.py,sha256=RoB99R3wN9j-K25QoJf5ir-CU35lL_d2veLFmfIXRMQ,54246
 setiastro/saspro/ops/script_editor.py,sha256=ygWNzPJ3LxsQyTMgfvAHC9MuGnE8IXsRNKu19mLPYKY,40986
 setiastro/saspro/ops/scripts.py,sha256=5BOnirSUia0NDg-keBy0HgfrElqcRIUNV-89FfYks8o,55817
-setiastro/saspro/ops/settings.py,sha256=tfWWZky3LTGw8Bd2VNf-n9-hbLl9G2zek9SdHNXHCi4,42651
+setiastro/saspro/ops/settings.py,sha256=5fsKFoOy-x9gC8LMN7Pa5SAsg9RLSRp1RzUQzEyKCmU,46829
 setiastro/saspro/parallel_utils.py,sha256=GoPhypMsp3k8dffv4129CjLU-xDqpu9wnhHI463RR6U,15931
 setiastro/saspro/pedestal.py,sha256=WkwNaY0Qp1XP6KFtb6tnnKMhg71R5WEhVOdwWwJFmJ8,4014
 setiastro/saspro/perfect_palette_picker.py,sha256=wJSTQQZgFm-baEBRopfF4Aw6vtvTmfL4_FZcd1q31vs,46937
@@ -418,9 +418,9 @@ setiastro/saspro/wimi.py,sha256=CNo833Pur9P-A1DUSntlAaQWekf6gzWIvetOMvLDrOw,3146
 setiastro/saspro/wims.py,sha256=HDfVI3Ckf5OJEJLH8NI36pFc2USZnETpb4UDIvweNX4,27450
 setiastro/saspro/window_shelf.py,sha256=hpId8uRPq7-UZ3dWW5YzH_v4TchQokGFoPGM8dyaIZA,9448
 setiastro/saspro/xisf.py,sha256=Ah1CXDAohN__ej1Lq7LPU8vGLnDz8fluLQTGE71aUoc,52669
-setiastrosuitepro-1.8.0.dist-info/entry_points.txt,sha256=g7cHWhUSiIP7mkyByG9JXGWWlHKeVC2vL7zvB9U-vEU,236
-setiastrosuitepro-1.8.0.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
-setiastrosuitepro-1.8.0.dist-info/licenses/license.txt,sha256=KCwYZ9VpVwmzjelDq1BzzWqpBvt9nbbapa-woz47hfQ,123930
-setiastrosuitepro-1.8.0.dist-info/METADATA,sha256=cyYMDuiXoheRcbSSp2m18sljM4jNXReZLVRuISTA3RY,9945
-setiastrosuitepro-1.8.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-setiastrosuitepro-1.8.0.dist-info/RECORD,,
+setiastrosuitepro-1.8.0.post3.dist-info/entry_points.txt,sha256=g7cHWhUSiIP7mkyByG9JXGWWlHKeVC2vL7zvB9U-vEU,236
+setiastrosuitepro-1.8.0.post3.dist-info/licenses/LICENSE,sha256=IwGE9guuL-ryRPEKi6wFPI_zOhg7zDZbTYuHbSt_SAk,35823
+setiastrosuitepro-1.8.0.post3.dist-info/licenses/license.txt,sha256=KCwYZ9VpVwmzjelDq1BzzWqpBvt9nbbapa-woz47hfQ,123930
+setiastrosuitepro-1.8.0.post3.dist-info/METADATA,sha256=nFMXeZwcWAhjm7tIq5a7CuhyoAVcO9GFkTyFtoPaEbY,9951
+setiastrosuitepro-1.8.0.post3.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+setiastrosuitepro-1.8.0.post3.dist-info/RECORD,,