From 01995c82c6aab8cee5a203801969e7f6957870d9 Mon Sep 17 00:00:00 2001
From: "Alexander G. Morano" <amorano@gmail.com>
Date: Sat, 12 Apr 2025 01:18:13 -0400
Subject: [PATCH 1/3] Update requirements.txt

---
 requirements.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 315562b..c9271f0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ matplotlib
 mido[ports-rtmidi]
 mss
 numba
-numpy>=1.26.4
+numpy<=1.26.4
 opencv-contrib-python
 Pillow
 PyOpenGL
@@ -21,4 +21,4 @@ scikit-learn
 SpoutGL; platform_system=="Windows"
 stereoscopy[auto_align]
 vnoise
-pyobjc-framework-Quartz; platform_system=='Darwin'
\ No newline at end of file
+pyobjc-framework-Quartz; platform_system=='Darwin'

From e6b88ccbc3114e6a48178acd34f7901caa33ea7c Mon Sep 17 00:00:00 2001
From: "Alexander G. Morano" <amorano@gmail.com>
Date: Sat, 12 Apr 2025 01:19:27 -0400
Subject: [PATCH 2/3] Update pyproject.toml

---
 pyproject.toml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8681bf0..6da8e1a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "jovimetrix"
 description = "Integrates Webcam, MIDI, Spout and GLSL shader support. Animation via tick. Parameter manipulation with wave generator. Math operations with Unary and Binary support. Value conversion for all major types (int, string, list, dict, Image, Mask). Shape mask generation, image stacking and channel ops, batch splitting, merging and randomizing, load images and video from anywhere, dynamic bus routing with a single node, export support for GIPHY, save output anywhere! flatten, crop, transform; check colorblindness, make stereogram or stereoscopic images, or liner interpolate values and more."
-version = "1.7.46"
+version = "1.7.48"
 license = { file = "LICENSE" }
 readme = "README.md"
 authors = [{ name = "Alexander G. Morano", email = "amorano@gmail.com" }]
@@ -27,8 +27,7 @@ dependencies = [
     "mido[ports-rtmidi]",
     "mss",
     "numba",
-    "numpy>=1.26.4,<2.0.0; python_version <= '3.11'",
-    "numpy>=2.0.0; python_version >= '3.12'",
+    "numpy>=1.26.4,<2.0.0",    
     "opencv-contrib-python",
     "Pillow",
     "PyOpenGL",

From 4e7952d333975b9ee665bf15a914dc690864b9d6 Mon Sep 17 00:00:00 2001
From: "Alexander G. Morano" <amorano@gmail.com>
Date: Sat, 12 Apr 2025 01:20:40 -0400
Subject: [PATCH 3/3] Update __init__.py

---
 __init__.py | 25 ++++++++++---------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/__init__.py b/__init__.py
index 9336b43..14b5985 100644
--- a/__init__.py
+++ b/__init__.py
@@ -855,24 +855,19 @@ def configLoad(fname:Path, as_json:bool=True) -> Any | list[str] | None:
 
 def load_module(name: str) -> None|ModuleType:
     module = inspect.getmodule(inspect.stack()[0][0]).__name__
+    module = module.replace("\\", "/")
+    route = str(name).replace("\\", "/")
     try:
-        route = str(name).replace("\\", "/")
-        route = route.split(f"{module}/core/")[1]
-        route = route.split('.')[0].replace('/', '.')
+        module = module.split("/")[-1]
+        route = route.split(f"{module}/")[1]
+        route = route.split('.')[0]
+        route = route.replace('/', '.')
+        module = f"{module}.{route}"
+        return importlib.import_module(module)
     except Exception as e:
-        logger.warning(f"module failed {name}")
+        logger.warning(f"file failed {name}")
+        logger.warning(f"module {module}")
         logger.warning(str(e))
-        return
-
-    try:
-        module = f"{module}.core.{route}"
-        module = importlib.import_module(module)
-    except Exception as e:
-        logger.warning(f"module failed {module}")
-        logger.warning(str(e))
-        return
-
-    return module
 
 def loader():
     global JOV_CONFIG, JOV_IGNORE_NODE, NODE_CLASS_MAPPINGS, NODE_DISPLAY_NAME_MAPPINGS