More API changes (#69)

Author: cpsievert

examples/bind_event/app.py

@@ -1,6 +1,6 @@
 import asyncio
 from shiny import *
-from htmltools import tags
+from shiny.ui import tags
 
 app_ui = ui.page_fluid(
     tags.p(

examples/download/app.py

@@ -5,7 +5,7 @@
 from typing import Any
 
 from shiny import *
-from htmltools import div, p
+from shiny.ui import div, p
 
 import matplotlib.pyplot as plt
 import numpy as np

examples/inputs-update/app.py

@@ -1,7 +1,7 @@
 from datetime import date
 
 from shiny import *
-from htmltools import tags, h2
+from shiny.ui import tags, h2
 
 app_ui = ui.page_fluid(
     ui.panel_title("Changing the values of inputs from the server"),

examples/inputs/app.py

@@ -1,5 +1,6 @@
 from shiny import *
-from htmltools import tags, HTML, Tag
+from shiny.types import ImgData
+from shiny.ui import tags, HTML, Tag
 from fontawesome import icon_svg
 
 app_ui = ui.page_fluid(
@@ -128,7 +129,8 @@ def image():
         from pathlib import Path
 
         dir = Path(__file__).resolve().parent
-        return {"src": dir / "rstudio-logo.png", "width": "150px"}
+        img: ImgData = {"src": str(dir / "rstudio-logo.png"), "width": "150px"}
+        return img
 
     @reactive.effect()
     def _():
@@ -146,8 +148,8 @@ def _():
     def _():
         link = input.link()
         if link and link > 0:
-            notification_show("A notification!")
-            p = Progress()
+            ui.notification_show("A notification!")
+            p = ui.Progress()
             import time
 
             for i in range(30):

examples/dynamic_ui/app.py renamed to examples/insert_ui/app.py

@@ -1,5 +1,5 @@
 from shiny import *
-from htmltools import tags
+from shiny.ui import tags
 
 # For plot rendering
 import numpy as np
@@ -54,9 +54,9 @@ def _():
     def _():
         btn = input.btn()
         if btn % 2 == 1:
-            ui_insert(tags.p("Thanks for clicking!", id="thanks"), "body")
+            ui.insert_ui(tags.p("Thanks for clicking!", id="thanks"), "body")
         elif btn > 0:
-            ui_remove("#thanks")
+            ui.remove_ui("#thanks")
 
 
 app = App(app_ui, server)

examples/moduleapp/app.py

@@ -1,11 +1,14 @@
+from typing import Callable
 from shiny import *
+from shiny.modules import *
+
 
 # ============================================================
 # Counter module
 # ============================================================
-def counter_module_ui(
+def counter_ui(
     ns: Callable[[str], str], label: str = "Increment counter"
-) -> TagChildArg:
+) -> ui.TagChildArg:
     return ui.div(
         {"style": "border: 1px solid #ccc; border-radius: 5px; margin: 5px 0;"},
         ui.h2("This is " + label),
@@ -14,9 +17,7 @@ def counter_module_ui(
     )
 
 
-def counter_module_server(
-    input: InputsProxy, output: OutputsProxy, session: SessionProxy
-):
+def counter_server(input: ModuleInputs, output: ModuleOutputs, session: ModuleSession):
     count: reactive.Value[int] = reactive.Value(0)
 
     @reactive.effect()
@@ -30,7 +31,7 @@ def out() -> str:
         return f"Click count is {count()}"
 
 
-counter_module = ShinyModule(counter_module_ui, counter_module_server)
+counter_module = Module(counter_ui, counter_server)
 
 
 # =============================================================================

examples/myapp/app.py

@@ -1,5 +1,5 @@
 from shiny import *
-from shiny.fileupload import FileInfo
+from shiny.types import FileInfo
 import matplotlib.pyplot as plt
 import numpy as np
 

examples/req/app.py

@@ -1,4 +1,5 @@
 from shiny import *
+from shiny.types import SafeException
 
 app_ui = ui.page_fluid(
     ui.input_action_button("safe", "Throw a safe error"),

shiny/__init__.py

@@ -1,19 +1,47 @@
-"""Top-level package for Shiny."""
+"""A package for building reactive web applications."""
 
-__author__ = """Winston Chang"""
-__email__ = "[email protected]"
-__version__ = "0.0.0.9001"
-
-# All objects imported into this scope will be available as shiny.foo
-from .decorators import *
-from .dynamic_ui import *
-from .notifications import *
-from .progress import *
+# User-facing subpackages that should be available on `from shiny import *`
+from . import reactive
 from .render import *
-from .app import *
 from .session import *
-from .shinymodule import *
-from .validation import *
-
-from . import reactive
 from . import ui
+
+# Private submodules that have some user-facing functionality
+from ._app import App
+from ._decorators import event
+from ._main import run as run_app
+from ._validation import req
+
+# User-facing submodules that should *not* be available on `from shiny import *`
+from . import modules
+from . import types
+
+# N.B.: we intentionally don't import 'developer-facing' submodules (e.g.,
+# html_dependencies) so that they aren't super visible when you `import shiny`, but
+# developers who know what they're doing can import them directly.
+
+
+__all__ = (
+    # public sub-packages
+    "reactive",
+    "render",
+    "session",
+    "ui",
+    # _app.py
+    "App",
+    # _decorators.py
+    "event",
+    # _main.py
+    "run_app",
+    # _render.py
+    "render_text",
+    "render_plot",
+    "render_image",
+    "render_ui",
+    # _session.py
+    "Session",
+    "Inputs",
+    "Outputs",
+    # _validation.py
+    "req",
+)

shiny/__main__.py

@@ -1,4 +1,4 @@
-from .main import main
+from ._main import main
 
 if __name__ == "__main__":
     main()