Merge pull request #92 from MightyYeti/main

Patches import

__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

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",

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'
+pyobjc-framework-Quartz; platform_system=='Darwin'