shinychat 0.2.1__tar.gz → 0.2.3__tar.gz

{shinychat-0.2.1 → shinychat-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinychat
-Version: 0.2.1
+Version: 0.2.3
 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.1 → shinychat-0.2.3}/pkg-py/src/shinychat/__version.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '0.2.1'
-__version_tuple__ = version_tuple = (0, 2, 1)
+__version__ = version = '0.2.3'
+__version_tuple__ = version_tuple = (0, 2, 3)
 
 __commit_id__ = commit_id = None

{shinychat-0.2.1 → shinychat-0.2.3}/pkg-py/src/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
@@ -44,6 +44,8 @@ def message_content(message):
     """
     if isinstance(message, (str, HTML)) or message is None:
         return ChatMessage(content=message)
+    if isinstance(message, ChatMessage):
+        return message
     if isinstance(message, dict):
         if "content" not in message:
             raise ValueError("Message dictionary must have a 'content' key")
@@ -90,6 +92,8 @@ def message_content_chunk(chunk):
     """
     if isinstance(chunk, (str, HTML)) or chunk is None:
         return ChatMessage(content=chunk)
+    if isinstance(chunk, ChatMessage):
+        return chunk
     if isinstance(chunk, dict):
         if "content" not in chunk:
             raise ValueError("Chunk dictionary must have a 'content' key")
@@ -159,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):