streamlit 1.47.1__py3-none-any.whl → 1.48.0__py3-none-any.whl

streamlit/watcher/local_sources_watcher.py

@@ -23,6 +23,7 @@ from streamlit.logger import get_logger
 from streamlit.watcher.folder_black_list import FolderBlackList
 from streamlit.watcher.path_watcher import (
     NoOpPathWatcher,
+    PathWatcherType,
     get_default_path_watcher_class,
 )
 
@@ -36,12 +37,12 @@ _LOGGER: Final = get_logger(__name__)
 
 class WatchedModule(NamedTuple):
     watcher: Any
-    module_name: Any
+    module_name: str | None
 
 
 # This needs to be initialized lazily to avoid calling config.get_option() and
 # thus initializing config options when this file is first imported.
-PathWatcher = None
+PathWatcher: PathWatcherType | None = None
 
 
 class LocalSourcesWatcher:
@@ -169,7 +170,7 @@ class LocalSourcesWatcher:
             glob_pattern = "**/*" if is_directory else None
 
             wm = WatchedModule(
-                watcher=PathWatcher(
+                watcher=PathWatcher(  # ty: ignore
                     filepath,
                     self.on_path_changed,
                     glob_pattern=glob_pattern,  # Pass as named parameter

streamlit/web/bootstrap.py

@@ -335,23 +335,29 @@ def run(
         # by a debug websocket session.
         await server.stopped
 
-    # Run the server. This function will not return until the server is shut down.
-    # FIX RuntimeError: asyncio.run() cannot be called from a running event loop
-    # asyncio.run(run_server())  # noqa: ERA001
-
     # Define a main function to handle the event loop logic
     async def main() -> None:
         await run_server()
 
+    # Handle running in existing event loop vs creating new one
+    running_in_event_loop = False
     try:
         # Check if we're already in an event loop
-        if asyncio.get_running_loop().is_running():
-            # Use `asyncio.create_task` if we're in an async context
-            # TODO(lukasmasuch): Do we have to store a reference for the task here?
-            asyncio.create_task(main())  # noqa: RUF006
-        else:
-            # Otherwise, use `asyncio.run`
-            asyncio.run(main())
+        asyncio.get_running_loop()
+        running_in_event_loop = True
     except RuntimeError:
-        # get_running_loop throws RuntimeError if no running event loop
+        # No running event loop - this is expected for normal CLI usage
+        pass
+
+    if running_in_event_loop:
+        _LOGGER.debug("Running server in existing event loop.")
+        # We're in an existing event loop.
+        task = asyncio.create_task(main(), name="bootstrap.run_server")
+        # Store task reference on the server to keep it alive
+        # This prevents the task from being garbage collected
+        server._bootstrap_task = task
+    else:
+        # No running event loop, so we can use asyncio.run
+        # This is the normal case when running streamlit from the command line
+        _LOGGER.debug("Starting new event loop for server")
         asyncio.run(main())

streamlit/web/cli.py

@@ -114,13 +114,14 @@ def configurator_options(func: F) -> F:
 def _download_remote(main_script_path: str, url_path: str) -> None:
     """Fetch remote file at url_path to main_script_path."""
     import requests
+    from requests.exceptions import RequestException
 
     with open(main_script_path, "wb") as fp:
         try:
             resp = requests.get(url_path, timeout=30)
             resp.raise_for_status()
             fp.write(resp.content)
-        except requests.exceptions.RequestException as e:
+        except RequestException as e:
             raise click.BadParameter(f"Unable to fetch {url_path}.\n{e}")
 
 

streamlit/web/server/oauth_authlib_routes.py

@@ -15,7 +15,7 @@ from __future__ import annotations
 
 import json
 from typing import Any, Final, cast
-from urllib.parse import urlparse
+from urllib.parse import urlencode, urlparse
 
 import tornado.web
 
@@ -130,7 +130,63 @@ class AuthLoginHandler(AuthHandlerMixin, tornado.web.RequestHandler):
 class AuthLogoutHandler(AuthHandlerMixin, tornado.web.RequestHandler):
     def get(self) -> None:
         self.clear_auth_cookie()
-        self.redirect_to_base()
+
+        provider_logout_url = self._get_provider_logout_url()
+        if provider_logout_url:
+            self.redirect(provider_logout_url)
+        else:
+            self.redirect_to_base()
+
+    def _get_redirect_root(self) -> str | None:
+        auth_section = get_secrets_auth_section()
+        if not auth_section or not auth_section.get("redirect_uri"):
+            return None
+
+        redirect_uri: str = auth_section["redirect_uri"]
+        if not redirect_uri.endswith("/oauth2callback"):
+            _LOGGER.warning("Redirect URI does not end with /oauth2callback")
+            return None
+
+        return redirect_uri.removesuffix("oauth2callback")
+
+    def _get_provider_logout_url(self) -> str | None:
+        """Get the OAuth provider's logout URL from OIDC metadata."""
+        try:
+            cookie_value = self.get_signed_cookie(AUTH_COOKIE_NAME)
+        except AttributeError:  # Backward compatibility with Tornado < 6.3.0
+            cookie_value = self.get_secure_cookie(AUTH_COOKIE_NAME)
+
+        if not cookie_value:
+            return None
+
+        try:
+            user_info = json.loads(cookie_value)
+            provider = user_info.get("provider")
+            if not provider:
+                return None
+
+            client, _ = create_oauth_client(provider)
+
+            metadata = client.load_server_metadata()
+            end_session_endpoint = metadata.get("end_session_endpoint")
+
+            if not end_session_endpoint:
+                _LOGGER.info("No end_session_endpoint found for provider %s", provider)
+                return None
+
+            redirect_root = self._get_redirect_root()
+            if redirect_root is None:
+                _LOGGER.info("Redirect url could not be determined")
+                return None
+
+            logout_params = {"post_logout_redirect_uri": redirect_root}
+
+            # Not using id_token_hint as we don't store the id token
+            return f"{end_session_endpoint}?{urlencode(logout_params)}"
+
+        except Exception as e:
+            _LOGGER.warning("Failed to get provider logout URL: %s", e)
+            return None
 
 
 class AuthCallbackHandler(AuthHandlerMixin, tornado.web.RequestHandler):
@@ -172,7 +228,7 @@ class AuthCallbackHandler(AuthHandlerMixin, tornado.web.RequestHandler):
         token = client.authorize_access_token(self)
         user = cast("dict[str, Any]", token.get("userinfo"))
 
-        cookie_value = dict(user, origin=origin, is_logged_in=True)
+        cookie_value = dict(user, origin=origin, is_logged_in=True, provider=provider)
         if user:
             self.set_auth_cookie(cookie_value)
         else:

streamlit/web/server/server.py

@@ -22,11 +22,7 @@ import sys
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Final
 
-import tornado.concurrent
-import tornado.locks
-import tornado.netutil
 import tornado.web
-import tornado.websocket
 from tornado.httpserver import HTTPServer
 
 from streamlit import cli_util, config, file_util, util
@@ -62,25 +58,67 @@ from streamlit.web.server.stats_request_handler import StatsRequestHandler
 from streamlit.web.server.upload_file_request_handler import UploadFileRequestHandler
 
 if TYPE_CHECKING:
+    import asyncio
     from collections.abc import Awaitable
     from ssl import SSLContext
 
 _LOGGER: Final = get_logger(__name__)
 
-TORNADO_SETTINGS = {
-    # Gzip HTTP responses.
-    "compress_response": True,
-    # Ping every 30s to keep WS alive.
-    # With recent versions of Tornado, this value must be greater than or
-    # equal to websocket_ping_timeout.
-    # For details, see https://github.com/tornadoweb/tornado/pull/3376
-    # For compatibility with older versions of Tornado, we set the value to 1.
-    "websocket_ping_interval": 1 if is_tornado_version_less_than("6.5.0") else 30,
-    # If we don't get a ping response within 30s, the connection
-    # is timed out.
-    "websocket_ping_timeout": 30,
-    "xsrf_cookie_name": "_streamlit_xsrf",
-}
+
+def _get_websocket_ping_interval_and_timeout() -> tuple[int, int]:
+    """Get the websocket ping interval and timeout from config or defaults.
+
+    Returns
+    -------
+        tuple: (ping_interval, ping_timeout)
+    """
+    configured_interval = config.get_option("server.websocketPingInterval")
+
+    if configured_interval is not None:
+        # User has explicitly set a value
+        interval = int(configured_interval)
+
+        # Warn if using Tornado 6.5+ with low interval
+        if not is_tornado_version_less_than("6.5.0") and interval < 30:
+            _LOGGER.warning(
+                "You have set server.websocketPingInterval to %s, but Tornado >= 6.5 "
+                "requires websocket_ping_interval >= websocket_ping_timeout. "
+                "To comply, we are setting both the ping interval and ping timeout to %s. "
+                "Depending on the specific deployment setup, this may cause connection issues.",
+                interval,
+                interval,
+            )
+
+        # When user configures interval, set timeout to match
+        return interval, interval
+
+    # Default behavior: respect Tornado version for interval, always 30s timeout
+    default_interval = 1 if is_tornado_version_less_than("6.5.0") else 30
+    return default_interval, 30
+
+
+def get_tornado_settings() -> dict[str, Any]:
+    """Get Tornado settings for the server.
+
+    This is a function to allow for testing and dynamic configuration.
+    """
+    ping_interval, ping_timeout = _get_websocket_ping_interval_and_timeout()
+
+    return {
+        # Gzip HTTP responses.
+        "compress_response": True,
+        # Ping interval for websocket keepalive.
+        # With recent versions of Tornado, this value must be greater than or
+        # equal to websocket_ping_timeout.
+        # For details, see https://github.com/tornadoweb/tornado/pull/3376
+        # For compatibility with older versions of Tornado, we set the value to 1.
+        "websocket_ping_interval": ping_interval,
+        # If we don't get a ping response within this time, the connection
+        # is timed out.
+        "websocket_ping_timeout": ping_timeout,
+        "xsrf_cookie_name": "_streamlit_xsrf",
+    }
+
 
 # When server.port is not available it will look for the next available port
 # up to MAX_PORT_SEARCH_RETRIES.
@@ -191,8 +229,16 @@ def start_listening_unix_socket(http_server: HTTPServer) -> None:
     address = config.get_option("server.address")
     file_name = os.path.expanduser(address[len(UNIX_SOCKET_PREFIX) :])
 
-    unix_socket = tornado.netutil.bind_unix_socket(file_name)
-    http_server.add_socket(unix_socket)
+    import tornado.netutil
+
+    if hasattr(tornado.netutil, "bind_unix_socket"):
+        unix_socket = tornado.netutil.bind_unix_socket(file_name)
+        http_server.add_socket(unix_socket)
+    else:
+        _LOGGER.error(
+            "Unix socket support is not available in this version of Tornado."
+        )
+        sys.exit(1)
 
 
 def start_listening_tcp_socket(http_server: HTTPServer) -> None:
@@ -240,6 +286,11 @@ class Server:
 
         self._main_script_path = main_script_path
 
+        # The task that runs the server if an event loop is already running.
+        # We need to save a reference to it so that it doesn't get
+        # garbage collected while running.
+        self._bootstrap_task: asyncio.Task[None] | None = None
+
         # Initialize MediaFileStorage and its associated endpoint
         media_file_storage = MemoryMediaFileStorage(MEDIA_ENDPOINT)
         MediaFileHandler.initialize_storage(media_file_storage)
@@ -440,7 +491,7 @@ class Server:
             xsrf_cookies=is_xsrf_enabled(),
             # Set the websocket message size. The default value is too low.
             websocket_max_message_size=get_max_message_size_bytes(),
-            **TORNADO_SETTINGS,  # type: ignore[arg-type]
+            **get_tornado_settings(),
         )
 
     @property

{streamlit-1.47.1.dist-info → streamlit-1.48.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: streamlit
-Version: 1.47.1
+Version: 1.48.0
 Summary: A faster way to build and share data apps
 Home-page: https://streamlit.io
 Author: Snowflake Inc
@@ -31,7 +31,7 @@ Classifier: Topic :: Software Development :: Libraries :: Application Frameworks
 Classifier: Topic :: Software Development :: Widget Sets
 Requires-Python: >=3.9, !=3.9.7
 Description-Content-Type: text/markdown
-Requires-Dist: altair<6,>=4.0
+Requires-Dist: altair!=5.4.0,!=5.4.1,<6,>=4.0
 Requires-Dist: blinker<2,>=1.5.0
 Requires-Dist: cachetools<7,>=4.0
 Requires-Dist: click<9,>=7.0
@@ -52,6 +52,18 @@ Requires-Dist: tornado!=6.5.0,<7,>=6.0.3
 Provides-Extra: snowflake
 Requires-Dist: snowflake-snowpark-python[modin]>=1.17.0; python_version < "3.12" and extra == "snowflake"
 Requires-Dist: snowflake-connector-python>=3.3.0; python_version < "3.12" and extra == "snowflake"
+Provides-Extra: auth
+Requires-Dist: Authlib>=1.3.2; extra == "auth"
+Provides-Extra: charts
+Requires-Dist: matplotlib>=3.0.0; extra == "charts"
+Requires-Dist: graphviz>=0.19.0; extra == "charts"
+Requires-Dist: plotly>=4.0.0; extra == "charts"
+Requires-Dist: orjson>=3.5.0; extra == "charts"
+Provides-Extra: sql
+Requires-Dist: SQLAlchemy>=2.0.0; extra == "sql"
+Provides-Extra: all
+Requires-Dist: streamlit[auth,charts,snowflake,sql]; extra == "all"
+Requires-Dist: rich>=11.0.0; extra == "all"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier