Merge branch 'main' into machow-feat-narwhals

* main:
  chore: Fix white space formatting in `reactive.poll` Returns (posit-dev#1667)
  fix(shiny create): Use `template.id` for default directory (posit-dev#1666)
  fix(tests): Add missing env vars for shinyapps.io tests (posit-dev#1663)
  v1.1.0 release candidate
  Put streaming visual cue at the end of the content (posit-dev#1659)
  CI(debug): Print full stdout/stderr when command fails (posit-dev#1660)

Author: schloerke

.github/workflows/deploy-tests.yaml

@@ -64,6 +64,7 @@ jobs:
             pypi_shiny: false
             pypi_rsconnect: false
             base_test_dir: "./tests/playwright/deploys"
+            app_name: "express_page_sidebar"
             test_shinyappsio: true
 
       fail-fast: false
@@ -110,9 +111,9 @@ jobs:
           DEPLOY_APPS: "true"
           DEPLOY_CONNECT_SERVER_URL: "${{ (matrix.config.released_connect_server && 'https://connect.posit.it/') || 'https://rsc.radixu.com/' }}"
           DEPLOY_CONNECT_SERVER_API_KEY: "${{ (matrix.config.released_connect_server && secrets.DEPLOY_CONNECT_POSIT_SERVER_API_KEY) || secrets.DEPLOY_CONNECT_SERVER_API_KEY }}"
-          DEPLOY_SHINYAPPS_NAME: "${{ matrix.config.test_shinyappsio && matrix.config.shinyapps_name }}"
-          DEPLOY_SHINYAPPS_TOKEN: "${{ matrix.config.test_shinyappsio && matrix.config.shinyapps_token }}"
-          DEPLOY_SHINYAPPS_SECRET: "${{ matrix.config.test_shinyappsio && matrix.config.shinyapps_secret }}"
+          DEPLOY_SHINYAPPS_NAME: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_NAME }}"
+          DEPLOY_SHINYAPPS_TOKEN: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_TOKEN }}"
+          DEPLOY_SHINYAPPS_SECRET: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_SECRET }}"
           EXPRESS_PAGE_SIDEBAR_NAME: "${{ matrix.config.app_name }}"
           DEPLOY_GITHUB_REQUIREMENTS_TXT: "${{ !matrix.config.pypi_shiny }}"
         timeout-minutes: 30

CHANGELOG.md

@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [UNRELEASED]
 
+### Bug fixes
+
+* `shiny create` now uses the template `id` rather than the directory name as the default directory. (#1666)
+
+## [1.1.0] - 2024-09-03
+
 ### 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)

Makefile

@@ -149,14 +149,21 @@ clean-js: FORCE
 SUB_FILE:=
 PYTEST_BROWSERS:= --browser webkit --browser firefox --browser chromium
 PYTEST_DEPLOYS_BROWSERS:= --browser chromium
+
+# Full test path to playwright tests
+TEST_FILE:=tests/playwright/$(SUB_FILE)
+# Default `make` values that shouldn't be directly used; (Use `TEST_FILE` instead!)
+DEPLOYS_TEST_FILE:=tests/playwright/deploys$(SUB_FILE)
+SHINY_TEST_FILE:=tests/playwright/shiny/$(SUB_FILE)
+EXAMPLES_TEST_FILE:=tests/playwright/examples/$(SUB_FILE)
+
 install-playwright: FORCE
 	playwright install --with-deps
 
 install-rsconnect: FORCE
 	pip install git+https://github.com/rstudio/rsconnect-python.git#egg=rsconnect-python
 
-# Full test path to playwright tests
-TEST_FILE:="tests/playwright/$(SUB_FILE)"
+
 # All end-to-end tests with playwright
 playwright: install-playwright ## All end-to-end tests with playwright; (TEST_FILE="" from root of repo)
 	pytest $(TEST_FILE) $(PYTEST_BROWSERS)
@@ -169,20 +176,18 @@ playwright-show-trace: ## Show trace of failed tests
 
 # end-to-end tests with playwright; (SUB_FILE="" within tests/playwright/shiny/)
 playwright-shiny: FORCE
-	$(MAKE) playwright TEST_FILE="tests/playwright/shiny/$(SUB_FILE)"
+	$(MAKE) playwright TEST_FILE="$(SHINY_TEST_FILE)"
 
 # end-to-end tests on deployed apps with playwright; (SUB_FILE="" within tests/playwright/deploys/)
 playwright-deploys: FORCE
-	$(MAKE) playwright PYTEST_BROWSERS="$(PYTEST_DEPLOYS_BROWSERS)" TEST_FILE="$(TEST_FILE)"
-playwright-deploys-legacy: FORCE
-	$(MAKE) playwright TEST_FILE="tests/playwright/deploys/$(SUB_FILE)" PYTEST_BROWSERS="$(PYTEST_DEPLOYS_BROWSERS)"
+	$(MAKE) playwright PYTEST_BROWSERS="$(PYTEST_DEPLOYS_BROWSERS)" TEST_FILE="$(DEPLOYS_TEST_FILE)"
 
 # end-to-end tests on all py-shiny examples with playwright; (SUB_FILE="" within tests/playwright/examples/)
 playwright-examples: FORCE
-	$(MAKE) playwright TEST_FILE="tests/playwright/examples/$(SUB_FILE)"
+	$(MAKE) playwright TEST_FILE="$(EXAMPLES_TEST_FILE)"
 
 coverage: FORCE ## check combined code coverage (must run e2e last)
-	pytest --cov-report term-missing --cov=shiny tests/pytest/ tests/playwright/shiny/$(SUB_FILE) $(PYTEST_BROWSERS)
+	pytest --cov-report term-missing --cov=shiny tests/pytest/ $(SHINY_TEST_FILE) $(PYTEST_BROWSERS)
 	coverage html
 	$(BROWSER) htmlcov/index.html
 

js/chat/chat.scss

@@ -40,17 +40,6 @@ shiny-chat-container {
       .message-content {
         align-self: center;
       }
-      .message-streaming-icon {
-        display: none;
-        opacity: 0;
-      }
-      &[streaming] .message-streaming-icon {
-        display: block;
-        animation-delay: 2s;
-        animation-name: fade-in;
-        animation-duration: 10ms;
-        animation-fill-mode: forwards;
-      }
     }
 
     /* Align the user message to the right */
@@ -154,13 +143,3 @@ pre:has(.code-copy-button) {
     background-color: var(--bs-success, #198754);
   }
 }
-
-/* Keyframes for the fading spinner */
-@keyframes fade-in {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}

js/chat/chat.ts

@@ -57,11 +57,17 @@ const ICONS = {
   // https://github.com/n3r4zzurr0/svg-spinners/blob/main/svg-css/3-dots-fade.svg
   dots_fade:
     '<svg width="24" height="24" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><style>.spinner_S1WN{animation:spinner_MGfb .8s linear infinite;animation-delay:-.8s}.spinner_Km9P{animation-delay:-.65s}.spinner_JApP{animation-delay:-.5s}@keyframes spinner_MGfb{93.75%,100%{opacity:.2}}</style><circle class="spinner_S1WN" cx="4" cy="12" r="3"/><circle class="spinner_S1WN spinner_Km9P" cx="12" cy="12" r="3"/><circle class="spinner_S1WN spinner_JApP" cx="20" cy="12" r="3"/></svg>',
-  // https://github.com/n3r4zzurr0/svg-spinners/blob/main/svg-css/bouncing-ball.svg
-  ball_bounce:
-    '<svg width="24" height="24" fill="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><style>.spinner_rXNP{animation:spinner_YeBj .8s infinite; opacity:.8}@keyframes spinner_YeBj{0%{animation-timing-function:cubic-bezier(0.33,0,.66,.33);cy:5px}46.875%{cy:20px;rx:4px;ry:4px}50%{animation-timing-function:cubic-bezier(0.33,.66,.66,1);cy:20.5px;rx:4.8px;ry:3px}53.125%{rx:4px;ry:4px}100%{cy:5px}}</style><ellipse class="spinner_rXNP" cx="12" cy="5" rx="4" ry="4"/></svg>',
+  dot: '<svg width="12" height="12" xmlns="http://www.w3.org/2000/svg" class="chat-streaming-dot" style="margin-left:.25em;margin-top:-.25em"><circle cx="6" cy="6" r="6"/></svg>',
 };
 
+function createSVGIcon(icon: string): HTMLElement {
+  const parser = new DOMParser();
+  const svgDoc = parser.parseFromString(icon, "image/svg+xml");
+  return svgDoc.documentElement;
+}
+
+const SVG_DOT = createSVGIcon(ICONS.dot);
+
 const requestScroll = (el: HTMLElement, cancelIfScrolledUp = false) => {
   el.dispatchEvent(
     new CustomEvent("shiny-chat-request-scroll", {
@@ -127,17 +133,29 @@ class ChatMessage extends LightElement {
     return html`
       <div class="message-icon">${unsafeHTML(icon)}</div>
       <div class="message-content">${content}</div>
-      <div class="message-streaming-icon">${unsafeHTML(ICONS.ball_bounce)}</div>
     `;
   }
 
   updated(changedProperties: Map<string, unknown>): void {
     if (changedProperties.has("content")) {
       this.#highlightAndCodeCopy();
+      if (this.streaming) this.#appendStreamingDot();
       // It's important that the scroll request happens at this point in time, since
       // otherwise, the content may not be fully rendered yet
       requestScroll(this, this.streaming);
     }
+    if (changedProperties.has("streaming")) {
+      this.streaming ? this.#appendStreamingDot() : this.#removeStreamingDot();
+    }
+  }
+
+  #appendStreamingDot(): void {
+    const content = this.querySelector(".message-content") as HTMLElement;
+    content.lastElementChild?.appendChild(SVG_DOT);
+  }
+
+  #removeStreamingDot(): void {
+    this.querySelector(".message-content svg.chat-streaming-dot")?.remove();
   }
 
   // Highlight code blocks after the element is rendered
@@ -416,6 +434,7 @@ class ChatContainer extends LightElement {
     lastMessage.setAttribute("content", message.content);
 
     if (message.chunk_type === "message_end") {
+      this.lastMessage?.removeAttribute("streaming");
       this.#finalizeMessage();
     }
   }
@@ -441,7 +460,6 @@ class ChatContainer extends LightElement {
 
   #finalizeMessage(): void {
     this.input.disabled = false;
-    this.lastMessage?.removeAttribute("streaming");
   }
 
   #onRequestScroll(event: CustomEvent<requestScrollEvent>): void {

shiny/_main_create.py

@@ -657,7 +657,6 @@ def app_template_questions(
     mode: Optional[str] = None,
     dest_dir: Optional[Path] = None,
 ):
-    template_dir = template.path
     template_cli_name = cli_bold(cli_field(template.title or template.id))
 
     if mode == "express" and not template.express_available:
@@ -666,7 +665,7 @@ def app_template_questions(
         )
 
     click.echo(cli_wait(f"Creating {template_cli_name} Shiny app..."))
-    dest_dir = directory_prompt(dest_dir, template_dir.name)
+    dest_dir = directory_prompt(dest_dir, template.id)
 
     if mode is None and template.express_available:
         mode = questionary.select(

shiny/reactive/_poll.py

@@ -87,10 +87,10 @@ def poll(
     -------
     :
         A decorator that should be applied to a no-argument function that (expensively)
-    reads whatever data is desired. (This function may be a regular function or a
-    co-routine function.) The result of the decorator is a reactive
-    :func:`~shiny.reactive.calc` that always returns up-to-date data, and invalidates
-    callers when changes are detected via polling.
+        reads whatever data is desired. (This function may be a regular function or a
+        co-routine function.) The result of the decorator is a reactive
+        :func:`~shiny.reactive.calc` that always returns up-to-date data, and
+        invalidates callers when changes are detected via polling.
 
     See Also
     --------