Reorganize session utils

Author: wch

shiny/modules.py

@@ -11,8 +11,7 @@
 
 from .reactive import Value
 from .render import RenderFunction
-from .session import Inputs, Outputs, Session
-from .session._utils import require_active_session
+from .session import Inputs, Outputs, Session, require_active_session
 
 
 class ModuleInputs(Inputs):

shiny/session/__init__.py

@@ -3,5 +3,12 @@
 """
 
 from ._session import *
+from ._utils import *
 
-__all__ = ("Session", "Inputs", "Outputs", "get_current_session")
+__all__ = (
+    "Session",
+    "Inputs",
+    "Outputs",
+    "get_current_session",
+    "require_active_session",
+)

shiny/session/_session.py

@@ -1,4 +1,4 @@
-__all__ = ("Session", "Inputs", "Outputs", "get_current_session", "session_context")
+__all__ = ("Session", "Inputs", "Outputs")
 
 import functools
 import os
@@ -12,8 +12,6 @@
 import mimetypes
 import dataclasses
 import urllib.parse
-from contextvars import ContextVar, Token
-from contextlib import contextmanager
 from typing import (
     TYPE_CHECKING,
     AsyncIterable,
@@ -56,7 +54,7 @@
 from .._fileupload import FileInfo, FileUploadManager
 from ..input_handler import input_handlers
 from ..types import SafeException, SilentCancelOutputException, SilentException
-from ._utils import *
+from ._utils import RenderedDeps, read_thunk_opt, session_context
 
 # This cast is necessary because if the type checker thinks that if
 # "tag" isn't in `message`, then it's not a ClientMessage object.
@@ -688,24 +686,3 @@ def _is_hidden(self, name: str) -> bool:
             return True
         else:
             return hidden
-
-
-# ==============================================================================
-# Context manager for current session (AKA current reactive domain)
-# ==============================================================================
-_current_session: ContextVar[Optional[Session]] = ContextVar(
-    "current_session", default=None
-)
-
-
-def get_current_session() -> Optional[Session]:
-    return _current_session.get()
-
-
-@contextmanager
-def session_context(session: Optional[Session]):
-    token: Token[Union[Session, None]] = _current_session.set(session)
-    try:
-        yield
-    finally:
-        _current_session.reset(token)

shiny/session/_utils.py

@@ -1,5 +1,9 @@
+__all__ = ("get_current_session", "session_context", "require_active_session")
+
 import sys
-from typing import TYPE_CHECKING, List, Dict, Any, Optional, TypeVar, Callable, Union
+from contextlib import contextmanager
+from contextvars import ContextVar, Token
+from typing import TYPE_CHECKING, Any, Callable, Dict, List, Optional, TypeVar, Union
 
 if TYPE_CHECKING:
     from ._session import Session
@@ -16,10 +20,29 @@ class RenderedDeps(TypedDict):
     html: str
 
 
+# ==============================================================================
+# Context manager for current session (AKA current reactive domain)
+# ==============================================================================
+_current_session: ContextVar[Optional["Session"]] = ContextVar(
+    "current_session", default=None
+)
+
+
+def get_current_session() -> Optional["Session"]:
+    return _current_session.get()
+
+
+@contextmanager
+def session_context(session: Optional["Session"]):
+    token: Token[Union[Session, None]] = _current_session.set(session)
+    try:
+        yield
+    finally:
+        _current_session.reset(token)
+
+
 def require_active_session(session: Optional["Session"]) -> "Session":
     if session is None:
-        from ._session import get_current_session
-
         session = get_current_session()
     if session is None:
         import inspect

shiny/ui/_input_update.py

@@ -31,8 +31,7 @@
 from ._input_select import SelectChoicesArg, _normalize_choices, _render_choices
 from ._input_slider import SliderValueArg, SliderStepArg, _slider_type, _as_numeric
 from .._utils import drop_none
-from ..session import Session
-from ..session._utils import require_active_session
+from ..session import Session, require_active_session
 
 # -----------------------------------------------------------------------------
 # input_action_button.py

shiny/ui/_insert.py

@@ -10,8 +10,7 @@
 
 from htmltools import TagChildArg
 
-from ..session import Session
-from ..session._utils import require_active_session
+from ..session import Session, require_active_session
 
 
 def insert_ui(

shiny/ui/_modal.py

@@ -16,8 +16,7 @@
 from htmltools import tags, Tag, div, HTML, TagChildArg, TagAttrArg
 
 from .._utils import run_coro_sync
-from ..session import Session
-from ..session._utils import require_active_session
+from ..session import Session, require_active_session
 
 
 def modal_button(label: str, icon: TagChildArg = None, **kwargs: TagChildArg) -> Tag:

shiny/ui/_notification.py

@@ -11,8 +11,7 @@
 from htmltools import TagList, TagChildArg
 
 from .._utils import run_coro_sync, rand_hex
-from ..session import Session
-from ..session._utils import require_active_session
+from ..session import Session, require_active_session
 
 
 def notification_show(

shiny/ui/_progress.py

@@ -3,8 +3,7 @@
 from typing import Optional, Dict, Any
 from warnings import warn
 from .._utils import run_coro_sync, rand_hex
-from ..session import Session
-from ..session._utils import require_active_session
+from ..session import Session, require_active_session
 
 
 class Progress: