hmr 0.4.1__py3-none-any.whl → 0.4.2__py3-none-any.whl

{hmr-0.4.1.dist-info → hmr-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hmr
-Version: 0.4.1
+Version: 0.4.2
 Summary: Hot Module Reload for Python
 Project-URL: repository, https://github.com/promplate/pyth-on-line/tree/reactivity
 Requires-Python: >=3.12

{hmr-0.4.1.dist-info → hmr-0.4.2.dist-info}/RECORD

@@ -1,14 +1,14 @@
-hmr-0.4.1.dist-info/METADATA,sha256=Zx1F2ZUK7Els9nM6w76ceL693CD7JAPUvf7uBVUS2LQ,258
-hmr-0.4.1.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
-hmr-0.4.1.dist-info/entry_points.txt,sha256=g_T0uJ43WgsdG14kkkdaBQuIL0HO-m1qvtjXMP6d060,59
+hmr-0.4.2.dist-info/METADATA,sha256=0dGqIVXUA-EX7VuNsQSOLtOvX5aKy-noYyrRLZpSwkc,258
+hmr-0.4.2.dist-info/WHEEL,sha256=tSfRZzRHthuv7vxpI4aehrdN9scLjk-dCJkPLzkHxGg,90
+hmr-0.4.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=1KCpre2HTFZrngEKkI2HwSFMkCmsUCq2aPEbp0y3kKg,5140
 reactivity/hmr/__init__.py,sha256=S5ZIHqCRpevdzWuhS0aCua_S8F0LkK0YNg6IgeTScFQ,177
 reactivity/hmr/__main__.py,sha256=uIcyjR5gMFIXH_3hS0B3SD00RirVf7GIct-uItx675o,64
 reactivity/hmr/api.py,sha256=Esb1fYiBW0SLxQ0MPXby25ZgIIZhIp-M3b2KiqpffmU,2094
-reactivity/hmr/core.py,sha256=HxPngNSKcw5OrIiokqJtbUfAw2Fph-1G3ToJIDP4Pf4,11677
+reactivity/hmr/core.py,sha256=x71UilKjeH-HH72ta_u46tnRV3Fb28KXqoqtGdGabko,12250
 reactivity/hmr/hooks.py,sha256=jIFpe4CNxfaS9RcR4OIodx_sOZlnJ_IA1T1RtHPXhwU,945
 reactivity/hmr/utils.py,sha256=-PO-LMP4sc3IP-Bn_baq2w9IFWBZ3zGesgRn5wR6bS0,1555
 reactivity/primitives.py,sha256=mB6cbHKDqtilOfgaEhshtRWJq9s0nPEKqRK0hfCoyFE,5671
-hmr-0.4.1.dist-info/RECORD,,
+hmr-0.4.2.dist-info/RECORD,,

reactivity/hmr/core.py

@@ -15,7 +15,7 @@ from weakref import WeakValueDictionary
 from .. import Reactive, batch
 from ..functional import create_effect
 from ..helpers import DerivedMethod
-from ..primitives import BaseDerived, Derived, Signal
+from ..primitives import BaseComputation, BaseDerived, Derived, Signal
 from .hooks import call_post_reload_hooks, call_pre_reload_hooks
 
 
@@ -33,8 +33,7 @@ def is_called_in_this_file() -> bool:
 
 
 class Name(Signal, BaseDerived):
-    def __init__(self, initial_value):
-        super().__init__(initial_value)
+    pass
 
 
 class NamespaceProxy(Reactive[str, Any]):
@@ -44,7 +43,7 @@ class NamespaceProxy(Reactive[str, Any]):
         self.module = module
 
     def _null(self):
-        self.module.load.subscribers.add(signal := Name(self.UNSET))
+        self.module.load.subscribers.add(signal := Name(self.UNSET, self._check_equality))
         signal.dependencies.add(self.module.load)
         return signal
 
@@ -97,12 +96,24 @@ class ReactiveModule(ModuleType):
         else:
             exec(code, self.__namespace, self.__namespace_proxy)
         finally:
-            for dep in list((load := self.__load).dependencies):
-                assert ismethod(load.fn)  # for type narrowing
+            load = self.__load
+            assert ismethod(load.fn)  # for type narrowing
+            for dep in list(load.dependencies):
                 if isinstance(dep, Derived) and ismethod(dep.fn) and isinstance(dep.fn.__self__, ReactiveModule) and dep.fn.__func__ is load.fn.__func__:
                     # unsubscribe it because we want invalidation to be fine-grained
                     dep.subscribers.remove(load)
                     load.dependencies.remove(dep)
+                elif isinstance(dep, BaseComputation):
+                    visited = set()  # cache visited nodes, maybe share cache between iteration too (?)
+                    to_visit: set[BaseComputation] = {dep}
+                    while to_visit and (current := to_visit.pop()) not in visited:
+                        visited.add(current)
+                        if load in current.dependencies:
+                            # unsubscribe it to avoid circular dependencies
+                            dep.subscribers.remove(load)
+                            load.dependencies.remove(dep)
+                            break
+                        to_visit.update(i for i in current.dependencies if isinstance(i, BaseComputation))
 
     @property
     def load(self):
@@ -122,8 +133,7 @@ class ReactiveModule(ModuleType):
         try:
             return self.__namespace_proxy[name]
         except KeyError as e:
-            caller = currentframe().f_back.f_globals["__name__"]  # type: ignore
-            if caller != "importlib._bootstrap" and (getattr := self.__namespace_proxy.get("__getattr__")):
+            if name != "__path__" and (getattr := self.__namespace_proxy.get("__getattr__")):
                 return getattr(name)
             raise AttributeError(*e.args) from e
 
@@ -134,14 +144,13 @@ class ReactiveModule(ModuleType):
 
 
 class ReactiveModuleLoader(Loader):
-    def __init__(self, file: Path, is_package=False):
+    def __init__(self, file: Path):
         super().__init__()
         self._file = file
-        self._is_package = is_package
 
     def create_module(self, spec: ModuleSpec):
         namespace = {"__file__": str(self._file), "__spec__": spec, "__loader__": self, "__name__": spec.name}
-        if self._is_package:
+        if spec.submodule_search_locations is not None:
             assert self._file.name == "__init__.py"
             namespace["__path__"] = [str(self._file.parent)]
         return ReactiveModule(self._file, namespace, spec.name)
@@ -174,7 +183,7 @@ class ReactiveModuleFinder(MetaPathFinder):
                 return spec_from_loader(fullname, ReactiveModuleLoader(file), origin=str(file))
             file = directory / f"{fullname.replace('.', '/')}/__init__.py"
             if self._accept(file) and (paths is None or is_relative_to_any(file, paths)):
-                return spec_from_loader(fullname, ReactiveModuleLoader(file, is_package=True), origin=str(file), is_package=True)
+                return spec_from_loader(fullname, ReactiveModuleLoader(file), origin=str(file), is_package=True)
 
 
 def is_relative_to_any(path: Path, paths: Iterable[str | Path]):
@@ -340,4 +349,4 @@ def cli():
     SyncReloader(entry).keep_watching_until_interrupt()
 
 
-__version__ = "0.4.1"
+__version__ = "0.4.2"