graxpert 3.2.0a0.dev7__tar.gz → 3.2.0a0.dev8__tar.gz

{graxpert-3.2.0a0.dev7 → graxpert-3.2.0a0.dev8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graxpert
-Version: 3.2.0a0.dev7
+Version: 3.2.0a0.dev8
 Summary: GraXpert is an astronomical image processing program for extracting and removing gradients in the background of your astrophotos
 Home-page: https://graxpert.com
 Author: GraXpert Development Team
@@ -15,6 +15,7 @@ Classifier: Topic :: Scientific/Engineering :: Image Processing
 Classifier: Topic :: Multimedia :: Graphics :: Editors
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
@@ -28,17 +29,17 @@ Description-Content-Type: text/markdown
 Requires-Dist: ml-dtypes>=0.5.3
 Requires-Dist: pillow>=11.3.0
 Requires-Dist: appdirs
-Requires-Dist: astropy>=6.1.7
+Requires-Dist: astropy>=6.0.1
 Requires-Dist: astropy-iers-data>=0.2025.9.1.0.42.11
 Requires-Dist: customtkinter>=5.2.2
 Requires-Dist: imageio>=2.37.0
 Requires-Dist: minio>=7.2.16
-Requires-Dist: numpy==2.2.6
+Requires-Dist: numpy<=2.2.6,>=2.0.2
 Requires-Dist: opencv-python-headless==4.11.0.86
 Requires-Dist: PyKrige>=1.7.2
 Requires-Dist: requests>=2.32.5
-Requires-Dist: scikit-image>=0.25.2
-Requires-Dist: scipy>=1.15.3
+Requires-Dist: scikit-image>=0.24.0
+Requires-Dist: scipy>=1.13.1
 Requires-Dist: xisf>=0.9.5
 Provides-Extra: cuda
 Requires-Dist: onnxruntime-gpu[cuda,cudnn]==1.22.0; extra == "cuda"

{graxpert-3.2.0a0.dev7 → graxpert-3.2.0a0.dev8}/graxpert/ai_model_handling.py

@@ -4,6 +4,7 @@ import sys
 import re
 import shutil
 import zipfile
+from multiprocessing import Process, Queue
 
 from appdirs import user_data_dir
 from minio import Minio
@@ -214,6 +215,33 @@ def get_execution_providers_ordered(gpu_acceleration=True):
         "{}".format(e))
         sys.exit(1)
 
+
+def run_in_process(fn: callable):
+    """Run a function in a separate process and return the result or raise an exception."""
+
+    q = Queue()
+
+    # Create a closure to call fn and put the result in the queue    
+    def wrapped():
+        try:
+            r = fn()
+        except Exception as e:
+            r = e # return the exception to the main process
+        q.put(r)
+
+    p = Process(target=wrapped, name="ai-worker")
+    p.start()
+    p.join()
+
+    if p.exitcode != 0:
+        raise RuntimeError(f"worker process crashed with exit code {p.exitcode}.")
+
+    result = q.get()
+    if isinstance(result, Exception):
+        raise result
+    return result
+
+
 # Provides a mutable session context that can swap out different sessions if needed
 class SessionContext:
     model_name: str
@@ -232,13 +260,24 @@ class SessionContext:
         logging.info(f"Used inference providers for {model_name}: {self.session.get_providers()}")
 
 
+    def __run_low(self, model_args: dict, gpu_acceleration: bool = True) -> any:
+        """Run the ONNX model using the specified execution provider."""
+
+        # if we are using a GPU the ONNX runtimes might crash due to native bugs (ROCm)
+        # so run in a separate process just in case
+        fn = lambda: self.session.run(None, model_args)
+        if gpu_acceleration:
+            return run_in_process(fn)
+        else:
+            return fn()
+
     def run(self, model_args: dict) -> any:
         """Run the ONNX model using the specified execution provider."""
 
         providers = self.session.get_providers()
         gpu_acceleration = len(providers) > 1 or providers[0] != "CPUExecutionProvider"
         try:
-            result = self.session.run(None, model_args)
+            result = self.__run_low(model_args, gpu_acceleration)
         except Exception as e:
             if not gpu_acceleration:
                 raise  # Rethrow, the failure occurred with the regular CPU model also - show error dialog
@@ -246,7 +285,7 @@ class SessionContext:
             logging.warning(f"Error running model, falling back to CPU only: {e}")
             import onnxruntime as ort
             self.session = ort.InferenceSession(self.model_name, providers=get_execution_providers_ordered(False))
-            result = self.session.run(None, model_args)
+            result = self.__run_low(model_args, False)
 
         # all graxpert results are in the first array index
         return result[0]

graxpert-3.2.0a0.dev8/graxpert/version.py

@@ -0,0 +1,2 @@
+release = "update changelist notes"
+version = "3.2.0.a0.dev8"

graxpert-3.2.0a0.dev8/graxpert/version.py.bak

@@ -0,0 +1,2 @@
+release = "update changelist notes"
+version = "SNAPSHOT"

{graxpert-3.2.0a0.dev7 → graxpert-3.2.0a0.dev8}/graxpert.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graxpert
-Version: 3.2.0a0.dev7
+Version: 3.2.0a0.dev8
 Summary: GraXpert is an astronomical image processing program for extracting and removing gradients in the background of your astrophotos
 Home-page: https://graxpert.com
 Author: GraXpert Development Team
@@ -15,6 +15,7 @@ Classifier: Topic :: Scientific/Engineering :: Image Processing
 Classifier: Topic :: Multimedia :: Graphics :: Editors
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
 Classifier: Operating System :: POSIX :: Linux
@@ -28,17 +29,17 @@ Description-Content-Type: text/markdown
 Requires-Dist: ml-dtypes>=0.5.3
 Requires-Dist: pillow>=11.3.0
 Requires-Dist: appdirs
-Requires-Dist: astropy>=6.1.7
+Requires-Dist: astropy>=6.0.1
 Requires-Dist: astropy-iers-data>=0.2025.9.1.0.42.11
 Requires-Dist: customtkinter>=5.2.2
 Requires-Dist: imageio>=2.37.0
 Requires-Dist: minio>=7.2.16
-Requires-Dist: numpy==2.2.6
+Requires-Dist: numpy<=2.2.6,>=2.0.2
 Requires-Dist: opencv-python-headless==4.11.0.86
 Requires-Dist: PyKrige>=1.7.2
 Requires-Dist: requests>=2.32.5
-Requires-Dist: scikit-image>=0.25.2
-Requires-Dist: scipy>=1.15.3
+Requires-Dist: scikit-image>=0.24.0
+Requires-Dist: scipy>=1.13.1
 Requires-Dist: xisf>=0.9.5
 Provides-Extra: cuda
 Requires-Dist: onnxruntime-gpu[cuda,cudnn]==1.22.0; extra == "cuda"

{graxpert-3.2.0a0.dev7 → graxpert-3.2.0a0.dev8}/graxpert.egg-info/requires.txt

@@ -1,17 +1,17 @@
 ml-dtypes>=0.5.3
 pillow>=11.3.0
 appdirs
-astropy>=6.1.7
+astropy>=6.0.1
 astropy-iers-data>=0.2025.9.1.0.42.11
 customtkinter>=5.2.2
 imageio>=2.37.0
 minio>=7.2.16
-numpy==2.2.6
+numpy<=2.2.6,>=2.0.2
 opencv-python-headless==4.11.0.86
 PyKrige>=1.7.2
 requests>=2.32.5
-scikit-image>=0.25.2
-scipy>=1.15.3
+scikit-image>=0.24.0
+scipy>=1.13.1
 xisf>=0.9.5
 
 [cpuonly]

{graxpert-3.2.0a0.dev7 → graxpert-3.2.0a0.dev8}/pyproject.toml

@@ -11,9 +11,9 @@ archs = ["auto64"]
 requires = [
     "setuptools>=80.9.0",
     "wheel>=0.45.1",
-    "astropy>=7.1.0",
+    "astropy>=6.0.1",
     "cx_Freeze>=8.4.0",
     "imageio>=2.37.0",
-    "scikit-image>=0.25.2"
+    "scikit-image>=0.24.0"
 ]
 build-backend = "setuptools.build_meta"

{graxpert-3.2.0a0.dev7 → graxpert-3.2.0a0.dev8}/requirements.txt

@@ -1,15 +1,15 @@
 ml-dtypes>=0.5.3
 pillow>=11.3.0
 appdirs
-astropy>=6.1.7
+astropy>=6.0.1
 astropy-iers-data>=0.2025.9.1.0.42.11
 customtkinter>=5.2.2
 imageio>=2.37.0
 minio>=7.2.16
-numpy==2.2.6
+numpy>=2.0.2,<=2.2.6
 opencv-python-headless==4.11.0.86
 PyKrige>=1.7.2
 requests>=2.32.5
-scikit-image>=0.25.2
-scipy>=1.15.3
+scikit-image>=0.24.0
+scipy>=1.13.1
 xisf>=0.9.5

{graxpert-3.2.0a0.dev7 → graxpert-3.2.0a0.dev8}/setup.py

@@ -109,6 +109,7 @@ setup_options = {
         # Supported Python versions: List all versions you test against.
         "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: 3.12",
+        "Programming Language :: Python :: 3.13",
 
         # Operating System: Specify which OSs are supported.
         "Operating System :: Microsoft :: Windows",
@@ -208,15 +209,17 @@ if cx_freeze_commands.intersection(sys.argv):
 
     # for exe builds we are careful to include the correct onnxruntime
     if sys.platform == "win32":
-        build_options["excludes"] += ["onnxruntime", "onnxruntime-rocm", "onnxruntime-gpu"]
-        # FIXME temporarily disable until we see if it is needed on windows
+        pass
+        # on windows we default to whatever onnx lib was installed at build time
+        # build_options["excludes"] += ["onnxruntime", "onnxruntime-rocm", "onnxruntime-gpu"]
         # build_options["includes"] += ["onnxruntime-directml"]
     else:
         build_options["excludes"] += ["onnxruntime-gpu", "onnxruntime-rocm", "onnxruntime-directml"]
         build_options["includes"] += ["onnxruntime"]
 
     # console allows passing in command line
-    base = "Win32GUI" if sys.platform == "win32" else "console"
+    base = "gui" if sys.platform == "win32" else "console"
+    # base = "console" # if debugging on windows (or trying to use the exe in a script, then this is probably better)
 
     executables = [cx_Freeze.Executable("./graxpert/main.py", base=base,
                                         icon="./img/Icon", # leave off extension so it will be autocorrected for any OS

graxpert-3.2.0a0.dev7/graxpert/version.py

@@ -1,2 +0,0 @@
-release = "the github CI DMG builds are not yet reliable, don't require them before pypi publish"
-version = "3.2.0.a0.dev7"

graxpert-3.2.0a0.dev7/graxpert/version.py.bak

@@ -1,2 +0,0 @@
-release = "the github CI DMG builds are not yet reliable, don't require them before pypi publish"
-version = "SNAPSHOT"