Merge branch 'main' into machow-feat-narwhals

* main:
  setup.cfg -> pyproject.toml (posit-dev#1625)
  docs(navset): Add server function to navset docs (posit-dev#1596)
  Pin syrupy to avoid pytest-rerunfailures incompatibility (posit-dev#1632)
  refactor: `shiny create` and `shiny add test` supporting functions (posit-dev#1629)
  Update CHANGELOG.md
  Fix posit-dev#1601: Force text/javascript for .js files
  Work around griffe 1.0 breaking changes
  feat(shiny create): Support simpler syntax for `--github` flag (posit-dev#1623)
  Make sure `Chat.messages(format='google')` converts role assistant -> model (posit-dev#1622)
  Fix `NormalizerRegistry.register()` (posit-dev#1619)
  Update JS/CSS from shiny and bslib (posit-dev#1617)
  Add ability to update `Chat()`'s input placeholder (posit-dev#1594)
  docs: Add double-quotes to shiny[theme] (posit-dev#1605)
  `json.dump()` each websocket message once instead of twice (posit-dev#1597)
  docs: Update note on style keys allowing for kebab-case (posit-dev#1595)
  docs: fix navset function links (posit-dev#1590)
  Get `ui.Chat()` working inside Shiny modules (posit-dev#1582)
  bug(notification): Allow for duration to be `None` and passed to client (posit-dev#1577)
  Fix logic for detection of support files in docs (posit-dev#1580)
  docs(navset): Add examples for navset (posit-dev#1579)

Author: schloerke

.github/workflows/build-docs.yaml

@@ -20,6 +20,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Setup py-shiny
         uses: ./.github/py-shiny/setup

.github/workflows/deploy-tests.yaml

@@ -20,6 +20,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setup py-shiny
         uses: ./.github/py-shiny/setup
         with:

.github/workflows/pytest.yaml

@@ -30,6 +30,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setup py-shiny
         id: install
         uses: ./.github/py-shiny/setup
@@ -63,6 +65,8 @@ jobs:
     needs: [check]
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: "Set up Python 3.10"
         uses: actions/setup-python@v4
         with:
@@ -117,6 +121,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setup py-shiny
         uses: ./.github/py-shiny/setup
         with:
@@ -159,6 +165,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setup py-shiny
         uses: ./.github/py-shiny/setup
         with:
@@ -205,6 +213,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
       - name: Setup py-shiny
         uses: ./.github/py-shiny/setup
         with:

.github/workflows/verify-js-built.yaml

@@ -11,6 +11,8 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
 
       - name: Extract node version from .nvmrc
         id: nvm

.gitignore

@@ -115,3 +115,6 @@ docs/source/reference/
 _dev/
 tests/playwright/deploys/**/requirements.txt
 test-results/
+
+# setuptools_scm
+shiny/_version.py

CHANGELOG.md

@@ -9,19 +9,29 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### New features
 
+* `ui.Chat()` gains a new `.update_user_input()` method, which adds the ability to update the input placeholder message. As a result, `.set_user_message()` is now deprecated (since the new method can also be used to update the message). (#1594)
+
+* `shiny create` now supports a succinct format for specifying the GitHub repository via the `--github` flag, e.g. `--github posit-dev/py-shiny-templates`. You can now also use `--github` and `--template` together, in which case `--github` should point to a repository containing a directory matching the name provided in `--template`. (#1623)
+
 ### Other changes
 
 ### Bug fixes
 
-* An empty `input_date()` value no longer crashes Shiny. (#1528)
+* A handful of fixes for `ui.Chat()`, including:
+  * A fix for use inside Shiny modules. (#1582)
+  * `.messages(format="google")` now returns the correct role. (#1622)
+
+* An empty `ui.input_date()` value no longer crashes Shiny. (#1528)
 
 * Fixed bug where calling `.update_filter(None)` on a data frame renderer did not visually reset non-numeric column filters. (It did reset the column's filtering, just not the label). Now it resets filter's label. (#1557)
 
 * Require shinyswatch >= 0.7.0 and updated examples accordingly. (#1558)
 
-* `input_text_area(autoresize=True)` now resizes properly even when it's not visible when initially rendered (e.g. in a closed accordion or a hidden tab). (#1560)
+* `ui.input_text_area(autoresize=True)` now resizes properly even when it's not visible when initially rendered (e.g. in a closed accordion or a hidden tab). (#1560)
 
-### Bug fixes
+* `ui.notification_show(duration=None)` now persists the notification until the app user closes it. (#1577)
+
+* Some copies of Windows 10 have registry entries mapping .js files to content type "text/plain", which was causing all sorts of problems for browsers. (#1624)
 
 ### Deprecations
 

Makefile

@@ -188,9 +188,9 @@ release: dist ## package and upload a release
 	twine upload dist/*
 
 dist: clean ## builds source and wheel package
-	pip install setuptools
-	python setup.py sdist
-	python setup.py bdist_wheel
+	pip install build
+	python -m build --sdist
+	python -m build --wheel
 	ls -l dist
 
 

js/chat/chat.ts

@@ -27,14 +27,19 @@ type requestScrollEvent = {
   cancelIfScrolledUp: boolean;
 };
 
+type UpdateUserInput = {
+  value?: string;
+  placeholder?: string;
+};
+
 // https://github.com/microsoft/TypeScript/issues/28357#issuecomment-748550734
 declare global {
   interface GlobalEventHandlersEventMap {
     "shiny-chat-input-sent": CustomEvent<Message>;
     "shiny-chat-append-message": CustomEvent<Message>;
     "shiny-chat-append-message-chunk": CustomEvent<Message>;
     "shiny-chat-clear-messages": CustomEvent;
-    "shiny-chat-set-user-input": CustomEvent<string>;
+    "shiny-chat-update-user-input": CustomEvent<UpdateUserInput>;
     "shiny-chat-remove-loading-message": CustomEvent;
     "shiny-chat-request-scroll": CustomEvent<requestScrollEvent>;
   }
@@ -270,7 +275,7 @@ class ChatContainer extends LightElement {
       this.#onAppendChunk
     );
     this.addEventListener("shiny-chat-clear-messages", this.#onClear);
-    this.addEventListener("shiny-chat-set-user-input", this.#onSetUserInput);
+    this.addEventListener("shiny-chat-update-user-input", this.#onUpdateUserInput);
     this.addEventListener(
       "shiny-chat-remove-loading-message",
       this.#onRemoveLoadingMessage
@@ -291,7 +296,10 @@ class ChatContainer extends LightElement {
       this.#onAppendChunk
     );
     this.removeEventListener("shiny-chat-clear-messages", this.#onClear);
-    this.removeEventListener("shiny-chat-set-user-input", this.#onSetUserInput);
+    this.removeEventListener(
+      "shiny-chat-update-user-input",
+      this.#onUpdateUserInput
+    );
     this.removeEventListener(
       "shiny-chat-remove-loading-message",
       this.#onRemoveLoadingMessage
@@ -373,8 +381,14 @@ class ChatContainer extends LightElement {
     this.messages.innerHTML = "";
   }
 
-  #onSetUserInput(event: CustomEvent<string>): void {
-    this.input.setInputValue(event.detail);
+  #onUpdateUserInput(event: CustomEvent<UpdateUserInput>): void {
+    const { value, placeholder } = event.detail;
+    if (value !== undefined) {
+      this.input.setInputValue(value);
+    }
+    if (placeholder !== undefined) {
+      this.input.placeholder = placeholder;
+    }
   }
 
   #onRemoveLoadingMessage(): void {

pyproject.toml

@@ -0,0 +1,148 @@
+[build-system]
+requires = ["setuptools>=60", "wheel", "setuptools_scm>=8.0"]
+build-backend = "setuptools.build_meta"
+
+[tool.setuptools]
+packages = {find = {include = ["shiny", "shiny.*"]}}
+
+[tool.setuptools_scm]
+write_to = "shiny/_version.py"
+local_scheme = "no-local-version"
+
+[project]
+name = "shiny"
+dynamic = ["version"]
+authors = [
+    {name = "Winston Chang", email = "winston@posit.co"},
+]
+description = "A web development framework for Python."
+readme = "README.md"
+requires-python = ">=3.8"
+license = {text = "MIT"}
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Developers",
+    "License :: OSI Approved :: MIT License",
+    "Natural Language :: English",
+    "Programming Language :: Python :: 3.8",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
+]
+dependencies = [
+    "typing-extensions>=4.10.0",
+    "uvicorn>=0.16.0;platform_system!='Emscripten'",
+    "starlette",
+    "websockets>=10.0",
+    "python-multipart",
+    "htmltools>=0.5.2",
+    "click>=8.1.4;platform_system!='Emscripten'",
+    "markdown-it-py>=1.1.0",
+    "mdit-py-plugins>=0.3.0",
+    "linkify-it-py>=1.0",
+    "appdirs>=1.4.4",
+    "asgiref>=3.5.2",
+    "packaging>=20.9",
+    "watchfiles>=0.18.0;platform_system!='Emscripten'",
+    "questionary>=2.0.0;platform_system!='Emscripten'",
+    "prompt-toolkit;platform_system!='Emscripten'",
+    "python-multipart>=0.0.7;platform_system!='Emscripten'",
+    "setuptools;python_version>='3.12'",
+]
+
+[project.optional-dependencies]
+theme = ["libsass>=0.23.0"]
+test = [
+    "pytest>=6.2.4",
+    "pytest-asyncio>=0.17.2",
+    "pytest-playwright>=0.3.0",
+    "playwright>=1.43.0",
+    "pytest-xdist",
+    "pytest-timeout",
+    "pytest-rerunfailures",
+    "pytest-cov",
+    "coverage",
+    "syrupy>=4.7.1",
+    "psutil",
+    "astropy",
+    "suntime",
+    "timezonefinder",
+    "ipyleaflet",
+    "shinywidgets",
+    "seaborn",
+    "plotnine",
+    "plotly",
+    "duckdb",
+    "holoviews",
+    "bokeh",
+    "xarray",
+    "geopandas",
+    "geodatasets",
+    "missingno",
+    "rsconnect-python",
+    "scikit-learn",
+    "folium",
+    "palmerpenguins",
+    "faicons",
+    "ridgeplot",
+    "great_tables",
+]
+dev = [
+    "black>=24.0",
+    "flake8>=6.0.0",
+    "flake8-bugbear>=23.2.13",
+    "Flake8-pyproject>=1.2.3",
+    "isort>=5.10.1",
+    "libsass>=0.23.0",
+    "pyright==1.1.369",
+    "pre-commit>=2.15.0",
+    "wheel",
+    "matplotlib",
+    "pandas",
+    "pandas-stubs",
+    "polars",
+    "numpy",
+    "shinyswatch>=0.7.0",
+    "python-dotenv",
+    "anthropic",
+    "google-generativeai;python_version>='3.9'",
+    "langchain_core",
+    "openai",
+    "ollama",
+    "tokenizers",
+    "aiohttp",
+    "beautifulsoup4",
+]
+doc = [
+    "jupyter",
+    "jupyter_client < 8.0.0",
+    "tabulate",
+    "shinylive",
+    "pydantic>=2.7.4",
+    "quartodoc==0.7.5",
+    "griffe<1.0.0",
+]
+
+[project.urls]
+Homepage = "https://github.com/posit-dev/py-shiny"
+Documentation = "https://shiny.posit.co/py/"
+Repository = "https://github.com/posit-dev/py-shiny"
+"Bug Tracker" = "https://github.com/posit-dev/py-shiny/issues"
+
+[project.scripts]
+shiny = "shiny._main:main"
+
+[project.entry-points.pytest11]
+shiny-test = "shiny.pytest._pytest"
+
+[tool.pytest.ini_options]
+testpaths = ["tests"]
+
+[tool.flake8]
+extend-exclude = ["docs", ".venv", "venv", "typings", "build", "_dev"]
+ignore = ["E302", "E501", "F403", "F405", "W503", "E203", "E701", "E704"]
+
+[tool.isort]
+profile = "black"
+skip = ["__init__.py", "typings/", "_dev/", ".venv", "venv", ".tox", "build"]