Update/remove tests in anticipation of posit-dev/shinychat#62

Author: cpsievert

tests/playwright/shiny/components/chat/basic/app.py

@@ -1,18 +1,15 @@
+from shinychat.express import Chat
+
 from shiny.express import render, ui
 
 # Set some Shiny page options
 ui.page_opts(title="Hello Chat")
 
 # Create a chat instance, with an initial message
-chat = ui.Chat(
-    id="chat",
-    messages=[
-        {"content": "Hello! How can I help you today?", "role": "assistant"},
-    ],
-)
+chat = Chat(id="chat")
 
 # Display the chat
-chat.ui()
+chat.ui(messages=["Hello! How can I help you today?"])
 
 
 # Define a callback to run when the user submits a message

tests/playwright/shiny/components/chat/basic/test_chat_basic.py

@@ -1,15 +1,14 @@
 from playwright.sync_api import Page, expect
-from utils.deploy_utils import skip_on_webkit
+from shinychat.playwright import ChatController
 
 from shiny.playwright import controller
 from shiny.run import ShinyAppProc
 
 
-@skip_on_webkit
 def test_validate_chat_basic(page: Page, local_app: ShinyAppProc) -> None:
     page.goto(local_app.url)
 
-    chat = controller.Chat(page, "chat")
+    chat = ChatController(page, "chat")
 
     # Verify starting state
     expect(chat.loc).to_be_visible(timeout=30 * 1000)
@@ -44,7 +43,6 @@ def test_validate_chat_basic(page: Page, local_app: ShinyAppProc) -> None:
     message_state = controller.OutputCode(page, "message_state")
     message_state_expected = tuple(
         [
-            {"content": initial_message, "role": "assistant"},
             {"content": f"\n{user_message}", "role": "user"},
             {"content": f"You said: \n{user_message}", "role": "assistant"},
             {"content": f"{user_message2}", "role": "user"},

tests/playwright/shiny/components/chat/icon/app.py

@@ -2,6 +2,7 @@
 from pathlib import Path
 
 import faicons
+from shinychat.express import Chat
 
 from shiny.express import app_opts, input, ui
 
@@ -11,27 +12,22 @@
 
 with ui.layout_columns():
     # Default Bot ---------------------------------------------------------------------
-    chat_default = ui.Chat(
-        id="chat_default",
-        messages=[
-            {
-                "content": "Hello! I'm Default Bot. How can I help you today?",
-                "role": "assistant",
-            },
-        ],
-    )
+    chat_default = Chat(id="chat_default")
 
     with ui.div():
         ui.h2("Default Bot")
-        chat_default.ui(icon_assistant=None)
+        chat_default.ui(
+            messages=["Hello! I'm Default Bot. How can I help you today?"],
+            icon_assistant=None,
+        )
 
     @chat_default.on_user_submit
     async def handle_user_input_default(user_input: str):
         await asyncio.sleep(1)
         await chat_default.append_message(f"You said: {user_input}")
 
     # Animal Bot ----------------------------------------------------------------------
-    chat_animal = ui.Chat(id="chat_animal")
+    chat_animal = Chat(id="chat_animal")
 
     with ui.div():
         ui.h2("Animal Bot")
@@ -63,7 +59,7 @@ async def handle_user_input_otter(user_input: str):
     </svg>
     """
 
-    chat_svg = ui.Chat(id="chat_svg")
+    chat_svg = Chat(id="chat_svg")
 
     with ui.div():
         ui.h2("SVG Bot")
@@ -77,7 +73,7 @@ async def handle_user_input_svg(user_input: str):
         await chat_svg.append_message(f"You said: {user_input}")
 
     # Image Bot -----------------------------------------------------------------------
-    chat_image = ui.Chat(id="chat_image")
+    chat_image = Chat(id="chat_image")
 
     with ui.div():
         ui.h2("Image Bot")

tests/playwright/shiny/components/chat/input-suggestion/app.py

@@ -1,4 +1,6 @@
-from shiny.express import ui
+from shinychat.express import Chat
+
+import shiny.express  # noqa: F401
 
 suggestions1 = """
 <p>Here is the <span id="first" class='suggestion'>1st input suggestion</span>.
@@ -11,9 +13,9 @@
 And <span id="fifth" data-suggestion="another suggestion" data-suggestion-submit="true">this suggestion will also auto-submit</span>.</p>
 """
 
-chat = ui.Chat("chat", messages=[suggestion2])
+chat = Chat("chat")
 
-chat.ui(messages=[suggestions1])
+chat.ui(messages=[suggestions1, suggestion2])
 
 
 @chat.on_user_submit

tests/playwright/shiny/components/chat/shiny_input/app.py

@@ -1,3 +1,5 @@
+from shinychat.express import Chat
+
 from shiny import reactive
 from shiny.express import input, ui
 
@@ -16,11 +18,11 @@
     ),
 )
 
-chat = ui.Chat(
-    id="chat",
+chat = Chat(id="chat")
+chat.ui(
+    class_="mb-5",
     messages=[welcome],
 )
-chat.ui(class_="mb-5")
 
 
 @reactive.effect

tests/playwright/shiny/components/chat/shiny_output/app.py

@@ -1,6 +1,7 @@
 import ipyleaflet as ipyl  # pyright: ignore[reportMissingTypeStubs]
 import pandas as pd
 import plotly.express as px  # pyright: ignore[reportMissingTypeStubs]
+from shinychat.express import Chat
 from shinywidgets import render_plotly, render_widget
 
 from shiny import reactive, render
@@ -19,12 +20,9 @@ def map():
         return ipyl.Map(center=(52, 10), zoom=8)
 
 
-chat = ui.Chat(
-    id="chat",
-    messages=[map_ui],
-)
+chat = Chat(id="chat")
 
-chat.ui()
+chat.ui(messages=[map_ui])
 
 with ui.hold() as df_1:
 
@@ -49,7 +47,7 @@ def df2():
 
 @reactive.effect
 async def _():
-    await chat.append_message_stream(df_2)
+    await chat.append_message(df_2)
 
 
 with ui.hold() as plot_ui: