hmr 0.1.2__py3-none-any.whl → 0.2.0__py3-none-any.whl

{hmr-0.1.2.dist-info → hmr-0.2.0.dist-info}/METADATA

@@ -1,8 +1,8 @@
 Metadata-Version: 2.1
 Name: hmr
-Version: 0.1.2
+Version: 0.2.0
 Summary: Hot Module Reload for Python
 Project-URL: repository, https://github.com/promplate/pyth-on-line/tree/reactivity
 Requires-Python: >=3.12
-Requires-Dist: watchfiles<2,>=0.21
+Requires-Dist: watchfiles<2,>=0.21; sys_platform != "emscripten"
 

hmr-0.2.0.dist-info/RECORD

@@ -0,0 +1,9 @@
+hmr-0.2.0.dist-info/METADATA,sha256=EOVgm-SYoDvhCdf7X3stdnfoOwt4JiJz4dU-MH5qp4A,258
+hmr-0.2.0.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+hmr-0.2.0.dist-info/entry_points.txt,sha256=g_T0uJ43WgsdG14kkkdaBQuIL0HO-m1qvtjXMP6d060,59
+reactivity/__init__.py,sha256=pX-RUzkezCC1x4eOWGxNhXbwrbvBLP_3pQuZr9eZz1Y,300
+reactivity/functional.py,sha256=U06vshcVhZ0sb218gcmHtEhfgTNAGtQ7zyvPz2w5qKM,1292
+reactivity/helpers.py,sha256=7gwsIKKrjEahSz9G9oR4s1LdYXQTCIMO0k4UGXGla9Y,3714
+reactivity/hmr.py,sha256=CeJSXPeDA-wc_tE_JC0gXfFgeaGsCEvmVbbsCYJtGok,9603
+reactivity/primitives.py,sha256=DR2waJbzhVKOioHXMliE4FIsxQUq7DZA0umPrlvchA4,4217
+hmr-0.2.0.dist-info/RECORD,,

reactivity/helpers.py

@@ -13,32 +13,29 @@ class Memoized[T](Subscribable, BaseComputation[T]):
         self.fn = fn
         self.is_stale = True
         self.cached_value: T
-        self._recompute = False
+
+    def recompute(self):
+        self._before()
+        try:
+            self.cached_value = self.fn()
+            self.is_stale = False
+        finally:
+            self._after()
 
     def trigger(self):
-        self.track()
-        if self._recompute:
-            self._recompute = False
-            self._before()
-            try:
-                self.cached_value = self.fn()
-                self.is_stale = False
-            finally:
-                self._after()
-        else:
-            self.invalidate()
+        self.invalidate()
 
     def __call__(self):
+        self.track()
         if self.is_stale:
-            self._recompute = True
-            self.trigger()
-            assert not self._recompute
+            self.recompute()
         return self.cached_value
 
     def invalidate(self):
         if not self.is_stale:
             del self.cached_value
             self.is_stale = True
+            self.notify()
 
 
 class MemoizedProperty[T, I]:

reactivity/hmr.py

@@ -278,9 +278,10 @@ def cli():
         print("\n Usage: hmr <entry file>, just like python <entry file>\n")
         exit(1)
     entry = sys.argv[-1]
-    assert Path(entry).is_file(), f"{entry} is not a file"
+    if not (path := Path(entry)).is_file():
+        raise FileNotFoundError(path.resolve())
     sys.path.insert(0, ".")
     SyncReloader(entry, excludes={".venv"}).keep_watching_until_interrupt()
 
 
-__version__ = "0.1.2"
+__version__ = "0.2.0"

reactivity/primitives.py

@@ -1,4 +1,4 @@
-from collections.abc import Callable
+from collections.abc import Callable, Iterable
 from typing import Any, Self, overload
 from weakref import WeakKeyDictionary, WeakSet
 
@@ -9,17 +9,19 @@ class Subscribable:
         self.subscribers = set[BaseComputation]()
 
     def track(self):
-        for computation in _current_computations:
-            if computation is not self:
-                self.subscribers.add(computation)
-                computation.dependencies.add(self)
+        if not _current_computations:
+            return
+        last = _current_computations[-1]
+        if last is not self:
+            self.subscribers.add(last)
+            last.dependencies.add(self)
 
     def notify(self):
         if _batches:
-            _batches[-1].callbacks.extend(self.subscribers)
+            schedule_callbacks(self.subscribers)
         else:
-            for subscriber in {*self.subscribers}:
-                subscriber.trigger()
+            with Batch(force_flush=False):
+                schedule_callbacks(self.subscribers)
 
 
 class BaseComputation[T]:
@@ -46,9 +48,9 @@ class BaseComputation[T]:
     def __exit__(self, *_):
         self.dispose()
 
-    def trigger(self) -> T: ...
+    def trigger(self) -> Any: ...
 
-    def __call__(self):
+    def __call__(self) -> T:
         return self.trigger()
 
 
@@ -119,22 +121,38 @@ class Effect[T](BaseComputation[T]):
 
 
 class Batch:
-    def __init__(self):
-        self.callbacks: list[BaseComputation] = []
+    def __init__(self, force_flush=True):
+        self.callbacks = set[BaseComputation]()
+        self.force_flush = force_flush
 
     def flush(self):
-        callbacks = set(self.callbacks)
-        self.callbacks.clear()
-        for computation in callbacks:
-            computation.trigger()
+        triggered = set()
+        while self.callbacks:
+            callbacks = self.callbacks - triggered
+            self.callbacks.clear()
+            for computation in callbacks:
+                if computation in self.callbacks:
+                    continue  # skip if re-added during callback
+                computation.trigger()
+                triggered.add(computation)
 
     def __enter__(self):
         _batches.append(self)
 
     def __exit__(self, *_):
-        last = _batches.pop()
+        if self.force_flush or len(_batches) == 1:
+            try:
+                self.flush()
+            finally:
+                last = _batches.pop()
+        else:
+            last = _batches.pop()
+            schedule_callbacks(self.callbacks)
         assert last is self
-        self.flush()
 
 
 _batches: list[Batch] = []
+
+
+def schedule_callbacks(callbacks: Iterable[BaseComputation]):
+    _batches[-1].callbacks.update(callbacks)

hmr-0.1.2.dist-info/RECORD

@@ -1,9 +0,0 @@
-hmr-0.1.2.dist-info/METADATA,sha256=tHSOaU8XTf-WF85Hg7r6Fimk-g6WZZa3jJeurid7yno,228
-hmr-0.1.2.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-hmr-0.1.2.dist-info/entry_points.txt,sha256=g_T0uJ43WgsdG14kkkdaBQuIL0HO-m1qvtjXMP6d060,59
-reactivity/__init__.py,sha256=pX-RUzkezCC1x4eOWGxNhXbwrbvBLP_3pQuZr9eZz1Y,300
-reactivity/functional.py,sha256=U06vshcVhZ0sb218gcmHtEhfgTNAGtQ7zyvPz2w5qKM,1292
-reactivity/helpers.py,sha256=1KmMCO6lqluHlMsjGQQ9UJZBtbFppjFZnmi9RhowRHo,3872
-reactivity/hmr.py,sha256=lUqHeB_5LlrHMUSWXRvSRGoaMkFAm3ONQNxm5OCk0Uw,9570
-reactivity/primitives.py,sha256=lw4G3GpANRGK5dKw11eYc2-nlOJ1uCO3f3MiLa41jG8,3588
-hmr-0.1.2.dist-info/RECORD,,