shinychat 0.2.0__tar.gz → 0.2.2__tar.gz

{shinychat-0.2.0 → shinychat-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinychat
-Version: 0.2.0
+Version: 0.2.2
 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.0 → shinychat-0.2.2}/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.0'
-__version_tuple__ = version_tuple = (0, 2, 0)
+__version__ = version = '0.2.2'
+__version_tuple__ = version_tuple = (0, 2, 2)
 
 __commit_id__ = commit_id = None

{shinychat-0.2.0 → shinychat-0.2.2}/pkg-py/src/shinychat/_chat.py

@@ -22,7 +22,7 @@ from weakref import WeakValueDictionary
 
 from htmltools import (
     HTML,
-    RenderedHTML,
+    HTMLDependency,
     Tag,
     TagAttrValue,
     TagChild,
@@ -595,6 +595,7 @@ class Chat:
             * A dictionary with `content` and `role` keys. The `content` key can contain
               content as described above, and the `role` key can be "assistant" or
               "user".
+            * More generally, any type registered with :func:`shinychat.message_content`.
 
             **NOTE:** content may include specially formatted **input suggestion** links
             (see note below).
@@ -829,6 +830,7 @@ class Chat:
             * A dictionary with `content` and `role` keys. The `content` key can contain
               content as described above, and the `role` key can be "assistant" or
               "user".
+            * More generally, any type registered with :func:`shinychat.message_content_chunk`.
 
             **NOTE:** content may include specially formatted **input suggestion** links
             (see note below).
@@ -1588,7 +1590,9 @@ class ChatExpress(Chat):
     def ui(
         self,
         *,
-        messages: Optional[Sequence[TagChild | ChatMessageDict]] = None,
+        messages: Optional[
+            Iterable[str | TagChild | ChatMessageDict | ChatMessage | Any]
+        ] = None,
         placeholder: str = "Enter a message...",
         width: CssUnit = "min(680px, 100%)",
         height: CssUnit = "auto",
@@ -1690,12 +1694,14 @@ class ChatExpress(Chat):
 def chat_ui(
     id: str,
     *,
-    messages: Optional[Sequence[TagChild | ChatMessageDict]] = None,
+    messages: Optional[
+        Iterable[str | TagChild | ChatMessageDict | ChatMessage | Any]
+    ] = None,
     placeholder: str = "Enter a message...",
     width: CssUnit = "min(680px, 100%)",
     height: CssUnit = "auto",
     fill: bool = True,
-    icon_assistant: HTML | Tag | TagList | None = None,
+    icon_assistant: Optional[HTML | Tag | TagList] = None,
     **kwargs: TagAttrValue,
 ) -> Tag:
     """
@@ -1722,6 +1728,7 @@ def chat_ui(
               interpreted as markdown as long as they're not inside HTML.
         * A dictionary with `content` and `role` keys. The `content` key can contain a
           content as described above, and the `role` key can be "assistant" or "user".
+        * More generally, any type registered with :func:`shinychat.message_content`.
 
         **NOTE:** content may include specially formatted **input suggestion** links
         (see :method:`~shiny.ui.Chat.append_message` for more info).
@@ -1755,34 +1762,14 @@ def chat_ui(
     if messages is None:
         messages = []
     for x in messages:
-        role = "assistant"
-        content: TagChild = None
-        if not isinstance(x, dict):
-            content = x
-        else:
-            if "content" not in x:
-                raise ValueError(
-                    "Each message dictionary must have a 'content' key."
-                )
-
-            content = x["content"]
-            if "role" in x:
-                role = x["role"]
-
-        # `content` is most likely a string, so avoid overhead in that case
-        # (it's also important that we *don't escape HTML* here).
-        if isinstance(content, str):
-            ui: RenderedHTML = {"html": content, "dependencies": []}
-        else:
-            ui = TagList(content).render()
-
+        msg = message_content(x)
         message_tags.append(
             Tag(
                 "shiny-chat-message",
-                ui["dependencies"],
-                content=ui["html"],
+                *[HTMLDependency(**d) for d in msg.html_deps],
+                content=msg.content,
                 icon=icon_attr,
-                data_role=role,
+                data_role=msg.role,
             )
         )
 

{shinychat-0.2.0 → shinychat-0.2.2}/pkg-py/src/shinychat/_chat_normalize.py

@@ -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")

{shinychat-0.2.0 → shinychat-0.2.2}/pkg-py/src/shinychat/_chat_types.py

@@ -4,7 +4,7 @@ from dataclasses import dataclass
 from typing import Literal, TypedDict
 
 from htmltools import HTML, Tag, TagChild, Tagifiable, TagList
-from shiny.session import require_active_session
+from shiny.session import get_current_session
 
 from ._typing_extensions import NotRequired
 
@@ -32,10 +32,14 @@ class ChatMessage:
         # markdown), so only process it if it's not a string.
         deps = []
         if not isinstance(content, str):
-            session = require_active_session(None)
-            res = session._process_ui(content)
+            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"]
-            deps = res["deps"]
 
         if is_html:
             # Code blocks with `{=html}` infostrings are rendered as-is by a