Fix InputsProxy and add tests

Author: wch

examples/moduleapp/app.py

@@ -1,44 +1,32 @@
-# To run this app:
-#   python3 app.py
-
-# Then point web browser to:
-#   http://localhost:8000/
-
-# Add parent directory to path, so we can find the prism module.
-# (This is just a temporary fix)
-import os
-import sys
-
-# This will load the shiny module dynamically, without having to install it.
-# This makes the debug/run cycle quicker.
-shiny_module_dir = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
-sys.path.insert(0, shiny_module_dir)
-
+import shiny.ui_toolkit as st
 from shiny import *
 
+
 # =============================================================================
 # Counter module
 # =============================================================================
 def counter_module_ui(
     ns: Callable[[str], str], label: str = "Increment counter"
 ) -> TagChildArg:
     return TagList(
-        input_action_button(id=ns("button"), label=label),
-        output_text_verbatim(id=ns("out")),
+        st.input_action_button(id=ns("button"), label=label),
+        st.output_text_verbatim(id=ns("out")),
     )
 
 
-def counter_module_server(session: SessionProxy):
-    count: ReactiveVal[int] = ReactiveVal(0)
+def counter_module_server(
+    input: InputsProxy, output: OutputsProxy, session: SessionProxy
+):
+    count: reactive.Value[int] = reactive.Value(0)
 
-    @observe()
+    @reactive.effect()
+    @event(session.input.button)
     def _():
-        session.input["button"]
-        with isolate():
-            count(count() + 1)
+        count.set(count() + 1)
 
-    @session.output("out")
-    def _() -> str:
+    @output()
+    @render_text()
+    def out() -> str:
         return f"Click count is {count()}"
 
 
@@ -48,19 +36,15 @@ def _() -> str:
 # =============================================================================
 # App that uses module
 # =============================================================================
-ui = page_fluid(
+ui = st.page_fluid(
     counter_module.ui("counter1", "Counter 1"),
     counter_module.ui("counter2", "Counter 2"),
 )
 
 
-def server(session: Session):
+def server(input: Inputs, output: Outputs, session: Session):
     counter_module.server("counter1")
     counter_module.server("counter2")
 
 
 app = App(ui, server)
-
-
-if __name__ == "__main__":
-    app.run()

shiny/shinymodule.py

@@ -6,13 +6,13 @@
     "ShinyModule",
 )
 
-from typing import Optional, Union, Callable, Any
+from typing import Any, Callable, Optional
 
 from htmltools.core import TagChildArg
 
-from .session import Session, Inputs, Outputs, _require_active_session
 from .reactive import Value
 from .render import RenderFunction
+from .session import Inputs, Outputs, Session, _require_active_session
 
 
 class InputsProxy(Inputs):
@@ -34,14 +34,14 @@ def __delitem__(self, key: str) -> None:
 
     # Allow access of values as attributes.
     def __setattr__(self, attr: str, value: Value[Any]) -> None:
-        if attr in ("_values", "_ns"):
-            super().__setattr__(attr, value)
+        if attr in ("_values", "_ns", "_ns_key"):
+            object.__setattr__(self, attr, value)
             return
         else:
             self.__setitem__(attr, value)
 
     def __getattr__(self, attr: str) -> Value[Any]:
-        if attr in ("_values", "_ns"):
+        if attr in ("_values", "_ns", "_ns_key"):
             return object.__getattribute__(self, attr)
         else:
             return self.__getitem__(attr)

tests/test_modules.py

@@ -0,0 +1,77 @@
+"""Tests for `ShinyModule`."""
+
+import pytest
+
+import shiny.ui_toolkit as ui
+from shiny import *
+
+
+def mod_ui(ns: Callable[[str], str]) -> TagChildArg:
+    return TagList(
+        ui.input_action_button(id=ns("button"), label="module1"),
+        ui.output_text_verbatim(id=ns("out")),
+    )
+
+
+# Note: We currently can't test Session; this is just here for future use.
+def mod_server(input: InputsProxy, output: OutputsProxy, session: SessionProxy):
+    count: reactive.Value[int] = reactive.Value(0)
+
+    @reactive.effect()
+    @event(session.input.button)
+    def _():
+        count.set(count() + 1)
+
+    @output()
+    @render_text()
+    def out() -> str:
+        return f"Click count is {count()}"
+
+
+mod = ShinyModule(mod_ui, mod_server)
+
+
+def test_module_ui():
+    x = mod.ui("mod1")
+    assert x[0].attrs["id"] == "mod1-button"
+    assert x[1].attrs["id"] == "mod1-out"
+
+
+@pytest.mark.asyncio
+async def test_inputs_proxy():
+    input = session.Inputs(a=1)
+    input_proxy = InputsProxy("mod1", input)
+
+    with isolate():
+        assert input.a() == 1
+        # Different ways of accessing "a" from the input proxy.
+        assert input_proxy.a() is None
+        assert input_proxy["a"]() is None
+        assert input["mod1-a"]() is None
+
+    input_proxy.a.set(2)
+
+    with isolate():
+        assert input.a() == 1
+        assert input_proxy.a() == 2
+        assert input_proxy["a"]() == 2
+        assert input["mod1-a"]() == 2
+
+    # Nested input proxies
+    input_proxy_proxy = InputsProxy("mod2", input_proxy)
+    with isolate():
+        assert input.a() == 1
+        assert input_proxy.a() == 2
+        # Different ways of accessing "a" from the input proxy.
+        assert input_proxy_proxy.a() is None
+        assert input_proxy_proxy["a"]() is None
+        assert input["mod1-mod2-a"]() is None
+
+    input_proxy_proxy.a.set(3)
+
+    with isolate():
+        assert input.a() == 1
+        assert input_proxy.a() == 2
+        assert input_proxy_proxy.a() == 3
+        assert input_proxy_proxy["a"]() == 3
+        assert input["mod1-mod2-a"]() == 3