Merge followup

Author: schloerke

shiny/express/_module.py

@@ -23,7 +23,7 @@ def module(
 
     @functools.wraps(fn)
     def wrapper(id: Id, *args: P.args, **kwargs: P.kwargs) -> R:
-        parent_session = require_active_session(None)
+        parent_session = require_active_session()
         module_session = parent_session.make_scope(id)
 
         with session_context(module_session):

shiny/render/_data_frame.py

@@ -764,7 +764,7 @@ def _set_output_metadata(self, *, output_id: str) -> None:
         # from creating a renderer in one module and registering it on an output with a
         # different session.
 
-        active_session = require_active_session(None)
+        active_session = require_active_session()
         if self._get_session() != active_session:
             raise RuntimeError(
                 "The session used when creating the renderer "

shiny/render/_data_frame_utils/_datagridtable.py

@@ -335,7 +335,7 @@ def serialize_pandas_df(df: "pd.DataFrame") -> dict[str, Any]:
 
         with pd.option_context("mode.copy_on_write", True):
             df = df.copy(deep=False)
-            session = require_active_session(None)
+            session = require_active_session()
 
             def wrap_shiny_html_with_session(x: TagNode):
                 return wrap_shiny_html(x, session=session)

shiny/ui/_input_dark_mode.py

@@ -8,7 +8,8 @@
 
 from .._docstring import add_example, no_example
 from .._namespaces import resolve_id
-from ..session import Session, require_active_session
+from ..session import require_active_session
+from ..types import MISSING, MISSING_TYPE
 from ._web_component import web_component
 
 BootstrapColorMode = Literal["light", "dark"]
@@ -80,14 +81,16 @@ def validate_dark_mode_option(mode: BootstrapColorMode) -> BootstrapColorMode:
 
 @no_example()
 def update_dark_mode(
-    mode: BootstrapColorMode, *, session: Optional[Session] = None
+    mode: BootstrapColorMode,
+    *,
+    session: MISSING_TYPE = MISSING,
 ) -> None:
-    session = require_active_session(session)
+    active_session = require_active_session(session)
 
     mode = validate_dark_mode_option(mode)
 
     msg: dict[str, object] = {
         "method": "toggle",
         "value": mode,
     }
-    session._send_message_sync({"custom": {"bslib.toggle-dark-mode": msg}})
+    active_session._send_message_sync({"custom": {"bslib.toggle-dark-mode": msg}})

shiny/ui/_modal.py

@@ -7,7 +7,7 @@
     "modal_remove",
 )
 
-from typing import TYPE_CHECKING, Literal, Optional
+from typing import Literal, Optional
 
 from htmltools import HTML, Tag, TagAttrs, TagAttrValue, TagChild, div, tags
 
@@ -16,9 +16,6 @@
 from ..session import require_active_session
 from ..types import MISSING, MISSING_TYPE
 
-if TYPE_CHECKING:
-    from ..session import Session
-
 
 @add_example(ex_dir="../api-examples/modal")
 def modal_button(label: TagChild, icon: TagChild = None, **kwargs: TagAttrValue) -> Tag: