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

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/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/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.3ab8e8d9.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.3ab8e8d9.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.3ab8e8d9.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>