solara 1.25.0__py2.py3-none-any.whl → 1.25.1__py2.py3-none-any.whl

solara/__init__.py

@@ -1,5 +1,5 @@
 """Build webapps using IPywidgets"""
-__version__ = "1.25.0"
+__version__ = "1.25.1"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 

solara/__main__.py

@@ -86,7 +86,7 @@ def _check_version():
 def find_all_packages_paths():
     paths = []
     # sitepackages = set([os.path.dirname(k) for k in site.getsitepackages()])
-    sitepackages = set([k for k in site.getsitepackages()])
+    sitepackages = {k for k in site.getsitepackages()}
     paths.extend(list(sitepackages))
     for name, module in sys.modules.items():
         if hasattr(module, "__path__"):

solara/cache.py

@@ -1,6 +1,7 @@
 import hashlib
 import inspect
 import logging
+import sys
 from typing import (
     Any,
     Callable,
@@ -15,12 +16,11 @@ from typing import (
 )
 
 import cachetools
-import typing_extensions
-from reacton.utils import equals
-
 import solara
 import solara.settings
 import solara.util
+import typing_extensions
+from reacton.utils import equals
 
 logger = logging.getLogger("solara.cache")
 
@@ -59,7 +59,12 @@ class MemoizedFunction(Generic[P, R]):
             nonlocals = inspect.getclosurevars(f).nonlocals
             if nonlocals:
                 raise ValueError(f"Memoized functions cannot depend on nonlocal variables, it now depends on {nonlocals}")
-        codehash = hashlib.md5(f.__code__.co_code).hexdigest()
+        if sys.version_info[:2] < (3, 9):
+            # usedforsecurity is only available in Python 3.9+
+            codehash = hashlib.md5(f.__code__.co_code).hexdigest()
+        else:
+            codehash = hashlib.md5(f.__code__.co_code, usedforsecurity=False).hexdigest()  # type: ignore
+
         self.function_key = (f.__qualname__, codehash)
         current_globals = dict(inspect.getclosurevars(f).globals)
         _global_values_used.setdefault(self.function_key, current_globals)

solara/checks.py

@@ -19,6 +19,7 @@ logger = logging.getLogger(__name__)
 
 jupyter_checked_path = get_solara_home() / ".jupyter_checked"
 solara_checked_path = get_solara_home() / ".solara_checked"
+solara_version = solara.__version__
 
 
 def _should_perform_check(path: Path):
@@ -67,12 +68,12 @@ def JupyterCheck():
         # if the widgets do not work
         IPython.display.display(
             IPython.display.Javascript(
-                data="""
+                data=f"""
 const prevIframe = document.getElementById("solara-jupyter-check");
 if(prevIframe)
     prevIframe.remove();
 const iframe = document.createElement('iframe')
-iframe.setAttribute("src", "https://solara.dev/static/public/success.html?check=purejs");
+iframe.setAttribute("src", "https://solara.dev/static/public/success.html?check=purejs&version={solara_version}");
 iframe.style.width = "0px";
 iframe.style.height = "0px";
 iframe.style.display = "none";
@@ -95,7 +96,7 @@ document.body.appendChild(iframe);
     # this iframe should only get through if the widget installation succeeded
     return solara.v.Html(
         tag="iframe",
-        attributes={"src": "https://solara.dev/static/public/success.html?check=widget", "width": "0px", "height": "0px"},
+        attributes={"src": f"https://solara.dev/static/public/success.html?check=widget&version={solara_version}", "width": "0px", "height": "0px"},
         style_="display: none;",
     )
 
@@ -111,7 +112,11 @@ def SolaraCheck():
     solara.use_effect(flag_solara_checked, [])
     return solara.v.Html(
         tag="iframe",
-        attributes={"src": "https://solara.dev/static/public/success.html?system=solara&check=widget", "width": "0px", "height": "0px"},
+        attributes={
+            "src": f"https://solara.dev/static/public/success.html?system=solara&check=widget&version={solara_version}",
+            "width": "0px",
+            "height": "0px",
+        },
         style_="display: none;",
     )
 

solara/minisettings.py

@@ -94,7 +94,7 @@ class BaseSettings:
     def __init__(self, **kwargs) -> None:
         cls = type(self)
         self._values = {**kwargs}
-        keys = set([k.upper() for k in os.environ.keys()])
+        keys = {k.upper() for k in os.environ.keys()}
         for key, field in cls.__dict__.items():
             if key in kwargs:
                 continue