streamlit-nightly 1.31.1.dev20240207__py2.py3-none-any.whl → 1.31.1.dev20240208__py2.py3-none-any.whl

streamlit/commands/execution_control.py

@@ -138,11 +138,12 @@ def switch_page(page: str) -> NoReturn:  # type: ignore[misc]
         # This should never be the case
         raise NoSessionContext()
 
-    main_script_path = os.path.join(os.getcwd(), ctx.main_script_path)
+    normalized_ctx_main_script_path = os.path.normpath(ctx.main_script_path)
+    main_script_path = os.path.join(os.getcwd(), normalized_ctx_main_script_path)
     main_script_directory = os.path.dirname(main_script_path)
 
-    # Convenience for handling ./ notation and ensure leading / doesn't refer to root directory
-    page = os.path.normpath(page.strip("/"))
+    # Convenience for handling ./ notation
+    page = os.path.normpath(page)
 
     # Build full path
     requested_page = os.path.join(main_script_directory, page)
@@ -152,7 +153,7 @@ def switch_page(page: str) -> NoReturn:  # type: ignore[misc]
 
     if len(matched_pages) == 0:
         raise StreamlitAPIException(
-            f"Could not find page: '{page}'. Must be the file path relative to the main script, from the directory: {os.path.basename(main_script_directory)}."
+            f"Could not find page: '{page}'. Must be the file path relative to the main script, from the directory: {os.path.basename(main_script_directory)}. Only the main app file and files in the `pages/` directory are supported."
         )
 
     ctx.script_requests.request_rerun(

streamlit/elements/lib/streamlit_plotly_theme.py

@@ -12,178 +12,194 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import plotly.graph_objects as go
-import plotly.io as pio
+import contextlib
 
-# This is the streamlit theme for plotly where we pass in a template.data
-# and a template.layout.
 
-# Template.data is for changing specific graph properties in a general aspect
-# such as Contour plots or Waterfall plots.
+def configure_streamlit_plotly_theme() -> None:
+    """Configure the Streamlit chart theme for Plotly.
 
-# Template.layout is for changing things such as the x axis and fonts and other
-# general layout properties for general graphs.
+    The theme is only configured if Plotly is installed.
+    """
+    # We do nothing if Plotly is not installed. This is expected since Plotly is an optional dependency.
+    with contextlib.suppress(ImportError):
+        import plotly.graph_objects as go
+        import plotly.io as pio
 
-# We pass in temporary colors to the frontend and the frontend will replace
-# those colors because we want to change colors based on the background color.
+        # This is the streamlit theme for plotly where we pass in a template.data
+        # and a template.layout.
+        # Template.data is for changing specific graph properties in a general aspect
+        # such as Contour plots or Waterfall plots.
+        # Template.layout is for changing things such as the x axis and fonts and other
+        # general layout properties for general graphs.
+        # We pass in temporary colors to the frontend and the frontend will replace
+        # those colors because we want to change colors based on the background color.
+        # Start at #0000001 because developers may be likely to use #000000
+        CATEGORY_0 = "#000001"
+        CATEGORY_1 = "#000002"
+        CATEGORY_2 = "#000003"
+        CATEGORY_3 = "#000004"
+        CATEGORY_4 = "#000005"
+        CATEGORY_5 = "#000006"
+        CATEGORY_6 = "#000007"
+        CATEGORY_7 = "#000008"
+        CATEGORY_8 = "#000009"
+        CATEGORY_9 = "#000010"
 
-# Start at #0000001 because developers may be likely to use #000000
-CATEGORY_0 = "#000001"
-CATEGORY_1 = "#000002"
-CATEGORY_2 = "#000003"
-CATEGORY_3 = "#000004"
-CATEGORY_4 = "#000005"
-CATEGORY_5 = "#000006"
-CATEGORY_6 = "#000007"
-CATEGORY_7 = "#000008"
-CATEGORY_8 = "#000009"
-CATEGORY_9 = "#000010"
+        SEQUENTIAL_0 = "#000011"
+        SEQUENTIAL_1 = "#000012"
+        SEQUENTIAL_2 = "#000013"
+        SEQUENTIAL_3 = "#000014"
+        SEQUENTIAL_4 = "#000015"
+        SEQUENTIAL_5 = "#000016"
+        SEQUENTIAL_6 = "#000017"
+        SEQUENTIAL_7 = "#000018"
+        SEQUENTIAL_8 = "#000019"
+        SEQUENTIAL_9 = "#000020"
 
-SEQUENTIAL_0 = "#000011"
-SEQUENTIAL_1 = "#000012"
-SEQUENTIAL_2 = "#000013"
-SEQUENTIAL_3 = "#000014"
-SEQUENTIAL_4 = "#000015"
-SEQUENTIAL_5 = "#000016"
-SEQUENTIAL_6 = "#000017"
-SEQUENTIAL_7 = "#000018"
-SEQUENTIAL_8 = "#000019"
-SEQUENTIAL_9 = "#000020"
+        DIVERGING_0 = "#000021"
+        DIVERGING_1 = "#000022"
+        DIVERGING_2 = "#000023"
+        DIVERGING_3 = "#000024"
+        DIVERGING_4 = "#000025"
+        DIVERGING_5 = "#000026"
+        DIVERGING_6 = "#000027"
+        DIVERGING_7 = "#000028"
+        DIVERGING_8 = "#000029"
+        DIVERGING_9 = "#000030"
+        DIVERGING_10 = "#000031"
 
-DIVERGING_0 = "#000021"
-DIVERGING_1 = "#000022"
-DIVERGING_2 = "#000023"
-DIVERGING_3 = "#000024"
-DIVERGING_4 = "#000025"
-DIVERGING_5 = "#000026"
-DIVERGING_6 = "#000027"
-DIVERGING_7 = "#000028"
-DIVERGING_8 = "#000029"
-DIVERGING_9 = "#000030"
-DIVERGING_10 = "#000031"
+        INCREASING = "#000032"
+        DECREASING = "#000033"
+        TOTAL = "#000034"
 
-INCREASING = "#000032"
-DECREASING = "#000033"
-TOTAL = "#000034"
+        GRAY_70 = "#000036"
+        GRAY_90 = "#000037"
+        BG_COLOR = "#000038"
+        FADED_TEXT_05 = "#000039"
+        BG_MIX = "#000040"
 
-GRAY_30 = "#000035"
-GRAY_70 = "#000036"
-GRAY_90 = "#000037"
-BG_COLOR = "#000038"
-FADED_TEXT_05 = "#000039"
-BG_MIX = "#000040"
+        # Plotly represents continuous colorscale through an array of pairs.
+        # The pair's first index is the starting point and the next pair's first index is the end point.
+        # The pair's second index is the starting color and the next pair's second index is the end color.
+        # For more information, please refer to https://plotly.com/python/colorscales/
 
+        streamlit_colorscale = [
+            [0.0, SEQUENTIAL_0],
+            [0.1111111111111111, SEQUENTIAL_1],
+            [0.2222222222222222, SEQUENTIAL_2],
+            [0.3333333333333333, SEQUENTIAL_3],
+            [0.4444444444444444, SEQUENTIAL_4],
+            [0.5555555555555556, SEQUENTIAL_5],
+            [0.6666666666666666, SEQUENTIAL_6],
+            [0.7777777777777778, SEQUENTIAL_7],
+            [0.8888888888888888, SEQUENTIAL_8],
+            [1.0, SEQUENTIAL_9],
+        ]
 
-# Plotly represents continuous colorscale through an array of pairs.
-# The pair's first index is the starting point and the next pair's first index is the end point.
-# The pair's second index is the starting color and the next pair's second index is the end color.
-# For more information, please refer to https://plotly.com/python/colorscales/
-
-streamlit_colorscale = [
-    [0.0, SEQUENTIAL_0],
-    [0.1111111111111111, SEQUENTIAL_1],
-    [0.2222222222222222, SEQUENTIAL_2],
-    [0.3333333333333333, SEQUENTIAL_3],
-    [0.4444444444444444, SEQUENTIAL_4],
-    [0.5555555555555556, SEQUENTIAL_5],
-    [0.6666666666666666, SEQUENTIAL_6],
-    [0.7777777777777778, SEQUENTIAL_7],
-    [0.8888888888888888, SEQUENTIAL_8],
-    [1.0, SEQUENTIAL_9],
-]
-
-pio.templates["streamlit"] = go.layout.Template(
-    data=go.layout.template.Data(
-        candlestick=[
-            go.layout.template.data.Candlestick(
-                decreasing=go.candlestick.Decreasing(
-                    line=go.candlestick.decreasing.Line(color=DECREASING)
-                ),
-                increasing=go.candlestick.Increasing(
-                    line=go.candlestick.increasing.Line(color=INCREASING)
-                ),
-            )
-        ],
-        contour=[go.layout.template.data.Contour(colorscale=streamlit_colorscale)],
-        contourcarpet=[
-            go.layout.template.data.Contourcarpet(colorscale=streamlit_colorscale)
-        ],
-        heatmap=[go.layout.template.data.Heatmap(colorscale=streamlit_colorscale)],
-        histogram2d=[
-            go.layout.template.data.Histogram2d(colorscale=streamlit_colorscale)
-        ],
-        icicle=[
-            go.layout.template.data.Icicle(textfont=go.icicle.Textfont(color="white"))
-        ],
-        sankey=[
-            go.layout.template.data.Sankey(textfont=go.sankey.Textfont(color=GRAY_70))
-        ],
-        scatter=[
-            go.layout.template.data.Scatter(
-                marker=go.scatter.Marker(line=go.scatter.marker.Line(width=0))
-            )
-        ],
-        table=[
-            go.layout.template.data.Table(
-                cells=go.table.Cells(
-                    fill=go.table.cells.Fill(color=BG_COLOR),
-                    font=go.table.cells.Font(color=GRAY_90),
-                    line=go.table.cells.Line(color=FADED_TEXT_05),
-                ),
-                header=go.table.Header(
-                    font=go.table.header.Font(color=GRAY_70),
-                    line=go.table.header.Line(color=FADED_TEXT_05),
-                    fill=go.table.header.Fill(color=BG_MIX),
+        pio.templates["streamlit"] = go.layout.Template(
+            data=go.layout.template.Data(
+                candlestick=[
+                    go.layout.template.data.Candlestick(
+                        decreasing=go.candlestick.Decreasing(
+                            line=go.candlestick.decreasing.Line(color=DECREASING)
+                        ),
+                        increasing=go.candlestick.Increasing(
+                            line=go.candlestick.increasing.Line(color=INCREASING)
+                        ),
+                    )
+                ],
+                contour=[
+                    go.layout.template.data.Contour(colorscale=streamlit_colorscale)
+                ],
+                contourcarpet=[
+                    go.layout.template.data.Contourcarpet(
+                        colorscale=streamlit_colorscale
+                    )
+                ],
+                heatmap=[
+                    go.layout.template.data.Heatmap(colorscale=streamlit_colorscale)
+                ],
+                histogram2d=[
+                    go.layout.template.data.Histogram2d(colorscale=streamlit_colorscale)
+                ],
+                icicle=[
+                    go.layout.template.data.Icicle(
+                        textfont=go.icicle.Textfont(color="white")
+                    )
+                ],
+                sankey=[
+                    go.layout.template.data.Sankey(
+                        textfont=go.sankey.Textfont(color=GRAY_70)
+                    )
+                ],
+                scatter=[
+                    go.layout.template.data.Scatter(
+                        marker=go.scatter.Marker(line=go.scatter.marker.Line(width=0))
+                    )
+                ],
+                table=[
+                    go.layout.template.data.Table(
+                        cells=go.table.Cells(
+                            fill=go.table.cells.Fill(color=BG_COLOR),
+                            font=go.table.cells.Font(color=GRAY_90),
+                            line=go.table.cells.Line(color=FADED_TEXT_05),
+                        ),
+                        header=go.table.Header(
+                            font=go.table.header.Font(color=GRAY_70),
+                            line=go.table.header.Line(color=FADED_TEXT_05),
+                            fill=go.table.header.Fill(color=BG_MIX),
+                        ),
+                    )
+                ],
+                waterfall=[
+                    go.layout.template.data.Waterfall(
+                        increasing=go.waterfall.Increasing(
+                            marker=go.waterfall.increasing.Marker(color=INCREASING)
+                        ),
+                        decreasing=go.waterfall.Decreasing(
+                            marker=go.waterfall.decreasing.Marker(color=DECREASING)
+                        ),
+                        totals=go.waterfall.Totals(
+                            marker=go.waterfall.totals.Marker(color=TOTAL)
+                        ),
+                        connector=go.waterfall.Connector(
+                            line=go.waterfall.connector.Line(color=GRAY_70, width=2)
+                        ),
+                    )
+                ],
+            ),
+            layout=go.Layout(
+                colorway=[
+                    CATEGORY_0,
+                    CATEGORY_1,
+                    CATEGORY_2,
+                    CATEGORY_3,
+                    CATEGORY_4,
+                    CATEGORY_5,
+                    CATEGORY_6,
+                    CATEGORY_7,
+                    CATEGORY_8,
+                    CATEGORY_9,
+                ],
+                colorscale=go.layout.Colorscale(
+                    sequential=streamlit_colorscale,
+                    sequentialminus=streamlit_colorscale,
+                    diverging=[
+                        [0.0, DIVERGING_0],
+                        [0.1, DIVERGING_1],
+                        [0.2, DIVERGING_2],
+                        [0.3, DIVERGING_3],
+                        [0.4, DIVERGING_4],
+                        [0.5, DIVERGING_5],
+                        [0.6, DIVERGING_6],
+                        [0.7, DIVERGING_7],
+                        [0.8, DIVERGING_8],
+                        [0.9, DIVERGING_9],
+                        [1.0, DIVERGING_10],
+                    ],
                 ),
-            )
-        ],
-        waterfall=[
-            go.layout.template.data.Waterfall(
-                increasing=go.waterfall.Increasing(
-                    marker=go.waterfall.increasing.Marker(color=INCREASING)
-                ),
-                decreasing=go.waterfall.Decreasing(
-                    marker=go.waterfall.decreasing.Marker(color=DECREASING)
-                ),
-                totals=go.waterfall.Totals(
-                    marker=go.waterfall.totals.Marker(color=TOTAL)
-                ),
-                connector=go.waterfall.Connector(
-                    line=go.waterfall.connector.Line(color=GRAY_70, width=2)
-                ),
-            )
-        ],
-    ),
-    layout=go.Layout(
-        colorway=[
-            CATEGORY_0,
-            CATEGORY_1,
-            CATEGORY_2,
-            CATEGORY_3,
-            CATEGORY_4,
-            CATEGORY_5,
-            CATEGORY_6,
-            CATEGORY_7,
-            CATEGORY_8,
-            CATEGORY_9,
-        ],
-        colorscale=go.layout.Colorscale(
-            sequential=streamlit_colorscale,
-            sequentialminus=streamlit_colorscale,
-            diverging=[
-                [0.0, DIVERGING_0],
-                [0.1, DIVERGING_1],
-                [0.2, DIVERGING_2],
-                [0.3, DIVERGING_3],
-                [0.4, DIVERGING_4],
-                [0.5, DIVERGING_5],
-                [0.6, DIVERGING_6],
-                [0.7, DIVERGING_7],
-                [0.8, DIVERGING_8],
-                [0.9, DIVERGING_9],
-                [1.0, DIVERGING_10],
-            ],
-        ),
-        coloraxis=go.layout.Coloraxis(colorscale=streamlit_colorscale),
-    ),
-)
+                coloraxis=go.layout.Coloraxis(colorscale=streamlit_colorscale),
+            ),
+        )
+
+        pio.templates.default = "streamlit"

streamlit/elements/plotly_chart.py

@@ -14,15 +14,19 @@
 
 """Streamlit support for Plotly charts."""
 
+from __future__ import annotations
+
 import json
 import urllib.parse
-from typing import TYPE_CHECKING, Any, Dict, List, Set, Union, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Literal, Set, Union, cast
 
-from typing_extensions import Final, Literal, TypeAlias
+from typing_extensions import TypeAlias
 
 from streamlit import type_util
+from streamlit.elements.lib.streamlit_plotly_theme import (
+    configure_streamlit_plotly_theme,
+)
 from streamlit.errors import StreamlitAPIException
-from streamlit.logger import get_logger
 from streamlit.proto.PlotlyChart_pb2 import PlotlyChart as PlotlyChartProto
 from streamlit.runtime.legacy_caching import caching
 from streamlit.runtime.metrics_util import gather_metrics
@@ -34,19 +38,8 @@ if TYPE_CHECKING:
 
     from streamlit.delta_generator import DeltaGenerator
 
-
-try:
-    import plotly.io as pio
-
-    import streamlit.elements.lib.streamlit_plotly_theme
-
-    pio.templates.default = "streamlit"
-except ModuleNotFoundError:
-    # We have imports here because it takes too loo long to load the template default for the first graph to load
-    # We do nothing if Plotly is not installed. This is expected since Plotly is an optional dependency.
-    pass
-
-LOGGER: Final = get_logger(__name__)
+# We need to configure the Plotly theme before any Plotly figures are created:
+configure_streamlit_plotly_theme()
 
 SharingMode: TypeAlias = Literal["streamlit", "private", "public", "secret"]
 
@@ -84,7 +77,7 @@ class PlotlyMixin:
         figure_or_data: FigureOrData,
         use_container_width: bool = False,
         sharing: SharingMode = "streamlit",
-        theme: Union[None, Literal["streamlit"]] = "streamlit",
+        theme: Literal["streamlit"] | None = "streamlit",
         **kwargs: Any,
     ) -> "DeltaGenerator":
         """Display an interactive Plotly chart.
@@ -181,7 +174,7 @@ def marshall(
     figure_or_data: FigureOrData,
     use_container_width: bool,
     sharing: SharingMode,
-    theme: Union[None, Literal["streamlit"]],
+    theme: Literal["streamlit"] | None,
     **kwargs: Any,
 ) -> None:
     """Marshall a proto with a Plotly spec.

streamlit/elements/widgets/button.py

@@ -664,11 +664,12 @@ class ButtonMixin:
         if ctx:
             ctx_main_script = ctx.main_script_path
 
-        main_script_path = os.path.join(os.getcwd(), ctx_main_script)
+        normalized_ctx_main_script_path = os.path.normpath(ctx_main_script)
+        main_script_path = os.path.join(os.getcwd(), normalized_ctx_main_script_path)
         main_script_directory = os.path.dirname(main_script_path)
 
-        # Convenience for handling ./ notation and ensure leading / doesn't refer to root directory
-        page = os.path.normpath(page.strip("/"))
+        # Convenience for handling ./ notation
+        page = os.path.normpath(page)
 
         # Build full path
         requested_page = os.path.join(main_script_directory, page)
@@ -677,17 +678,17 @@ class ButtonMixin:
         # Handle retrieving the page_script_hash & page
         for page_data in all_app_pages:
             full_path = page_data["script_path"]
-            page_name = page_data["page_name"].replace("_", " ")
+            page_name = page_data["page_name"]
             if requested_page == full_path:
                 if label is None:
-                    page_link_proto.label = page_name
+                    page_link_proto.label = page_name.replace("_", " ")
                 page_link_proto.page_script_hash = page_data["page_script_hash"]
-                page_link_proto.page = full_path
+                page_link_proto.page = page_name
                 break
 
         if page_link_proto.page_script_hash == "":
             raise StreamlitAPIException(
-                f"Could not find page: '{page}'. Must be the file path relative to the main script, from the directory: {os.path.basename(main_script_directory)}."
+                f"Could not find page: '{page}'. Must be the file path relative to the main script, from the directory: {os.path.basename(main_script_directory)}. Only the main app file and files in the `pages/` directory are supported."
             )
 
         return self.dg._enqueue("page_link", page_link_proto)

streamlit/elements/widgets/time_widgets.py

@@ -29,7 +29,6 @@ from typing import (
     overload,
 )
 
-from dateutil import relativedelta
 from typing_extensions import TypeAlias
 
 from streamlit.elements.form import current_form_id
@@ -68,6 +67,23 @@ ALLOWED_DATE_FORMATS = re.compile(
 )
 
 
+def _adjust_years(input_date: date, years: int) -> date:
+    """Add or subtract years from a date."""
+    try:
+        # Attempt to directly add/subtract years
+        return input_date.replace(year=input_date.year + years)
+    except ValueError as err:
+        # Handle case for leap year date (February 29) that doesn't exist in the target year
+        # by moving the date to February 28
+        if input_date.month == 2 and input_date.day == 29:
+            return input_date.replace(year=input_date.year + years, month=2, day=28)
+
+        raise StreamlitAPIException(
+            f"Date {input_date} does not exist in the target year {input_date.year + years}. "
+            "This should never happen. Please report this bug."
+        ) from err
+
+
 def _parse_date_value(
     value: DateValue | Literal["today"] | Literal["default_value_today"],
 ) -> Tuple[List[date] | None, bool]:
@@ -112,9 +128,9 @@ def _parse_min_date(
         parsed_min_date = min_value
     elif min_value is None:
         if parsed_dates:
-            parsed_min_date = parsed_dates[0] - relativedelta.relativedelta(years=10)
+            parsed_min_date = _adjust_years(parsed_dates[0], years=-10)
         else:
-            parsed_min_date = date.today() - relativedelta.relativedelta(years=10)
+            parsed_min_date = _adjust_years(date.today(), years=-10)
     else:
         raise StreamlitAPIException(
             "DateInput min should either be a date/datetime or None"
@@ -133,9 +149,9 @@ def _parse_max_date(
         parsed_max_date = max_value
     elif max_value is None:
         if parsed_dates:
-            parsed_max_date = parsed_dates[-1] + relativedelta.relativedelta(years=10)
+            parsed_max_date = _adjust_years(parsed_dates[-1], years=10)
         else:
-            parsed_max_date = date.today() + relativedelta.relativedelta(years=10)
+            parsed_max_date = _adjust_years(date.today(), years=10)
     else:
         raise StreamlitAPIException(
             "DateInput max should either be a date/datetime or None"
@@ -651,9 +667,9 @@ class TimeWidgetsMixin:
     def _date_input(
         self,
         label: str,
-        value: DateValue
-        | Literal["today"]
-        | Literal["default_value_today"] = "default_value_today",
+        value: (
+            DateValue | Literal["today"] | Literal["default_value_today"]
+        ) = "default_value_today",
         min_value: SingleDateValue = None,
         max_value: SingleDateValue = None,
         key: Key | None = None,