Fix hook stack errors

Author: Archmonger

src/reactpy/core/_life_cycle_hook.py

@@ -33,7 +33,10 @@ class _HookStack(Singleton):  # nocov
     )
 
     def get(self) -> list[LifeCycleHook]:
-        return self._state.get()
+        try:
+            return self._state.get()
+        except LookupError:
+            return []
 
     def initialize(self) -> Token[list[LifeCycleHook]] | None:
         return None if isinstance(self._state, ThreadLocal) else self._state.set([])

src/reactpy/core/layout.py

@@ -34,7 +34,7 @@
     REACTPY_CHECK_VDOM_SPEC,
     REACTPY_DEBUG,
 )
-from reactpy.core._life_cycle_hook import LifeCycleHook
+from reactpy.core._life_cycle_hook import HOOK_STACK, LifeCycleHook
 from reactpy.core.vdom import validate_vdom_json
 from reactpy.types import (
     BaseLayout,
@@ -162,43 +162,47 @@ async def _parallel_render(self) -> LayoutUpdateMessage:
     async def _create_layout_update(
         self, old_state: _ModelState
     ) -> LayoutUpdateMessage:
-        component = old_state.life_cycle_state.component
+        token = HOOK_STACK.initialize()
         try:
-            parent: _ModelState | None = old_state.parent
-        except AttributeError:
-            parent = None
-
-        async with AsyncExitStack() as exit_stack:
-            new_state = await self._render_component(
-                exit_stack,
-                old_state,
-                parent,
-                old_state.index,
-                old_state.key,
-                component,
-            )
+            component = old_state.life_cycle_state.component
+            try:
+                parent: _ModelState | None = old_state.parent
+            except AttributeError:
+                parent = None
+
+            async with AsyncExitStack() as exit_stack:
+                new_state = await self._render_component(
+                    exit_stack,
+                    old_state,
+                    parent,
+                    old_state.index,
+                    old_state.key,
+                    component,
+                )
 
-        if parent is not None:
-            parent.children_by_key[new_state.key] = new_state
-            old_parent_model = parent.model.current
-            old_parent_children = old_parent_model.setdefault("children", [])
-            parent.model.current = {
-                **old_parent_model,
-                "children": [
-                    *old_parent_children[: new_state.index],
-                    new_state.model.current,
-                    *old_parent_children[new_state.index + 1 :],
-                ],
+            if parent is not None:
+                parent.children_by_key[new_state.key] = new_state
+                old_parent_model = parent.model.current
+                old_parent_children = old_parent_model.setdefault("children", [])
+                parent.model.current = {
+                    **old_parent_model,
+                    "children": [
+                        *old_parent_children[: new_state.index],
+                        new_state.model.current,
+                        *old_parent_children[new_state.index + 1 :],
+                    ],
+                }
+
+            if REACTPY_CHECK_VDOM_SPEC.current:
+                validate_vdom_json(new_state.model.current)
+
+            return {
+                "type": "layout-update",
+                "path": new_state.patch_path,
+                "model": new_state.model.current,
             }
-
-        if REACTPY_CHECK_VDOM_SPEC.current:
-            validate_vdom_json(new_state.model.current)
-
-        return {
-            "type": "layout-update",
-            "path": new_state.patch_path,
-            "model": new_state.model.current,
-        }
+        finally:
+            HOOK_STACK.reset(token)
 
     async def _render_component(
         self,

src/reactpy/core/serve.py

@@ -45,22 +45,18 @@ async def _single_outgoing_loop(
     send: SendCoroutine,
 ) -> None:
     while True:
-        token = HOOK_STACK.initialize()
+        update = await layout.render()
         try:
-            update = await layout.render()
-            try:
-                await send(update)
-            except Exception:  # nocov
-                if not REACTPY_DEBUG.current:
-                    msg = (
-                        "Failed to send update. More info may be available "
-                        "if you enabling debug mode by setting "
-                        "`reactpy.config.REACTPY_DEBUG.current = True`."
-                    )
-                    logger.error(msg)
-                raise
-        finally:
-            HOOK_STACK.reset(token)
+            await send(update)
+        except Exception:  # nocov
+            if not REACTPY_DEBUG.current:
+                msg = (
+                    "Failed to send update. More info may be available "
+                    "if you enabling debug mode by setting "
+                    "`reactpy.config.REACTPY_DEBUG.current = True`."
+                )
+                logger.error(msg)
+            raise
 
 
 async def _single_incoming_loop(

tests/conftest.py

@@ -54,23 +54,6 @@ def rebuild():
     subprocess.run(["hatch", "build", "-t", "wheel"], check=True, env=env)  # noqa: S607
 
 
-@pytest.fixture(autouse=True, scope="function")
-def create_hook_state():
-    """This fixture is a bug fix related to `pytest_asyncio`.
-
-    Usually the hook stack is created automatically within the display fixture, but context
-    variables aren't retained within `pytest_asyncio` async fixtures. As a workaround,
-    this fixture ensures that the hook stack is created before each test is run.
-
-    Ref: https://github.com/pytest-dev/pytest-asyncio/issues/127
-    """
-    from reactpy.core._life_cycle_hook import HOOK_STACK
-
-    token = HOOK_STACK.initialize()
-    yield token
-    HOOK_STACK.reset(token)
-
-
 @pytest.fixture
 async def display(server, page):
     async with DisplayFixture(server, page) as display: