Skip to content

fix(Chat): fix statically rendered custom icons #1940

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 24, 2025
Merged

fix(Chat): fix statically rendered custom icons #1940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9589508
Follow up to #1853: Fix for statically rendered custom icons
cpsievert Mar 24, 2025
ecdf8ad
Update playwright test to render startup messages statically
cpsievert Mar 24, 2025
297512e
Fix typo
cpsievert Mar 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions shiny/ui/_chat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,14 @@ def chat_ui(

id = resolve_id(id)

icon_attr = None
if icon_assistant is not None:
icon_attr = str(icon_assistant)

icon_deps = None
if isinstance(icon_assistant, (Tag, TagList)):
icon_deps = icon_assistant.get_dependencies()

message_tags: list[Tag] = []
if messages is None:
messages = []
Expand Down Expand Up @@ -1462,13 +1470,10 @@ def chat_ui(
tag_name,
ui["dependencies"],
content=ui["html"],
icon=icon_attr,
)
)

html_deps = None
if isinstance(icon_assistant, (Tag, TagList)):
html_deps = icon_assistant.get_dependencies()

res = Tag(
"shiny-chat-container",
Tag("shiny-chat-messages", *message_tags),
Expand All @@ -1478,7 +1483,7 @@ def chat_ui(
placeholder=placeholder,
),
chat_deps(),
html_deps,
icon_deps,
{
"style": css(
width=as_css_unit(width),
Expand All @@ -1488,7 +1493,9 @@ def chat_ui(
id=id,
placeholder=placeholder,
fill=fill,
icon_assistant=str(icon_assistant) if icon_assistant is not None else None,
# Also include icon on the parent so that when messages are dynamically added,
# we know the default icon has changed
icon_assistant=icon_attr,
**kwargs,
)

Expand Down
43 changes: 13 additions & 30 deletions tests/playwright/shiny/components/chat/icon/app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,14 @@ async def handle_user_input_default(user_input: str):
await chat_default.append_message(f"You said: {user_input}")

# Animal Bot ----------------------------------------------------------------------
chat_animal = ui.Chat(
id="chat_animal",
messages=[
{
"content": "Hello! I'm Animal Bot. How can I help you today?",
"role": "assistant",
},
],
)
chat_animal = ui.Chat(id="chat_animal")

with ui.div():
ui.h2("Animal Bot")
chat_animal.ui(icon_assistant=faicons.icon_svg("otter").add_class("icon-otter"))
chat_animal.ui(
messages=["Hello! I'm Animal Bot. How can I help you today?"],
icon_assistant=faicons.icon_svg("otter").add_class("icon-otter"),
)
ui.input_select("animal", "Animal", choices=["Otter", "Hippo", "Frog", "Dove"])

@chat_animal.on_user_submit
Expand All @@ -68,42 +63,30 @@ async def handle_user_input_otter(user_input: str):
</svg>
"""

chat_svg = ui.Chat(
id="chat_svg",
messages=[
{
"content": "Hello! I'm SVG Bot. How can I help you today?",
"role": "assistant",
},
],
)
chat_svg = ui.Chat(id="chat_svg")

with ui.div():
ui.h2("SVG Bot")
chat_svg.ui(icon_assistant=ui.HTML(bs_icon_info_circle_fill))
chat_svg.ui(
messages=["Hello! I'm SVG Bot. How can I help you today?"],
icon_assistant=ui.HTML(bs_icon_info_circle_fill),
)

@chat_svg.on_user_submit
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",
messages=[
{
"content": "Hello! I'm Image Bot. How can I help you today?",
"role": "assistant",
},
],
)
chat_image = ui.Chat(id="chat_image")

with ui.div():
ui.h2("Image Bot")
chat_image.ui(
messages=["Hello! I'm Image Bot. How can I help you today?"],
icon_assistant=ui.img(
src="img/grace-hopper.jpg",
class_="icon-image grace-hopper",
)
),
)
ui.input_select("image", "Image", choices=["Grace Hopper", "Shiny"])

Expand Down
Loading