solara 1.24.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.24.0"
+__version__ = "1.25.1"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 

solara/__main__.py

@@ -18,6 +18,8 @@ from uvicorn.main import LEVEL_CHOICES, LOOP_CHOICES
 import solara
 from solara.server import settings
 
+from .server import telemetry
+
 try:
     from solara_enterprise.ssg import ssg_crawl
 except ImportError:
@@ -84,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__"):
@@ -287,6 +289,7 @@ def run(
 
     failed = False
     if reload:
+        telemetry._auto_restart_enabled = True
         solara_root = Path(solara.__file__).parent
 
         reload_dirs = list(reload_dirs if reload_dirs else [])

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/lab/components/__init__.py

@@ -1,3 +1,4 @@
+from .chat import ChatBox, ChatInput, ChatMessage  # noqa: F401
 from .confirmation_dialog import ConfirmationDialog  # noqa: F401
 from .input_date import InputDate, InputDateRange  # noqa: F401
 from .menu import ClickMenu, ContextMenu, Menu  # noqa: F401 F403

solara/lab/components/chat.py

@@ -0,0 +1,203 @@
+import uuid
+from typing import Callable, Dict, List, Optional, Union
+
+from typing_extensions import Literal
+
+import solara
+from solara.components.input import use_change
+
+
+@solara.component
+def ChatBox(
+    children: List[solara.Element] = [],
+    style: Optional[Union[str, Dict[str, str]]] = None,
+    classes: List[str] = [],
+):
+    """
+    The ChatBox component is a container for ChatMessage components.
+    Its primary use is to ensure the proper ordering of messages,
+    using `flex-direction: column-reverse` together with `reversed(messages)`.
+
+    # Arguments
+
+    * `children`: A list of child components.
+    * `style`: CSS styles to apply to the component. Either a string or a dictionary.
+    * `classes`: A list of CSS classes to apply to the component.
+    """
+    style_flat = solara.util._flatten_style(style)
+    if "flex-grow" not in style_flat:
+        style_flat += " flex-grow: 1;"
+    if "flex-direction" not in style_flat:
+        style_flat += " flex-direction: column-reverse;"
+    if "overflow-y" not in style_flat:
+        style_flat += " overflow-y: auto;"
+
+    classes += ["chat-box"]
+    with solara.Column(
+        style=style_flat,
+        classes=classes,
+    ):
+        for child in list(reversed(children)):
+            solara.display(child)
+
+
+@solara.component
+def ChatInput(
+    send_callback: Optional[Callable] = None,
+    disabled: bool = False,
+    style: Optional[Union[str, Dict[str, str]]] = None,
+    classes: List[str] = [],
+):
+    """
+    The ChatInput component renders a text input together with a send button.
+
+    # Arguments
+
+    * `send_callback`: A callback function for when the user presses enter or clicks the send button.
+    * `disabled`: Whether the input should be disabled. Useful for disabling sending further messages while a chatbot is replying,
+        among other things.
+    * `style`: CSS styles to apply to the component. Either a string or a dictionary. These styles are applied to the container component.
+    * `classes`: A list of CSS classes to apply to the component. Also applied to the container.
+    """
+    message, set_message = solara.use_state("")  # type: ignore
+    style_flat = solara.util._flatten_style(style)
+
+    if "align-items" not in style_flat:
+        style_flat += " align-items: center;"
+
+    with solara.Row(style=style_flat, classes=classes):
+
+        def send(*ignore_args):
+            if message != "" and send_callback is not None:
+                send_callback(message)
+                set_message("")
+
+        message_input = solara.v.TextField(
+            label="Type a message...",
+            v_model=message,
+            on_v_model=set_message,
+            rounded=True,
+            filled=True,
+            hide_details=True,
+            style_="flex-grow: 1;",
+            disabled=disabled,
+        )
+
+        use_change(message_input, send, update_events=["keyup.enter"])
+
+        button = solara.v.Btn(color="primary", icon=True, children=[solara.v.Icon(children=["mdi-send"])], disabled=message == "")
+
+        use_change(button, send, update_events=["click"])
+
+
+@solara.component
+def ChatMessage(
+    children: Union[List[solara.Element], str],
+    user: bool = False,
+    avatar: Union[solara.Element, str, Literal[False], None] = None,
+    name: Optional[str] = None,
+    color: Optional[str] = "rgba(0,0,0,.06)",
+    avatar_background_color: Optional[str] = None,
+    border_radius: Optional[str] = None,
+    notch: bool = False,
+    style: Optional[Union[str, Dict[str, str]]] = None,
+    classes: List[str] = [],
+):
+    """
+    The ChatMessage component renders a message. Messages with `user=True` are rendered on the right side of the screen,
+    all others on the left.
+
+    # Arguments
+
+    * `children`: A list of child components.
+    * `user`: Whether the message is from the current user or not.
+    * `avatar`: An avatar to display next to the message. Can be a string representation of a URL or Material design icon name,
+        a solara Element, False to disable avatars altogether, or None to display initials based on `name`.
+    * `name`: The name of the user who sent the message.
+    * `color`: The background color of the message. Defaults to `rgba(0,0,0,.06)`. Can be any valid CSS color.
+    * `avatar_background_color`: The background color of the avatar. Defaults to `color` if left as `None`.
+    * `border_radius`: Sets the roundness of the corners of the message. Defaults to `None`,
+        which applies the default border radius of a `solara.Column`, i.e. `4px`.
+    * `notch`: Whether to display a speech bubble style notch on the side of the message.
+    * `style`: CSS styles to apply to the component. Either a string or a dictionary. Applied to the container of the message.
+    * `classes`: A list of CSS classes to apply to the component. Applied to the same container.
+    """
+    style_flat = solara.util._flatten_style(style)
+
+    if "border-radius" not in style_flat:
+        style_flat += f" border-radius: {border_radius if border_radius is not None else ''};"
+    if f"border-top-{'right' if user else 'left'}-radius" not in style_flat:
+        style_flat += f" border-top-{'right' if user else 'left'}-radius: 0;"
+    if "padding" not in style_flat:
+        style_flat += " padding: .5em 1.5em;"
+
+    msg_uuid = solara.use_memo(lambda: str(uuid.uuid4()), dependencies=[])
+    with solara.Row(
+        justify="end" if user else "start",
+        style={"flex-direction": "row-reverse" if user else "row", "padding": "5px"},
+    ):
+        if avatar is not False:
+            with solara.v.Avatar(color=avatar_background_color if avatar_background_color is not None else color):
+                if avatar is None and name is not None:
+                    initials = "".join([word[:1] for word in name.split(" ")])
+                    solara.HTML(tag="span", unsafe_innerHTML=initials, classes=["headline"])
+                elif isinstance(avatar, solara.Element):
+                    solara.display(avatar)
+                elif isinstance(avatar, str) and avatar.startswith("mdi-"):
+                    solara.v.Icon(children=[avatar])
+                else:
+                    solara.HTML(tag="img", attributes={"src": avatar, "width": "100%"})
+        classes_new = classes + ["chat-message-" + msg_uuid, "right" if user else "left"]
+        with solara.Column(
+            classes=classes_new,
+            gap=0,
+            style=style_flat,
+        ):
+            if name is not None:
+                solara.Text(name, style="font-weight: bold;", classes=["message-name", "right" if user else "left"])
+            for child in children:
+                if isinstance(child, solara.Element):
+                    solara.display(child)
+                else:
+                    solara.Markdown(child)
+        # we use the uuid to generate 'scoped' CSS, i.e. css that only applies to the component instance.
+        extra_styles = (
+            f""".chat-message-{msg_uuid}:before{{
+                content: '';
+                position: absolute;
+                width: 0;
+                height: 0;
+                border: 6px solid;
+                top: 0;
+            }}
+            .chat-message-{msg_uuid}.left:before{{
+                left: -12px;
+                border-color: var(--color) var(--color) transparent transparent;
+            }}
+            .chat-message-{msg_uuid}.right:before{{
+                right: -12px;
+                border-color: var(--color) transparent transparent var(--color);
+            }}"""
+            if notch
+            else ""
+        )
+        solara.Style(
+            f"""
+            .chat-message-{msg_uuid}{{
+                --color: {color};
+                max-width: 75%;
+                position: relative;
+            }}
+            .chat-message-{msg_uuid}.left{{
+                    border-top-left-radius: 0;
+                    background-color:var(--color);
+                    { "margin-left: 10px !important;" if notch else ""}
+            }}
+            .chat-message-{msg_uuid}.right{{
+                    border-top-right-radius: 0;
+                    background-color:var(--color);
+                    { "margin-right: 10px !important;" if notch else ""}
+            }}
+            {extra_styles}
+            """
+        )

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