setiastrosuitepro 1.6.0__py3-none-any.whl → 1.6.4.post1__py3-none-any.whl

setiastro/saspro/supernovaasteroidhunter.py

@@ -24,7 +24,7 @@ from setiastro.saspro.legacy.image_manager import load_image, save_image
 from setiastro.saspro.legacy.numba_utils import bulk_cosmetic_correction_numba
 from setiastro.saspro.imageops.stretch import stretch_mono_image, stretch_color_image
 from setiastro.saspro.star_alignment import PolyGradientRemoval 
-from pro import minorbodycatalog as mbc
+from setiastro.saspro import minorbodycatalog as mbc
 from setiastro.saspro.plate_solver import PlateSolverDialog as PlateSolver
 from setiastro.saspro.widgets.themed_buttons import themed_toolbtn
 
@@ -159,7 +159,7 @@ class MinorBodyWorker(QObject):
     def run(self):
         try:
             # Kick off with a low percentage
-            self.progress.emit(0, "Minor-body search: preparing catalog query...")
+            self.progress.emit(0, self.tr("Minor-body search: preparing catalog query..."))
             bodies = self._owner._get_predicted_minor_bodies_for_field(
                 H_ast_max=self._owner.minor_H_ast_max,
                 H_com_max=self._owner.minor_H_com_max,
@@ -292,11 +292,11 @@ class ImagePreviewWindow(QDialog):
 
         # toolbar
         tb = QToolBar(self)
-        self.act_fit = QAction("Fit", self)
-        self.act_1to1 = QAction("1:1", self)
-        self.act_zoom_in = QAction("Zoom In", self)
-        self.act_zoom_out = QAction("Zoom Out", self)
-        self.act_push = QAction("Push to New View", self)
+        self.act_fit = QAction(self.tr("Fit"), self)
+        self.act_1to1 = QAction(self.tr("1:1"), self)
+        self.act_zoom_in = QAction(self.tr("Zoom In"), self)
+        self.act_zoom_out = QAction(self.tr("Zoom Out"), self)
+        self.act_push = QAction(self.tr("Push to New View"), self)
         # self.act_minor = QAction("Check Catalogued Minor Bodies in Field", self)
 
         self.act_zoom_in.setShortcut("Ctrl++")
@@ -343,7 +343,7 @@ class ImagePreviewWindow(QDialog):
     def _on_push(self):
         # Emit the anomaly-marked image
         self.pushed.emit(self._original, self.windowTitle())
-        QMessageBox.information(self, "Pushed", "New View Created.")
+        QMessageBox.information(self, self.tr("Pushed"), self.tr("New View Created."))
 
 
     def _on_minor_body_search(self):
@@ -361,7 +361,10 @@ class SupernovaAsteroidHunterDialog(QDialog):
                  image_manager=None, doc_manager=None,
                  supernova_path=None, wrench_path=None, spinner_path=None):
         super().__init__(parent)
-        self.setWindowTitle("Supernova / Asteroid Hunter")
+        self.setWindowTitle(self.tr("Supernova / Asteroid Hunter"))
+        self.setWindowFlag(Qt.WindowType.Window, True)
+        self.setWindowModality(Qt.WindowModality.NonModal)
+        self.setModal(False)
         if supernova_path:
             self.setWindowIcon(QIcon(supernova_path))
         # keep icon path for previews
@@ -404,17 +407,17 @@ class SupernovaAsteroidHunterDialog(QDialog):
         layout = self.layout()
 
         # Instruction Label
-        instructions = QLabel(
+        instructions = QLabel(self.tr(
             "Select the reference image and search images. "
             "Then click Process to hunt for anomalies."
-        )
+        ))
         layout.addWidget(instructions)
 
         # --- Reference Image Selection ---
         ref_layout = QHBoxLayout()
         self.ref_line_edit = QLineEdit(self)
-        self.ref_line_edit.setPlaceholderText("No reference image selected")
-        self.ref_button = QPushButton("Select Reference Image", self)
+        self.ref_line_edit.setPlaceholderText(self.tr("No reference image selected"))
+        self.ref_button = QPushButton(self.tr("Select Reference Image"), self)
         self.ref_button.clicked.connect(self.selectReferenceImage)
         ref_layout.addWidget(self.ref_line_edit)
         ref_layout.addWidget(self.ref_button)
@@ -423,7 +426,7 @@ class SupernovaAsteroidHunterDialog(QDialog):
         # --- Search Images Selection ---
         search_layout = QHBoxLayout()
         self.search_list = QListWidget(self)
-        self.search_button = QPushButton("Select Search Images", self)
+        self.search_button = QPushButton(self.tr("Select Search Images"), self)
         self.search_button.clicked.connect(self.selectSearchImages)
         search_layout.addWidget(self.search_list)
         search_layout.addWidget(self.search_button)
@@ -431,13 +434,13 @@ class SupernovaAsteroidHunterDialog(QDialog):
 
         # --- Cosmetic Correction Checkbox ---
         self.cosmetic_checkbox = QCheckBox(
-            "Apply Cosmetic Correction before Preprocessing", self
+            self.tr("Apply Cosmetic Correction before Preprocessing"), self
         )
         layout.addWidget(self.cosmetic_checkbox)
 
         # --- Threshold Slider ---
         thresh_layout = QHBoxLayout()
-        self.thresh_label = QLabel("Anomaly Detection Threshold: 0.10", self)
+        self.thresh_label = QLabel(self.tr("Anomaly Detection Threshold: 0.10"), self)
         self.thresh_slider = QSlider(Qt.Orientation.Horizontal, self)
         self.thresh_slider.setMinimum(1)
         self.thresh_slider.setMaximum(50)    # Represents 0.01 to 0.50
@@ -449,19 +452,19 @@ class SupernovaAsteroidHunterDialog(QDialog):
 
         # --- Process Button ---
         self.process_button = QPushButton(
-            "Process (Cosmetic Correction, Preprocess, and Search)", self
+            self.tr("Process (Cosmetic Correction, Preprocess, and Search)"), self
         )
         self.process_button.clicked.connect(self.process)
         layout.addWidget(self.process_button)
 
         # --- Progress Labels ---
-        self.preprocess_progress_label = QLabel("Preprocessing progress: 0 / 0", self)
-        self.search_progress_label = QLabel("Processing progress: 0 / 0", self)
+        self.preprocess_progress_label = QLabel(self.tr("Preprocessing progress: 0 / 0"), self)
+        self.search_progress_label = QLabel(self.tr("Processing progress: 0 / 0"), self)
         layout.addWidget(self.preprocess_progress_label)
         layout.addWidget(self.search_progress_label)
 
         # -- Status label --
-        self.status_label = QLabel("Status: Idle", self)
+        self.status_label = QLabel(self.tr("Status: Idle"), self)
         layout.addWidget(self.status_label)
 
         # Minor-body progress bar (hidden by default)
@@ -472,7 +475,7 @@ class SupernovaAsteroidHunterDialog(QDialog):
         layout.addWidget(self.minor_progress)
 
         # --- New Instance Button ---
-        self.new_instance_button = QPushButton("New Instance", self)
+        self.new_instance_button = QPushButton(self.tr("New Instance"), self)
         self.new_instance_button.clicked.connect(self.newInstance)
         layout.addWidget(self.new_instance_button)
 
@@ -484,18 +487,18 @@ class SupernovaAsteroidHunterDialog(QDialog):
     def updateThreshold(self, value):
         threshold = value / 100.0  # e.g. slider value 10 becomes 0.10
         self.parameters["threshold"] = threshold
-        self.thresh_label.setText(f"Anomaly Detection Threshold: {threshold:.2f}")
+        self.thresh_label.setText(self.tr("Anomaly Detection Threshold: {0:.2f}").format(threshold))
 
     def selectReferenceImage(self):
-        file_path, _ = QFileDialog.getOpenFileName(self, "Select Reference Image", "",
-                                                   "Images (*.png *.tif *.tiff *.fits *.fit *.xisf)")
+        file_path, _ = QFileDialog.getOpenFileName(self, self.tr("Select Reference Image"), "",
+                                                   self.tr("Images (*.png *.tif *.tiff *.fits *.fit *.xisf)"))
         if file_path:
             self.parameters["referenceImagePath"] = file_path
             self.ref_line_edit.setText(os.path.basename(file_path))
 
     def selectSearchImages(self):
-        file_paths, _ = QFileDialog.getOpenFileNames(self, "Select Search Images", "",
-                                                     "Images (*.png *.tif *.tiff *.fits *.fit *.xisf)")
+        file_paths, _ = QFileDialog.getOpenFileNames(self, self.tr("Select Search Images"), "",
+                                                     self.tr("Images (*.png *.tif *.tiff *.fits *.fit *.xisf)"))
         if file_paths:
             self.parameters["searchImagePaths"] = file_paths
             self.search_list.clear()
@@ -503,24 +506,24 @@ class SupernovaAsteroidHunterDialog(QDialog):
                 self.search_list.addItem(os.path.basename(path))
 
     def process(self):
-        self.status_label.setText("Process started...")
+        self.status_label.setText(self.tr("Process started..."))
         QApplication.processEvents()
 
         # If cosmetic correction is enabled, run it first
         if self.cosmetic_checkbox.isChecked():
-            self.status_label.setText("Running Cosmetic Correction...")
+            self.status_label.setText(self.tr("Running Cosmetic Correction..."))
             QApplication.processEvents()
             self.runCosmeticCorrectionIfNeeded()
 
-        self.status_label.setText("Preprocessing images...")
+        self.status_label.setText(self.tr("Preprocessing images..."))
         QApplication.processEvents()
         self.preprocessImages()
 
-        self.status_label.setText("Analyzing anomalies...")
+        self.status_label.setText(self.tr("Analyzing anomalies..."))
         QApplication.processEvents()
         self.runSearch()
 
-        self.status_label.setText("Process complete.")
+        self.status_label.setText(self.tr("Process complete."))
         QApplication.processEvents()
 
 
@@ -534,7 +537,9 @@ class SupernovaAsteroidHunterDialog(QDialog):
         for idx, image_path in enumerate(self.parameters["searchImagePaths"]):
             try:
                 # Update status label to show which image is being handled
-                self.status_label.setText(f"Cosmetic Correction: {idx+1}/{len(self.parameters['searchImagePaths'])} => {os.path.basename(image_path)}")
+                self.status_label.setText(self.tr("Cosmetic Correction: {0}/{1} => {2}").format(
+                    idx+1, len(self.parameters['searchImagePaths']), os.path.basename(image_path)
+                ))
                 QApplication.processEvents()
 
                 img, header, bit_depth, is_mono = load_image(image_path)
@@ -558,13 +563,13 @@ class SupernovaAsteroidHunterDialog(QDialog):
 
     def preprocessImages(self):
         # Update status label for reference image
-        self.status_label.setText("Preprocessing reference image...")
+        self.status_label.setText(self.tr("Preprocessing reference image..."))
         print("[Preprocessing] Preprocessing reference image...")
         QApplication.processEvents()
 
         ref_path = self.parameters["referenceImagePath"]
         if not ref_path:
-            QMessageBox.warning(self, "Error", "No reference image selected.")
+            QMessageBox.warning(self, self.tr("Error"), self.tr("No reference image selected."))
             return
 
         try:
@@ -623,11 +628,11 @@ class SupernovaAsteroidHunterDialog(QDialog):
             ref_processed = self.preprocessImage(ref_img, debug_prefix=debug_prefix_ref)
             self.preprocessed_reference = ref_processed
             self.preprocess_progress_label.setText(
-                "Preprocessing reference image... Done."
+                self.tr("Preprocessing reference image... Done.")
             )
 
         except Exception as e:
-            QMessageBox.critical(self, "Error", f"Failed to preprocess reference image: {e}")
+            QMessageBox.critical(self, self.tr("Error"), self.tr("Failed to preprocess reference image: {0}").format(e))
             return
 
         # --- Preprocess search images ---
@@ -638,7 +643,9 @@ class SupernovaAsteroidHunterDialog(QDialog):
         for i, path in enumerate(search_paths):
             try:
                 self.status_label.setText(
-                    f"Preprocessing search image {i+1}/{total} => {os.path.basename(path)}"
+                    self.tr("Preprocessing search image {0}/{1} => {2}").format(
+                        i+1, total, os.path.basename(path)
+                    )
                 )
                 QApplication.processEvents()
 
@@ -653,14 +660,14 @@ class SupernovaAsteroidHunterDialog(QDialog):
                 self.preprocessed_search.append({"path": path, "image": processed})
 
                 self.preprocess_progress_label.setText(
-                    f"Preprocessing image {i+1} of {total}... Done."
+                    self.tr("Preprocessing image {0} of {1}... Done.").format(i+1, total)
                 )
                 QApplication.processEvents()
 
             except Exception as e:
                 print(f"Failed to preprocess {path}: {e}")
 
-        self.status_label.setText("All search images preprocessed.")
+        self.status_label.setText(self.tr("All search images preprocessed."))
         QApplication.processEvents()
 
     def _ensure_wcs(self, ref_path: str):
@@ -736,7 +743,7 @@ class SupernovaAsteroidHunterDialog(QDialog):
         False if they cancelled.
         """
         dlg = QDialog(self)
-        dlg.setWindowTitle("Minor-body Search Limits")
+        dlg.setWindowTitle(self.tr("Minor-body Search Limits"))
         layout = QVBoxLayout(dlg)
 
         row_layout = QGridLayout()
@@ -837,29 +844,29 @@ class SupernovaAsteroidHunterDialog(QDialog):
             print("[MinorBodies] prediction failed:", error)
             QMessageBox.critical(
                 self,
-                "Minor-body Search",
-                f"Minor-body prediction failed:\n{error}"
+                self.tr("Minor-body Search"),
+                self.tr("Minor-body prediction failed:\n{0}").format(error)
             )
-            self.status_label.setText("Minor-body search failed.")
+            self.status_label.setText(self.tr("Minor-body search failed."))
             return
 
         self.predicted_minor_bodies = bodies or []
 
         if not self.predicted_minor_bodies:
             self.status_label.setText(
-                "Minor-body search complete: no catalogued objects in this field "
-                "for the current magnitude limits."
+                self.tr("Minor-body search complete: no catalogued objects in this field "
+                        "for the current magnitude limits.")
             )
             QMessageBox.information(
                 self,
-                "Minor-body Search",
-                "No catalogued minor bodies (within the configured magnitude limits) "
-                "were found in this field."
+                self.tr("Minor-body Search"),
+                self.tr("No catalogued minor bodies (within the configured magnitude limits) "
+                        "were found in this field.")
             )
             return
 
         self.status_label.setText(
-            f"Minor-body search complete: {len(self.predicted_minor_bodies)} objects in field."
+            self.tr("Minor-body search complete: {0} objects in field.").format(len(self.predicted_minor_bodies))
         )
         QApplication.processEvents()
 
@@ -876,10 +883,10 @@ class SupernovaAsteroidHunterDialog(QDialog):
             else:
                 QMessageBox.information(
                     self,
-                    "Minor-body Search",
-                    "Minor bodies in field have been computed.\n\n"
-                    "Run the anomaly search (Process) to cross-match detections "
-                    "against the predicted objects."
+                    self.tr("Minor-body Search"),
+                    self.tr("Minor bodies in field have been computed.\n\n"
+                            "Run the anomaly search (Process) to cross-match detections "
+                            "against the predicted objects.")
                 )
         except Exception as e:
             print("[MinorBodies] cross-match failed:", e)
@@ -897,26 +904,26 @@ class SupernovaAsteroidHunterDialog(QDialog):
         if not ref_path:
             QMessageBox.warning(
                 self,
-                "Minor-body Search",
-                "No reference image selected.\n\n"
-                "Please select a reference image and run Process first."
+                self.tr("Minor-body Search"),
+                self.tr("No reference image selected.\n\n"
+                        "Please select a reference image and run Process first.")
             )
             return
 
         if self.preprocessed_reference is None:
             QMessageBox.warning(
                 self,
-                "Minor-body Search",
-                "Reference image has not been preprocessed yet.\n\n"
-                "Please click 'Process' before running the minor-body search."
+                self.tr("Minor-body Search"),
+                self.tr("Reference image has not been preprocessed yet.\n\n"
+                        "Please click 'Process' before running the minor-body search.")
             )
             return
 
         if self.settings is None:
             QMessageBox.warning(
                 self,
-                "Minor-body Search",
-                "Settings object is not available; cannot locate the minor-body database path."
+                self.tr("Minor-body Search"),
+                self.tr("Settings object is not available; cannot locate the minor-body database path.")
             )
             return
 

setiastro/saspro/swap_manager.py

@@ -1,10 +1,5 @@
-import os
-import shutil
-import tempfile
-import uuid
-import pickle
-import atexit
-import threading
+import os, shutil, tempfile, uuid, atexit, threading
+from collections import OrderedDict
 import numpy as np
 
 class SwapManager:
@@ -14,66 +9,110 @@ class SwapManager:
     def __new__(cls, *args, **kwargs):
         with cls._lock:
             if cls._instance is None:
-                cls._instance = super(SwapManager, cls).__new__(cls)
+                cls._instance = super().__new__(cls)
                 cls._instance._initialized = False
         return cls._instance
 
-    def __init__(self):
+    def __init__(self, *, cache_bytes: int = 1_000_000_000):
         if self._initialized:
             return
         self._initialized = True
-        
-        # Create a unique temp directory for this session
-        self.temp_dir = os.path.join(tempfile.gettempdir(), "SetiAstroSuitePro_Swap", str(uuid.uuid4()))
+
+        self.temp_dir = os.path.join(
+            tempfile.gettempdir(), "SetiAstroSuitePro_Swap", str(uuid.uuid4())
+        )
         os.makedirs(self.temp_dir, exist_ok=True)
-        
-        # Register cleanup on exit
         atexit.register(self.cleanup_all)
 
+        # LRU of in-RAM states: swap_id -> ndarray
+        self._cache = OrderedDict()
+        self._cache_bytes = int(cache_bytes)
+        self._cache_used = 0
+        self._cache_lock = threading.Lock()
+
     def get_swap_path(self, swap_id: str) -> str:
-        return os.path.join(self.temp_dir, f"{swap_id}.swap")
+        # store as .npy (fast + supports mmap)
+        return os.path.join(self.temp_dir, f"{swap_id}.npy")
+
+    def _arr_nbytes(self, a: np.ndarray) -> int:
+        try:
+            return int(a.nbytes)
+        except Exception:
+            return 0
+
+    def _cache_put(self, swap_id: str, arr: np.ndarray):
+        if arr is None:
+            return
+        n = self._arr_nbytes(arr)
+        if n <= 0:
+            return
 
-    def save_state(self, image: np.ndarray) -> str:
-        """
-        Save the image array to a swap file.
-        Returns the unique swap_id.
-        """
+        with self._cache_lock:
+            # If already present, refresh
+            old = self._cache.pop(swap_id, None)
+            if old is not None:
+                self._cache_used -= self._arr_nbytes(old)
+
+            self._cache[swap_id] = arr
+            self._cache_used += n
+
+            # Evict LRU until under budget
+            while self._cache_used > self._cache_bytes and self._cache:
+                k, v = self._cache.popitem(last=False)
+                self._cache_used -= self._arr_nbytes(v)
+
+    def _cache_get(self, swap_id: str):
+        with self._cache_lock:
+            arr = self._cache.pop(swap_id, None)
+            if arr is None:
+                return None
+            # move to MRU
+            self._cache[swap_id] = arr
+            return arr
+
+    def save_state(self, image: np.ndarray) -> str | None:
         swap_id = uuid.uuid4().hex
         path = self.get_swap_path(swap_id)
-        
-        # We only save the image data to disk. Metadata is kept in RAM by the caller.
-        # Using pickle for simplicity and robustness with numpy arrays.
-        # For pure numpy arrays, np.save might be slightly faster, but pickle is more flexible if we change what we store.
-        # Let's stick to pickle for now as per plan.
         try:
-            with open(path, "wb") as f:
-                pickle.dump(image, f, protocol=pickle.HIGHEST_PROTOCOL)
+            # Write fast .npy
+            np.save(path, image, allow_pickle=False)
+            # Optionally keep it hot in RAM too (depends how you use it)
+            self._cache_put(swap_id, image)
+            return swap_id
         except Exception as e:
             print(f"[SwapManager] Failed to save state {swap_id}: {e}")
             return None
-            
-        return swap_id
 
     def load_state(self, swap_id: str) -> np.ndarray | None:
-        """
-        Load the image array from the swap file.
-        """
+        #print("[SwapManager] LOAD", swap_id)
+        # First: try RAM
+        hot = self._cache_get(swap_id)
+        if hot is not None:
+            return hot
+
         path = self.get_swap_path(swap_id)
         if not os.path.exists(path):
             print(f"[SwapManager] Swap file not found: {path}")
             return None
-            
+
         try:
-            with open(path, "rb") as f:
-                return pickle.load(f)
+            # mmap_mode="r" is extremely fast; convert to real ndarray only if needed
+            arr = np.load(path, mmap_mode="r", allow_pickle=False)
+            # If your pipeline needs a writable array, materialize:
+            # arr = np.array(arr, copy=True)
+            # Cache the loaded array (mmap object still OK to cache; you can decide)
+            self._cache_put(swap_id, np.array(arr, copy=False))
+            return np.array(arr, copy=False)
         except Exception as e:
             print(f"[SwapManager] Failed to load state {swap_id}: {e}")
             return None
 
     def delete_state(self, swap_id: str):
-        """
-        Delete a specific swap file.
-        """
+        with self._cache_lock:
+            old = self._cache.pop(swap_id, None)
+            if old is not None:
+                self._cache_used -= self._arr_nbytes(old)
+
         path = self.get_swap_path(swap_id)
         try:
             if os.path.exists(path):
@@ -82,13 +121,9 @@ class SwapManager:
             print(f"[SwapManager] Failed to delete state {swap_id}: {e}")
 
     def cleanup_all(self):
-        """
-        Delete the entire temporary directory for this session.
-        """
         try:
             if os.path.exists(self.temp_dir):
                 shutil.rmtree(self.temp_dir, ignore_errors=True)
-                # print(f"[SwapManager] Cleaned up {self.temp_dir}")
         except Exception as e:
             print(f"[SwapManager] Cleanup failed: {e}")