hmr 0.3.3__tar.gz → 0.3.3.2__tar.gz

{hmr-0.3.3 → hmr-0.3.3.2}/PKG-INFO

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

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

{hmr-0.3.3 → hmr-0.3.3.2}/reactivity/hmr/api.py

@@ -1,4 +1,11 @@
-from .core import AsyncReloader, SyncReloader
+from .core import AsyncReloader, BaseReloader, SyncReloader
+
+
+def _clean_up(r: BaseReloader):
+    r.run_entry_file.dispose()
+    r.run_entry_file.invalidate()
+    r.entry_module.load.dispose()
+    r.entry_module.load.invalidate()
 
 
 class SyncReloaderAPI(SyncReloader):
@@ -13,21 +20,19 @@ class SyncReloaderAPI(SyncReloader):
     def __exit__(self, *_):
         self.stop_watching()
         self.thread.join()
-        self.run_entry_file.dispose()
-        self.run_entry_file.invalidate()
+        _clean_up(self)
 
     async def __aenter__(self):
         from asyncio import ensure_future, to_thread
 
-        self.run_entry_file()
+        await to_thread(self.run_entry_file)
         self.future = ensure_future(to_thread(self.start_watching))
         return super()
 
     async def __aexit__(self, *_):
         self.stop_watching()
         await self.future
-        self.run_entry_file.dispose()
-        self.run_entry_file.invalidate()
+        _clean_up(self)
 
 
 class AsyncReloaderAPI(AsyncReloader):
@@ -43,8 +48,7 @@ class AsyncReloaderAPI(AsyncReloader):
     def __exit__(self, *_):
         self.stop_watching()
         self.thread.join()
-        self.run_entry_file.dispose()
-        self.run_entry_file.invalidate()
+        _clean_up(self)
 
     async def __aenter__(self):
         from asyncio import ensure_future, to_thread
@@ -56,5 +60,4 @@ class AsyncReloaderAPI(AsyncReloader):
     async def __aexit__(self, *_):
         self.stop_watching()
         await self.future
-        self.run_entry_file.dispose()
-        self.run_entry_file.invalidate()
+        _clean_up(self)

{hmr-0.3.3 → hmr-0.3.3.2}/reactivity/hmr/core.py

@@ -9,7 +9,8 @@ from inspect import currentframe
 from pathlib import Path
 from site import getsitepackages
 from types import ModuleType, TracebackType
-from typing import Any
+from typing import Any, Self
+from weakref import WeakValueDictionary
 
 from .. import Reactive, batch, memoized_method
 from .hooks import call_post_reload_hooks, call_pre_reload_hooks
@@ -43,6 +44,8 @@ class NamespaceProxy(Reactive[str, Any]):
 
 
 class ReactiveModule(ModuleType):
+    instances: WeakValueDictionary[Path, Self] = WeakValueDictionary()
+
     def __init__(self, file: Path, namespace: dict, name: str, doc: str | None = None):
         super().__init__(name, doc)
         self.__is_initialized = False
@@ -53,6 +56,8 @@ class ReactiveModule(ModuleType):
         self.__namespace_proxy = NamespaceProxy(namespace)
         self.__file = file
 
+        self.instances[file.resolve()] = self
+
     @property
     def file(self):
         if is_called_in_this_file():
@@ -155,7 +160,7 @@ def patch_meta_path(includes: Iterable[str] = (".",), excludes: Iterable[str] =
 
 
 def get_path_module_map():
-    return {module.file.resolve(): module for module in sys.modules.values() if isinstance(module, ReactiveModule)}
+    return {**ReactiveModule.instances}
 
 
 class ErrorFilter:
@@ -190,15 +195,17 @@ class BaseReloader:
         patch_meta_path(includes, excludes)
         self.error_filter = ErrorFilter(*(str(i) for i in Path(__file__, "../..").resolve().glob("**/*.py")))
 
+    @cached_property
+    def entry_module(self):
+        namespace = {"__file__": self.entry, "__name__": "__main__"}
+        return ReactiveModule(Path(self.entry), namespace, "__main__")
+
     @memoized_method
     def run_entry_file(self):
         call_pre_reload_hooks()
 
-        if not isinstance(module := sys.modules["__main__"], ReactiveModule):
-            namespace = {"__file__": self.entry, "__name__": "__main__"}
-            module = sys.modules["__main__"] = ReactiveModule(Path(self.entry), namespace, "__main__")
-        module.load.invalidate()
-        module.load()
+        self.entry_module.load.invalidate()
+        self.entry_module.load()
 
         call_post_reload_hooks()
 
@@ -305,4 +312,4 @@ def cli():
     SyncReloader(entry).keep_watching_until_interrupt()
 
 
-__version__ = "0.3.3"
+__version__ = "0.3.3.2"

{hmr-0.3.3 → hmr-0.3.3.2}/reactivity/hmr/utils.py

@@ -1,8 +1,8 @@
-import sys
 from collections import UserDict
 from collections.abc import Callable
 from functools import wraps
-from inspect import getsource
+from inspect import getsource, getsourcefile
+from pathlib import Path
 from types import FunctionType
 
 from .. import create_memo
@@ -28,7 +28,9 @@ def clear_memos():
 
 
 def cache_across_reloads[T](func: Callable[[], T]) -> Callable[[], T]:
-    module = sys.modules[func.__module__]
+    file = getsourcefile(func)
+    assert file is not None
+    module = ReactiveModule.instances[Path(file).resolve()]
 
     if not isinstance(module, ReactiveModule):
         from functools import cache