Move express stub bookmark object

Author: schloerke

shiny/bookmark/__init__.py

@@ -1,4 +1,17 @@
-from ._bookmark import Bookmark, BookmarkApp, BookmarkProxy, ShinySaveState
+from ._bookmark import (
+    Bookmark,
+    BookmarkApp,
+    BookmarkExpressStub,
+    BookmarkProxy,
+    ShinySaveState,
+)
 from ._save_state import SaveState
 
-__all__ = ("SaveState", "ShinySaveState", "Bookmark", "BookmarkApp", "BookmarkProxy")
+__all__ = (
+    "SaveState",
+    "ShinySaveState",
+    "Bookmark",
+    "BookmarkApp",
+    "BookmarkProxy",
+    "BookmarkExpressStub",
+)

shiny/bookmark/_bookmark.py

@@ -53,7 +53,15 @@
 
 if TYPE_CHECKING:
     from .._namespaces import ResolvedId
+    from ..express._stub_session import ExpressStubSession
     from ..session import Session
+else:
+    from typing import Any
+
+    Session = Any
+    ResolvedId = Any
+    ExpressStubSession = Any
+
 
 BookmarkStore = Literal["url", "server", "disable"]
 
@@ -406,6 +414,49 @@ def store(  # pyright: ignore[reportIncompatibleVariableOverride]
         self._root_bookmark.store = value
 
 
+class BookmarkExpressStub(Bookmark):
+
+    def __init__(self, root_session: ExpressStubSession) -> None:
+        super().__init__(root_session)
+        self._proxy_exclude_fns = []
+
+    def _get_bookmark_exclude(self) -> list[str]:
+        raise NotImplementedError(
+            "Please call `._get_bookmark_exclude()` only from a real session object"
+        )
+
+    def on_bookmark(
+        self,
+        callback: (
+            Callable[[ShinySaveState], None]
+            | Callable[[ShinySaveState], Awaitable[None]]
+        ),
+    ) -> None:
+        raise NotImplementedError(
+            "Please call `.on_bookmark()` only from a real session object"
+        )
+
+    def on_bookmarked(
+        self,
+        callback: Callable[[str], None] | Callable[[str], Awaitable[None]],
+    ) -> None:
+        raise NotImplementedError(
+            "Please call `.on_bookmarked()` only from a real session object"
+        )
+
+    async def update_query_string(
+        self, query_string: str, mode: Literal["replace", "push"] = "replace"
+    ) -> None:
+        raise NotImplementedError(
+            "Please call `.update_query_string()` only from a real session object"
+        )
+
+    async def do_bookmark(self) -> None:
+        raise NotImplementedError(
+            "Please call `.do_bookmark()` only from a real session object"
+        )
+
+
 # RestoreContext <- R6Class("RestoreContext",
 #   public = list(
 #     # This will be set to TRUE if there's actually a state to restore

shiny/bookmark/_save_state.py

@@ -13,6 +13,8 @@
 
 if TYPE_CHECKING:
     from .. import Inputs
+else:
+    Inputs = Any
 
 
 class SaveState(ABC):

shiny/express/_stub_session.py

@@ -4,11 +4,9 @@
 
 from htmltools import TagChild
 
-from shiny.bookmark._bookmark import ShinySaveState
-
 from .._namespaces import Id, ResolvedId, Root
+from ..bookmark import BookmarkExpressStub
 from ..session import Inputs, Outputs, Session
-from ..session._session import Bookmark, SessionProxy
 
 if TYPE_CHECKING:
     from ..session._session import DownloadHandler, DynamicRouteHandler, RenderedDeps
@@ -145,46 +143,3 @@ def download(
         encoding: str = "utf-8",
     ) -> Callable[[DownloadHandler], None]:
         return lambda x: None
-
-
-class BookmarkExpressStub(Bookmark):
-
-    def __init__(self, root_session: ExpressStubSession) -> None:
-        super().__init__(root_session)
-        self._proxy_exclude_fns = []
-
-    def _get_bookmark_exclude(self) -> list[str]:
-        raise NotImplementedError(
-            "Please call `._get_bookmark_exclude()` only from a real session object"
-        )
-
-    def on_bookmark(
-        self,
-        callback: (
-            Callable[[ShinySaveState], None]
-            | Callable[[ShinySaveState], Awaitable[None]]
-        ),
-    ) -> None:
-        raise NotImplementedError(
-            "Please call `.on_bookmark()` only from a real session object"
-        )
-
-    def on_bookmarked(
-        self,
-        callback: Callable[[str], None] | Callable[[str], Awaitable[None]],
-    ) -> None:
-        raise NotImplementedError(
-            "Please call `.on_bookmarked()` only from a real session object"
-        )
-
-    async def update_query_string(
-        self, query_string: str, mode: Literal["replace", "push"] = "replace"
-    ) -> None:
-        raise NotImplementedError(
-            "Please call `.update_query_string()` only from a real session object"
-        )
-
-    async def do_bookmark(self) -> None:
-        raise NotImplementedError(
-            "Please call `.do_bookmark()` only from a real session object"
-        )