Skip to content

Commit a6f66a5

Browse files
committed
Merge branch 'main' into markdown-stream-component
2 parents ba86904 + 230940c commit a6f66a5

File tree

102 files changed

+1161
-1442
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

102 files changed

+1161
-1442
lines changed

.github/workflows/build-docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ jobs:
9797
9898
- name: Upload site artifact
9999
if: github.ref == 'refs/heads/main'
100-
uses: actions/upload-pages-artifact@v1
100+
uses: actions/upload-pages-artifact@v3
101101
with:
102102
path: "deploy"
103103

@@ -120,4 +120,4 @@ jobs:
120120
steps:
121121
- name: Deploy to GitHub Pages
122122
id: deployment
123-
uses: actions/deploy-pages@v1
123+
uses: actions/deploy-pages@v4

CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,20 @@ All notable changes to Shiny for Python will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## [UNRELEASED]
9+
10+
### New features
11+
12+
* Added a new `.add_sass_layer_file()` method to `ui.Theme` that supports reading a Sass file with layer boundary comments, e.g. `/*-- scss:defaults --*/`. This format [is supported by Quarto](https://quarto.org/docs/output-formats/html-themes-more.html#bootstrap-bootswatch-layering) and makes it easier to store Sass rules and declarations that need to be woven into Shiny's Sass Bootstrap files. (#1790)
13+
14+
* The `ui.Chat()` component's `.on_user_submit()` decorator method now passes the user input to the decorated function. This makes it a bit more obvious how to access the user input inside the decorated function. See the new templates (mentioned below) for examples. (#1801)
15+
16+
* `shiny create` includes new and improved `ui.Chat()` template options. Most of these templates leverage the new [`{chatlas}` package](https://posit-dev.github.io/chatlas/), our opinionated approach to interfacing with various LLM. (#1806)
17+
18+
### Bug fixes
19+
20+
* `ui.Chat()` now correctly handles new `ollama.chat()` return value introduced in `ollama` v0.4. (#1787)
21+
822
## [1.2.1] - 2024-11-14
923

1024
### Bug fixes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ If you have questions about Shiny for Python, or want to help us decide what to
2424

2525
## Getting started
2626

27-
To get started with shiny follow the [installation instructions](https://shiny.posit.co/py/docs/install.html) or just install it from pip.
27+
To get started with shiny follow the [installation instructions](https://shiny.posit.co/py/docs/install-create-run.html) or just install it from pip.
2828

2929
```sh
3030
pip install shiny

examples/airmass/location.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ def location_server(
3737
input: Inputs, output: Outputs, session: Session, *, wrap_long: bool = True
3838
):
3939
map = L.Map(center=(0, 0), zoom=1, scoll_wheel_zoom=True)
40-
with reactive.isolate():
41-
marker = L.Marker(location=(input.lat() or 0, input.long() or 0))
40+
marker = L.Marker(location=(0, 0))
4241

4342
with reactive.isolate(): # Use this to ensure we only execute one time
4443
if input.lat() is None and input.long() is None:

examples/brand/app.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import os
21
from pathlib import Path
32

43
import matplotlib.pyplot as plt
@@ -7,10 +6,8 @@
76
from shiny import App, render, ui
87
from shiny.ui._theme_brand import bootstrap_colors
98

10-
# TODO: Move this into the test that runs this app
11-
os.environ["SHINY_BRAND_YML_RAISE_UNMAPPED"] = "true"
129
theme = ui.Theme.from_brand(__file__)
13-
# theme = ui.Theme()
10+
# theme = ui.Theme() ## default theme
1411
theme.add_rules((Path(__file__).parent / "_colors.scss").read_text())
1512

1613
app_ui = ui.page_navbar(

examples/chat/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

examples/chat/RAG/recipes/app.py

Lines changed: 0 additions & 60 deletions
This file was deleted.

examples/chat/RAG/recipes/requirements.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

examples/chat/RAG/recipes/utils.py

Lines changed: 0 additions & 106 deletions
This file was deleted.

examples/chat/README.md

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)