Merge branch 'main' into chore/support-for-narwhals-binary-dtype

Author: FBruzzesi

shiny/bookmark/_bookmark.py

@@ -3,7 +3,7 @@
 import warnings
 from abc import ABC, abstractmethod
 from pathlib import Path
-from typing import TYPE_CHECKING, Awaitable, Callable, Literal
+from typing import TYPE_CHECKING, Awaitable, Callable, Literal, Optional
 
 from .._docstring import add_example
 from .._utils import AsyncCallbacks, CancelCallback, wrap_async
@@ -167,7 +167,7 @@ def on_restored(
     @abstractmethod
     async def update_query_string(
         self,
-        query_string: str,
+        query_string: Optional[str] = None,
         mode: Literal["replace", "push"] = "replace",
     ) -> None:
         """
@@ -176,7 +176,7 @@ async def update_query_string(
         Parameters
         ----------
         query_string
-            The query string to set.
+            The query string to set. If `None`, the current bookmark state URL will be used.
         mode
             Whether to replace the current URL or push a new one. Pushing a new value
             will add to the user's browser history.
@@ -448,9 +448,12 @@ async def invoke_on_restored_callbacks():
 
     async def update_query_string(
         self,
-        query_string: str,
+        query_string: Optional[str] = None,
         mode: Literal["replace", "push"] = "replace",
     ) -> None:
+        if query_string is None:
+            query_string = await self.get_bookmark_url()
+
         if mode not in {"replace", "push"}:
             raise ValueError(f"Invalid mode: {mode}")
         await self._root_session._send_message(
@@ -723,7 +726,9 @@ def _restore_context(self) -> RestoreContext | None:
         return self._root_bookmark._restore_context
 
     async def update_query_string(
-        self, query_string: str, mode: Literal["replace", "push"] = "replace"
+        self,
+        query_string: Optional[str] = None,
+        mode: Literal["replace", "push"] = "replace",
     ) -> None:
         await self._root_bookmark.update_query_string(query_string, mode)
 
@@ -769,7 +774,9 @@ def on_bookmarked(
         return lambda: None
 
     async def update_query_string(
-        self, query_string: str, mode: Literal["replace", "push"] = "replace"
+        self,
+        query_string: Optional[str] = None,
+        mode: Literal["replace", "push"] = "replace",
     ) -> None:
         # no-op within ExpressStub
         return None

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