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

setiastro/saspro/resources.py

@@ -15,6 +15,7 @@ from __future__ import annotations
 import os
 import sys
 from functools import lru_cache
+from pathlib import Path
 
 
 def _get_base_path() -> str:
@@ -340,16 +341,6 @@ class Icons:
     FUNCTION_BUNDLES = property(lambda self: _resource_path('functionbundle.png'))
     VIEW_BUNDLES = property(lambda self: _resource_path('viewbundle.png'))
 
-
-class Resources:
-    """
-    Centralized data resource paths.
-    """
-    SASP_DATA = property(lambda self: _resource_path('data/SASP_data.fits'))
-    ASTROBIN_FILTERS_CSV = property(lambda self: _resource_path('data/catalogs/astrobin_filters.csv'))
-    SPINNER_GIF = property(lambda self: _resource_path('spinner.gif'))
-
-
 # Singleton instances for easy access
 _icons_instance = None
 _resources_instance = None
@@ -557,6 +548,78 @@ def _init_legacy_paths():
         'planetprojection_path': get_icon_path('3dplanet.png'),
     }
 
+class Resources:
+    """
+    Centralized data resource paths.
+    """
+    SASP_DATA = property(lambda self: _resource_path('data/SASP_data.fits'))
+    ASTROBIN_FILTERS_CSV = property(lambda self: _resource_path('data/catalogs/astrobin_filters.csv'))
+    SPINNER_GIF = property(lambda self: _resource_path('spinner.gif'))
+
+    # --- Models root ---
+    MODELS_DIR = property(lambda self: get_models_dir())
+
+    # --- Cosmic Clarity Sharpen ---
+    CC_STELLAR_SHARP_PTH  = property(lambda self: model_path('deep_sharp_stellar_cnn_AI3_5s.pth'))
+    CC_STELLAR_SHARP_ONNX = property(lambda self: model_path('deep_sharp_stellar_cnn_AI3_5s.onnx'))
+
+    CC_NS1_PTH  = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_1AI3_5s.pth'))
+    CC_NS1_ONNX = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_1AI3_5s.onnx'))
+
+    CC_NS2_PTH  = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_2AI3_5s.pth'))
+    CC_NS2_ONNX = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_2AI3_5s.onnx'))
+    CC_NS4_PTH  = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_4AI3_5s.pth'))
+    CC_NS4_ONNX = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_4AI3_5s.onnx'))
+
+    CC_NS8_PTH  = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_8AI3_5s.pth'))
+    CC_NS8_ONNX = property(lambda self: model_path('deep_nonstellar_sharp_cnn_radius_8AI3_5s.onnx'))
+
+    CC_DENOISE_PTH  = property(lambda self: model_path('deep_denoise_cnn_AI3_6.pth'))
+    CC_DENOISE_ONNX = property(lambda self: model_path('deep_denoise_cnn_AI3_6.onnx'))
+
+    # --- Super Resolution ---
+    CC_SUPERRES_2X_PTH  = property(lambda self: model_path('superres_2x.pth'))
+    CC_SUPERRES_2X_ONNX = property(lambda self: model_path('superres_2x.onnx'))
+    CC_SUPERRES_3X_PTH  = property(lambda self: model_path('superres_3x.pth'))
+    CC_SUPERRES_3X_ONNX = property(lambda self: model_path('superres_3x.onnx'))
+
+    CC_SUPERRES_4X_PTH  = property(lambda self: model_path('superres_4x.pth'))
+    CC_SUPERRES_4X_ONNX = property(lambda self: model_path('superres_4x.onnx'))
+
+    # --- Dark Star (Star Removal) ---
+    CC_DARKSTAR_MONO_PTH   = property(lambda self: model_path('darkstar_v2.1.pth'))
+    CC_DARKSTAR_MONO_ONNX  = property(lambda self: model_path('darkstar_v2.1.onnx'))
+    CC_DARKSTAR_COLOR_PTH  = property(lambda self: model_path('darkstar_v2.1c.pth'))
+    CC_DARKSTAR_COLOR_ONNX = property(lambda self: model_path('darkstar_v2.1c.onnx'))
+
+    # --- Cosmic Clarity Satellite Removal ---
+    CC_SAT_DETECT1_PTH  = property(lambda self: model_path('satellite_trail_detector_AI3.5.pth'))
+    CC_SAT_DETECT1_ONNX = property(lambda self: model_path('satellite_trail_detector_AI3.5.onnx'))
+    CC_SAT_DETECT2_PTH  = property(lambda self: model_path('satellite_trail_detector_mobilenetv2.5.pth'))
+    CC_SAT_DETECT2_ONNX = property(lambda self: model_path('satellite_trail_detector_mobilenetv2.5.onnx'))
+
+    CC_SAT_REMOVE_PTH   = property(lambda self: model_path('satelliteremovalAI3.5.pth'))
+    CC_SAT_REMOVE_ONNX  = property(lambda self: model_path('satelliteremovalAI3.5.onnx'))
+
+@lru_cache(maxsize=8)
+def get_models_dir() -> str:
+    # Prefer user-installed models
+    try:
+        from setiastro.saspro.model_manager import models_root
+        p = Path(models_root())
+        if p.is_dir():
+            if any(p.rglob("*.pth")) or any(p.rglob("*.onnx")):
+                return str(p)
+    except Exception:
+        pass
+
+    # Fallback to packaged (dev/frozen) path
+    return _resource_path('data/models')
+
+def model_path(filename: str) -> str:
+    base = Path(get_models_dir())
+    path = base / filename
+    return str(path)
 
 # Export all legacy paths as module-level variables
 _legacy = _init_legacy_paths()

setiastro/saspro/runtime_torch.py

@@ -172,6 +172,24 @@ def _purge_bad_torch_from_sysmodules(status_cb=print) -> None:
     except Exception:
         pass
 
+def _torch_stack_sanity_check(status_cb=print) -> None:
+    """
+    Ensure torch imports sanely AND torchvision/torchaudio are importable.
+    (Satellite engine requires torchvision; we install torchaudio too for safety.)
+    """
+    _torch_sanity_check(status_cb=status_cb)
+
+    try:
+        import torchvision  # noqa
+    except Exception as e:
+        raise RuntimeError(f"torchvision import failed: {e}") from e
+
+    try:
+        import torchaudio  # noqa
+    except Exception as e:
+        raise RuntimeError(f"torchaudio import failed: {e}") from e
+
+
 def _torch_sanity_check(status_cb=print):
     try:
         import torch
@@ -459,7 +477,8 @@ except Exception as e:
     return bool(data.get("has_xpu")), data.get("err")
 
 
-def _install_torch(venv_python: Path, prefer_cuda: bool, prefer_xpu: bool, status_cb=print):
+def _install_torch(venv_python: Path, prefer_cuda: bool, prefer_xpu: bool, prefer_dml: bool, status_cb=print):
+
     """
     Install torch into the per-user venv with best-effort backend detection:
       • macOS arm64 → PyPI (MPS)
@@ -476,14 +495,6 @@ def _install_torch(venv_python: Path, prefer_cuda: bool, prefer_xpu: bool, statu
         return subprocess.run([str(venv_python), "-m", "pip", *args],
                               stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True, env=e)
 
-    def _pip_ok(cmd: list[str]) -> bool:
-        r = _pip(*cmd)
-        if r.returncode != 0:
-            # surface tail of pip log for the UI
-            tail = (r.stdout or "").strip()
-            status_cb(tail[-4000:])
-        return r.returncode == 0
-
     def _pyver() -> tuple[int, int]:
         code = "import sys; print(f'{sys.version_info.major}.{sys.version_info.minor}')"
         out = subprocess.check_output([str(venv_python), "-c", code], text=True).strip()
@@ -494,6 +505,36 @@ def _install_torch(venv_python: Path, prefer_cuda: bool, prefer_xpu: bool, statu
     machine = _plat.machine().lower()
     py_major, py_minor = _pyver()
 
+    def _pip_ok(cmd: list[str]) -> bool:
+        r = _pip(*cmd)
+        if r.returncode != 0:
+            tail = (r.stdout or "").strip()
+            status_cb(tail[-4000:])
+        return r.returncode == 0
+
+    # NEW: DirectML FIRST (Windows, non-NVIDIA)
+    if sysname == "Windows" and prefer_dml:
+        status_cb("Installing PyTorch with DirectML (torch-directml)…")
+
+        # Clean slate helps resolver if something already got partially installed
+        _pip_ok(["uninstall", "-y", "torch", "torchvision", "torchaudio", "torch-directml"])
+
+        if not _pip_ok(["install", "--prefer-binary", "--no-cache-dir", "torch-directml"]):
+            raise RuntimeError("Failed to install torch-directml.")
+
+        # You still need torchvision/torchaudio for your app; let pip resolve compatible versions.
+        _pip_ok(["install", "--prefer-binary", "--no-cache-dir", "torchvision", "torchaudio"])
+
+        # Verify import + device creation
+        code = "import torch, torch_directml; d=torch_directml.device(); x=torch.tensor([1]).to(d); y=torch.tensor([2]).to(d); print(int((x+y).item()))"
+        r = subprocess.run([str(venv_python), "-c", code], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, text=True)
+        if r.returncode != 0 or "3" not in (r.stdout or ""):
+            status_cb((r.stdout or "")[-2000:])
+            raise RuntimeError("torch-directml installed, but DirectML verification failed.")
+
+        status_cb("Installed DirectML backend successfully.")
+        return
+
     if sysname == "Darwin" and ("arm64" in machine or "aarch64" in machine):
         if py_minor >= 13:
             raise RuntimeError(
@@ -513,13 +554,16 @@ def _install_torch(venv_python: Path, prefer_cuda: bool, prefer_xpu: bool, statu
         base = ["install", "--prefer-binary", "--no-cache-dir"]
         if index_url:
             base += ["--index-url", index_url]
-        # latest for that index first
-        if _pip_ok(base + ["torch"]):
+
+        # First try "latest trio" from that index
+        if _pip_ok(base + ["torch", "torchvision", "torchaudio"]):
             return True
-        # walk the ladder
+
+        # Walk the ladder: pin all three to the same version family
         for v in versions:
-            if _pip_ok(base + [f"torch=={v}"]):
+            if _pip_ok(base + [f"torch=={v}", f"torchvision=={v}", f"torchaudio=={v}"]):
                 return True
+
         return False
 
     # macOS Apple Silicon → MPS wheels on PyPI
@@ -587,7 +631,7 @@ def _install_torch(venv_python: Path, prefer_cuda: bool, prefer_xpu: bool, statu
 # Public entry points
 # ──────────────────────────────────────────────────────────────────────────────
 
-def import_torch(prefer_cuda: bool = True, prefer_xpu: bool = False, status_cb=print):
+def import_torch(prefer_cuda: bool = True, prefer_xpu: bool = False, prefer_dml: bool = False, status_cb=print):
     """
     Ensure a per-user venv exists with torch installed; return the imported module.
     Hardened against shadow imports, broken wheels, concurrent installs, and partial markers.
@@ -596,10 +640,12 @@ def import_torch(prefer_cuda: bool = True, prefer_xpu: bool = False, status_cb=p
     _ban_shadow_torch_paths(status_cb=status_cb)
     _purge_bad_torch_from_sysmodules(status_cb=status_cb)
 
+    add_runtime_to_sys_path(status_cb=lambda *_: None)
+
     # Fast path: if torch already importable and sane, use it
     try:
         import torch  # noqa
-        _torch_sanity_check(status_cb=status_cb)
+        _torch_stack_sanity_check(status_cb=status_cb)
         return torch
     except Exception:
         pass
@@ -621,7 +667,7 @@ def import_torch(prefer_cuda: bool = True, prefer_xpu: bool = False, status_cb=p
             with _install_lock(rt):
                 # Re-check inside lock in case another process finished
                 if not marker.exists():
-                    _install_torch(vp, prefer_cuda=prefer_cuda, prefer_xpu=prefer_xpu, status_cb=status_cb)
+                    _install_torch(vp, prefer_cuda=prefer_cuda, prefer_xpu=prefer_xpu, prefer_dml=prefer_dml, status_cb=status_cb)
         except Exception as e:
             if _is_access_denied(e):
                 raise OSError(_access_denied_msg(rt)) from e
@@ -638,13 +684,28 @@ def import_torch(prefer_cuda: bool = True, prefer_xpu: bool = False, status_cb=p
             status_cb("Detected broken/shadowed Torch import → attempting clean repair…")
         except Exception:
             pass
-        subprocess.run([str(vp), "-m", "pip", "uninstall", "-y", "torch"], check=False)
+
+        # remove marker so future launches don't skip install
+        try:
+            marker.unlink()
+        except Exception:
+            pass
+
+        subprocess.run([str(vp), "-m", "pip", "uninstall", "-y",
+                        "torch", "torchvision", "torchaudio"], check=False)
         subprocess.run([str(vp), "-m", "pip", "cache", "purge"], check=False)
         with _install_lock(rt):
-            _install_torch(vp, prefer_cuda=prefer_cuda, prefer_xpu=prefer_xpu, status_cb=status_cb)
+            _install_torch(
+                vp,
+                prefer_cuda=prefer_cuda,
+                prefer_xpu=prefer_xpu,
+                prefer_dml=prefer_dml,
+                status_cb=status_cb,
+            )
         importlib.invalidate_caches()
         _demote_shadow_torch_paths(status_cb=status_cb)
 
+
     try:
         _ensure_numpy(vp, status_cb=status_cb)
     except Exception:
@@ -652,21 +713,45 @@ def import_torch(prefer_cuda: bool = True, prefer_xpu: bool = False, status_cb=p
 
     try:
         import torch  # noqa
-        _torch_sanity_check(status_cb=status_cb)
+        _torch_stack_sanity_check(status_cb=status_cb)
         # write/update marker only when sane
         if not marker.exists():
             pyver = f"{sys.version_info.major}.{sys.version_info.minor}"
-            marker.write_text(json.dumps({"installed": True, "python": pyver, "when": int(time.time())}), encoding="utf-8")
+            try:
+                import torch, torchvision, torchaudio
+                marker.write_text(json.dumps({
+                    "installed": True,
+                    "python": pyver,
+                    "when": int(time.time()),
+                    "torch": getattr(torch, "__version__", None),
+                    "torchvision": getattr(torchvision, "__version__", None),
+                    "torchaudio": getattr(torchaudio, "__version__", None),
+                }), encoding="utf-8")
+            except Exception:
+                marker.write_text(json.dumps({"installed": True, "python": pyver, "when": int(time.time())}), encoding="utf-8")
+
         return torch
     except Exception:
         _force_repair()
         _purge_bad_torch_from_sysmodules(status_cb=status_cb)
         _ban_shadow_torch_paths(status_cb=status_cb)
         import torch  # retry
-        _torch_sanity_check(status_cb=status_cb)
+        _torch_stack_sanity_check(status_cb=status_cb)
         if not marker.exists():
             pyver = f"{sys.version_info.major}.{sys.version_info.minor}"
-            marker.write_text(json.dumps({"installed": True, "python": pyver, "when": int(time.time())}), encoding="utf-8")
+            try:
+                import torch, torchvision, torchaudio
+                marker.write_text(json.dumps({
+                    "installed": True,
+                    "python": pyver,
+                    "when": int(time.time()),
+                    "torch": getattr(torch, "__version__", None),
+                    "torchvision": getattr(torchvision, "__version__", None),
+                    "torchaudio": getattr(torchaudio, "__version__", None),
+                }), encoding="utf-8")
+            except Exception:
+                marker.write_text(json.dumps({"installed": True, "python": pyver, "when": int(time.time())}), encoding="utf-8")
+
         return torch
 
 def _find_system_python_cmd() -> list[str]:

setiastro/saspro/signature_insert.py

@@ -11,7 +11,7 @@ from PyQt6.QtWidgets import (
     QDialog, QVBoxLayout, QHBoxLayout, QGridLayout, QGroupBox, QLabel, QPushButton,
     QSlider, QCheckBox, QColorDialog, QComboBox, QFileDialog, QInputDialog, QMenu,
     QMessageBox, QWidget, QGraphicsView, QGraphicsScene, QGraphicsItem,QFontComboBox, QGraphicsTextItem,
-    QGraphicsPixmapItem, QGraphicsEllipseItem, QGraphicsRectItem, QSpinBox
+    QGraphicsPixmapItem, QGraphicsEllipseItem, QGraphicsRectItem, QSpinBox, QScrollArea
 )
 from setiastro.saspro.widgets.themed_buttons import themed_toolbtn
 
@@ -844,8 +844,19 @@ class SignatureInsertDialogPro(QDialog):
         row_commit.addStretch(1)
         col.addLayout(row_commit)
 
-        left = QWidget(); left.setLayout(col)
-        root.addWidget(left, 0)
+        left = QWidget()
+        left.setLayout(col)
+
+        scroll = QScrollArea(self)
+        scroll.setWidgetResizable(True)
+        scroll.setHorizontalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAlwaysOff)
+        scroll.setVerticalScrollBarPolicy(Qt.ScrollBarPolicy.ScrollBarAsNeeded)
+        scroll.setWidget(left)
+
+        # Optional: make it feel less “webby”
+        scroll.setFrameShape(QScrollArea.Shape.NoFrame)
+
+        root.addWidget(scroll, 0)   # instead of root.addWidget(left, 0)
         root.addWidget(self.view, 1)
 
     def _tech_active_doc(self):