Merge branch 'main' into machow-feat-narwhals

* main:
  chore: Fix `langchain_core` test that used a new `Sequence` type (posit-dev#1697)
  tests(input_slider): add kitchensink tests for input_slider (posit-dev#1691)
  chore: More minor type changes in prep for py-htmltools updates (posit-dev#1693)
  chore: Add types and check action for py-htmltools (posit-dev#1692)
  Anticipate `htmltools.HTML` no longer inheriting from `str` (posit-dev#1690)
  tests(input_select): Add kitchensink tests for input_select and input_selectize (posit-dev#1686)

Author: schloerke

.github/py-shiny/check/action.yaml

@@ -0,0 +1,35 @@
+name: 'check py-shiny'
+description: 'Action that checks py-shiny in multiple steps so that any of them may fail but not prevent the others from running. Note, this action is used by py-htmltools as a way to consistently check py-shiny. If more checks are needed for py-htmltools to believe py-shiny is working, it should be added here.'
+runs:
+  using: "composite"
+  steps:
+    - name: Run unit tests
+      shell: bash
+      run: |
+        # Run unit tests
+        make check-tests
+
+    - name: Type check
+      shell: bash
+      run: |
+        # Type check
+        make check-types
+
+    - name: Lint code
+      shell: bash
+      run: |
+        # Lint code
+        make check-lint
+
+    - name: Verify code formatting
+      shell: bash
+      run: |
+        # Verify code formatting
+        make check-format
+
+    - name: Verify code can run with mypy (not Windows)
+      if: ${{ runner.os != 'Windows' }}
+      shell: bash
+      run: |
+        # Verify code can run with mypy (not Windows)
+        make ci-check-mypy-can-run

CHANGELOG.md

@@ -25,7 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Bug fixes
 
-* A few fixes for `ui.Chat()`, including: 
+* A few fixes for `ui.Chat()`, including:
   * Fixed a bug with `Chat()` sometimes silently dropping errors. (#1672)
   * Fixed a bug with `Chat()` sometimes not removing it's loading icon (on error or a `None` transform). (#1679)
   * `.messages(format="anthropic")` correctly removes non-user starting messages (once again). (#1685)
@@ -35,6 +35,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 * `ui.Theme()` now works correctly on Windows when the theme requires Sass compilation. (thanks @yuuuxt, #1684)
 
+* Fixed the `InputSlider` controller's `.expect_width()` to check the `width` property within the `style` attribute. (#1691)
+
 ## [1.1.0] - 2024-09-03
 
 ### New features

shiny/playwright/controller/_input_controls.py

@@ -17,10 +17,9 @@
 from ..expect._internal import expect_style_to_have_value as _expect_style_to_have_value
 from ._base import (
     InitLocator,
+    UiWithContainerP,
     UiWithLabel,
     WidthContainerM,
-    WidthLocM,
-    _expect_multiple,
     all_missing,
     not_is_missing,
 )
@@ -30,7 +29,7 @@
 )
 
 
-class _InputSliderBase(WidthLocM, UiWithLabel):
+class _InputSliderBase(UiWithLabel):
 
     loc_irs: Locator
     """
@@ -203,6 +202,19 @@ def expect_max(self, value: AttrValue, *, timeout: Timeout = None) -> None:
             self.loc, "data-max", value=value, timeout=timeout
         )
 
+    def expect_width(self, value: str, *, timeout: Timeout = None) -> None:
+        """
+        Expects the slider to have the specified width.
+
+        Parameters
+        ----------
+        value
+            The expected width.
+        timeout
+            The maximum time to wait for the width to be visible and interactable. Defaults to `None`.
+        """
+        _expect_style_to_have_value(self.loc_container, "width", value, timeout=timeout)
+
     def expect_step(self, value: AttrValue, *, timeout: Timeout = None) -> None:
         """
         Expect the input element to have the expected `step` attribute value.
@@ -923,30 +935,40 @@ def __init__(
         )
 
 
-class _InputSelectBase(
-    WidthLocM,
-    UiWithLabel,
-):
-    loc_selected: Locator
-    """
-    Playwright `Locator` for the selected option of the input select.
-    """
-    loc_choices: Locator
-    """
-    Playwright `Locator` for the choices of the input select.
+class InputSelectWidthM:
     """
-    loc_choice_groups: Locator
-    """
-    Playwright `Locator` for the choice groups of the input select.
+    A base class representing the input `select` and `selectize` widths.
+
+    This class provides methods to expect the width attribute of a DOM element.
     """
 
-    def __init__(
-        self,
-        page: Page,
-        id: str,
+    def expect_width(
+        self: UiWithContainerP,
+        value: AttrValue,
         *,
-        select_class: str = "",
+        timeout: Timeout = None,
     ) -> None:
+        """
+        Expect the input select to have a specific width.
+
+        Parameters
+        ----------
+        value
+            The expected width.
+        timeout
+            The maximum time to wait for the expectation to be fulfilled. Defaults to `None`.
+        """
+        _expect_style_to_have_value(self.loc_container, "width", value, timeout=timeout)
+
+
+class InputSelect(InputSelectWidthM, UiWithLabel):
+    """
+    Controller for :func:`shiny.ui.input_select`.
+
+    If you have defined your app's select input (`ui.input_select()`) with `selectize=TRUE`, use `InputSelectize` to test your app's UI.
+    """
+
+    def __init__(self, page: Page, id: str) -> None:
         """
         Initializes the input select.
 
@@ -956,13 +978,11 @@ def __init__(
             The page where the input select is located.
         id
             The id of the input select.
-        select_class
-            The class of the select element. Defaults to "".
         """
         super().__init__(
             page,
             id=id,
-            loc=f"select#{id}.shiny-bound-input{select_class}",
+            loc=f"select#{id}.shiny-bound-input.form-select",
         )
         self.loc_selected = self.loc.locator("option:checked")
         self.loc_choices = self.loc.locator("option")
@@ -988,9 +1008,29 @@ def set(
             selected = [selected]
         self.loc.select_option(value=selected, timeout=timeout)
 
+    # If `selectize=` parameter does not become deprecated, uncomment this
+    # # selectize: bool = False,
+    # def expect_selectize(self, value: bool, *, timeout: Timeout = None) -> None:
+    #     """
+    #     Expect the input select to be selectize.
+
+    #     Parameters
+    #     ----------
+    #     value
+    #         Whether the input select is selectize.
+    #     timeout
+    #         The maximum time to wait for the expectation to be fulfilled. Defaults to `None`.
+    #     """
+    #     # class_=None if selectize else "form-select",
+    #     _expect_class_to_have_value(
+    #         self.loc,
+    #         "form-select",
+    #         has_class=not value,
+    #         timeout=timeout,
+    #     )
+
     def expect_choices(
         self,
-        # TODO-future; support patterns?
         choices: ListPatternOrStr,
         *,
         timeout: Timeout = None,
@@ -1111,10 +1151,9 @@ def expect_choice_labels(
             return
         playwright_expect(self.loc_choices).to_have_text(value, timeout=timeout)
 
-    # multiple: bool = False,
     def expect_multiple(self, value: bool, *, timeout: Timeout = None) -> None:
         """
-        Expect the input select to allow multiple selections.
+        Expect the input selectize to allow multiple selections.
 
         Parameters
         ----------
@@ -1123,7 +1162,12 @@ def expect_multiple(self, value: bool, *, timeout: Timeout = None) -> None:
         timeout
             The maximum time to wait for the expectation to be fulfilled. Defaults to `None`.
         """
-        _expect_multiple(self.loc, value, timeout=timeout)
+        _expect_attribute_to_have_value(
+            self.loc,
+            "multiple",
+            value="" if value else None,
+            timeout=timeout,
+        )
 
     def expect_size(self, value: AttrValue, *, timeout: Timeout = None) -> None:
         """
@@ -1144,50 +1188,7 @@ def expect_size(self, value: AttrValue, *, timeout: Timeout = None) -> None:
         )
 
 
-class InputSelect(_InputSelectBase):
-    """Controller for :func:`shiny.ui.input_select`."""
-
-    def __init__(self, page: Page, id: str) -> None:
-        """
-        Initializes the input select.
-
-        Parameters
-        ----------
-        page
-            The page where the input select is located.
-        id
-            The id of the input select.
-        """
-        super().__init__(
-            page,
-            id=id,
-            select_class=".form-select",
-        )
-
-    # selectize: bool = False,
-    def expect_selectize(self, value: bool, *, timeout: Timeout = None) -> None:
-        """
-        Expect the input select to be selectize.
-
-        Parameters
-        ----------
-        value
-            Whether the input select is selectize.
-        timeout
-            The maximum time to wait for the expectation to be fulfilled. Defaults to `None`.
-        """
-        # class_=None if selectize else "form-select",
-        _expect_class_to_have_value(
-            self.loc,
-            "form-select",
-            has_class=not value,
-            timeout=timeout,
-        )
-
-
-class InputSelectize(
-    UiWithLabel,
-):
+class InputSelectize(InputSelectWidthM, UiWithLabel):
     """Controller for :func:`shiny.ui.input_selectize`."""
 
     def __init__(self, page: Page, id: str) -> None:

shiny/types.py

@@ -209,7 +209,7 @@ def resolve(
         """
         ...
 
-    def get_value(self) -> Optional[str]:
+    def get_value(self) -> str | None:
         """
         Get the value of this navigation item (if any).
 

shiny/ui/_chat.py

@@ -489,7 +489,7 @@ def messages(
                     transform_user == "last" and i == len(messages) - 1
                 )
             content_key = m["transform_key" if transform else "pre_transform_key"]
-            chat_msg = ChatMessage(content=m[content_key], role=m["role"])
+            chat_msg = ChatMessage(content=str(m[content_key]), role=m["role"])
             if not isinstance(format, MISSING_TYPE):
                 chat_msg = as_provider_message(chat_msg, format)
             res.append(chat_msg)
@@ -635,7 +635,7 @@ async def _send_append_message(
         content_type = "html" if isinstance(content, HTML) else "markdown"
 
         msg = ClientMessage(
-            content=content,
+            content=str(content),
             role=message["role"],
             content_type=content_type,
             chunk_type=chunk_type,
@@ -790,7 +790,7 @@ async def _transform_message(
         if content is None:
             return None
 
-        res[key] = content
+        res[key] = content  # type: ignore
 
         return res
 
@@ -950,7 +950,7 @@ def user_input(self, transform: bool = False) -> str | None:
         if msg is None:
             return None
         key = "content_server" if transform else "content_client"
-        return msg[key]
+        return str(msg[key])
 
     def _user_input(self) -> str:
         id = self.user_input_id

shiny/ui/_chat_normalize.py

@@ -2,6 +2,8 @@
 from abc import ABC, abstractmethod
 from typing import TYPE_CHECKING, Any, Optional, cast
 
+from htmltools import HTML
+
 from ._chat_types import ChatMessage
 
 if TYPE_CHECKING:
@@ -49,10 +51,10 @@ def normalize_chunk(self, chunk: Any) -> ChatMessage:
         return ChatMessage(content=x or "", role="assistant")
 
     def can_normalize(self, message: Any) -> bool:
-        return isinstance(message, str) or message is None
+        return isinstance(message, (str, HTML)) or message is None
 
     def can_normalize_chunk(self, chunk: Any) -> bool:
-        return isinstance(chunk, str) or chunk is None
+        return isinstance(chunk, (str, HTML)) or chunk is None
 
 
 class DictNormalizer(BaseMessageNormalizer):

shiny/ui/_chat_types.py

@@ -2,6 +2,8 @@
 
 from typing import Literal, TypedDict
 
+from htmltools import HTML
+
 Role = Literal["assistant", "user", "system"]
 
 
@@ -14,7 +16,7 @@ class ChatMessage(TypedDict):
 
 # A message once transformed have been applied
 class TransformedMessage(TypedDict):
-    content_client: str
+    content_client: str | HTML
     content_server: str
     role: Role
     transform_key: Literal["content_client", "content_server"]