From 5ce2a4012b5e90809e7820afe830e1e30325d431 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Fri, 5 Jan 2024 22:14:27 -0600
Subject: [PATCH 1/2] Add underscores to hide some imports

---
 shiny/express/__init__.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/shiny/express/__init__.py b/shiny/express/__init__.py
index 9b318c8c6..c541c9ff1 100644
--- a/shiny/express/__init__.py
+++ b/shiny/express/__init__.py
@@ -1,6 +1,8 @@
 from __future__ import annotations
 
-from ..session import Inputs, Outputs, Session
+# Import these with underscore names so they won't show in autocomplete from the Python
+# console.
+from ..session import Inputs as _Inputs, Outputs as _Outputs, Session as _Session
 from ..session import _utils as _session_utils
 from . import app, ui
 from ._is_express import is_express_app
@@ -22,9 +24,9 @@
 )
 
 # Add types to help type checkers
-input: Inputs
-output: Outputs
-session: Session
+input: _Inputs
+output: _Outputs
+session: _Session
 
 
 # Note that users should use `from shiny.express import input` instead of `from shiny
@@ -50,8 +52,8 @@ def __init__(self):
 
         from .._namespaces import Root
 
-        self.input = Inputs({})
-        self.output = Outputs(cast(Session, self), Root, {}, {})
+        self.input = _Inputs({})
+        self.output = _Outputs(cast(_Session, self), Root, {}, {})
 
     # This is needed so that Outputs don't throw an error.
     def _is_hidden(self, name: str) -> bool:
@@ -61,7 +63,7 @@ def _is_hidden(self, name: str) -> bool:
 _current_mock_session: _MockSession | None = None
 
 
-def _get_current_session_or_mock() -> Session:
+def _get_current_session_or_mock() -> _Session:
     from typing import cast
 
     session = _session_utils.get_current_session()
@@ -69,7 +71,7 @@ def _get_current_session_or_mock() -> Session:
         global _current_mock_session
         if _current_mock_session is None:
             _current_mock_session = _MockSession()
-        return cast(Session, _current_mock_session)
+        return cast(_Session, _current_mock_session)
 
     else:
         return session

From 3dd698c89894ad5287fa9c5f18a86fa292c53f75 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Mon, 8 Jan 2024 10:22:21 -0600
Subject: [PATCH 2/2] Don't export shiny.express.app

---
 shiny/express/__init__.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/shiny/express/__init__.py b/shiny/express/__init__.py
index c541c9ff1..062a94c94 100644
--- a/shiny/express/__init__.py
+++ b/shiny/express/__init__.py
@@ -4,7 +4,7 @@
 # console.
 from ..session import Inputs as _Inputs, Outputs as _Outputs, Session as _Session
 from ..session import _utils as _session_utils
-from . import app, ui
+from . import ui
 from ._is_express import is_express_app
 from ._output import output_args, suspend_display
 from ._run import wrap_express_app
@@ -18,7 +18,6 @@
     "output_args",
     "suspend_display",
     "wrap_express_app",
-    "app",
     "ui",
     "display_body",
 )