first step to reorganise decorators (#7)

Author: zokrezyl

docs/demo/js/pyodide_loader.js

@@ -60,6 +60,13 @@ async function loadPyodideAndPackages() {
     try {
         showLoadingModal();
         updateProgress(0, 'Loading Pyodide...');
+
+        // Load examples.json to get the required imery version
+        const examplesResponse = await fetch('examples/examples.json');
+        const examplesData = await examplesResponse.json();
+        const imeryVersion = examplesData.version || 'latest';
+        console.log(`Target imery version: ${imeryVersion}`);
+
         pyodide = await loadPyodide();
         const pythonVersion = pyodide.runPython("import sys; sys.version");
         updateProgress(7, 'Pyodide loaded.');
@@ -71,7 +78,7 @@ async function loadPyodideAndPackages() {
         // SDL support in Pyodide is experimental. The flag is used to bypass certain issues.
         pyodide._api._skip_unwind_fatal_error = true;
 
-        // List of packages to install
+        // List of packages to install (imery version from examples.json)
         const packages = [
             // Core Python packages from PyPI
             // ------------------------------
@@ -87,9 +94,9 @@ async function loadPyodideAndPackages() {
             // ----------------------------------------------------------
             'imgui_bundle',
 
-            // Imery (from PyPI)
+            // Imery (from PyPI) - pinned to version from build
             // -----------------
-            'imery',
+            `imery==${imeryVersion}`,
         ];
 
         const totalSteps = packages.length;

scripts/hatch_build.py

@@ -223,11 +223,14 @@ def initialize(self, version, build_data):
                 print(f"  Error aggregating {demo_dir.name}: {e}")
                 # Continue with other demos even if one fails
 
-        # Write examples.json
+        # Write examples.json with version
         examples_json_path = aggregated_dir / "examples.json"
         with open(examples_json_path, 'w') as f:
-            json.dump({"examples": examples}, f, indent=2)
+            json.dump({
+                "version": version,
+                "examples": examples
+            }, f, indent=2)
             f.write('\n')
 
         print(f"Successfully aggregated {aggregated_count} demo files")
-        print(f"Generated {examples_json_path} with {len(examples)} examples")
+        print(f"Generated {examples_json_path} with {len(examples)} examples (version {version})")

src/imery/backend/decorators.py

@@ -8,7 +8,7 @@
 from imery.result import Result, Ok
 
 from imery.logging import log
-from imery.backend.decorators import _pending_device_managers
+from imery.decorators import _pending_device_managers, _pending_devices
 
 from pprint import pp
 

src/imery/backend/kernel.py

@@ -0,0 +1,16 @@
+
+_pending_widgets = []
+def widget(obj):
+    _pending_widgets.append(obj)
+    return obj
+
+
+_pending_device_managers = []
+def device_manager(obj):
+    _pending_device_managers.append(obj)
+    return obj
+
+_pending_devices = []
+def device(obj):
+    _pending_devices.append(obj)
+    return obj

src/imery/decorators.py

@@ -3,7 +3,7 @@
 """
 
 from imery.frontend.widget import Widget
-from imery.frontend.decorators import widget
+from imery.decorators import widget
 from imery.types import DataPath
 from imery.result import Result, Ok
 

src/imery/frontend/composite.py

@@ -49,7 +49,7 @@ def __init__(self, dispatcher: Dispatcher, widget_definitions: Dict[str, dict],
 
     def init(self) -> Result[None]:
         """Load widget classes dynamically from widgets_path"""
-        from imery.frontend.decorators import _pending_widgets
+        from imery.decorators import _pending_widgets
 
         # Build list of widget directories from colon-separated path
         widget_dirs = []

src/imery/frontend/decorators.py

@@ -4,7 +4,7 @@
 
 from imgui_bundle import imgui, im_cool_bar, hello_imgui, ImVec2, immapp
 from imery.frontend.widget import Widget
-from imery.frontend.decorators import widget
+from imery.decorators import widget
 from imery.result import Result, Ok
 
 

src/imery/frontend/widget_factory.py

@@ -4,7 +4,7 @@
 
 from imgui_bundle import imgui, hello_imgui
 from imery.frontend.widget import Widget
-from imery.frontend.decorators import widget
+from imery.decorators import widget
 from imery.types import DataPath
 from imery.backend.types import TreeLike
 from imery.result import Result, Ok