streamlit-nightly 1.29.1.dev20240108__py2.py3-none-any.whl → 1.30.1.dev20240111__py2.py3-none-any.whl

streamlit/commands/execution_control.py

@@ -157,7 +157,7 @@ def switch_page(page: str) -> NoReturn:  # type: ignore[misc]
 
     ctx.script_requests.request_rerun(
         RerunData(
-            query_string="",
+            query_string=ctx.query_string,
             page_script_hash=matched_pages[0]["page_script_hash"],
         )
     )

streamlit/commands/experimental_query_params.py

@@ -16,15 +16,16 @@ import urllib.parse as parse
 from typing import Any, Dict, List, Union
 
 from streamlit import util
+from streamlit.constants import (
+    EMBED_OPTIONS_QUERY_PARAM,
+    EMBED_QUERY_PARAM,
+    EMBED_QUERY_PARAMS_KEYS,
+)
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 from streamlit.runtime.metrics_util import gather_metrics
 from streamlit.runtime.scriptrunner import get_script_run_ctx
 
-EMBED_QUERY_PARAM = "embed"
-EMBED_OPTIONS_QUERY_PARAM = "embed_options"
-EMBED_QUERY_PARAMS_KEYS = [EMBED_QUERY_PARAM, EMBED_OPTIONS_QUERY_PARAM]
-
 
 @gather_metrics("experimental_get_query_params")
 def get_query_params() -> Dict[str, List[str]]:

streamlit/connections/snowflake_connection.py

@@ -52,11 +52,14 @@ class SnowflakeConnection(BaseConnection["InternalSnowflakeConnection"]):
     def _connect(self, **kwargs) -> "InternalSnowflakeConnection":
         import snowflake.connector  # type:ignore[import]
         from snowflake.connector import Error as SnowflakeError  # type:ignore[import]
-        from snowflake.snowpark.context import get_active_session  # type:ignore[import]
 
         # If we're running in SiS, just call get_active_session() and retrieve the
         # lower-level connection from it.
         if running_in_sis():
+            from snowflake.snowpark.context import (  # type:ignore[import]  # isort: skip
+                get_active_session,
+            )
+
             session = get_active_session()
 
             if hasattr(session, "connection"):

streamlit/connections/util.py

@@ -81,8 +81,11 @@ def load_from_snowsql_config_file(connection_name: str) -> Dict[str, Any]:
 
 def running_in_sis() -> bool:
     """Return whether this app is running in SiS."""
-    from snowflake.snowpark._internal.utils import (  # type: ignore[import]  # isort: skip
-        is_in_stored_procedure,
-    )
-
-    return cast(bool, is_in_stored_procedure())
+    try:
+        from snowflake.snowpark._internal.utils import (  # type: ignore[import]  # isort: skip
+            is_in_stored_procedure,
+        )
+
+        return cast(bool, is_in_stored_procedure())
+    except ModuleNotFoundError:
+        return False

streamlit/constants.py

@@ -0,0 +1,17 @@
+# Copyright (c) Streamlit Inc. (2018-2022) Snowflake Inc. (2022-2024)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+EMBED_QUERY_PARAM = "embed"
+EMBED_OPTIONS_QUERY_PARAM = "embed_options"
+EMBED_QUERY_PARAMS_KEYS = [EMBED_QUERY_PARAM, EMBED_OPTIONS_QUERY_PARAM]

streamlit/runtime/caching/cache_data_api.py

@@ -60,7 +60,7 @@ from streamlit.runtime.caching.storage.dummy_cache_storage import (
 )
 from streamlit.runtime.metrics_util import gather_metrics
 from streamlit.runtime.scriptrunner.script_run_context import get_script_run_ctx
-from streamlit.runtime.stats import CacheStat, CacheStatsProvider
+from streamlit.runtime.stats import CacheStat, CacheStatsProvider, group_stats
 
 _LOGGER = get_logger(__name__)
 
@@ -236,7 +236,7 @@ class DataCaches(CacheStatsProvider):
         stats: list[CacheStat] = []
         for cache in function_caches.values():
             stats.extend(cache.get_stats())
-        return stats
+        return group_stats(stats)
 
     def validate_cache_params(
         self,

streamlit/runtime/caching/cache_resource_api.py

@@ -47,7 +47,7 @@ from streamlit.runtime.caching.cached_message_replay import (
 from streamlit.runtime.caching.hashing import HashFuncsDict
 from streamlit.runtime.metrics_util import gather_metrics
 from streamlit.runtime.scriptrunner.script_run_context import get_script_run_ctx
-from streamlit.runtime.stats import CacheStat, CacheStatsProvider
+from streamlit.runtime.stats import CacheStat, CacheStatsProvider, group_stats
 from streamlit.vendor.pympler.asizeof import asizeof
 
 _LOGGER = get_logger(__name__)
@@ -131,7 +131,7 @@ class ResourceCaches(CacheStatsProvider):
         stats: list[CacheStat] = []
         for cache in function_caches.values():
             stats.extend(cache.get_stats())
-        return stats
+        return group_stats(stats)
 
 
 # Singleton ResourceCaches instance

streamlit/runtime/forward_msg_cache.py

@@ -19,7 +19,7 @@ from weakref import WeakKeyDictionary
 from streamlit import config, util
 from streamlit.logger import get_logger
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
-from streamlit.runtime.stats import CacheStat, CacheStatsProvider
+from streamlit.runtime.stats import CacheStat, CacheStatsProvider, group_stats
 from streamlit.util import HASHLIB_KWARGS
 
 if TYPE_CHECKING:
@@ -292,4 +292,4 @@ class ForwardMsgCache(CacheStatsProvider):
                     byte_length=entry.msg.ByteSize() if entry.msg is not None else 0,
                 )
             )
-        return stats
+        return group_stats(stats)

streamlit/runtime/memory_media_file_storage.py

@@ -28,7 +28,7 @@ from streamlit.runtime.media_file_storage import (
     MediaFileStorage,
     MediaFileStorageError,
 )
-from streamlit.runtime.stats import CacheStat, CacheStatsProvider
+from streamlit.runtime.stats import CacheStat, CacheStatsProvider, group_stats
 from streamlit.util import HASHLIB_KWARGS
 
 LOGGER = get_logger(__name__)
@@ -181,4 +181,4 @@ class MemoryMediaFileStorage(MediaFileStorage, CacheStatsProvider):
                     byte_length=len(file.content),
                 )
             )
-        return stats
+        return group_stats(stats)

streamlit/runtime/memory_uploaded_file_manager.py

@@ -18,7 +18,7 @@ from typing import Dict, List, Sequence
 
 from streamlit import util
 from streamlit.logger import get_logger
-from streamlit.runtime.stats import CacheStat
+from streamlit.runtime.stats import CacheStat, group_stats
 from streamlit.runtime.uploaded_file_manager import (
     UploadedFileManager,
     UploadedFileRec,
@@ -125,7 +125,7 @@ class MemoryUploadedFileManager(UploadedFileManager):
         for session_storage in file_storage_copy.values():
             all_files.extend(session_storage.values())
 
-        return [
+        stats: List[CacheStat] = [
             CacheStat(
                 category_name="UploadedFileManager",
                 cache_name="",
@@ -133,3 +133,4 @@ class MemoryUploadedFileManager(UploadedFileManager):
             )
             for file in all_files
         ]
+        return group_stats(stats)

streamlit/runtime/state/query_params.py

@@ -14,7 +14,9 @@
 
 from dataclasses import dataclass, field
 from typing import Dict, Iterable, Iterator, List, MutableMapping, Union
+from urllib import parse
 
+from streamlit.constants import EMBED_QUERY_PARAMS_KEYS
 from streamlit.errors import StreamlitAPIException
 from streamlit.proto.ForwardMsg_pb2 import ForwardMsg
 
@@ -29,7 +31,12 @@ class QueryParams(MutableMapping[str, str]):
 
     def __iter__(self) -> Iterator[str]:
         self._ensure_single_query_api_used()
-        return iter(self._query_params.keys())
+
+        return iter(
+            key
+            for key in self._query_params.keys()
+            if key not in EMBED_QUERY_PARAMS_KEYS
+        )
 
     def __getitem__(self, key: str) -> str:
         """Retrieves a value for a given key in query parameters.
@@ -38,6 +45,8 @@ class QueryParams(MutableMapping[str, str]):
         """
         self._ensure_single_query_api_used()
         try:
+            if key in EMBED_QUERY_PARAMS_KEYS:
+                raise KeyError(missing_key_error_message(key))
             value = self._query_params[key]
             if isinstance(value, list):
                 if len(value) == 0:
@@ -56,6 +65,10 @@ class QueryParams(MutableMapping[str, str]):
                 f"You cannot set a query params key `{key}` to a dictionary."
             )
 
+        if key in EMBED_QUERY_PARAMS_KEYS:
+            raise StreamlitAPIException(
+                "Query param embed and embed_options (case-insensitive) cannot be set programmatically."
+            )
         # Type checking users should handle the string serialization themselves
         # We will accept any type for the list and serialize to str just in case
         if isinstance(value, Iterable) and not isinstance(value, str):
@@ -66,6 +79,8 @@ class QueryParams(MutableMapping[str, str]):
 
     def __delitem__(self, key: str) -> None:
         try:
+            if key in EMBED_QUERY_PARAMS_KEYS:
+                raise KeyError(missing_key_error_message(key))
             del self._query_params[key]
             self._send_query_param_msg()
         except KeyError:
@@ -73,18 +88,19 @@ class QueryParams(MutableMapping[str, str]):
 
     def get_all(self, key: str) -> List[str]:
         self._ensure_single_query_api_used()
-        if key not in self._query_params:
+        if key not in self._query_params or key in EMBED_QUERY_PARAMS_KEYS:
             return []
         value = self._query_params[key]
         return value if isinstance(value, list) else [value]
 
     def __len__(self) -> int:
         self._ensure_single_query_api_used()
-        return len(self._query_params)
+        return len(
+            {key for key in self._query_params if key not in EMBED_QUERY_PARAMS_KEYS}
+        )
 
     def _send_query_param_msg(self) -> None:
         # Avoid circular imports
-        from streamlit.commands.experimental_query_params import _ensure_no_embed_params
         from streamlit.runtime.scriptrunner import get_script_run_ctx
 
         ctx = get_script_run_ctx()
@@ -93,27 +109,31 @@ class QueryParams(MutableMapping[str, str]):
         self._ensure_single_query_api_used()
 
         msg = ForwardMsg()
-        msg.page_info_changed.query_string = _ensure_no_embed_params(
-            self._query_params, ctx.query_string
+        msg.page_info_changed.query_string = parse.urlencode(
+            self._query_params, doseq=True
         )
         ctx.query_string = msg.page_info_changed.query_string
         ctx.enqueue(msg)
 
     def clear(self) -> None:
-        self._query_params.clear()
+        new_query_params = {}
+        for key, value in self._query_params.items():
+            if key in EMBED_QUERY_PARAMS_KEYS:
+                new_query_params[key] = value
+        self._query_params = new_query_params
+
         self._send_query_param_msg()
 
     def to_dict(self) -> Dict[str, str]:
         self._ensure_single_query_api_used()
-        # return the last query param if multiple keys are set
-        return {key: self[key] for key in self._query_params}
+        # return the last query param if multiple values are set
+        return {
+            key: self[key]
+            for key in self._query_params
+            if key not in EMBED_QUERY_PARAMS_KEYS
+        }
 
     def set_with_no_forward_msg(self, key: str, val: Union[List[str], str]) -> None:
-        # Avoid circular imports
-        from streamlit.commands.experimental_query_params import EMBED_QUERY_PARAMS_KEYS
-
-        if key.lower() in EMBED_QUERY_PARAMS_KEYS:
-            return
         self._query_params[key] = val
 
     def clear_with_no_forward_msg(self) -> None:

streamlit/runtime/state/session_state.py

@@ -43,7 +43,7 @@ from streamlit.runtime.state.common import (
     is_widget_id,
 )
 from streamlit.runtime.state.query_params import QueryParams
-from streamlit.runtime.stats import CacheStat, CacheStatsProvider
+from streamlit.runtime.stats import CacheStat, CacheStatsProvider, group_stats
 from streamlit.type_util import ValueFieldName, is_array_value_field_name
 from streamlit.vendor.pympler.asizeof import asizeof
 
@@ -677,4 +677,4 @@ class SessionStateStatProvider(CacheStatsProvider):
         for session_info in self._session_mgr.list_active_sessions():
             session_state = session_info.session.session_state
             stats.extend(session_state.get_stats())
-        return stats
+        return group_stats(stats)

streamlit/runtime/stats.py

@@ -11,7 +11,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-
 import itertools
 from abc import abstractmethod
 from typing import List, NamedTuple
@@ -63,6 +62,28 @@ class CacheStat(NamedTuple):
         metric_point.gauge_value.int_value = self.byte_length
 
 
+def group_stats(stats: List[CacheStat]) -> List[CacheStat]:
+    """Group a list of CacheStats by category_name and cache_name and sum byte_length"""
+
+    def key_function(individual_stat):
+        return individual_stat.category_name, individual_stat.cache_name
+
+    result: List[CacheStat] = []
+
+    sorted_stats = sorted(stats, key=key_function)
+    grouped_stats = itertools.groupby(sorted_stats, key=key_function)
+
+    for (category_name, cache_name), single_group_stats in grouped_stats:
+        result.append(
+            CacheStat(
+                category_name=category_name,
+                cache_name=cache_name,
+                byte_length=sum(map(lambda item: item.byte_length, single_group_stats)),
+            )
+        )
+    return result
+
+
 @runtime_checkable
 class CacheStatsProvider(Protocol):
     @abstractmethod
@@ -82,26 +103,9 @@ class StatsManager:
         self._cache_stats_providers.append(provider)
 
     def get_stats(self) -> List[CacheStat]:
-        """Return a list containing all stats from each registered provider.
-        Stats are grouped by category_name and cache_type."""
+        """Return a list containing all stats from each registered provider."""
         all_stats: List[CacheStat] = []
         for provider in self._cache_stats_providers:
-            provider_stats = provider.get_stats()
-            grouped_stats = itertools.groupby(
-                provider_stats,
-                lambda individual_stat: (
-                    individual_stat.category_name,
-                    individual_stat.cache_name,
-                ),
-            )
-
-            for (category_name, cache_name), stats in grouped_stats:
-                all_stats.append(
-                    CacheStat(
-                        category_name=category_name,
-                        cache_name=cache_name,
-                        byte_length=sum(map(lambda item: item.byte_length, stats)),
-                    )
-                )
+            all_stats.extend(provider.get_stats())
 
         return all_stats

streamlit/static/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "./static/css/main.77d1c464.css",
-    "main.js": "./static/js/main.cbbf0bd5.js",
+    "main.js": "./static/js/main.673a9494.js",
     "static/js/9336.2d95d840.chunk.js": "./static/js/9336.2d95d840.chunk.js",
     "static/js/9330.c0dd1723.chunk.js": "./static/js/9330.c0dd1723.chunk.js",
     "static/js/7217.d970c074.chunk.js": "./static/js/7217.d970c074.chunk.js",
@@ -149,6 +149,6 @@
   },
   "entrypoints": [
     "static/css/main.77d1c464.css",
-    "static/js/main.cbbf0bd5.js"
+    "static/js/main.673a9494.js"
   ]
 }

streamlit/static/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><link rel="shortcut icon" href="./favicon.png"/><link rel="preload" href="./static/media/SourceSansPro-Regular.0d69e5ff5e92ac64a0c9.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-SemiBold.abed79cd0df1827e18cf.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-Bold.118dea98980e20a81ced.woff2" as="font" type="font/woff2" crossorigin><title>Streamlit</title><script>window.prerenderReady=!1</script><script defer="defer" src="./static/js/main.cbbf0bd5.js"></script><link href="./static/css/main.77d1c464.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="UTF-8"/><meta name="viewport" content="width=device-width,initial-scale=1,shrink-to-fit=no"/><link rel="shortcut icon" href="./favicon.png"/><link rel="preload" href="./static/media/SourceSansPro-Regular.0d69e5ff5e92ac64a0c9.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-SemiBold.abed79cd0df1827e18cf.woff2" as="font" type="font/woff2" crossorigin><link rel="preload" href="./static/media/SourceSansPro-Bold.118dea98980e20a81ced.woff2" as="font" type="font/woff2" crossorigin><title>Streamlit</title><script>window.prerenderReady=!1</script><script defer="defer" src="./static/js/main.673a9494.js"></script><link href="./static/css/main.77d1c464.css" rel="stylesheet"></head><body><noscript>You need to enable JavaScript to run this app.</noscript><div id="root"></div></body></html>