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

setiastro/saspro/planetprojection.py

@@ -2175,6 +2175,52 @@ class PlanetProjectionDialog(QDialog):
             self._show_stereo_pair(cross_eye=cross_eye)
             return
 
+        # ---- GALAXY TOP-DOWN (early exit) ----
+        # IMPORTANT: do this BEFORE any ROI crop, otherwise huge galaxies get clipped by ROI sizing.
+        is_galaxy = (ptype == 3) or (mode == 5)  # planet_type==Galaxy OR output==Galaxy Polar View
+        if is_galaxy:
+            def to01(x):
+                if x.dtype == np.uint8:
+                    return x.astype(np.float32) / 255.0
+                if x.dtype == np.uint16:
+                    return x.astype(np.float32) / 65535.0
+                return x.astype(np.float32, copy=False)
+
+            roi = img[..., :3]          # FULL IMAGE
+            cx0 = float(cx)             # FULL-IMAGE coords
+            cy0 = float(cy)
+            roi01 = to01(roi)
+
+            pa = float(self.spin_ring_pa.value())      # reuse ring PA widget as galaxy PA
+            tilt = float(self.spin_ring_tilt.value())  # reuse ring tilt widget as galaxy b/a
+
+            # output size: tied to full image (clamped)
+            out_size = int(max(256, min(2400, max(roi.shape[0], roi.shape[1]))))
+
+            try:
+                top8 = deproject_galaxy_topdown_u8(
+                    roi01,
+                    cx0=cx0, cy0=cy0,
+                    rpx=float(r),
+                    pa_deg=pa,
+                    tilt=tilt,
+                    out_size=out_size,
+                )
+            except Exception as e:
+                QMessageBox.warning(self, "Galaxy Polar View", f"Failed to deproject galaxy:\n{e}")
+                return
+
+            # push single-frame output
+            self._left = None
+            self._right = None
+            self._wiggle_frames = None
+            self._wiggle_state = False
+
+            self._last_preview_u8 = top8
+            self._push_preview_u8(top8)
+            return
+
+
         # ---- Saturn rings ROI expansion (only increases s) ----
         is_saturn = (self.cmb_planet_type.currentIndex() == 1)
         rings_on = bool(is_saturn and getattr(self, "chk_rings", None) is not None and self.chk_rings.isChecked())
@@ -2209,6 +2255,28 @@ class PlanetProjectionDialog(QDialog):
         y1 = min(Hfull, y0 + s)
 
         roi = img[y0:y1, x0:x1, :3]
+        # ---- GALAXY ROI expansion (ensure full projected ellipse fits) ----
+        if ptype == 3:
+            tilt = float(self.spin_ring_tilt.value())
+            pa   = float(self.spin_ring_pa.value())
+
+            tilt = float(np.clip(tilt, 0.02, 1.0))
+
+            # ellipse in SOURCE pixels
+            a = float(r)              # semi-major
+            b = max(1.0, a * tilt)    # semi-minor
+
+            th = np.deg2rad(pa)
+            cth, sth = np.cos(th), np.sin(th)
+
+            # bounding half-extents of rotated ellipse
+            dx = np.sqrt((a * cth) ** 2 + (b * sth) ** 2)
+            dy = np.sqrt((a * sth) ** 2 + (b * cth) ** 2)
+            need_half = float(max(dx, dy))
+
+            margin = 12.0
+            s_need = int(np.ceil(2.0 * (need_half + margin)))
+            s = max(s, s_need)
 
         # ---- disk mask (ROI coords) ----
         H0, W0 = roi.shape[:2]
@@ -2226,42 +2294,6 @@ class PlanetProjectionDialog(QDialog):
 
         theta = float(self.spin_theta.value())
 
-        # ---- GALAXY TOP-DOWN (early exit) ----
-        is_galaxy = (ptype == 3) or (mode == 5)  # planet_type==Galaxy OR output==Galaxy Polar View
-
-        if is_galaxy:
-            # Galaxy wants the ROI disk params (cx0, cy0, r) + PA/tilt
-            roi01 = to01(roi)
-
-            pa = float(self.spin_ring_pa.value())      # reuse ring PA widget as galaxy PA
-            tilt = float(self.spin_ring_tilt.value())  # reuse ring tilt widget as galaxy b/a
-
-            # choose output size: use ROI size or clamp to something reasonable
-            out_size = int(max(256, min(2000, max(roi.shape[0], roi.shape[1]))))
-
-            try:
-                top8 = deproject_galaxy_topdown_u8(
-                    roi01,
-                    cx0=float(cx0), cy0=float(cy0),
-                    rpx=float(r),
-                    pa_deg=pa,
-                    tilt=tilt,
-                    out_size=out_size,
-                )
-            except Exception as e:
-                QMessageBox.warning(self, "Galaxy Polar View", f"Failed to deproject galaxy:\n{e}")
-                return
-
-            # push single-frame output
-            self._left = None
-            self._right = None
-            self._wiggle_frames = None
-            self._wiggle_state = False
-
-            self._last_preview_u8 = top8
-            self._push_preview_u8(top8)
-            return
-
         # ---- BODY (sphere reprojection) ----
         interp = cv2.INTER_LANCZOS4
         left_w, right_w, maskL, maskR = make_stereo_pair(

setiastro/saspro/resources.py

@@ -340,6 +340,7 @@ class Icons:
     DEBAYER = property(lambda self: _resource_path('debayer.png'))
     FUNCTION_BUNDLES = property(lambda self: _resource_path('functionbundle.png'))
     VIEW_BUNDLES = property(lambda self: _resource_path('viewbundle.png'))
+    FINDER_CHART = property(lambda self: _resource_path('finderchart.png'))
 
 # Singleton instances for easy access
 _icons_instance = None
@@ -396,157 +397,178 @@ def get_data_path(name: str) -> str:
     """
     return _resource_path(name)
 
+# ---------------- Legacy compatibility (LAZY) ----------------
+# These names match the original module-level variables used in older code.
+
+_LEGACY_ICON_MAP = {
+    'icon_path': 'astrosuitepro.png',
+    'windowslogo_path': 'astrosuitepro.ico',
+    'green_path': 'green.png',
+    'neutral_path': 'neutral.png',
+    'whitebalance_path': 'whitebalance.png',
+    'texture_clarity_path': 'TextureClarity.svg',
+    'morpho_path': 'morpho.png',
+    'clahe_path': 'clahe.png',
+    'starnet_path': 'starnet.png',
+    'staradd_path': 'staradd.png',
+    'LExtract_path': 'LExtract.png',
+    'LInsert_path': 'LInsert.png',
+    'slot0_path': 'slot0.png',
+    'slot1_path': 'slot1.png',
+    'slot2_path': 'slot2.png',
+    'slot3_path': 'slot3.png',
+    'slot4_path': 'slot4.png',
+    'slot5_path': 'slot5.png',
+    'slot6_path': 'slot6.png',
+    'slot7_path': 'slot7.png',
+    'slot8_path': 'slot8.png',
+    'slot9_path': 'slot9.png',
+    'acv_icon_path': 'acv_icon.png',
+
+    'moon_new_path': 'new_moon.png',
+    'moon_waxing_crescent_1_path': 'waxing_crescent_1.png',
+    'moon_waxing_crescent_2_path': 'waxing_crescent_2.png',
+    'moon_waxing_crescent_3_path': 'waxing_crescent_3.png',
+    'moon_waxing_crescent_4_path': 'waxing_crescent_4.png',
+    'moon_waxing_crescent_5_path': 'waxing_crescent_5.png',
+    'moon_first_quarter_path': 'first_quarter.png',
+    'moon_waxing_gibbous_1_path': 'waxing_gibbous_1.png',
+    'moon_waxing_gibbous_2_path': 'waxing_gibbous_2.png',
+    'moon_waxing_gibbous_3_path': 'waxing_gibbous_3.png',
+    'moon_waxing_gibbous_4_path': 'waxing_gibbous_4.png',
+    'moon_waxing_gibbous_5_path': 'waxing_gibbous_5.png',
+    'moon_full_path': 'full_moon.png',
+    'moon_waning_gibbous_1_path': 'waning_gibbous_1.png',
+    'moon_waning_gibbous_2_path': 'waning_gibbous_2.png',
+    'moon_waning_gibbous_3_path': 'waning_gibbous_3.png',
+    'moon_waning_gibbous_4_path': 'waning_gibbous_4.png',
+    'moon_waning_gibbous_5_path': 'waning_gibbous_5.png',
+    'moon_last_quarter_path': 'last_quarter.png',
+    'moon_waning_crescent_1_path': 'waning_crescent_1.png',
+    'moon_waning_crescent_2_path': 'waning_crescent_2.png',
+    'moon_waning_crescent_3_path': 'waning_crescent_3.png',
+    'moon_waning_crescent_4_path': 'waning_crescent_4.png',
+    'moon_waning_crescent_5_path': 'waning_crescent_5.png',
+
+    'rgbcombo_path': 'rgbcombo.png',
+    'rgbextract_path': 'rgbextract.png',
+    'copyslot_path': 'copyslot.png',
+    'graxperticon_path': 'graxpert.png',
+    'cropicon_path': 'cropicon.png',
+    'openfile_path': 'openfile.png',
+    'abeicon_path': 'abeicon.png',
+    'undoicon_path': 'undoicon.png',
+    'redoicon_path': 'redoicon.png',
+    'blastericon_path': 'blaster.png',
+    'clonestampicon_path': 'clonestamp.png',
+    'hdr_path': 'hdr.png',
+    'invert_path': 'invert.png',
+    'fliphorizontal_path': 'fliphorizontal.png',
+    'flipvertical_path': 'flipvertical.png',
+    'rotateclockwise_path': 'rotateclockwise.png',
+    'rotatecounterclockwise_path': 'rotatecounterclockwise.png',
+    'rotate180_path': 'rotate180.png',
+    'rotatearbitrary_path': 'rotatearbitrary.png',
+    'maskcreate_path': 'maskcreate.png',
+    'maskapply_path': 'maskapply.png',
+    'maskremove_path': 'maskremove.png',
+    'pixelmath_path': 'pixelmath.png',
+    'histogram_path': 'histogram.png',
+    'mosaic_path': 'mosaic.png',
+    'rescale_path': 'rescale.png',
+    'staralign_path': 'staralign.png',
+    'mask_path': 'maskapply.png',
+    'platesolve_path': 'platesolve.png',
+    'psf_path': 'psf.png',
+    'supernova_path': 'supernova.png',
+    'starregistration_path': 'starregistration.png',
+    'stacking_path': 'stacking.png',
+    'pedestal_icon_path': 'pedestal.png',
+    'starspike_path': 'starspike.png',
+    'astrospike_path': 'Astro_Spikes.png',
+    'aperture_path': 'aperture.png',
+    'jwstpupil_path': 'jwstpupil.png',
+    'signature_icon_path': 'pen.png',
+    'livestacking_path': 'livestacking.png',
+    'hrdiagram_path': 'HRDiagram.png',
+    'convoicon_path': 'convo.png',
+    'spcc_icon_path': 'spcc.png',
+
+    'exoicon_path': 'exoicon.png',
+    'peeker_icon': 'gridicon.png',
+    'dse_icon_path': 'dse.png',
+    'isophote_path': 'isophote.png',
+    'statstretch_path': 'statstretch.png',
+    'starstretch_path': 'starstretch.png',
+    'curves_path': 'curves.png',
+    'disk_path': 'disk.png',
+    'uhs_path': 'uhs.png',
+    'blink_path': 'blink.png',
+    'ppp_path': 'ppp.png',
+    'nbtorgb_path': 'nbtorgb.png',
+    'freqsep_path': 'freqsep.png',
+    'multiscale_decomp_path': 'multiscale_decomp.png',
+    'contsub_path': 'contsub.png',
+    'halo_path': 'halo.png',
+    'cosmic_path': 'cosmic.png',
+    'satellite_path': 'cosmicsat.png',
+    'imagecombine_path': 'imagecombine.png',
+    'wrench_path': 'wrench_icon.png',
+    'eye_icon_path': 'eye.png',
+    'disk_icon_path': 'disk.png',
+    'nuke_path': 'nuke.png',
+    'hubble_path': 'hubble.png',
+    'collage_path': 'collage.png',
+    'annotated_path': 'annotated.png',
+    'colorwheel_path': 'colorwheel.png',
+    'narrowbandnormalization_path': 'narrowbandnormalization.png',
+    'font_path': 'font.png',
+    'csv_icon_path': 'cvs.png',
+    'wims_path': 'wims.png',
+    'wimi_path': 'wimi_icon_256x256.png',
+    'linearfit_path': 'linearfit.png',
+    'debayer_path': 'debayer.png',
+    'aberration_path': 'aberration.png',
+    'functionbundles_path': 'functionbundle.png',
+    'planetarystacker_path': 'planetarystacker.png',
+    'viewbundles_path': 'viewbundle.png',
+    'selectivecolor_path': 'selectivecolor.png',
+    'rgbalign_path': 'rgbalign.png',
+    'background_path': 'background.png',
+    'script_icon_path': 'script.png',
+    'planetprojection_path': '3dplanet.png',
+    'finderchart_path': 'finderchart.png',
+}
+
+_LEGACY_DATA_MAP = {
+    'sasp_data_path': 'data/SASP_data.fits',
+    'astrobin_filters_csv_path': 'data/catalogs/astrobin_filters.csv',
+    'spinner_path': 'spinner.gif',
+}
+
+def __getattr__(name: str):
+    # --- legacy paths (lazy) ---
+    if name in _LEGACY_ICON_MAP:
+        return get_icon_path(_LEGACY_ICON_MAP[name])
+    if name in _LEGACY_DATA_MAP:
+        return get_data_path(_LEGACY_DATA_MAP[name])
+
+    # --- special exports ---
+    if name == 'background_startup_path':
+        return _resource_path('Background_startup.jpg')
+    if name == 'resource_monitor_qml':
+        return _resource_path(os.path.join("qml", "ResourceMonitor.qml"))
+
+    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")
+
+def __dir__():
+    return (
+        list(globals().keys())
+        + list(_LEGACY_ICON_MAP.keys())
+        + list(_LEGACY_DATA_MAP.keys())
+        + ['background_startup_path', 'resource_monitor_qml']
+    )
 
-# Legacy compatibility: export paths as module-level variables
-# These match the original variable names in setiastrosuitepro.py
-def _init_legacy_paths():
-    """Initialize legacy path variables for backward compatibility."""
-    return {
-        'icon_path': get_icon_path('astrosuitepro.png'),
-        'windowslogo_path': get_icon_path('astrosuitepro.ico'),
-        'green_path': get_icon_path('green.png'),
-        'neutral_path': get_icon_path('neutral.png'),
-        'whitebalance_path': get_icon_path('whitebalance.png'),
-        'texture_clarity_path': get_icon_path('TextureClarity.svg'),
-        'morpho_path': get_icon_path('morpho.png'),
-        'clahe_path': get_icon_path('clahe.png'),
-        'starnet_path': get_icon_path('starnet.png'),
-        'staradd_path': get_icon_path('staradd.png'),
-        'LExtract_path': get_icon_path('LExtract.png'),
-        'LInsert_path': get_icon_path('LInsert.png'),
-        'slot0_path': get_icon_path('slot0.png'),
-        'slot1_path': get_icon_path('slot1.png'),
-        'slot2_path': get_icon_path('slot2.png'),
-        'slot3_path': get_icon_path('slot3.png'),
-        'slot4_path': get_icon_path('slot4.png'),
-        'slot5_path': get_icon_path('slot5.png'),
-        'slot6_path': get_icon_path('slot6.png'),
-        'slot7_path': get_icon_path('slot7.png'),
-        'slot8_path': get_icon_path('slot8.png'),
-        'slot9_path': get_icon_path('slot9.png'),
-        'acv_icon_path': get_icon_path('acv_icon.png'),
-
-        'moon_new_path': get_icon_path('new_moon.png'),
-        'moon_waxing_crescent_1_path': get_icon_path('waxing_crescent_1.png'),
-        'moon_waxing_crescent_2_path': get_icon_path('waxing_crescent_2.png'),
-        'moon_waxing_crescent_3_path': get_icon_path('waxing_crescent_3.png'),
-        'moon_waxing_crescent_4_path': get_icon_path('waxing_crescent_4.png'),
-        'moon_waxing_crescent_5_path': get_icon_path('waxing_crescent_5.png'),
-
-        'moon_first_quarter_path': get_icon_path('first_quarter.png'),
-
-        'moon_waxing_gibbous_1_path': get_icon_path('waxing_gibbous_1.png'),
-        'moon_waxing_gibbous_2_path': get_icon_path('waxing_gibbous_2.png'),
-        'moon_waxing_gibbous_3_path': get_icon_path('waxing_gibbous_3.png'),
-        'moon_waxing_gibbous_4_path': get_icon_path('waxing_gibbous_4.png'),
-        'moon_waxing_gibbous_5_path': get_icon_path('waxing_gibbous_5.png'),
-
-        'moon_full_path': get_icon_path('full_moon.png'),
-
-        'moon_waning_gibbous_1_path': get_icon_path('waning_gibbous_1.png'),
-        'moon_waning_gibbous_2_path': get_icon_path('waning_gibbous_2.png'),
-        'moon_waning_gibbous_3_path': get_icon_path('waning_gibbous_3.png'),
-        'moon_waning_gibbous_4_path': get_icon_path('waning_gibbous_4.png'),
-        'moon_waning_gibbous_5_path': get_icon_path('waning_gibbous_5.png'),
-
-        'moon_last_quarter_path': get_icon_path('last_quarter.png'),
-
-        'moon_waning_crescent_1_path': get_icon_path('waning_crescent_1.png'),
-        'moon_waning_crescent_2_path': get_icon_path('waning_crescent_2.png'),
-        'moon_waning_crescent_3_path': get_icon_path('waning_crescent_3.png'),
-        'moon_waning_crescent_4_path': get_icon_path('waning_crescent_4.png'),
-        'moon_waning_crescent_5_path': get_icon_path('waning_crescent_5.png'),
-
-        'rgbcombo_path': get_icon_path('rgbcombo.png'),
-        'rgbextract_path': get_icon_path('rgbextract.png'),
-        'copyslot_path': get_icon_path('copyslot.png'),
-        'graxperticon_path': get_icon_path('graxpert.png'),
-        'cropicon_path': get_icon_path('cropicon.png'),
-        'openfile_path': get_icon_path('openfile.png'),
-        'abeicon_path': get_icon_path('abeicon.png'),
-        'undoicon_path': get_icon_path('undoicon.png'),
-        'redoicon_path': get_icon_path('redoicon.png'),
-        'blastericon_path': get_icon_path('blaster.png'),
-        'clonestampicon_path': get_icon_path('clonestamp.png'),
-        'hdr_path': get_icon_path('hdr.png'),
-        'invert_path': get_icon_path('invert.png'),
-        'fliphorizontal_path': get_icon_path('fliphorizontal.png'),
-        'flipvertical_path': get_icon_path('flipvertical.png'),
-        'rotateclockwise_path': get_icon_path('rotateclockwise.png'),
-        'rotatecounterclockwise_path': get_icon_path('rotatecounterclockwise.png'),
-        'rotate180_path': get_icon_path('rotate180.png'),
-        'rotatearbitrary_path': get_icon_path('rotatearbitrary.png'),
-        'maskcreate_path': get_icon_path('maskcreate.png'),
-        'maskapply_path': get_icon_path('maskapply.png'),
-        'maskremove_path': get_icon_path('maskremove.png'),
-        'pixelmath_path': get_icon_path('pixelmath.png'),
-        'histogram_path': get_icon_path('histogram.png'),
-        'mosaic_path': get_icon_path('mosaic.png'),
-        'rescale_path': get_icon_path('rescale.png'),
-        'staralign_path': get_icon_path('staralign.png'),
-        'mask_path': get_icon_path('maskapply.png'),
-        'platesolve_path': get_icon_path('platesolve.png'),
-        'psf_path': get_icon_path('psf.png'),
-        'supernova_path': get_icon_path('supernova.png'),
-        'starregistration_path': get_icon_path('starregistration.png'),
-        'stacking_path': get_icon_path('stacking.png'),
-        'pedestal_icon_path': get_icon_path('pedestal.png'),
-        'starspike_path': get_icon_path('starspike.png'),
-        'astrospike_path': get_icon_path('Astro_Spikes.png'),
-        'aperture_path': get_icon_path('aperture.png'),
-        'jwstpupil_path': get_icon_path('jwstpupil.png'),
-        'signature_icon_path': get_icon_path('pen.png'),
-        'livestacking_path': get_icon_path('livestacking.png'),
-        'hrdiagram_path': get_icon_path('HRDiagram.png'),
-        'convoicon_path': get_icon_path('convo.png'),
-        'spcc_icon_path': get_icon_path('spcc.png'),
-        'sasp_data_path': get_data_path('data/SASP_data.fits'),
-        'exoicon_path': get_icon_path('exoicon.png'),
-        'peeker_icon': get_icon_path('gridicon.png'),
-        'dse_icon_path': get_icon_path('dse.png'),
-        'astrobin_filters_csv_path': get_data_path('data/catalogs/astrobin_filters.csv'),
-        'isophote_path': get_icon_path('isophote.png'),
-        'statstretch_path': get_icon_path('statstretch.png'),
-        'starstretch_path': get_icon_path('starstretch.png'),
-        'curves_path': get_icon_path('curves.png'),
-        'disk_path': get_icon_path('disk.png'),
-        'uhs_path': get_icon_path('uhs.png'),
-        'blink_path': get_icon_path('blink.png'),
-        'ppp_path': get_icon_path('ppp.png'),
-        'nbtorgb_path': get_icon_path('nbtorgb.png'),
-        'freqsep_path': get_icon_path('freqsep.png'),
-        'multiscale_decomp_path': get_icon_path('multiscale_decomp.png'),
-        'contsub_path': get_icon_path('contsub.png'),
-        'halo_path': get_icon_path('halo.png'),
-        'cosmic_path': get_icon_path('cosmic.png'),
-        'satellite_path': get_icon_path('cosmicsat.png'),
-        'imagecombine_path': get_icon_path('imagecombine.png'),
-        'wrench_path': get_icon_path('wrench_icon.png'),
-        'eye_icon_path': get_icon_path('eye.png'),
-        'disk_icon_path': get_icon_path('disk.png'),
-        'nuke_path': get_icon_path('nuke.png'),
-        'hubble_path': get_icon_path('hubble.png'),
-        'collage_path': get_icon_path('collage.png'),
-        'annotated_path': get_icon_path('annotated.png'),
-        'colorwheel_path': get_icon_path('colorwheel.png'),
-        'narrowbandnormalization_path': get_icon_path('narrowbandnormalization.png'),
-        'font_path': get_icon_path('font.png'),
-        'csv_icon_path': get_icon_path('cvs.png'),
-        'spinner_path': get_data_path('spinner.gif'),
-        'wims_path': get_icon_path('wims.png'),
-        'wimi_path': get_icon_path('wimi_icon_256x256.png'),
-        'linearfit_path': get_icon_path('linearfit.png'),
-        'debayer_path': get_icon_path('debayer.png'),
-        'aberration_path': get_icon_path('aberration.png'),
-        'functionbundles_path': get_icon_path('functionbundle.png'),
-        'planetarystacker_path': get_icon_path('planetarystacker.png'),
-        'viewbundles_path': get_icon_path('viewbundle.png'),
-        'selectivecolor_path': get_icon_path('selectivecolor.png'),
-        'rgbalign_path': get_icon_path('rgbalign.png'),
-        'background_path': get_icon_path('background.png'), 
-        'script_icon_path': get_icon_path('script.png'),
-        'planetprojection_path': get_icon_path('3dplanet.png'),
-    }
 
 class Resources:
     """
@@ -603,41 +625,37 @@ class Resources:
 
 @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')
+    """
+    Models are NOT packaged resources. They must be installed via the model manager.
+    This returns the user models root and never falls back to _internal/data/models.
+    """
+    from setiastro.saspro.model_manager import models_root
+    p = Path(models_root())
+    # Ensure dir exists (models_root should already do this, but harmless)
+    p.mkdir(parents=True, exist_ok=True)
+    return str(p)
 
-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()
-globals().update(_legacy)
+def _assert_not_internal_models_path(p: str):
+    s = str(p).lower().replace("/", "\\")
+    if "\\_internal\\" in s and "\\data\\models\\" in s:
+        raise RuntimeError(f"Legacy internal model path detected: {p}")
 
+def model_path(filename: str) -> str:
+    from setiastro.saspro.model_manager import require_model
+    p = str(require_model(filename))
+    _assert_not_internal_models_path(p)
+    return p
 
-# Background for startup
-background_startup_path = _resource_path('Background_startup.jpg')
-_legacy['background_startup_path'] = background_startup_path
 
 # QML helper
 resource_monitor_qml = _resource_path(os.path.join("qml", "ResourceMonitor.qml"))
 
 # Export list for `from setiastro.saspro.resources import *`
 __all__ = [
-    'Icons', 'Resources', 
+    'Icons', 'Resources',
     'get_icons', 'get_resources',
     'get_icon_path', 'get_data_path',
+    'resource_monitor_qml',
     'background_startup_path',
-] + list(_legacy.keys())
-
+] + list(_LEGACY_ICON_MAP.keys()) + list(_LEGACY_DATA_MAP.keys())