hmr 0.4.2__tar.gz → 0.5.0__tar.gz

{hmr-0.4.2 → hmr-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: hmr
-Version: 0.4.2
+Version: 0.5.0
 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.2 → hmr-0.5.0}/pyproject.toml

@@ -6,7 +6,7 @@ description = "Hot Module Reload for Python"
 dependencies = [
     "watchfiles>=0.21,<2 ; sys_platform != 'emscripten'",
 ]
-version = "0.4.2"
+version = "0.5.0"
 
 [project.scripts]
 hmr = "reactivity.hmr:cli"

{hmr-0.4.2 → hmr-0.5.0}/reactivity/helpers.py

@@ -112,11 +112,13 @@ class Reactive[K, V](Subscribable, MutableMapping[K, V]):
 
     def __iter__(self):
         self.track()
-        return iter(self._signals)
+        unset = self.UNSET
+        return (key for key, signal in self._signals.items() if signal.get(track=False) is not unset)
 
     def __len__(self):
         self.track()
-        return len(self._signals)
+        unset = self.UNSET
+        return sum(signal.get(track=False) is not unset for signal in self._signals.values())
 
     def __repr__(self):
         self.track()

{hmr-0.4.2 → hmr-0.5.0}/reactivity/hmr/core.py

@@ -15,21 +15,21 @@ from weakref import WeakValueDictionary
 from .. import Reactive, batch
 from ..functional import create_effect
 from ..helpers import DerivedMethod
-from ..primitives import BaseComputation, BaseDerived, Derived, Signal
+from ..primitives import BaseDerived, Derived, Signal
 from .hooks import call_post_reload_hooks, call_pre_reload_hooks
 
 
-def is_called_in_this_file() -> bool:
-    frame = currentframe()  # this function
-    assert frame is not None
+def is_called_internally(*, extra_depth=0) -> bool:
+    """Protect private methods from being called from outside this package."""
 
-    frame = frame.f_back  # the function calling this function
+    frame = currentframe()  # this function
     assert frame is not None
 
-    frame = frame.f_back  # the function calling the function calling this function
-    assert frame is not None
+    for _ in range(extra_depth + 2):
+        frame = frame.f_back
+        assert frame is not None
 
-    return frame.f_globals.get("__file__") == __file__
+    return frame.f_globals.get("__package__") == __package__
 
 
 class Name(Signal, BaseDerived):
@@ -83,7 +83,7 @@ class ReactiveModule(ModuleType):
 
     @property
     def file(self):
-        if is_called_in_this_file():
+        if is_called_internally(extra_depth=1):  # + 1 for `__getattribute__`
             return self.__file
         raise AttributeError("file")
 
@@ -103,21 +103,10 @@ class ReactiveModule(ModuleType):
                     # 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):
-        if is_called_in_this_file():
+        if is_called_internally(extra_depth=1):  # + 1 for `__getattribute__`
             return self.__load
         raise AttributeError("load")
 
@@ -138,7 +127,7 @@ class ReactiveModule(ModuleType):
             raise AttributeError(*e.args) from e
 
     def __setattr__(self, name: str, value):
-        if is_called_in_this_file():
+        if is_called_internally():
             return super().__setattr__(name, value)
         self.__namespace_proxy[name] = value
 
@@ -349,4 +338,4 @@ def cli():
     SyncReloader(entry).keep_watching_until_interrupt()
 
 
-__version__ = "0.4.2"
+__version__ = "0.5.0"

{hmr-0.4.2 → hmr-0.5.0}/reactivity/hmr/utils.py

@@ -61,3 +61,7 @@ def cache_across_reloads[T](func: Callable[[], T]) -> Callable[[], T]:
 class DictProxy(UserDict, dict):  # type: ignore
     def __init__(self, data):
         self.data = data
+
+
+def load(module: ReactiveModule):
+    return module.load()

{hmr-0.4.2 → hmr-0.5.0}/reactivity/primitives.py

@@ -212,4 +212,13 @@ class Derived[T](BaseDerived[T]):
 
 
 def _pulled(sub: Subscribable):
-    return any(not isinstance(s, BaseDerived) or _pulled(s) for s in sub.subscribers)
+    visited = set()
+    to_visit: set[Subscribable] = {sub}
+    while to_visit:
+        visited.add(current := to_visit.pop())
+        for s in current.subscribers:
+            if not isinstance(s, BaseDerived):
+                return True
+            if s not in visited:
+                to_visit.add(s)
+    return False