From fd551fe98c20d783df90a8dd710169d8b0d85eb1 Mon Sep 17 00:00:00 2001
From: Carson <cpsievert1@gmail.com>
Date: Wed, 8 Jun 2022 16:36:56 -0500
Subject: [PATCH] Close #185 and close #16: send busy/idle when an Effect is
 executing and output binding progress when an Output is recalculating

---
 shiny/reactive/_reactives.py |  4 ++++
 shiny/session/_session.py    |  5 +++++
 shiny/ui/_progress.py        | 19 +++++++------------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/shiny/reactive/_reactives.py b/shiny/reactive/_reactives.py
index 10141c06c..83125152a 100644
--- a/shiny/reactive/_reactives.py
+++ b/shiny/reactive/_reactives.py
@@ -474,6 +474,8 @@ def on_invalidate_cb() -> None:
 
             def _continue() -> None:
                 ctx.add_pending_flush(self._priority)
+                if self._session:
+                    _utils.run_coro_sync(self._session._send_message({"busy": "busy"}))
 
             if self._suspended:
                 self._on_resume = _continue
@@ -483,6 +485,8 @@ def _continue() -> None:
         async def on_flush_cb() -> None:
             if not self._destroyed:
                 await self._run()
+            if self._session:
+                await self._session._send_message({"busy": "idle"})
 
         ctx.on_invalidate(on_invalidate_cb)
         ctx.on_flush(on_flush_cb)
diff --git a/shiny/session/_session.py b/shiny/session/_session.py
index 41c087a00..973b2e09e 100644
--- a/shiny/session/_session.py
+++ b/shiny/session/_session.py
@@ -490,6 +490,10 @@ def _send_remove_ui(self, selector: str, multiple: bool) -> None:
         msg = {"selector": selector, "multiple": multiple}
         _utils.run_coro_sync(self._send_message({"shiny-remove-ui": msg}))
 
+    def _send_progress(self, type: str, message: object) -> None:
+        msg: Dict[str, object] = {"progress": {"type": type, "message": message}}
+        _utils.run_coro_sync(self._send_message(msg))
+
     @add_example()
     async def send_custom_message(self, type: str, message: Dict[str, object]) -> None:
         """
@@ -822,6 +826,7 @@ async def output_obs():
                 await self._session._send_message(
                     {"recalculating": {"name": fn_name, "status": "recalculating"}}
                 )
+                self._session._send_progress("binding", {"id": fn_name})
 
                 message: Dict[str, object] = {}
                 try:
diff --git a/shiny/ui/_progress.py b/shiny/ui/_progress.py
index 954a6e537..b2861c27a 100644
--- a/shiny/ui/_progress.py
+++ b/shiny/ui/_progress.py
@@ -1,11 +1,11 @@
 __all__ = ("Progress",)
 
 from types import TracebackType
-from typing import Optional, Dict, Any, Type
+from typing import Optional, Type
 from warnings import warn
 
 from .._docstring import add_example
-from .._utils import run_coro_sync, rand_hex
+from .._utils import rand_hex
 from ..session import Session, require_active_session
 
 
@@ -40,7 +40,7 @@ def __init__(
         self._session = require_active_session(session)
 
         msg = {"id": self._id, "style": self._style}
-        self._send_progress("open", msg)
+        self._session._send_progress("open", msg)
 
     def __enter__(self) -> "Progress":
         return self
@@ -97,7 +97,9 @@ def set(
             "style": self._style,
         }
 
-        self._send_progress("update", {k: v for k, v in msg.items() if v is not None})
+        self._session._send_progress(
+            "update", {k: v for k, v in msg.items() if v is not None}
+        )
 
     def inc(
         self,
@@ -150,12 +152,5 @@ def close(self) -> None:
             warn("Attempting to close progress, but progress already closed.")
             return None
 
-        self._send_progress("close", {"id": self._id, "style": self._style})
+        self._session._send_progress("close", {"id": self._id, "style": self._style})
         self._closed = True
-
-    def _send_progress(self, type: str, message: Dict[str, Any]) -> None:
-        run_coro_sync(
-            self._session._send_message(
-                {"progress": {"type": type, "message": message}}
-            )
-        )