Fix for Anthropic; cleanup

Author: cpsievert

pkg-py/src/shinychat/_chat_normalize.py

@@ -180,7 +180,25 @@ def _(chunk: ChatCompletionChunk) -> ChatMessage:
 
 try:
     from anthropic.types import Message as AnthropicMessage
-    from anthropic.types import MessageStreamEvent
+    from anthropic.types import (
+        RawContentBlockDeltaEvent,
+        RawContentBlockStartEvent,
+        RawContentBlockStopEvent,
+        RawMessageDeltaEvent,
+        RawMessageStartEvent,
+        RawMessageStopEvent,
+    )
+
+    # Create a non-annotated type alias for RawMessageStreamEvent
+    # (so it works with singledispatch)
+    RawMessageStreamEvent = (
+        RawMessageStartEvent
+        | RawMessageDeltaEvent
+        | RawMessageStopEvent
+        | RawContentBlockStartEvent
+        | RawContentBlockDeltaEvent
+        | RawContentBlockStopEvent
+    )
 
     @get_message_content.register
     def _(message: AnthropicMessage) -> ChatMessage:
@@ -193,7 +211,7 @@ def _(message: AnthropicMessage) -> ChatMessage:
         return ChatMessage(content=content.text, role="assistant")
 
     @get_message_chunk_content.register
-    def _(chunk: MessageStreamEvent) -> ChatMessage:
+    def _(chunk: RawMessageStreamEvent) -> ChatMessage:
         content = ""
         if chunk.type == "content_block_delta":
             if chunk.delta.type != "text_delta":

pkg-py/tests/pytest/test_chat.py

@@ -398,7 +398,7 @@ def test_ollama_normalization():
 def test_as_anthropic_message():
     from anthropic.resources.messages import AsyncMessages, Messages
     from anthropic.types import MessageParam
-    from shiny.ui._chat_provider_types import as_anthropic_message
+    from shinychat._chat_provider_types import as_anthropic_message
 
     # Make sure return type of llm.messages.create() hasn't changed
     assert (
@@ -416,7 +416,7 @@ def test_as_anthropic_message():
 
 
 def test_as_google_message():
-    from shiny.ui._chat_provider_types import as_google_message
+    from shinychat._chat_provider_types import as_google_message
 
     # Not available for Python 3.8
     if sys.version_info < (3, 9):
@@ -460,7 +460,7 @@ def test_as_langchain_message():
         MessageLikeRepresentation,
         SystemMessage,
     )
-    from shiny.ui._chat_provider_types import as_langchain_message
+    from shinychat._chat_provider_types import as_langchain_message
 
     assert BaseChatModel.invoke.__annotations__["input"] == "LanguageModelInput"
     assert BaseChatModel.stream.__annotations__["input"] == "LanguageModelInput"
@@ -491,7 +491,7 @@ def test_as_openai_message():
         ChatCompletionSystemMessageParam,
         ChatCompletionUserMessageParam,
     )
-    from shiny.ui._chat_provider_types import as_openai_message
+    from shinychat._chat_provider_types import as_openai_message
 
     assert (
         Completions.create.__annotations__["messages"]
@@ -523,14 +523,11 @@ def test_as_ollama_message():
     import ollama
     from ollama import Message as OllamaMessage
 
-    # ollama 0.4.2 added Callable to the type hints, but pyright complains about
-    # missing arguments to the Callable type. We'll ignore this for now.
-    # https://github.com/ollama/ollama-python/commit/b50a65b
-    chat = ollama.chat  # type: ignore
-
-    assert "ollama._types.Message" in str(chat.__annotations__["messages"])
+    assert "ollama._types.Message" in str(
+        ollama.chat.__annotations__["messages"]
+    )
 
-    from shiny.ui._chat_provider_types import as_ollama_message
+    from shinychat._chat_provider_types import as_ollama_message
 
     msg = ChatMessageDict(content="I have a question", role="user")
     assert as_ollama_message(msg) == OllamaMessage(

pyproject.toml

@@ -28,7 +28,7 @@ providers = [
     "chatlas>=0.6.1",
     "google-generativeai;python_version>='3.9'",
     "langchain-core",
-    "ollama",
+    "ollama>=0.4.0",
     "openai",
     "tokenizers",
 ]