solara-ui 1.31.0__py2.py3-none-any.whl → 1.32.0__py2.py3-none-any.whl

solara/toestand.py

@@ -77,7 +77,12 @@ def merge_state(d1: S, **kwargs) -> S:
     if dataclasses.is_dataclass(d1):
         return dataclasses.replace(d1, **kwargs)  # type: ignore
     if "pydantic" in sys.modules and isinstance(d1, sys.modules["pydantic"].BaseModel):
-        return type(d1)(**{**d1.dict(), **kwargs})  # type: ignore
+        module = sys.modules["pydantic"]
+        version_major = int(module.__version__.split(".")[0])
+        if version_major >= 2:
+            return d1.model_copy(update=kwargs)
+        else:
+            return d1.copy(update=kwargs)
     return cast(S, {**cast(dict, d1), **kwargs})
 
 
@@ -282,21 +287,25 @@ class KernelStoreValue(KernelStore[S]):
         return self.default_value
 
 
+def _create_key_callable(f: Callable[[], S]):
+    try:
+        prefix = f.__qualname__
+    except Exception:
+        prefix = repr(f)
+    with KernelStore.scope_lock:
+        index = KernelStore._type_counter[prefix]
+        KernelStore._type_counter[prefix] += 1
+    try:
+        key = f.__module__ + ":" + prefix + ":" + str(index)
+    except Exception:
+        key = prefix + ":" + str(index)
+    return key
+
+
 class KernelStoreFactory(KernelStore[S]):
     def __init__(self, factory: Callable[[], S], key=None):
         self.factory = factory
-        try:
-            prefix = factory.__qualname__
-        except Exception:
-            prefix = repr(factory)
-        if key is None:
-            with KernelStore.scope_lock:
-                index = self._type_counter[prefix]
-                self._type_counter[prefix] += 1
-            try:
-                key = factory.__module__ + ":" + prefix + ":" + str(index)
-            except Exception:
-                key = prefix + ":" + str(index)
+        key = key or _create_key_callable(factory)
         super().__init__(key=key)
 
     def initial_value(self) -> S:

solara/website/assets/custom.css

@@ -239,6 +239,16 @@ blockquote p:last-child {
     border-radius: 8px;
 }
 
+.v-navigation-drawer__content .algolia {
+    padding: 0.35rem;
+}
+
+@media screen and (max-width: 960px) {
+    .header-logo-container{
+        justify-content: center !important;
+    }
+}
+
 /* vuetify component overrides */
 
 .v-btn.solara-docs-button {
@@ -262,6 +272,9 @@ blockquote p:last-child {
 }
 
 /* header */
+.header-logo {
+    display: block;
+}
 .news {
     background-color: var(--color-primary);
     padding: 10px;

solara/website/components/algolia.py

@@ -0,0 +1,6 @@
+import solara
+
+
+@solara.component_vue("algolia_api.vue")
+def Algolia():
+    pass

solara/website/components/algolia_api.vue

@@ -12,9 +12,10 @@
                     rounded
                     clearable
                     ref="search"
-                    style="max-width: 50%; flex-grow: 1;"
+                    style="flex-grow: 1; max-width: 650px;"
                     @click="show($event, on);"
                     @keyup.enter="item = 0"
+                    class="algolia"
                 ></v-text-field>
         </template>
         <v-list v-if="results != null && results.length == 0">

solara/website/components/header.py

@@ -4,11 +4,7 @@ import solara
 import solara.lab
 from solara.alias import rv
 from solara.server import settings
-
-
-@solara.component_vue("algolia_api.vue")
-def Algolia():
-    pass
+from .algolia import Algolia
 
 
 @solara.component
@@ -31,21 +27,17 @@ def Header(
             )
         with solara.v.AppBar(tag="header", flat=True, class_="bg-primary-fade padding-40", height="auto", clipped_left=True):
             with rv.ToolbarTitle(class_="d-flex", style_="align-items:center"):
-                if route_current and len(route_current.children) > 0:
+                if route_current is not None and route_current.module is not None and hasattr(route_current.module, "Sidebar"):
                     with solara.Button(icon=True, class_="hidden-md-and-up", on_click=lambda: on_toggle_left_menu and on_toggle_left_menu()):
                         rv.Icon(children=["mdi-menu"])
-                with solara.Link(path_or_route="/"):
-                    solara.Image(router.root_path + f"/static/assets/images/logo{'_white' if dark_effective else ''}.svg")
-            rv.Spacer()
 
-            if (
-                route_current_with_children is not None
-                and route_current is not None
-                and route_current.path == "documentation"
-                and route_current_with_children.path == "/"
+            with solara.Row(
+                justify="start", classes=["header-logo-container"], style={"flex-grow": "1", "background-color": "transparent", "align-items": "center"}
             ):
-                solara.v.Spacer()
-            else:
+                with solara.Link(path_or_route="/"):
+                    solara.Image(router.root_path + f"/static/assets/images/logo{'_white' if dark_effective else ''}.svg", classes=["header-logo"])
+
+            with rv.Html(tag="ul", class_="main-menu menu d-none d-md-flex", style_="flex-grow: 1;"):
                 if settings.search.enabled:
                     from solara_enterprise.search.search import Search
 
@@ -53,7 +45,7 @@ def Header(
                 else:
                     with solara.Row(justify="end", style={"align-items": "center", "flex-grow": "1", "background-color": "transparent"}):
                         Algolia()
-            with rv.Html(tag="ul", class_="main-menu menu d-none d-md-flex"):
+
                 for route in all_routes:
                     if route.path in ["apps", "contact", "changelog"]:
                         continue

solara/website/components/sidebar.py

@@ -0,0 +1,91 @@
+import solara
+
+
+@solara.component
+def Sidebar():
+    route_current, all_routes = solara.use_route(-1)
+    router = solara.use_router()
+    if route_current is None:
+        return solara.Error("Page not found")
+
+    # Pick out documentation route, so we can use this on any page
+    for route in all_routes:
+        if route.path == "documentation":
+            all_routes = route.children
+            break
+
+    with solara.v.List(expand=True, nav=True, style_="height: 100%; display: flex; flex-direction: column;") as main:
+        with solara.v.ListItemGroup(v_model=router.path):
+            for route in all_routes:
+                if len(route.children) == 1 or route.path == "/":
+                    with solara.Link("/documentation/" + route.path if route.path != "/" else "/documentation"):
+                        with solara.v.ListItem(value="/documentation/" + route.path if route.path != "/" else "/documentation"):
+                            if route.path == "/":
+                                solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-home"])])
+                            solara.v.ListItemTitle(style_="padding: 0 20px;", children=[route.label])
+                else:
+                    with solara.v.ListGroup(
+                        v_slots=[
+                            {
+                                "name": "activator",
+                                "children": solara.v.ListItemTitle(
+                                    children=[route.label],
+                                    style_="padding: 0 20px;",
+                                ),
+                            }
+                        ],
+                        value=router.path.startswith("/documentation/" + route.path),
+                    ):
+                        for item in route.children:
+                            if item.path == "/":
+                                continue
+                            if item.children != [] and any([c.label is not None and c.path != "/" for c in item.children]):
+                                with solara.v.ListGroup(
+                                    v_slots=[
+                                        {
+                                            "name": "activator",
+                                            "children": solara.v.ListItemTitle(
+                                                children=[item.label],
+                                            ),
+                                        }
+                                    ],
+                                    sub_group=True,
+                                    no_action=True,
+                                    value=router.path.startswith("/documentation/" + route.path + "/" + item.path),
+                                ):
+                                    for subitem in item.children:
+                                        # skip pages that are only used to demonstrate Link or Router usage
+                                        if subitem.path == "/" or subitem.label is None:
+                                            continue
+                                        path = (
+                                            "/documentation/" + route.path + "/" + item.path + "/" + subitem.path
+                                            if item.path != "fullscreen"
+                                            else "/apps/" + subitem.path
+                                        )
+                                        with solara.Link(
+                                            path,
+                                        ):
+                                            with solara.v.ListItem(dense=True, style_="padding: 0 20px;", value=path):
+                                                solara.v.ListItemContent(
+                                                    children=[subitem.label],
+                                                )
+                            else:
+                                with solara.v.ListItemGroup(value="/documentation/" + route.path + "/" + item.path):
+                                    with solara.Link(
+                                        "/documentation/" + route.path + "/" + item.path,
+                                    ):
+                                        with solara.v.ListItem(dense=True, style_="padding: 0 20px;"):
+                                            solara.v.ListItemContent(
+                                                children=[item.label],
+                                            )
+        with solara.v.ListItemGroup():
+            with solara.Link("/contact"):
+                with solara.v.ListItem():
+                    solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-email"])])
+                    solara.v.ListItemTitle(style_="padding: 0 20px;", children=["Contact"])
+            with solara.Link("/changelog"):
+                with solara.v.ListItem():
+                    solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-history"])])
+                    solara.v.ListItemTitle(style_="padding: 0 20px;", children=["Changelog"])
+
+    return main

solara/website/pages/__init__.py

@@ -1,10 +1,9 @@
-import contextlib
-
 import solara
 from solara import autorouting
 from solara.alias import rv
 from solara.components.title import Title
 from solara.server import server
+from solara.website.components.algolia import Algolia
 
 from ..components import Header, Hero
 from ..components.mailchimp import MailChimp
@@ -237,39 +236,6 @@ def List(children=[], class_: str = None):
     return rv.Html(tag="ul", children=children, attributes={"class": class_})
 
 
-@solara.component
-def Sidebar():
-    route_current, all_routes = solara.use_route()
-    router = solara.use_router()
-    selected = router.path
-    with rv.Col(tag="aside", md=4, lg=3, class_="sidebar bg-grey d-none d-md-block") as main:
-        with List():
-            for route in all_routes:
-                if route.children and route.data is None:
-                    path = solara.resolve_path(route.children[0])
-                    path = getattr(route.module, "redirect", path)
-                    path = getattr(route.children[0].module, "redirect", path)
-                    with solara.Link(path) if path is not None else contextlib.nullcontext():
-                        with SimpleListItem(route.label, class_="active" if path == selected else None):
-                            with List():
-                                for child in route.children[1:]:
-                                    path = solara.resolve_path(child)
-                                    path = getattr(child.module, "redirect", path)
-                                    with solara.Link(path) if path is not None else contextlib.nullcontext():
-                                        title = child.label or "no label"
-                                        if callable(title):
-                                            title = "Error: dynamic title"
-                                        SimpleListItem(title, class_="active" if path == selected else None)
-                else:
-                    path = solara.resolve_path(route)
-                    path = getattr(route.module, "redirect", path)
-                    if route.children:
-                        path = getattr(route.children[0].module, "redirect", path)
-                    with solara.Link(path) if path is not None else contextlib.nullcontext():
-                        SimpleListItem(route.label, class_="active" if path == selected else None)
-    return main
-
-
 @solara.component
 def Layout(children=[]):
     router = solara.use_router()
@@ -476,17 +442,22 @@ def Layout(children=[]):
                     style_="flex-wrap: nowrap; margin: 0; min-height: calc(100vh - 215.5px);",
                     justify="center" if route_current is not None and route_current.path in ["documentation", "showcase"] else "start",
                 ):
-                    if route_current is not None and hasattr(route_current.module, "Sidebar"):
-                        route_current.module.Sidebar()  # type: ignore
-                    else:
-                        if route_current is not None and route_current.path not in ["documentation", "showcase", "contact", "changelog"]:
-                            Sidebar()
+                    if route_current is not None and route_current.module is not None and hasattr(route_current.module, "Sidebar"):
+                        with solara.v.NavigationDrawer(
+                            clipped=True,
+                            class_="d-none d-md-block",
+                            height="unset",
+                            style_="min-height: calc(100vh - 215.5px);",
+                            width="20rem",
+                            v_model=True,  # Forces menu to display even if it had somehow been closed
+                        ):
+                            route_current.module.Sidebar()
                     with rv.Col(
                         tag="main",
                         md=True,
                         class_="pa-0",
                         style_=f"""max-width: {'1024px' if route_current.path not in ['documentation', 'contact', 'changelog']
-                                               else 'unset'}; overflow: hidden auto;""",
+                                               else 'unset'}; overflow-x: hidden;""",
                     ):
                         if route_current is not None and route_current.path == "/":
                             with rv.Row(align="center"):
@@ -512,6 +483,7 @@ def Layout(children=[]):
                 overlay_opacity=0.5,
                 style_="height: 100vh",
             ):
+                Algolia()
                 with rv.List(nav=True):
                     with rv.ListItemGroup(active_class="text--primary"):
                         for route in all_routes:
@@ -520,32 +492,18 @@ def Layout(children=[]):
                             with solara.Link(route):
                                 solara.ListItem(route.label)
 
-            # Drawer navigation for sidebar
-            with rv.NavigationDrawer(
-                v_model=show_left_menu,
-                on_v_model=set_show_left_menu,
-                fixed=True,
-                absolute=True,
-                hide_overlay=False,
-                overlay_color="#000000",
-                overlay_opacity=0.5,
-                style_="height: 100vh",
-            ):
-                with rv.List(nav=True):
-                    current_path = router.path
-                    with rv.ListItemGroup(active_class="text--primary", v_model=current_path):
-                        for route in all_routes_sidebar:
-                            # this gets rid of the api/link child routes
-                            if len([k for k in route.children if k.label]) == 0:
-                                with solara.Link(route):
-                                    solara.ListItem(route.label, value=solara.resolve_path(route))
-                            else:
-                                with solara.ListItem(route.label or "no-title", value=solara.resolve_path(route) + "_no_select"):
-                                    for subroute in route.children:
-                                        if subroute.label:
-                                            with solara.Link(subroute):
-                                                with solara.ListItem(subroute.label, value=solara.resolve_path(subroute)):
-                                                    pass
+            if route_current is not None and route_current.module is not None and hasattr(route_current.module, "Sidebar"):
+                with solara.v.NavigationDrawer(
+                    absolute=True,
+                    clipped=True,
+                    class_="d-md-none d-block",
+                    height="unset",
+                    style_="min-height: 100vh;",
+                    v_model=show_left_menu,
+                    on_v_model=set_show_left_menu,
+                    width="20rem",
+                ):
+                    route_current.module.Sidebar()
 
     return main
 

solara/website/pages/changelog/__init__.py

@@ -1,8 +1,10 @@
 from pathlib import Path
 
 import solara
+from solara.website.components.sidebar import Sidebar
 
 title = "Changelog"
 HERE = Path(__file__)
 
 Page = solara.Markdown(Path(HERE.parent / "changelog.md").read_text())
+Sidebar = Sidebar

solara/website/pages/changelog/changelog.md

@@ -1,5 +1,17 @@
 # Solara Changelog
 
+
+## Version 1.31
+
+We changed solara from a single package into multiple packages.
+
+The `solara` package is a meta package that installs all the necessary dependencies to get started with Solara. By default, we install:
+
+  * [`pip install "solara-ui[all]"`](https://pypi.org/project/solara-ui)
+  * [`pip install "solara-server[starlette,dev]"`](https://pypi.org/project/solara-ui)
+
+Notebook users can simply install `solara-ui` if they do not need the solara-server. Read our [installation guide](https://solara.dev/documentation/getting_started/installing) for more information.
+
 ## Version 1.30.1
 
 ### Details

solara/website/pages/contact/__init__.py

@@ -1,8 +1,10 @@
 from pathlib import Path
 
 import solara
+from solara.website.components.sidebar import Sidebar
 
 title = "Contact"
 HERE = Path(__file__)
 
 Page = solara.Markdown(Path(HERE.parent / "contact.md").read_text())
+Sidebar = Sidebar

solara/website/pages/documentation/__init__.py

@@ -1,10 +1,12 @@
 from pathlib import Path
 
 import solara
+from solara.website.components.sidebar import Sidebar
 
 _title = "Documentation"
 
 HERE = Path(__file__).parent
+Sidebar = Sidebar
 
 route_order = ["/", "getting_started", "examples", "components", "api", "advanced", "faq"]
 
@@ -79,94 +81,6 @@ def Page(children=[]):
                 pass
 
 
-@solara.component
-def Sidebar():
-    route_current, all_routes = solara.use_route()
-    router = solara.use_router()
-    if route_current is None:
-        return solara.Error("Page not found")
-
-    with solara.v.NavigationDrawer(
-        clipped=True, width="20rem", height="unset", style_="min-height: calc(100vh - 215.5px);", class_="d-none d-md-block"
-    ) as main:
-        with solara.v.List(expand=True, nav=True, style_="height: calc(100vh - 215.5px); display: flex; flex-direction: column;"):
-            with solara.v.ListItemGroup(v_model=router.path):
-                for route in all_routes:
-                    if len(route.children) == 1 or route.path == "/":
-                        with solara.Link("/documentation/" + route.path if route.path != "/" else "/documentation"):
-                            with solara.v.ListItem(value="/documentation/" + route.path if route.path != "/" else "/documentation"):
-                                if route.path == "/":
-                                    solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-home"])])
-                                solara.v.ListItemTitle(style_="padding: 0 20px;", children=[route.label])
-                    else:
-                        with solara.v.ListGroup(
-                            v_slots=[
-                                {
-                                    "name": "activator",
-                                    "children": solara.v.ListItemTitle(
-                                        children=[route.label],
-                                        style_="padding: 0 20px;",
-                                    ),
-                                }
-                            ],
-                            value=router.path.startswith("/documentation/" + route.path),
-                        ):
-                            for item in route.children:
-                                if item.path == "/":
-                                    continue
-                                if item.children != [] and any([c.label is not None and c.path != "/" for c in item.children]):
-                                    with solara.v.ListGroup(
-                                        v_slots=[
-                                            {
-                                                "name": "activator",
-                                                "children": solara.v.ListItemTitle(
-                                                    children=[item.label],
-                                                ),
-                                            }
-                                        ],
-                                        sub_group=True,
-                                        no_action=True,
-                                        value=router.path.startswith("/documentation/" + route.path + "/" + item.path),
-                                    ):
-                                        for subitem in item.children:
-                                            # skip pages that are only used to demonstrate Link or Router usage
-                                            if subitem.path == "/" or subitem.label is None:
-                                                continue
-                                            path = (
-                                                "/documentation/" + route.path + "/" + item.path + "/" + subitem.path
-                                                if item.path != "fullscreen"
-                                                else "/apps/" + subitem.path
-                                            )
-                                            with solara.Link(
-                                                path,
-                                            ):
-                                                with solara.v.ListItem(dense=True, style_="padding: 0 20px;", value=path):
-                                                    solara.v.ListItemContent(
-                                                        children=[subitem.label],
-                                                    )
-                                else:
-                                    with solara.v.ListItemGroup(value="/documentation/" + route.path + "/" + item.path):
-                                        with solara.Link(
-                                            "/documentation/" + route.path + "/" + item.path,
-                                        ):
-                                            with solara.v.ListItem(dense=True, style_="padding: 0 20px;"):
-                                                solara.v.ListItemContent(
-                                                    children=[item.label],
-                                                )
-            solara.v.Spacer(style_="flex-grow: 1;")
-            with solara.v.ListItemGroup():
-                with solara.Link("/contact"):
-                    with solara.v.ListItem():
-                        solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-email"])])
-                        solara.v.ListItemTitle(style_="padding: 0 20px;", children=["Contact"])
-                with solara.Link("/changelog"):
-                    with solara.v.ListItem():
-                        solara.v.ListItemIcon(children=[solara.v.Icon(children=["mdi-history"])])
-                        solara.v.ListItemTitle(style_="padding: 0 20px;", children=["Changelog"])
-
-    return main
-
-
 @solara.component
 def Layout(children=[]):
     route_current, all_routes = solara.use_route()