streamlit-nightly 1.42.3.dev20250226__py2.py3-none-any.whl → 1.42.3.dev20250228__py2.py3-none-any.whl

streamlit/proto/ForwardMsg_pb2.py

@@ -30,7 +30,7 @@ from streamlit.proto import SessionStatus_pb2 as streamlit_dot_proto_dot_Session
 from streamlit.proto import AuthRedirect_pb2 as streamlit_dot_proto_dot_AuthRedirect__pb2
 
 
-DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n streamlit/proto/ForwardMsg.proto\x1a\x1fstreamlit/proto/AutoRerun.proto\x1a\x1cstreamlit/proto/Common.proto\x1a\x1bstreamlit/proto/Delta.proto\x1a\x1dstreamlit/proto/GitInfo.proto\x1a\x1astreamlit/proto/Logo.proto\x1a streamlit/proto/Navigation.proto\x1a streamlit/proto/NewSession.proto\x1a streamlit/proto/PageConfig.proto\x1a\x1estreamlit/proto/PageInfo.proto\x1a!streamlit/proto/PageProfile.proto\x1a\"streamlit/proto/PageNotFound.proto\x1a\"streamlit/proto/PagesChanged.proto\x1a#streamlit/proto/ParentMessage.proto\x1a\"streamlit/proto/SessionEvent.proto\x1a#streamlit/proto/SessionStatus.proto\x1a\"streamlit/proto/AuthRedirect.proto\"\xc7\x07\n\nForwardMsg\x12\x0c\n\x04hash\x18\x01 \x01(\t\x12%\n\x08metadata\x18\x02 \x01(\x0b\x32\x13.ForwardMsgMetadata\x12\"\n\x0bnew_session\x18\x04 \x01(\x0b\x32\x0b.NewSessionH\x00\x12\x17\n\x05\x64\x65lta\x18\x05 \x01(\x0b\x32\x06.DeltaH\x00\x12&\n\x11page_info_changed\x18\x0c \x01(\x0b\x32\t.PageInfoH\x00\x12*\n\x13page_config_changed\x18\r \x01(\x0b\x32\x0b.PageConfigH\x00\x12;\n\x0fscript_finished\x18\x06 \x01(\x0e\x32 .ForwardMsg.ScriptFinishedStatusH\x00\x12$\n\x10git_info_changed\x18\x0e \x01(\x0b\x32\x08.GitInfoH\x00\x12$\n\x0cpage_profile\x18\x12 \x01(\x0b\x32\x0c.PageProfileH\x00\x12\x30\n\x16session_status_changed\x18\t \x01(\x0b\x32\x0e.SessionStatusH\x00\x12&\n\rsession_event\x18\n \x01(\x0b\x32\r.SessionEventH\x00\x12!\n\nnavigation\x18\x17 \x01(\x0b\x32\x0b.NavigationH\x00\x12\'\n\x0epage_not_found\x18\x0f \x01(\x0b\x32\r.PageNotFoundH\x00\x12&\n\rpages_changed\x18\x10 \x01(\x0b\x32\r.PagesChangedH\x00\x12/\n\x12\x66ile_urls_response\x18\x13 \x01(\x0b\x32\x11.FileURLsResponseH\x00\x12 \n\nauto_rerun\x18\x15 \x01(\x0b\x32\n.AutoRerunH\x00\x12\x15\n\x04logo\x18\x16 \x01(\x0b\x32\x05.LogoH\x00\x12&\n\rauth_redirect\x18\x18 \x01(\x0b\x32\r.AuthRedirectH\x00\x12(\n\x0eparent_message\x18\x14 \x01(\x0b\x32\x0e.ParentMessageH\x00\x12\x12\n\x08ref_hash\x18\x0b \x01(\tH\x00\x12\x1d\n\x15\x64\x65\x62ug_last_backmsg_id\x18\x11 \x01(\t\"\x98\x01\n\x14ScriptFinishedStatus\x12\x19\n\x15\x46INISHED_SUCCESSFULLY\x10\x00\x12\x1f\n\x1b\x46INISHED_WITH_COMPILE_ERROR\x10\x01\x12\x1c\n\x18\x46INISHED_EARLY_FOR_RERUN\x10\x02\x12&\n\"FINISHED_FRAGMENT_RUN_SUCCESSFULLY\x10\x03\x42\x06\n\x04typeJ\x04\x08\x07\x10\x08J\x04\x08\x08\x10\t\"\x8e\x01\n\x12\x46orwardMsgMetadata\x12\x11\n\tcacheable\x18\x01 \x01(\x08\x12\x12\n\ndelta_path\x18\x02 \x03(\r\x12\x35\n\x16\x65lement_dimension_spec\x18\x03 \x01(\x0b\x32\x15.ElementDimensionSpec\x12\x1a\n\x12\x61\x63tive_script_hash\x18\x04 \x01(\t\"5\n\x14\x45lementDimensionSpec\x12\r\n\x05width\x18\x01 \x01(\r\x12\x0e\n\x06height\x18\x02 \x01(\r\"/\n\x0e\x46orwardMsgList\x12\x1d\n\x08messages\x18\x01 \x03(\x0b\x32\x0b.ForwardMsgB/\n\x1c\x63om.snowflake.apps.streamlitB\x0f\x46orwardMsgProtob\x06proto3')
+DESCRIPTOR = _descriptor_pool.Default().AddSerializedFile(b'\n streamlit/proto/ForwardMsg.proto\x1a\x1fstreamlit/proto/AutoRerun.proto\x1a\x1cstreamlit/proto/Common.proto\x1a\x1bstreamlit/proto/Delta.proto\x1a\x1dstreamlit/proto/GitInfo.proto\x1a\x1astreamlit/proto/Logo.proto\x1a streamlit/proto/Navigation.proto\x1a streamlit/proto/NewSession.proto\x1a streamlit/proto/PageConfig.proto\x1a\x1estreamlit/proto/PageInfo.proto\x1a!streamlit/proto/PageProfile.proto\x1a\"streamlit/proto/PageNotFound.proto\x1a\"streamlit/proto/PagesChanged.proto\x1a#streamlit/proto/ParentMessage.proto\x1a\"streamlit/proto/SessionEvent.proto\x1a#streamlit/proto/SessionStatus.proto\x1a\"streamlit/proto/AuthRedirect.proto\"\xcb\x07\n\nForwardMsg\x12\x0c\n\x04hash\x18\x01 \x01(\t\x12%\n\x08metadata\x18\x02 \x01(\x0b\x32\x13.ForwardMsgMetadata\x12\"\n\x0bnew_session\x18\x04 \x01(\x0b\x32\x0b.NewSessionH\x00\x12\x17\n\x05\x64\x65lta\x18\x05 \x01(\x0b\x32\x06.DeltaH\x00\x12&\n\x11page_info_changed\x18\x0c \x01(\x0b\x32\t.PageInfoH\x00\x12*\n\x13page_config_changed\x18\r \x01(\x0b\x32\x0b.PageConfigH\x00\x12;\n\x0fscript_finished\x18\x06 \x01(\x0e\x32 .ForwardMsg.ScriptFinishedStatusH\x00\x12$\n\x10git_info_changed\x18\x0e \x01(\x0b\x32\x08.GitInfoH\x00\x12$\n\x0cpage_profile\x18\x12 \x01(\x0b\x32\x0c.PageProfileH\x00\x12\x30\n\x16session_status_changed\x18\t \x01(\x0b\x32\x0e.SessionStatusH\x00\x12&\n\rsession_event\x18\n \x01(\x0b\x32\r.SessionEventH\x00\x12!\n\nnavigation\x18\x17 \x01(\x0b\x32\x0b.NavigationH\x00\x12\'\n\x0epage_not_found\x18\x0f \x01(\x0b\x32\r.PageNotFoundH\x00\x12*\n\rpages_changed\x18\x10 \x01(\x0b\x32\r.PagesChangedB\x02\x18\x01H\x00\x12/\n\x12\x66ile_urls_response\x18\x13 \x01(\x0b\x32\x11.FileURLsResponseH\x00\x12 \n\nauto_rerun\x18\x15 \x01(\x0b\x32\n.AutoRerunH\x00\x12\x15\n\x04logo\x18\x16 \x01(\x0b\x32\x05.LogoH\x00\x12&\n\rauth_redirect\x18\x18 \x01(\x0b\x32\r.AuthRedirectH\x00\x12(\n\x0eparent_message\x18\x14 \x01(\x0b\x32\x0e.ParentMessageH\x00\x12\x12\n\x08ref_hash\x18\x0b \x01(\tH\x00\x12\x1d\n\x15\x64\x65\x62ug_last_backmsg_id\x18\x11 \x01(\t\"\x98\x01\n\x14ScriptFinishedStatus\x12\x19\n\x15\x46INISHED_SUCCESSFULLY\x10\x00\x12\x1f\n\x1b\x46INISHED_WITH_COMPILE_ERROR\x10\x01\x12\x1c\n\x18\x46INISHED_EARLY_FOR_RERUN\x10\x02\x12&\n\"FINISHED_FRAGMENT_RUN_SUCCESSFULLY\x10\x03\x42\x06\n\x04typeJ\x04\x08\x07\x10\x08J\x04\x08\x08\x10\t\"\x8e\x01\n\x12\x46orwardMsgMetadata\x12\x11\n\tcacheable\x18\x01 \x01(\x08\x12\x12\n\ndelta_path\x18\x02 \x03(\r\x12\x35\n\x16\x65lement_dimension_spec\x18\x03 \x01(\x0b\x32\x15.ElementDimensionSpec\x12\x1a\n\x12\x61\x63tive_script_hash\x18\x04 \x01(\t\"5\n\x14\x45lementDimensionSpec\x12\r\n\x05width\x18\x01 \x01(\r\x12\x0e\n\x06height\x18\x02 \x01(\r\"/\n\x0e\x46orwardMsgList\x12\x1d\n\x08messages\x18\x01 \x03(\x0b\x32\x0b.ForwardMsgB/\n\x1c\x63om.snowflake.apps.streamlitB\x0f\x46orwardMsgProtob\x06proto3')
 
 _globals = globals()
 _builder.BuildMessageAndEnumDescriptors(DESCRIPTOR, _globals)
@@ -38,14 +38,16 @@ _builder.BuildTopDescriptorsAndMessages(DESCRIPTOR, 'streamlit.proto.ForwardMsg_
 if not _descriptor._USE_C_DESCRIPTORS:
   _globals['DESCRIPTOR']._loaded_options = None
   _globals['DESCRIPTOR']._serialized_options = b'\n\034com.snowflake.apps.streamlitB\017ForwardMsgProto'
+  _globals['_FORWARDMSG'].fields_by_name['pages_changed']._loaded_options = None
+  _globals['_FORWARDMSG'].fields_by_name['pages_changed']._serialized_options = b'\030\001'
   _globals['_FORWARDMSG']._serialized_start=575
-  _globals['_FORWARDMSG']._serialized_end=1542
-  _globals['_FORWARDMSG_SCRIPTFINISHEDSTATUS']._serialized_start=1370
-  _globals['_FORWARDMSG_SCRIPTFINISHEDSTATUS']._serialized_end=1522
-  _globals['_FORWARDMSGMETADATA']._serialized_start=1545
-  _globals['_FORWARDMSGMETADATA']._serialized_end=1687
-  _globals['_ELEMENTDIMENSIONSPEC']._serialized_start=1689
-  _globals['_ELEMENTDIMENSIONSPEC']._serialized_end=1742
-  _globals['_FORWARDMSGLIST']._serialized_start=1744
-  _globals['_FORWARDMSGLIST']._serialized_end=1791
+  _globals['_FORWARDMSG']._serialized_end=1546
+  _globals['_FORWARDMSG_SCRIPTFINISHEDSTATUS']._serialized_start=1374
+  _globals['_FORWARDMSG_SCRIPTFINISHEDSTATUS']._serialized_end=1526
+  _globals['_FORWARDMSGMETADATA']._serialized_start=1549
+  _globals['_FORWARDMSGMETADATA']._serialized_end=1691
+  _globals['_ELEMENTDIMENSIONSPEC']._serialized_start=1693
+  _globals['_ELEMENTDIMENSIONSPEC']._serialized_end=1746
+  _globals['_FORWARDMSGLIST']._serialized_start=1748
+  _globals['_FORWARDMSGLIST']._serialized_end=1795
 # @@protoc_insertion_point(module_scope)

streamlit/proto/PagesChanged_pb2.pyi

@@ -29,7 +29,9 @@ DESCRIPTOR: google.protobuf.descriptor.FileDescriptor
 
 @typing.final
 class PagesChanged(google.protobuf.message.Message):
-    """Message used to tell the client that the app's pages have changed."""
+    """DEPRECATED - We don't use the proto anymore.
+    Message used to tell the client that the app's pages have changed.
+    """
 
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 

streamlit/runtime/app_session.py

@@ -50,7 +50,6 @@ from streamlit.watcher import LocalSourcesWatcher
 
 if TYPE_CHECKING:
     from streamlit.proto.BackMsg_pb2 import BackMsg
-    from streamlit.proto.PagesChanged_pb2 import PagesChanged
     from streamlit.runtime.script_data import ScriptData
     from streamlit.runtime.scriptrunner.script_cache import ScriptCache
     from streamlit.runtime.state import SessionState
@@ -200,9 +199,6 @@ class AppSession:
         self._stop_config_listener = config.on_config_parsed(
             self._on_source_file_changed, force_connect=True
         )
-        self._stop_pages_listener = self._pages_manager.register_pages_changed_callback(
-            self._on_pages_changed
-        )
         secrets_singleton.file_change_listener.connect(self._on_secrets_file_changed)
 
     def disconnect_file_watchers(self) -> None:
@@ -494,14 +490,6 @@ class AppSession:
         # `_on_source_file_changed` just for this purpose sounded finicky.
         self._on_source_file_changed()
 
-    def _on_pages_changed(self, _) -> None:
-        msg = ForwardMsg()
-        self._populate_app_pages(msg.pages_changed, self._pages_manager.get_pages())
-        self._enqueue_forward_msg(msg)
-
-        if self._local_sources_watcher is not None:
-            self._local_sources_watcher.update_watched_pages()
-
     def _clear_queue(self, fragment_ids_this_run: list[str] | None = None) -> None:
         self._browser_queue.clear(
             retain_lifecycle_msgs=True, fragment_ids_this_run=fragment_ids_this_run
@@ -886,7 +874,7 @@ class AppSession:
         self._enqueue_forward_msg(msg)
 
     def _populate_app_pages(
-        self, msg: NewSession | PagesChanged, pages: dict[PageHash, PageInfo]
+        self, msg: NewSession, pages: dict[PageHash, PageInfo]
     ) -> None:
         for page_script_hash, page_info in pages.items():
             page_proto = msg.app_pages.add()

streamlit/runtime/context.py

@@ -146,6 +146,8 @@ class ContextProxy:
 
         Examples
         --------
+        **Example 1: Access all available headers**
+
         Show a dictionary of headers (with only the last instance of any
         repeated key):
 
@@ -153,6 +155,8 @@ class ContextProxy:
         >>>
         >>> st.context.headers
 
+        **Example 2: Access a specific header**
+
         Show the value of a specific header (or the last instance if it's
         repeated):
 
@@ -183,12 +187,16 @@ class ContextProxy:
 
         Examples
         --------
+        **Example 1: Access all available cookies**
+
         Show a dictionary of cookies:
 
         >>> import streamlit as st
         >>>
         >>> st.context.cookies
 
+        **Example 2: Access a specific cookie**
+
         Show the value of a specific cookie:
 
         >>> import streamlit as st
@@ -209,7 +217,26 @@ class ContextProxy:
     @property
     @gather_metrics("context.timezone")
     def timezone(self) -> str | None:
-        """The timezone of the user's browser, read-only."""
+        """The read-only timezone of the user's browser.
+
+        Example
+        -------
+        Access the user's timezone, and format a datetime to display locally:
+
+        >>> import streamlit as st
+        >>> from datetime import datetime, timezone
+        >>> import pytz
+        >>>
+        >>> tz = st.context.timezone
+        >>> tz_obj = pytz.timezone(tz)
+        >>>
+        >>> now = datetime.now(timezone.utc)
+        >>>
+        >>> f"The user's timezone is {tz}."
+        >>> f"The UTC time is {now}."
+        >>> f"The user's local time is {now.astimezone(tz_obj)}"
+
+        """
         ctx = get_script_run_ctx()
 
         if ctx is None or ctx.context_info is None:
@@ -219,7 +246,25 @@ class ContextProxy:
     @property
     @gather_metrics("context.timezone_offset")
     def timezone_offset(self) -> int | None:
-        """The timezone offset of the user's browser, read-only."""
+        """The read-only timezone offset of the user's browser.
+
+        Example
+        -------
+        Access the user's timezone offset, and format a datetime to display locally:
+
+        >>> import streamlit as st
+        >>> from datetime import datetime, timezone, timedelta
+        >>>
+        >>> tzoff = st.context.timezone_offset
+        >>> tz_obj = timezone(-timedelta(minutes=tzoff))
+        >>>
+        >>> now = datetime.now(timezone.utc)
+        >>>
+        >>> f"The user's timezone is {tz}."
+        >>> f"The UTC time is {now}."
+        >>> f"The user's local time is {now.astimezone(tz_obj)}"
+
+        """
         ctx = get_script_run_ctx()
         if ctx is None or ctx.context_info is None:
             return None

streamlit/runtime/pages_manager.py

@@ -14,15 +14,11 @@
 
 from __future__ import annotations
 
-import os
-import threading
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, Final
+from typing import TYPE_CHECKING, Any, Final
 
-from streamlit import source_util
 from streamlit.logger import get_logger
 from streamlit.util import calc_md5
-from streamlit.watcher import watch_dir
 
 if TYPE_CHECKING:
     from streamlit.runtime.scriptrunner.script_cache import ScriptCache
@@ -31,198 +27,15 @@ if TYPE_CHECKING:
 _LOGGER: Final = get_logger(__name__)
 
 
-class PagesStrategyV1:
-    """
-    Strategy for MPA v1. This strategy handles pages being set directly
-    by a call to `st.navigation`. The key differences here are:
-    - The pages are defined by the existence of a `pages` directory
-    - We will ensure one watcher is watching the scripts in the directory.
-    - Only one script runs for a full rerun.
-    - We know at the beginning the intended page script to run.
-
-    NOTE: Thread safety of the pages is handled by the source_util module
-    """
-
-    is_watching_pages_dir: bool = False
-    pages_watcher_lock = threading.Lock()
-
-    # This is a static method because we only want to watch the pages directory
-    # once on initial load.
-    @staticmethod
-    def watch_pages_dir(pages_manager: PagesManager):
-        with PagesStrategyV1.pages_watcher_lock:
-            if PagesStrategyV1.is_watching_pages_dir:
-                return
-
-            def _handle_page_changed(_path: str) -> None:
-                source_util.invalidate_pages_cache()
-
-            pages_dir = pages_manager.main_script_parent / "pages"
-            watch_dir(
-                str(pages_dir),
-                _handle_page_changed,
-                glob_pattern="*.py",
-                allow_nonexistent=True,
-            )
-            PagesStrategyV1.is_watching_pages_dir = True
-
-    def __init__(self, pages_manager: PagesManager, setup_watcher: bool = True):
-        self.pages_manager = pages_manager
-
-        if setup_watcher:
-            PagesStrategyV1.watch_pages_dir(pages_manager)
-
-    @property
-    def initial_active_script_hash(self) -> PageHash:
-        return self.pages_manager.current_page_script_hash
-
-    def get_initial_active_script(
-        self, page_script_hash: PageHash, page_name: PageName
-    ) -> PageInfo | None:
-        pages = self.get_pages()
-
-        if page_script_hash:
-            return pages.get(page_script_hash, None)
-        elif not page_script_hash and page_name:
-            # If a user navigates directly to a non-main page of an app, we get
-            # the first script run request before the list of pages has been
-            # sent to the frontend. In this case, we choose the first script
-            # with a name matching the requested page name.
-            return next(
-                filter(
-                    # There seems to be this weird bug with mypy where it
-                    # thinks that p can be None (which is impossible given the
-                    # types of pages), so we add `p and` at the beginning of
-                    # the predicate to circumvent this.
-                    lambda p: p and (p["page_name"] == page_name),
-                    pages.values(),
-                ),
-                None,
-            )
-
-        # If no information about what page to run is given, default to
-        # running the main page.
-        # Safe because pages will at least contain the app's main page.
-        main_page_info = list(pages.values())[0]
-        return main_page_info
-
-    def get_pages(self) -> dict[PageHash, PageInfo]:
-        return source_util.get_pages(self.pages_manager.main_script_path)
-
-    def register_pages_changed_callback(
-        self,
-        callback: Callable[[str], None],
-    ) -> Callable[[], None]:
-        return source_util.register_pages_changed_callback(callback)
-
-    def set_pages(self, _pages: dict[PageHash, PageInfo]) -> None:
-        raise NotImplementedError("Unable to set pages in this V1 strategy")
-
-    def get_page_script(self, _fallback_page_hash: PageHash) -> PageInfo | None:
-        raise NotImplementedError("Unable to get page script in this V1 strategy")
-
-
-class PagesStrategyV2:
-    """
-    Strategy for MPA v2. This strategy handles pages being set directly
-    by a call to `st.navigation`. The key differences here are:
-    - The pages are set directly by the user
-    - The initial active script will always be the main script
-    - More than one script can run in a single app run (sequentially),
-      so we must keep track of the active script hash
-    - We rely on pages manager to retrieve the intended page script per run
-
-    NOTE: We don't provide any locks on the pages since the pages are not
-    shared across sessions. Only the user script thread can write to
-    pages and the event loop thread only reads
-    """
-
-    def __init__(self, pages_manager: PagesManager, **kwargs):
-        self.pages_manager = pages_manager
-        self._pages: dict[PageHash, PageInfo] | None = None
-
-    def get_initial_active_script(
-        self, page_script_hash: PageHash, page_name: PageName
-    ) -> PageInfo:
-        return {
-            # We always run the main script in V2 as it's the common code
-            "script_path": self.pages_manager.main_script_path,
-            "page_script_hash": page_script_hash
-            or self.pages_manager.main_script_hash,  # Default Hash
-        }
-
-    @property
-    def initial_active_script_hash(self) -> PageHash:
-        return self.pages_manager.main_script_hash
-
-    def get_page_script(self, fallback_page_hash: PageHash) -> PageInfo | None:
-        if self._pages is None:
-            return None
-
-        if self.pages_manager.intended_page_script_hash:
-            # We assume that if initial page hash is specified, that a page should
-            # exist, so we check out the page script hash or the default page hash
-            # as a backup
-            return self._pages.get(
-                self.pages_manager.intended_page_script_hash,
-                self._pages.get(fallback_page_hash, None),
-            )
-        elif self.pages_manager.intended_page_name:
-            # If a user navigates directly to a non-main page of an app, the
-            # the page name can identify the page script to run
-            return next(
-                filter(
-                    # There seems to be this weird bug with mypy where it
-                    # thinks that p can be None (which is impossible given the
-                    # types of pages), so we add `p and` at the beginning of
-                    # the predicate to circumvent this.
-                    lambda p: p
-                    and (p["url_pathname"] == self.pages_manager.intended_page_name),
-                    self._pages.values(),
-                ),
-                None,
-            )
-
-        return self._pages.get(fallback_page_hash, None)
-
-    def get_pages(self) -> dict[PageHash, PageInfo]:
-        # If pages are not set, provide the common page info where
-        # - the main script path is the executing script to start
-        # - the page script hash and name reflects the intended page requested
-        return self._pages or {
-            self.pages_manager.main_script_hash: {
-                "page_script_hash": self.pages_manager.intended_page_script_hash or "",
-                "page_name": self.pages_manager.intended_page_name or "",
-                "icon": "",
-                "script_path": self.pages_manager.main_script_path,
-            }
-        }
-
-    def set_pages(self, pages: dict[PageHash, PageInfo]) -> None:
-        self._pages = pages
-
-    def register_pages_changed_callback(
-        self,
-        callback: Callable[[str], None],
-    ) -> Callable[[], None]:
-        # V2 strategy does not handle any pages changed event
-        return lambda: None
-
-
 class PagesManager:
     """
-    PagesManager is responsible for managing the set of pages based on the
-    strategy. By default, PagesManager uses V1 which relies on the original
-    assumption that there exists a `pages` directory with all the scripts.
-
-    If the `pages` are being set directly, the strategy is switched to V2.
-    This indicates someone has written an `st.navigation` call in their app
-    which informs us of the pages.
-
-    NOTE: Each strategy handles its own thread safety when accessing the pages
+    PagesManager is responsible for managing the set of pages that make up
+    the entire application. At the start we assume the main script is the
+    only page. As the script runs, the main script can call `st.navigation`
+    to set the set of pages that make up the app.
     """
 
-    DefaultStrategy: type[PagesStrategyV1 | PagesStrategyV2] = PagesStrategyV1
+    uses_pages_directory: bool | None = None
 
     def __init__(
         self,
@@ -232,11 +45,23 @@ class PagesManager:
     ):
         self._main_script_path = main_script_path
         self._main_script_hash: PageHash = calc_md5(main_script_path)
-        self.pages_strategy = PagesManager.DefaultStrategy(self, **kwargs)
         self._script_cache = script_cache
         self._intended_page_script_hash: PageHash | None = None
         self._intended_page_name: PageName | None = None
         self._current_page_script_hash: PageHash = ""
+        self._pages: dict[PageHash, PageInfo] | None = None
+        # A relic of v1 of Multipage apps, we performed special handling
+        # for apps with a pages directory. We will keep this flag around
+        # for now to maintain the behavior for apps that were created with
+        # the pages directory feature.
+        #
+        # NOTE: we will update the feature if the flag has not been set
+        #       this means that if users use v2 behavior, the flag will
+        #       always be set to False
+        if PagesManager.uses_pages_directory is None:
+            PagesManager.uses_pages_directory = Path(
+                self.main_script_parent / "pages"
+            ).exists()
 
     @property
     def main_script_path(self) -> ScriptPath:
@@ -262,14 +87,6 @@ class PagesManager:
     def intended_page_script_hash(self) -> PageHash | None:
         return self._intended_page_script_hash
 
-    @property
-    def initial_active_script_hash(self) -> PageHash:
-        return self.pages_strategy.initial_active_script_hash
-
-    @property
-    def mpa_version(self) -> int:
-        return 2 if isinstance(self.pages_strategy, PagesStrategyV2) else 1
-
     def set_current_page_script_hash(self, page_script_hash: PageHash) -> None:
         self._current_page_script_hash = page_script_hash
 
@@ -288,45 +105,57 @@ class PagesManager:
     def get_initial_active_script(
         self, page_script_hash: PageHash, page_name: PageName
     ) -> PageInfo | None:
-        return self.pages_strategy.get_initial_active_script(
-            page_script_hash, page_name
-        )
+        return {
+            # We always run the main script in V2 as it's the common code
+            "script_path": self.main_script_path,
+            "page_script_hash": page_script_hash
+            or self.main_script_hash,  # Default Hash
+        }
 
     def get_pages(self) -> dict[PageHash, PageInfo]:
-        return self.pages_strategy.get_pages()
+        # If pages are not set, provide the common page info where
+        # - the main script path is the executing script to start
+        # - the page script hash and name reflects the intended page requested
+        return self._pages or {
+            self.main_script_hash: {
+                "page_script_hash": self.intended_page_script_hash or "",
+                "page_name": self.intended_page_name or "",
+                "icon": "",
+                "script_path": self.main_script_path,
+            }
+        }
 
     def set_pages(self, pages: dict[PageHash, PageInfo]) -> None:
-        # Manually setting the pages indicates we are using MPA v2.
-        if isinstance(self.pages_strategy, PagesStrategyV1):
-            if os.path.exists(self.main_script_parent / "pages"):
-                _LOGGER.warning(
-                    "st.navigation was called in an app with a pages/ directory. "
-                    "This may cause unusual app behavior. You may want to rename the "
-                    "pages/ directory."
-                )
-            PagesManager.DefaultStrategy = PagesStrategyV2
-            self.pages_strategy = PagesStrategyV2(self)
-
-        self.pages_strategy.set_pages(pages)
+        self._pages = pages
 
     def get_page_script(self, fallback_page_hash: PageHash = "") -> PageInfo | None:
-        # We assume the pages strategy is V2 cause this is used
-        # in the st.navigation call, but we just swallow the error
-        try:
-            return self.pages_strategy.get_page_script(fallback_page_hash)
-        except NotImplementedError:
+        if self._pages is None:
             return None
 
-    def register_pages_changed_callback(
-        self,
-        callback: Callable[[str], None],
-    ) -> Callable[[], None]:
-        """Register a callback to be called when the set of pages changes.
-
-        The callback will be called with the path changed.
-        """
+        if self.intended_page_script_hash:
+            # We assume that if initial page hash is specified, that a page should
+            # exist, so we check out the page script hash or the default page hash
+            # as a backup
+            return self._pages.get(
+                self.intended_page_script_hash,
+                self._pages.get(fallback_page_hash, None),
+            )
+        elif self.intended_page_name:
+            # If a user navigates directly to a non-main page of an app, the
+            # the page name can identify the page script to run
+            return next(
+                filter(
+                    # There seems to be this weird bug with mypy where it
+                    # thinks that p can be None (which is impossible given the
+                    # types of pages), so we add `p and` at the beginning of
+                    # the predicate to circumvent this.
+                    lambda p: p and (p["url_pathname"] == self.intended_page_name),
+                    self._pages.values(),
+                ),
+                None,
+            )
 
-        return self.pages_strategy.register_pages_changed_callback(callback)
+        return self._pages.get(fallback_page_hash, None)
 
     def get_page_script_byte_code(self, script_path: str) -> Any:
         if self._script_cache is None:

streamlit/runtime/scriptrunner/script_runner.py

@@ -21,7 +21,7 @@ import types
 from contextlib import contextmanager
 from enum import Enum
 from timeit import default_timer as timer
-from typing import TYPE_CHECKING, Callable, Final
+from typing import TYPE_CHECKING, Callable, Final, Literal, cast
 
 from blinker import Signal
 
@@ -34,6 +34,7 @@ from streamlit.runtime.metrics_util import (
     create_page_profile_message,
     to_microseconds,
 )
+from streamlit.runtime.pages_manager import PagesManager
 from streamlit.runtime.scriptrunner.exec_code import (
     exec_func_with_error_handling,
     modified_sys_path,
@@ -58,10 +59,10 @@ from streamlit.runtime.state import (
     SafeSessionState,
     SessionState,
 )
+from streamlit.source_util import page_sort_key
 
 if TYPE_CHECKING:
     from streamlit.runtime.fragment import FragmentStorage
-    from streamlit.runtime.pages_manager import PagesManager
     from streamlit.runtime.scriptrunner.script_cache import ScriptCache
     from streamlit.runtime.uploaded_file_manager import UploadedFileManager
 
@@ -116,6 +117,50 @@ it in the future.
 """
 
 
+# For projects that have a pages folder, we assume that this is a script that
+# is designed to leverage our original v1 version of multi-page apps. This
+# function will be called to run the script in lieu of the main script. This
+# function simulates the v1 setup using the modern v2 commands (st.navigation)
+def _mpa_v1(main_script_path: str):
+    from pathlib import Path
+
+    from streamlit.commands.navigation import PageType, _navigation
+    from streamlit.navigation.page import StreamlitPage
+
+    # Select the folder that should be used for the pages:
+    MAIN_SCRIPT_PATH = Path(main_script_path).resolve()
+    PAGES_FOLDER = MAIN_SCRIPT_PATH.parent / "pages"
+
+    # Read out the my_pages folder and create a page for every script:
+    pages = PAGES_FOLDER.glob("*.py")
+    pages = sorted(
+        [page for page in pages if page.name.endswith(".py")], key=page_sort_key
+    )
+
+    # Use this script as the main page and
+    main_page = StreamlitPage(MAIN_SCRIPT_PATH, default=True)
+    all_pages = [main_page] + [
+        StreamlitPage(PAGES_FOLDER / page.name) for page in pages
+    ]
+    # Initialize the navigation with all the pages:
+    position: Literal["sidebar", "hidden"] = (
+        "hidden"
+        if config.get_option("client.showSidebarNavigation") is False
+        else "sidebar"
+    )
+    page = _navigation(
+        cast(list[PageType], all_pages),
+        position=position,
+        expanded=False,
+    )
+
+    if page._page != main_page._page:
+        # Only run the page if it is not pointing to this script:
+        page.run()
+        # Finish the script execution here to only run the selected page
+        raise StopException()
+
+
 class ScriptRunner:
     def __init__(
         self,
@@ -590,6 +635,8 @@ class ScriptRunner:
                                 pass
 
                     else:
+                        if PagesManager.uses_pages_directory:
+                            _mpa_v1(self._main_script_path)
                         exec(code, module.__dict__)
                         self._fragment_storage.clear(
                             new_fragment_ids=ctx.new_fragment_ids

streamlit/runtime/scriptrunner_utils/script_run_context.py

@@ -149,7 +149,7 @@ class ScriptRunContext:
         self.query_string = query_string
         self.context_info = context_info
         self.pages_manager.set_current_page_script_hash(page_script_hash)
-        self._active_script_hash = self.pages_manager.initial_active_script_hash
+        self._active_script_hash = self.pages_manager.main_script_hash
         # Permit set_page_config when the ScriptRunContext is reused on a rerun
         self._set_page_config_allowed = True
         self._has_script_started = False