shinychat 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

shinychat/__version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.2'
-__version_tuple__ = version_tuple = (0, 2, 2)
+__version__ = version = '0.2.4'
+__version_tuple__ = version_tuple = (0, 2, 4)
 
 __commit_id__ = commit_id = None

shinychat/_chat.py

@@ -20,15 +20,7 @@ from typing import (
 )
 from weakref import WeakValueDictionary
 
-from htmltools import (
-    HTML,
-    HTMLDependency,
-    Tag,
-    TagAttrValue,
-    TagChild,
-    TagList,
-    css,
-)
+from htmltools import HTML, Tag, TagAttrValue, TagChild, TagList, css
 from shiny import reactive
 from shiny._deprecated import warn_deprecated
 from shiny.bookmark import BookmarkState, RestoreState
@@ -1001,9 +993,12 @@ class Chat:
         if icon is not None:
             msg["icon"] = str(icon)
 
+        # Register deps with the session and get the dictionary format
+        # for client-side rendering
         deps = message.html_deps
         if deps:
-            msg["html_deps"] = deps
+            processed = self._session._process_ui(TagList(*deps))
+            msg["html_deps"] = processed["deps"]
 
         # print(msg)
 
@@ -1766,7 +1761,7 @@ def chat_ui(
         message_tags.append(
             Tag(
                 "shiny-chat-message",
-                *[HTMLDependency(**d) for d in msg.html_deps],
+                *msg.html_deps,
                 content=msg.content,
                 icon=icon_attr,
                 data_role=msg.role,

shinychat/_chat_normalize.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 import sys
 from functools import singledispatch
 
-from htmltools import HTML, Tagifiable, TagList
+from htmltools import HTML, Tagifiable
 
 from ._chat_normalize_chatlas import tool_request_contents, tool_result_contents
 from ._chat_types import ChatMessage
@@ -163,10 +163,15 @@ try:
 
     @message_content.register
     def _(message: Turn):
-        contents = TagList()
+        from chatlas import ContentToolResult
+        content = ""
         for x in message.contents:
-            contents.append(message_content(x).content)
-        return ChatMessage(content=contents)
+            content += message_content(x).content
+        if all(isinstance(x, ContentToolResult) for x in message.contents):
+            role = "assistant"
+        else:
+            role = message.role
+        return ChatMessage(content=content, role=role)
 
     @message_content_chunk.register
     def _(chunk: Turn):

shinychat/_chat_types.py

@@ -3,8 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from typing import Literal, TypedDict
 
-from htmltools import HTML, Tag, TagChild, Tagifiable, TagList
-from shiny.session import get_current_session
+from htmltools import HTML, HTMLDependency, TagChild, TagList
 
 from ._typing_extensions import NotRequired
 
@@ -26,28 +25,18 @@ class ChatMessage:
     ):
         self.role: Role = role
 
-        is_html = isinstance(content, (Tag, TagList, HTML, Tagifiable))
-
         # content _can_ be a TagChild, but it's most likely just a string (of
         # markdown), so only process it if it's not a string.
         deps = []
         if not isinstance(content, str):
-            session = get_current_session()
-            if session and not session.is_stub_session():
-                res = session._process_ui(content)
-                deps = res["deps"]
-            else:
-                res = TagList(content).render()
-                deps = [d.as_dict() for d in res["dependencies"]]
-            content = res["html"]
-
-        if is_html:
+            ui = TagList(content).render()
+            content, deps = ui["html"], ui["dependencies"]
             # Code blocks with `{=html}` infostrings are rendered as-is by a
             # custom rendering method in markdown-stream.ts
             content = f"\n\n````````{{=html}}\n{content}\n````````\n\n"
 
         self.content = content
-        self.html_deps = deps
+        self.html_deps: list[HTMLDependency] = deps
 
 
 # A message once transformed have been applied
@@ -58,7 +47,7 @@ class TransformedMessage:
     role: Role
     transform_key: Literal["content_client", "content_server"]
     pre_transform_key: Literal["content_client", "content_server"]
-    html_deps: list[dict[str, str]] | None = None
+    html_deps: list[HTMLDependency] | None = None
 
     @classmethod
     def from_chat_message(cls, message: ChatMessage) -> "TransformedMessage":

{shinychat-0.2.2.dist-info → shinychat-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinychat
-Version: 0.2.2
+Version: 0.2.4
 Summary: An AI Chat interface for Shiny apps.
 Project-URL: Homepage, https://posit-dev.github.io/shinychat/
 Project-URL: Documentation, https://posit-dev.github.io/shinychat/py/

{shinychat-0.2.2.dist-info → shinychat-0.2.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
 shinychat/__init__.py,sha256=wT_dA5RTwONRhUx2MpVKu9o-eLkSqUDX8sU9W2GQYLY,316
-shinychat/__version.py,sha256=o3ZTescp-19Z9cvBGq9dQnbppljgzdUYUf98Nov0spY,704
-shinychat/_chat.py,sha256=xI32fiiDPx8UCGES1klfneqmxiEWdSWY2F0V0g42pd4,65831
+shinychat/__version.py,sha256=NRw4Jle4n9v_DD2wtplRqflGCvX8OU5eAjycYY0vY3Y,704
+shinychat/_chat.py,sha256=oe2-zdWGTpjkjzP_v7W96JcK40q_ONRx2QMHO5Xh5TY,65937
 shinychat/_chat_bookmark.py,sha256=E8okr1dkN4VNDtORyPVZnCXihmfV9jFGD6UQq4Z2p5s,3027
-shinychat/_chat_normalize.py,sha256=zItuC1OXK-f_mqwfMPW2cWqlWyI8eKiHjBk_cUSA34s,9984
+shinychat/_chat_normalize.py,sha256=7mzVcb2MPGJpjbMIyrrbxTD0NZ727oB3l4f4k8h84Ls,10170
 shinychat/_chat_normalize_chatlas.py,sha256=6iMObxHHSPZ0odWiWNTRUX52Vt8q0ocRaWvsdRjw9zk,12925
 shinychat/_chat_provider_types.py,sha256=gsBPAs0uro1YcepS1xEiCXyh4JMhpE7kjs28_LSspk0,4328
 shinychat/_chat_tokenizer.py,sha256=m-YS8j5TC5oJ2uTsIus04_NRYeldFbpHzsoanL2EA-E,1868
-shinychat/_chat_types.py,sha256=52UGHq1WSMkf11snrC_cDx0q0DC_WXharN41nDorZLA,2920
+shinychat/_chat_types.py,sha256=_4MyXhM4GKYhSi6TOWgrw0zEG5N7F3z2LIIze2tEa0w,2549
 shinychat/_html_deps_py_shiny.py,sha256=GeI_6dox592BalSmKdGTdQ3Nz9FgaqSOf1eJ-jxuX_k,1189
 shinychat/_markdown_stream.py,sha256=-NgjYDdFDE6wcn3KJ3HLvACVdYs-QZBqV33NXjLPFfU,12490
 shinychat/_typing_extensions.py,sha256=-PeNqGFdlfWF3Bg6oYCfeFzrh6gJ4WbwKxkrBFEPP4o,1685
@@ -25,7 +25,7 @@ shinychat/www/markdown-stream/markdown-stream.css,sha256=m-yRlzTkX36piqx1T8Nvx18
 shinychat/www/markdown-stream/markdown-stream.css.map,sha256=afnnfIkD6AuwmHWnzYKDR2qpn8GBzBdqsQ8QY2wH5Xc,9191
 shinychat/www/markdown-stream/markdown-stream.js,sha256=mcbHHYdKP1tSBAhV830UPOo36q4NBcs6VOvN_i3xC7g,272842
 shinychat/www/markdown-stream/markdown-stream.js.map,sha256=P7IdHoJhgJ_M9VlIHhzmzwDurBvIIS3FAkfsV86cMz0,1119239
-shinychat-0.2.2.dist-info/METADATA,sha256=YX1F15v16SQxoQBcHEOn24UJ0pbQSM_1bE58_4rStJM,3203
-shinychat-0.2.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-shinychat-0.2.2.dist-info/licenses/LICENSE,sha256=oB2X1GZjjWFbXGMjbtPLWg29aj7BzjbecsnG7yEaY8U,1078
-shinychat-0.2.2.dist-info/RECORD,,
+shinychat-0.2.4.dist-info/METADATA,sha256=SSpgQOYwBRvMeqpu6yJnK4Z8mmJJH0C5hnJnqge98kg,3203
+shinychat-0.2.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+shinychat-0.2.4.dist-info/licenses/LICENSE,sha256=oB2X1GZjjWFbXGMjbtPLWg29aj7BzjbecsnG7yEaY8U,1078
+shinychat-0.2.4.dist-info/RECORD,,