hmr 0.3.2.2__tar.gz → 0.3.3.1__tar.gz

{hmr-0.3.2.2 → hmr-0.3.3.1}/PKG-INFO

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

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

{hmr-0.3.2.2 → hmr-0.3.3.1}/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.2.2 → hmr-0.3.3.1}/reactivity/hmr/core.py

@@ -190,16 +190,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()
 
-        with self.error_filter:
-            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()
 
@@ -224,15 +225,14 @@ class BaseReloader:
                     if path.samefile(self.entry):
                         self.run_entry_file.invalidate()
                     elif module := path2module.get(path):
-                        with self.error_filter:
-                            module.load.invalidate()
+                        module.load.invalidate()
 
-            for module in path2module.values():
-                if module.file.samefile(self.entry):
-                    continue
-                with self.error_filter:
+            with self.error_filter:
+                for module in path2module.values():
+                    if module.file.samefile(self.entry):
+                        continue
                     module.load()
-            self.run_entry_file()
+                self.run_entry_file()
 
 
 class _SimpleEvent:
@@ -264,7 +264,8 @@ class SyncReloader(BaseReloader):
 
     def keep_watching_until_interrupt(self):
         with suppress(KeyboardInterrupt):
-            self.run_entry_file()
+            with self.error_filter:
+                self.run_entry_file()
             self.start_watching()
         self.run_entry_file.dispose()
 
@@ -289,7 +290,8 @@ class AsyncReloader(BaseReloader):
 
     async def keep_watching_until_interrupt(self):
         with suppress(KeyboardInterrupt):
-            self.run_entry_file()
+            with self.error_filter:
+                self.run_entry_file()
             await self.start_watching()
         self.run_entry_file.dispose()
 
@@ -305,4 +307,4 @@ def cli():
     SyncReloader(entry).keep_watching_until_interrupt()
 
 
-__version__ = "0.3.2.2"
+__version__ = "0.3.3.1"