sier2 0.23__tar.gz → 0.24__tar.gz

{sier2-0.23 → sier2-0.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sier2
-Version: 0.23
+Version: 0.24
 Summary: Blocks of code that are executed in dags
 Author: algol60
 Author-email: algol60@users.noreply.github.com

{sier2-0.23 → sier2-0.24}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sier2"
-version = "0.23"
+version = "0.24"
 description = "Blocks of code that are executed in dags"
 authors = ["algol60 <algol60@users.noreply.github.com>"]
 readme = "README.rst"

{sier2-0.23 → sier2-0.24}/src/sier2/_dag.py

@@ -3,6 +3,7 @@ from dataclasses import dataclass, field #, KW_ONLY, field
 from collections import defaultdict, deque
 import holoviews as hv
 import threading
+import sys
 from typing import Any
 
 # By default, loops in a dag aren't allowed.
@@ -70,7 +71,8 @@ class _BlockContext:
             self.block._block_state = BlockState.WAITING if isinstance(self.block, InputBlock) else BlockState.SUCCESSFUL
         elif exc_type is KeyboardInterrupt:
             self.block_state._block_state = BlockState.INTERRUPTED
-            self.dag._stopper.event.set()
+            if not self.dag._is_pyodide:
+                self.dag._stopper.event.set()
             print(f'KEYBOARD INTERRUPT IN BLOCK {self.name}')
         else:
             state = BlockState.ERROR
@@ -87,7 +89,8 @@ class _BlockContext:
 
                 # msg = f'While in {self.block.name}.execute(): {exc_val}'
                 # LOGGER.exception(msg)
-                self.dag._stopper.event.set()
+                if not self.dag._is_pyodide:
+                    self.dag._stopper.event.set()
 
                 if not issubclass(exc_type, BlockError):
                     # Convert non-BlockErrors in the block to a BlockError.
@@ -118,11 +121,14 @@ class Dag:
 
     def __init__(self, *, site: str='Block', title: str, doc: str):
         self._block_pairs: list[tuple[Block, Block]] = []
-        self._stopper = _Stopper()
+        
         self.site = site
         self.title = title
         self.doc = doc
 
+        if not self._is_pyodide:
+            self._stopper = _Stopper()
+
         # We watch output params to be notified when they are set.
         # Events are queued here.
         #
@@ -132,6 +138,10 @@ class Dag:
         #
         self._block_context = _BlockContext
 
+    @property
+    def _is_pyodide(self) -> bool:
+        return '_pyodide' in sys.modules
+
     def _for_each_once(self):
         """Yield each connected block once."""
 
@@ -144,13 +154,13 @@ class Dag:
 
     def stop(self):
         """Stop further execution of Block instances in this dag."""
-
-        self._stopper.event.set()
+        if not self._is_pyodide:
+            self._stopper.event.set()
 
     def unstop(self):
         """Enable further execution of Block instances in this dag."""
-
-        self._stopper.event.clear()
+        if not self._is_pyodide:
+            self._stopper.event.clear()
 
     def connect(self, src: Block, dst: Block, *connections: Connection):
         if any(not isinstance(c, Connection) for c in connections):
@@ -290,15 +300,17 @@ class Dag:
             # The user has set the "stop executing" flag.
             # Continue to set params, but don't execute anything
             #
-            if self._stopper.is_stopped:
-                can_execute = False
+            if not self._is_pyodide:
+                if self._stopper.is_stopped:
+                    can_execute = False
 
             item = self._block_queue.popleft()
             try:
                 item.dst.param.update(item.values)
             except ValueError as e:
                 msg = f'While in {item.dst.name} setting a parameter: {e}'
-                self._stopper.event.set()
+                if not self._is_pyodide:
+                    self._stopper.event.set()
                 raise BlockError(msg) from e
 
             # Execute the block.

{sier2-0.23 → sier2-0.24}/src/sier2/panel/_panel.py

@@ -10,8 +10,6 @@ from .._dag import _InputValues
 from ._feedlogger import getDagPanelLogger, getBlockPanelLogger
 from ._panel_util import _get_state_color, dag_doc
 
-NTHREADS = 2
-
 # From https://tabler.io/icons/icon/info-circle
 #
 INFO_SVG = '''<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round">
@@ -22,7 +20,26 @@ INFO_SVG = '''<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" vie
 </svg>
 '''
 
-pn.extension('floatpanel', inline=True, nthreads=NTHREADS, loading_spinner='bar', notifications=True)
+if '_pyodide' in sys.modules:
+    # Pyodide (to be specific, WASM) doesn't allow threads.
+    # Specifying one thread for panel for some reason tries to start one, so we need to rely on the default.
+    #
+    pn.extension(
+        'floatpanel', 
+        inline=True, 
+        loading_spinner='bar', 
+        notifications=True,
+    )
+else:
+    pn.extension(
+        'floatpanel', 
+        inline=True, 
+        nthreads=2, 
+        loading_spinner='bar', 
+        notifications=True,
+    )
+
+
 
 def _hms(sec):
     h, sec = divmod(int(sec), 3600)
@@ -60,6 +77,8 @@ class _PanelContext:
         return self.block
 
     def __exit__(self, exc_type, exc_val, exc_tb):
+
+        print('c')
         delta = (datetime.now() - self.t0).total_seconds()
 
         if self.block._progress:
@@ -73,7 +92,8 @@ class _PanelContext:
         elif isinstance(exc_type, KeyboardInterrupt):
             state = BlockState.INTERRUPTED
             self.block_state._block_state = state
-            self.dag._stopper.event.set()
+            if not self.dag._is_pyodide:
+                self.dag._stopper.event.set()
             if self.dag_logger:
                 self.dag_logger.exception(f'KEYBOARD INTERRUPT after {_hms(delta)}', block_name=self.block.name, block_state=state)
         else:
@@ -88,13 +108,13 @@ class _PanelContext:
                     )
 
                 # msg = f'While in {self.block.name}.execute(): {exc_val}'
-                self.dag._stopper.event.set()
+                if not self.dag._is_pyodide:
+                    self.dag._stopper.event.set()
 
                 if not issubclass(exc_type, BlockError):
                     # Convert the error in the block to a BlockError.
                     #
                     raise BlockError(f'Block {self.block.name}: {str(exc_val)}') from exc_val
-
         return False
 
 def _quit(session_context):
@@ -296,8 +316,9 @@ class BlockCard(pn.Card):
                 # current values on the queue.
                 # If their values are already there, it doesn't matter.
                 #
-                w.param.trigger(*w._block_out_params)
                 parent_template.main[0].loading = True
+                w.param.trigger(*w._block_out_params)
+                
                 try:
                     if dag_logger:
                         dag_logger.info('', block_name=None, block_state=None)
@@ -320,10 +341,9 @@ class BlockCard(pn.Card):
                         pn.state.notifications.error(notif, duration=0)
                 finally:
                     parent_template.main[0].loading = False
-
             c_button = pn.widgets.Button(name=w.continue_label, button_type='primary')
             c_button.on_click(on_continue)
-
+            
             w_ = pn.Column(
                 w,
                 pn.Row(c_button, align='end'),