graxpert 3.2.0a0.dev4__tar.gz → 3.2.0a0.dev5__tar.gz

{graxpert-3.2.0a0.dev4 → graxpert-3.2.0a0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: graxpert
-Version: 3.2.0a0.dev4
+Version: 3.2.0a0.dev5
 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
@@ -69,7 +69,7 @@ Dynamic: summary
 </p>
 
 # WARNING: This is a test branch/pip build, you probably don't want it yet.
-For the time being you a re better off with the install images from the graxpert
+For the time being you are better off with the install images from the graxpert
 homepage! for questions regarding this test build contact kevinh@geeksville.com.
 
 GraXpert is an astronomical image processing program for extracting and removing
@@ -97,6 +97,7 @@ We do this via the the python [pypi.org](https://pypi.org/project/graxpert/) rep
 
 FIXME, recommend directml for windows, FIXME for linux and FIXME for mac
 
+* **pip install graxpert\[cpuonly\]** - Use this if you are on OS-X - it is poorly named, but it will still use the CoreML Apple GPU support
 * **pip install graxpert\[cuda\]** - Use this if you have an Nvidia GPU
 * **pip install graxpert\[rocm\]** - Use this if you have an AMD GPU
 * **pip install graxpert\[openvino\]** - Use this if you don't have an advanced GPU or don't know what you have (provides sizable acceleration on most modern Intel CPUs)

{graxpert-3.2.0a0.dev4 → graxpert-3.2.0a0.dev5}/README.md

@@ -3,7 +3,7 @@
 </p>
 
 # WARNING: This is a test branch/pip build, you probably don't want it yet.
-For the time being you a re better off with the install images from the graxpert
+For the time being you are better off with the install images from the graxpert
 homepage! for questions regarding this test build contact kevinh@geeksville.com.
 
 GraXpert is an astronomical image processing program for extracting and removing
@@ -31,6 +31,7 @@ We do this via the the python [pypi.org](https://pypi.org/project/graxpert/) rep
 
 FIXME, recommend directml for windows, FIXME for linux and FIXME for mac
 
+* **pip install graxpert\[cpuonly\]** - Use this if you are on OS-X - it is poorly named, but it will still use the CoreML Apple GPU support
 * **pip install graxpert\[cuda\]** - Use this if you have an Nvidia GPU
 * **pip install graxpert\[rocm\]** - Use this if you have an AMD GPU
 * **pip install graxpert\[openvino\]** - Use this if you don't have an advanced GPU or don't know what you have (provides sizable acceleration on most modern Intel CPUs)

{graxpert-3.2.0a0.dev4 → graxpert-3.2.0a0.dev5}/graxpert/ai_model_handling.py

@@ -1,215 +1,215 @@
-import logging
-import os
-import sys
-import re
-import shutil
-import zipfile
-
-from appdirs import user_data_dir
-from minio import Minio
-from packaging import version
-
-try:
-    from graxpert.s3_secrets import endpoint, ro_access_key, ro_secret_key
-
-    client = Minio(endpoint, ro_access_key, ro_secret_key)
-except Exception as e:
-    logging.exception(e)
-    client = None
-
-from graxpert.ui.loadingframe import DynamicProgressThread
-
-ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "ai-models")
-bge_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "bge-ai-models")
-
-# old ai-models folder exists, rename to 'bge-ai-models'
-if os.path.exists(ai_models_dir):
-    logging.warning(f"Older 'ai_models_dir' {ai_models_dir} exists. Renaming to {bge_ai_models_dir} due to introduction of new denoising models in GraXpert 3.")
-    try:
-        os.rename(ai_models_dir, bge_ai_models_dir)
-    except Exception as e:
-        logging.error(f"Renaming {ai_models_dir} to {bge_ai_models_dir} failed. {bge_ai_models_dir} will be newly created. Consider deleting obsolete {ai_models_dir} manually.")
-
-os.makedirs(bge_ai_models_dir, exist_ok=True)
-
-deconvolution_object_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "deconvolution-object-ai-models")
-os.makedirs(deconvolution_object_ai_models_dir, exist_ok=True)
-deconvolution_stars_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "deconvolution-stars-ai-models")
-os.makedirs(deconvolution_stars_ai_models_dir, exist_ok=True)
-denoise_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "denoise-ai-models")
-os.makedirs(denoise_ai_models_dir, exist_ok=True)
-
-
-# ui operations
-def list_remote_versions(bucket_name):
-    if client is None:
-        return []
-    try:
-        objects = client.list_objects(bucket_name)
-        versions = []
-
-        for o in objects:
-            tags = client.get_object_tags(o.bucket_name, o.object_name)
-            if tags is not None and "ai-version" in tags:
-                versions.append(
-                    {
-                        "bucket": o.bucket_name,
-                        "object": o.object_name,
-                        "version": tags["ai-version"],
-                    }
-                )
-        return versions
-
-    except Exception as e:
-        logging.exception(e)
-    finally:
-        return versions
-
-
-def list_local_versions(ai_models_dir):
-    try:
-        model_dirs = [
-            {"path": os.path.join(ai_models_dir, f), "version": f}
-            for f in os.listdir(ai_models_dir)
-            if re.search(r"\d\.\d\.\d", f) and len(os.listdir(os.path.join(ai_models_dir, f))) > 0  # match semantic version
-        ]
-        return model_dirs
-    except Exception as e:
-        logging.exception(e)
-        return None
-
-
-def latest_version(ai_models_dir, bucket_name):
-    try:
-        remote_versions = list_remote_versions(bucket_name)
-    except Exception as e:
-        remote_versions = []
-        logging.exception(e)
-    try:
-        local_versions = list_local_versions(ai_models_dir)
-    except Exception as e:
-        local_versions = []
-        logging.exception(e)
-    ai_options = set([])
-    ai_options.update([rv["version"] for rv in remote_versions])
-    ai_options.update(set([lv["version"] for lv in local_versions]))
-    ai_options = sorted(ai_options, key=lambda k: version.parse(k), reverse=True)
-    return ai_options[0]
-
-
-def ai_model_path_from_version(ai_models_dir, local_version):
-    if local_version is None:
-        return None
-
-    return os.path.join(ai_models_dir, local_version, "model.onnx")
-
-
-def compute_orphaned_local_versions(ai_models_dir):
-    remote_versions = list_remote_versions(ai_models_dir)
-
-    if remote_versions is None:
-        logging.warning("Could not fetch remote versions. Thus, aborting cleaning of local versions in {}. Consider manual cleaning".format(ai_models_dir))
-        return
-
-    local_versions = list_local_versions()
-
-    if local_versions is None:
-        logging.warning("Could not read local versions in {}. Thus, aborting cleaning. Consider manual cleaning".format(ai_models_dir))
-        return
-
-    orphaned_local_versions = [{"path": lv["path"], "version": lv["version"]} for lv in local_versions if lv["version"] not in [rv["version"] for rv in remote_versions]]
-
-    return orphaned_local_versions
-
-
-def cleanup_orphaned_local_versions(orphaned_local_versions):
-    for olv in orphaned_local_versions:
-        try:
-            shutil.rmtree(olv["path"])
-        except Exception as e:
-            logging.exception(e)
-
-
-def download_version(ai_models_dir, bucket_name, target_version, progress=None):
-    try:
-        remote_versions = list_remote_versions(bucket_name)
-        for r in remote_versions:
-            if target_version == r["version"]:
-                remote_version = r
-                break
-
-        ai_model_dir = os.path.join(ai_models_dir, "{}".format(remote_version["version"]))
-        os.makedirs(ai_model_dir, exist_ok=True)
-
-        ai_model_file = os.path.join(ai_model_dir, "model.onnx")
-        ai_model_zip = os.path.join(ai_model_dir, "model.zip")
-        client.fget_object(
-            remote_version["bucket"],
-            remote_version["object"],
-            ai_model_zip,
-            progress=DynamicProgressThread(callback=progress),
-        )
-
-        with zipfile.ZipFile(ai_model_zip, "r") as zip_ref:
-            zip_ref.extractall(ai_model_dir)
-
-        if not os.path.isfile(ai_model_file):
-            raise ValueError(f"Could not find ai 'model.onnx' file after extracting {ai_model_zip}")
-        os.remove(ai_model_zip)
-
-    except Exception as e:
-        # try to delete (rollback) ai_model_dir in case of errors
-        logging.exception(e)
-        try:
-            shutil.rmtree(ai_model_dir)
-        except Exception as e2:
-            logging.exception(e2)
-
-
-def validate_local_version(ai_models_dir, local_version):
-    return os.path.isfile(os.path.join(ai_models_dir, local_version, "model.onnx"))
-
-
-def get_execution_providers_ordered(gpu_acceleration=True):
-    if gpu_acceleration:
-        supported_providers = [
-            (
-                "OpenVINOExecutionProvider",
-                {
-                    # per https://onnxruntime.ai/docs/execution-providers/OpenVINO-ExecutionProvider.html#summary-of-options
-                    # "device_type": "HETERO:GPU,CPU,NPU AUTO:GPU,CPU,NPU MULTI:GPU,CPU,NPU", # Will prefer dGPU, fallback to iGPU, NPU or CPU with extra Intel specific optimizations
-                    "device_type": "AUTO:GPU,CPU", # Will prefer dGPU, fallback to iGPU, NPU or CPU with extra Intel specific optimizations
-                }
-            ),
-            "ROCMExecutionProvider",
-            "DmlExecutionProvider",
-            (
-                "CoreMLExecutionProvider",
-                {
-                    "flags": "COREML_FLAG_CREATE_MLPROGRAM",
-                },
-            ),
-            "CUDAExecutionProvider",
-            "CPUExecutionProvider",
-        ]
-    else:
-        supported_providers = ["CPUExecutionProvider"]
-
-    result = []
-    try:
-        import onnxruntime as ort    
-        available = ort.get_available_providers()
-        for provider in supported_providers:
-            if isinstance(provider, tuple):
-                if provider[0] in available:
-                    result.append(provider)  # Append the entire tuple
-            else:
-                if provider in available:
-                    result.append(provider)
-        return result
-    except Exception as e:
-        logging.error("Critical error!  The required ONNX Runtime (AI library) package is misconfigured.\n" \
-        "Please read the README.md to confirm that you've selected the correct build for your hardware.\n" \
-        "If you are using one of our prebuilt executables, please file a bug with the following information:\n"
-        "{}".format(e))
-        sys.exit(1)
+import logging
+import os
+import sys
+import re
+import shutil
+import zipfile
+
+from appdirs import user_data_dir
+from minio import Minio
+from packaging import version
+
+try:
+    from graxpert.s3_secrets import endpoint, ro_access_key, ro_secret_key
+
+    client = Minio(endpoint, ro_access_key, ro_secret_key)
+except Exception as e:
+    logging.exception(e)
+    client = None
+
+from graxpert.ui.loadingframe import DynamicProgressThread
+
+ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "ai-models")
+bge_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "bge-ai-models")
+
+# old ai-models folder exists, rename to 'bge-ai-models'
+if os.path.exists(ai_models_dir):
+    logging.warning(f"Older 'ai_models_dir' {ai_models_dir} exists. Renaming to {bge_ai_models_dir} due to introduction of new denoising models in GraXpert 3.")
+    try:
+        os.rename(ai_models_dir, bge_ai_models_dir)
+    except Exception as e:
+        logging.error(f"Renaming {ai_models_dir} to {bge_ai_models_dir} failed. {bge_ai_models_dir} will be newly created. Consider deleting obsolete {ai_models_dir} manually.")
+
+os.makedirs(bge_ai_models_dir, exist_ok=True)
+
+deconvolution_object_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "deconvolution-object-ai-models")
+os.makedirs(deconvolution_object_ai_models_dir, exist_ok=True)
+deconvolution_stars_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "deconvolution-stars-ai-models")
+os.makedirs(deconvolution_stars_ai_models_dir, exist_ok=True)
+denoise_ai_models_dir = os.path.join(user_data_dir(appname="GraXpert"), "denoise-ai-models")
+os.makedirs(denoise_ai_models_dir, exist_ok=True)
+
+
+# ui operations
+def list_remote_versions(bucket_name):
+    if client is None:
+        return []
+    try:
+        objects = client.list_objects(bucket_name)
+        versions = []
+
+        for o in objects:
+            tags = client.get_object_tags(o.bucket_name, o.object_name)
+            if tags is not None and "ai-version" in tags:
+                versions.append(
+                    {
+                        "bucket": o.bucket_name,
+                        "object": o.object_name,
+                        "version": tags["ai-version"],
+                    }
+                )
+        return versions
+
+    except Exception as e:
+        logging.exception(e)
+    finally:
+        return versions
+
+
+def list_local_versions(ai_models_dir):
+    try:
+        model_dirs = [
+            {"path": os.path.join(ai_models_dir, f), "version": f}
+            for f in os.listdir(ai_models_dir)
+            if re.search(r"\d\.\d\.\d", f) and len(os.listdir(os.path.join(ai_models_dir, f))) > 0  # match semantic version
+        ]
+        return model_dirs
+    except Exception as e:
+        logging.exception(e)
+        return None
+
+
+def latest_version(ai_models_dir, bucket_name):
+    try:
+        remote_versions = list_remote_versions(bucket_name)
+    except Exception as e:
+        remote_versions = []
+        logging.exception(e)
+    try:
+        local_versions = list_local_versions(ai_models_dir)
+    except Exception as e:
+        local_versions = []
+        logging.exception(e)
+    ai_options = set([])
+    ai_options.update([rv["version"] for rv in remote_versions])
+    ai_options.update(set([lv["version"] for lv in local_versions]))
+    ai_options = sorted(ai_options, key=lambda k: version.parse(k), reverse=True)
+    return ai_options[0]
+
+
+def ai_model_path_from_version(ai_models_dir, local_version):
+    if local_version is None:
+        return None
+
+    return os.path.join(ai_models_dir, local_version, "model.onnx")
+
+
+def compute_orphaned_local_versions(ai_models_dir):
+    remote_versions = list_remote_versions(ai_models_dir)
+
+    if remote_versions is None:
+        logging.warning("Could not fetch remote versions. Thus, aborting cleaning of local versions in {}. Consider manual cleaning".format(ai_models_dir))
+        return
+
+    local_versions = list_local_versions()
+
+    if local_versions is None:
+        logging.warning("Could not read local versions in {}. Thus, aborting cleaning. Consider manual cleaning".format(ai_models_dir))
+        return
+
+    orphaned_local_versions = [{"path": lv["path"], "version": lv["version"]} for lv in local_versions if lv["version"] not in [rv["version"] for rv in remote_versions]]
+
+    return orphaned_local_versions
+
+
+def cleanup_orphaned_local_versions(orphaned_local_versions):
+    for olv in orphaned_local_versions:
+        try:
+            shutil.rmtree(olv["path"])
+        except Exception as e:
+            logging.exception(e)
+
+
+def download_version(ai_models_dir, bucket_name, target_version, progress=None):
+    try:
+        remote_versions = list_remote_versions(bucket_name)
+        for r in remote_versions:
+            if target_version == r["version"]:
+                remote_version = r
+                break
+
+        ai_model_dir = os.path.join(ai_models_dir, "{}".format(remote_version["version"]))
+        os.makedirs(ai_model_dir, exist_ok=True)
+
+        ai_model_file = os.path.join(ai_model_dir, "model.onnx")
+        ai_model_zip = os.path.join(ai_model_dir, "model.zip")
+        client.fget_object(
+            remote_version["bucket"],
+            remote_version["object"],
+            ai_model_zip,
+            progress=DynamicProgressThread(callback=progress),
+        )
+
+        with zipfile.ZipFile(ai_model_zip, "r") as zip_ref:
+            zip_ref.extractall(ai_model_dir)
+
+        if not os.path.isfile(ai_model_file):
+            raise ValueError(f"Could not find ai 'model.onnx' file after extracting {ai_model_zip}")
+        os.remove(ai_model_zip)
+
+    except Exception as e:
+        # try to delete (rollback) ai_model_dir in case of errors
+        logging.exception(e)
+        try:
+            shutil.rmtree(ai_model_dir)
+        except Exception as e2:
+            logging.exception(e2)
+
+
+def validate_local_version(ai_models_dir, local_version):
+    return os.path.isfile(os.path.join(ai_models_dir, local_version, "model.onnx"))
+
+
+def get_execution_providers_ordered(gpu_acceleration=True):
+    if gpu_acceleration:
+        supported_providers = [
+            (
+                "OpenVINOExecutionProvider",
+                {
+                    # per https://onnxruntime.ai/docs/execution-providers/OpenVINO-ExecutionProvider.html#summary-of-options
+                    # "device_type": "HETERO:GPU,CPU,NPU AUTO:GPU,CPU,NPU MULTI:GPU,CPU,NPU", # Will prefer dGPU, fallback to iGPU, NPU or CPU with extra Intel specific optimizations
+                    "device_type": "AUTO:GPU,CPU", # Will prefer dGPU, fallback to iGPU, NPU or CPU with extra Intel specific optimizations
+                }
+            ),
+            "ROCMExecutionProvider",
+            "DmlExecutionProvider",
+            (
+                "CoreMLExecutionProvider",
+                {
+                    "flags": "COREML_FLAG_CREATE_MLPROGRAM",
+                },
+            ),
+            "CUDAExecutionProvider",
+            "CPUExecutionProvider",
+        ]
+    else:
+        supported_providers = ["CPUExecutionProvider"]
+
+    result = []
+    try:
+        import onnxruntime as ort    
+        available = ort.get_available_providers()
+        for provider in supported_providers:
+            if isinstance(provider, tuple):
+                if provider[0] in available:
+                    result.append(provider)  # Append the entire tuple
+            else:
+                if provider in available:
+                    result.append(provider)
+        return result
+    except Exception as e:
+        logging.error("Critical error!  The required ONNX Runtime (AI library) package is misconfigured.\n" \
+        "Please read the README.md to confirm that you've selected the correct build for your hardware.\n" \
+        "If you are using one of our prebuilt executables, please file a bug with the following information:\n"
+        "{}".format(e))
+        sys.exit(1)