Merge branch 'main' into chat-inject-stream

Author: cpsievert

shiny/templates/chat/llm-enterprise/aws-bedrock-anthropic/app.py

@@ -13,7 +13,7 @@
 # them in a file named `.env`. The `python-dotenv` package will load `.env` as
 # environment variables which can be read by `os.getenv()`.
 load_dotenv()
-chat_model = ChatBedrockAnthropic(
+chat_client = ChatBedrockAnthropic(
     model="anthropic.claude-3-sonnet-20240229-v1:0",
 )
 
@@ -32,5 +32,5 @@
 # Define a callback to run when the user submits a message
 @chat.on_user_submit
 async def handle_user_input(user_input: str):
-    response = await chat_model.stream_async(user_input)
+    response = await chat_client.stream_async(user_input)
     await chat.append_message_stream(response)

shiny/templates/chat/llm-enterprise/azure-openai/app.py

@@ -12,7 +12,7 @@
 # See the docs for more information on how to obtain one.
 # https://posit-dev.github.io/chatlas/reference/ChatAzureOpenAI.html
 load_dotenv()
-chat_model = ChatAzureOpenAI(
+chat_client = ChatAzureOpenAI(
     api_key=os.getenv("AZURE_OPENAI_API_KEY"),
     endpoint="https://my-endpoint.openai.azure.com",
     deployment_id="gpt-4o-mini",
@@ -37,5 +37,5 @@
 # Define a callback to run when the user submits a message
 @chat.on_user_submit
 async def handle_user_input(user_input: str):
-    response = await chat_model.stream_async(user_input)
+    response = await chat_client.stream_async(user_input)
     await chat.append_message_stream(response)

shiny/templates/chat/llms/anthropic/app.py

@@ -12,7 +12,7 @@
 # See the docs for more information on how to obtain one.
 # https://posit-dev.github.io/chatlas/reference/ChatAnthropic.html
 load_dotenv()
-chat_model = ChatAnthropic(
+chat_client = ChatAnthropic(
     api_key=os.environ.get("ANTHROPIC_API_KEY"),
     model="claude-3-7-sonnet-latest",
     system_prompt="You are a helpful assistant.",
@@ -37,5 +37,5 @@
 # Generate a response when the user submits a message
 @chat.on_user_submit
 async def handle_user_input(user_input: str):
-    response = await chat_model.stream_async(user_input)
+    response = await chat_client.stream_async(user_input)
     await chat.append_message_stream(response)

shiny/templates/chat/llms/google/app.py

@@ -12,7 +12,7 @@
 # See the docs for more information on how to obtain one.
 # https://posit-dev.github.io/chatlas/reference/ChatGoogle.html
 load_dotenv()
-chat_model = ChatGoogle(
+chat_client = ChatGoogle(
     api_key=os.environ.get("GOOGLE_API_KEY"),
     system_prompt="You are a helpful assistant.",
     model="gemini-2.0-flash",
@@ -33,5 +33,5 @@
 # Generate a response when the user submits a message
 @chat.on_user_submit
 async def handle_user_input(user_input: str):
-    response = await chat_model.stream_async(user_input)
+    response = await chat_client.stream_async(user_input)
     await chat.append_message_stream(response)

shiny/templates/chat/llms/langchain/app.py

@@ -15,7 +15,7 @@
 # app, or set them in a file named `.env`. The `python-dotenv` package will load `.env`
 # as environment variables which can later be read by `os.getenv()`.
 load_dotenv()
-chat_model = ChatOpenAI(
+chat_client = ChatOpenAI(
     api_key=os.environ.get("OPENAI_API_KEY"),
     model="gpt-4o",
 )
@@ -38,5 +38,5 @@
 # Define a callback to run when the user submits a message
 @chat.on_user_submit
 async def handle_user_input(user_input: str):
-    response = await chat_model.stream_async(user_input)
+    response = await chat_client.stream_async(user_input)
     await chat.append_message_stream(response)

shiny/templates/chat/llms/ollama/app.py

@@ -9,7 +9,7 @@
 # ChatOllama() requires an Ollama model server to be running locally.
 # See the docs for more information on how to set up a local Ollama server.
 # https://posit-dev.github.io/chatlas/reference/ChatOllama.html
-chat_model = ChatOllama(model="llama3.2")
+chat_client = ChatOllama(model="llama3.2")
 
 # Set some Shiny page options
 ui.page_opts(
@@ -29,5 +29,5 @@
 # Generate a response when the user submits a message
 @chat.on_user_submit
 async def handle_user_input(user_input: str):
-    response = await chat_model.stream_async(user_input)
+    response = await chat_client.stream_async(user_input)
     await chat.append_message_stream(response)

shiny/templates/chat/llms/openai/app.py

@@ -12,7 +12,7 @@
 # See the docs for more information on how to obtain one.
 # https://posit-dev.github.io/chatlas/reference/ChatOpenAI.html
 load_dotenv()
-chat_model = ChatOpenAI(
+chat_client = ChatOpenAI(
     api_key=os.environ.get("OPENAI_API_KEY"),
     model="gpt-4o",
     system_prompt="You are a helpful assistant.",
@@ -37,5 +37,5 @@
 # Generate a response when the user submits a message
 @chat.on_user_submit
 async def handle_user_input(user_input: str):
-    response = await chat_model.stream_async(user_input)
+    response = await chat_client.stream_async(user_input)
     await chat.append_message_stream(response)

shiny/templates/chat/llms/playground/app.py

@@ -63,15 +63,15 @@ def get_model():
     }
 
     if input.model() in models["openai"]:
-        chat_model = ctl.ChatOpenAI(**model_params)
+        chat_client = ctl.ChatOpenAI(**model_params)
     elif input.model() in models["claude"]:
-        chat_model = ctl.ChatAnthropic(**model_params)
+        chat_client = ctl.ChatAnthropic(**model_params)
     elif input.model() in models["google"]:
-        chat_model = ctl.ChatGoogle(**model_params)
+        chat_client = ctl.ChatGoogle(**model_params)
     else:
         raise ValueError(f"Invalid model: {input.model()}")
 
-    return chat_model
+    return chat_client
 
 
 @reactive.calc

shiny/ui/_markdown_stream.py

@@ -158,6 +158,8 @@ async def _task():
 
         _task()
 
+        self._latest_stream.set(_task)
+
         # Since the task runs in the background (outside/beyond the current context,
         # if any), we need to manually raise any exceptions that occur
         @reactive.effect
@@ -208,7 +210,7 @@ def get_latest_stream_result(self) -> Union[str, None]:
             "The `.get_latest_stream_result()` method is deprecated and will be removed "
             "in a future release. Use `.latest_stream.result()` instead. "
         )
-        self.latest_stream.result()
+        return self.latest_stream.result()
 
     async def clear(self):
         """

tests/playwright/shiny/components/MarkdownStream/stream-result/app.py

@@ -0,0 +1,28 @@
+import asyncio
+
+from shiny import reactive
+from shiny.express import input, render, ui
+
+stream = ui.MarkdownStream("stream_id")
+stream.ui()
+
+
+ui.input_action_button("do_stream", "Do stream")
+
+
+async def gen():
+    yield "Hello "
+    await asyncio.sleep(0.1)
+    yield "world!"
+
+
+@reactive.effect
+@reactive.event(input.do_stream)
+async def _():
+    await stream.stream(gen())
+
+
+@render.code
+def stream_result():
+    res = stream.latest_stream.result()
+    return f"Stream result: {res}"