Address feedback

Author: cpsievert

CHANGELOG.md

@@ -10,7 +10,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### New features
 
 * The `.output_*()` methods of the `ClientData` class (e.g., `session.clientdata.output_height()`) can now be called without an `id` inside a output renderer. (#1978)
-* The `Session` class gains a `.current_output_id()` method. It returns the ID of the currently executing output renderer (if any). (#1978)
 
 ### Improvements
 

shiny/render/renderer/_renderer.py

@@ -366,7 +366,7 @@ async def __call__(self) -> IT | None:
         """
         Call the asynchronous function.
         """
-        with self._current_output_id():
+        with self._current_renderer():
             return await self._fn()
 
     def is_async(self) -> bool:
@@ -410,17 +410,17 @@ def get_sync_fn(self) -> Callable[[], IT | None]:
         return sync_fn
 
     @contextmanager
-    def _current_output_id(self):
+    def _current_renderer(self):
         from ...session import get_current_session
 
         session = get_current_session()
         if session is None:
             yield
             return
 
-        old_id = session._current_output_id
+        old_renderer = session._current_renderer
         try:
-            session._current_output_id = self._renderer.output_id
+            session._current_renderer = self._renderer
             yield
         finally:
-            session._current_output_id = old_id
+            session._current_renderer = old_renderer

shiny/session/_session.py

@@ -50,9 +50,8 @@
 from ..http_staticfiles import FileResponse
 from ..input_handler import input_handlers
 from ..module import ResolvedId
-from ..reactive import Effect_, Value, effect
+from ..reactive import Effect_, Value, effect, isolate
 from ..reactive import flush as reactive_flush
-from ..reactive import isolate
 from ..reactive._core import lock
 from ..reactive._core import on_flushed as reactive_on_flushed
 from ..render.renderer import Renderer, RendererT
@@ -189,7 +188,7 @@ class Session(ABC):
     groups: list[str] | None
 
     # Internal state for current_output_id()
-    _current_output_id: str | None = None
+    _current_renderer: Renderer[Any] | None = None
 
     # TODO: not sure these should be directly exposed
     _outbound_message_queues: OutBoundMessageQueues
@@ -381,9 +380,12 @@ def on_flushed(
             A function that can be used to cancel the registration.
         """
 
-    def current_output_id(self) -> str | None:
+    def _current_output_id(self) -> str | None:
         "Returns the id of the currently executing output renderer (if any)."
-        return self._current_output_id
+        if self._current_renderer is None:
+            return None
+        else:
+            return self._current_renderer.output_id
 
     @abstractmethod
     async def _unhandled_error(self, e: Exception) -> None: ...