solara-ui 1.37.2__tar.gz → 1.38.0__tar.gz

{solara_ui-1.37.2 → solara_ui-1.38.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: solara-ui
-Version: 1.37.2
+Version: 1.38.0
 Dynamic: Summary
 Project-URL: Home, https://www.github.com/widgetti/solara
 Project-URL: Documentation, https://solara.dev

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/__init__.py

@@ -1,6 +1,6 @@
 """Build webapps using IPywidgets"""
 
-__version__ = "1.37.2"
+__version__ = "1.38.0"
 github_url = "https://github.com/widgetti/solara"
 git_branch = "master"
 

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/components/cross_filter.py

@@ -275,14 +275,14 @@ def CrossFilterSlider(
         with solara.HBox(align_items="center"):
             label = f"Select {column} {mode} " if not invert else f"Drop {column} {mode} "
 
-            if py_types[column] == int:
+            if py_types[column] is int:
                 if isinstance(filter_value, int):
                     solara.SliderInt(label=label, value=filter_value, min=vmin, max=vmax, on_value=set_filter_value, disabled=not enable, thumb_label=False)
                 else:
                     solara.Error(f"Filter value is not an integer type, but {type(filter_value)} (value = {filter_value})")
                 if filter_value is not None:
                     solara.Text(f"{filter_value:,}")
-            elif py_types[column] == float:
+            elif py_types[column] is float:
                 if isinstance(filter_value, float):
                     solara.SliderFloat(label=label, value=filter_value, min=vmin, max=vmax, on_value=set_filter_value, disabled=not enable, thumb_label=False)
                 else:

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/minisettings.py

@@ -14,7 +14,7 @@ def _get_type(annotation):
         if annotation == Optional[check_type]:
             return check_type
     if hasattr(annotation, "__origin__"):
-        if annotation.__origin__ == dict:
+        if annotation.__origin__ is dict:
             return dict
     return annotation
 
@@ -72,13 +72,13 @@ def convert(annotation, value: str) -> Any:
             annotation = sub_type
             values = value.split(",")
             return [convert(sub_type, k) for k in values]
-    if annotation == str:
+    if annotation is str:
         return value
-    elif annotation == int:
+    elif annotation is int:
         return int(value)
-    elif annotation == float:
+    elif annotation is float:
         return float(value)
-    elif annotation == bool:
+    elif annotation is bool:
         if value in ("True", "true", "1"):
             return True
         elif value in ("False", "false", "0"):

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/server/flask.py

@@ -199,7 +199,7 @@ def nbext(dir, filename):
     for directory in server.nbextensions_directories:
         file = directory / dir / filename
         if file.exists():
-            return send_from_directory(directory, dir + os.path.sep + filename)
+            return send_from_directory(directory, dir + "/" + filename)
     return flask.Response("not found", status=404)
 
 

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/server/starlette.py

@@ -9,6 +9,7 @@ import threading
 import typing
 from typing import Any, Dict, List, Optional, Set, Union, cast
 from uuid import uuid4
+import warnings
 
 import anyio
 import starlette.websockets
@@ -85,7 +86,11 @@ prefix = ""
 # Since starlette seems to accept really large values for http, lets do the same for websockets
 # An arbitrarily large value we settled on for now is 32kb
 # If we don't do this, users with many cookies will fail to get a websocket connection.
-websockets.legacy.http.MAX_LINE = 1024 * 32
+ws_version = tuple(map(int, websockets.__version__.split(".")))
+if ws_version[0] >= 13:
+    websockets.legacy.http.MAX_LINE_LENGTH = int(os.environ.get("WEBSOCKETS_MAX_LINE_LENGTH", str(1024 * 32)))  # type: ignore
+else:
+    websockets.legacy.http.MAX_LINE = 1024 * 32  # type: ignore
 
 
 class WebsocketDebugInfo:
@@ -322,17 +327,45 @@ def close(request: Request):
 
 
 async def root(request: Request, fullpath: str = ""):
+    forwarded_host = request.headers.get("x-forwarded-host")
+    forwarded_proto = request.headers.get("x-forwarded-proto")
+    host = request.headers.get("host")
+    if forwarded_proto and forwarded_proto != request.scope["scheme"]:
+        warnings.warn(f"""Header x-forwarded-proto={forwarded_proto!r} does not match scheme={request.scope['scheme']!r} as given by the asgi framework (probably uvicorn)
+
+This might be a configuration mismatch behind a reverse proxy and can cause issues with redirect urls, and auth.
+
+Most likely, you need to trust your reverse proxy server, see:
+    https://solara.dev/documentation/getting_started/deploying/self-hosted
+
+If you use uvicorn (the default when you use `solara run`), make sure you
+configure the following environment variables for uvicorn correctly:
+UVICORN_PROXY_HEADERS=1  # only needed for uvicorn < 0.10, since it is the default after 0.10
+FORWARDED_ALLOW_IPS="127.0.0.1"  # 127.0.0.1 is the default, replace this by the ip of the proxy server
+
+Make sure you replace the IP with the correct IP of the reverse proxy server (instead of 127.0.0.1).
+
+If you are sure that only the reverse proxy can reach the solara server, you can consider setting:
+FORWARDED_ALLOW_IPS="*" # This can be a security risk, only use when you know what you are doing
+""")
     if settings.oauth.private and not has_auth_support:
         raise RuntimeError("SOLARA_OAUTH_PRIVATE requires solara-enterprise")
     root_path = settings.main.root_path or ""
     if not settings.main.base_url:
+        # Note:
+        # starlette does not respect x-forwarded-host, and therefore
+        # base_url and expected_origin below could be different
+        # x-forwarded-host should only be considered if the same criteria in
+        # uvicorn's ProxyHeadersMiddleware accepts x-forwarded-proto
         settings.main.base_url = str(request.base_url)
     # if not explicltly set,
+    configured_root_path = settings.main.root_path
+    scope = request.scope
+    root_path_asgi = scope.get("route_root_path", scope.get("root_path", ""))
     if settings.main.root_path is None:
         # use the default root path from the app, which seems to also include the path
         # if we are mounted under a path
-        scope = request.scope
-        root_path = scope.get("route_root_path", scope.get("root_path", ""))
+        root_path = root_path_asgi
         logger.debug("root_path: %s", root_path)
         # or use the script-name header, for instance when running under a reverse proxy
         script_name = request.headers.get("script-name")
@@ -345,6 +378,51 @@ async def root(request: Request, fullpath: str = ""):
             root_path = script_name
         settings.main.root_path = root_path
 
+    # lets be flexible about the trailing slash
+    # TODO: maybe we should be more strict about the trailing slash
+    naked_root_path = settings.main.root_path.rstrip("/")
+    naked_base_url = settings.main.base_url.rstrip("/")
+    if not naked_base_url.endswith(naked_root_path):
+        msg = f"""base url {naked_base_url!r} does not end with root path {naked_root_path!r}
+
+This could be a configuration mismatch behind a reverse proxy and can cause issues with redirect urls, and auth.
+
+See also https://solara.dev/documentation/getting_started/deploying/self-hosted
+"""
+        if "script-name" in request.headers:
+            msg += f"""It looks like the reverse proxy sets the script-name header to {request.headers['script-name']!r}
+            """
+        if "x-script-name" in request.headers:
+            msg += f"""It looks like the reverse proxy sets the x-script-name header to {request.headers['x-script-name']!r}
+            """
+        if configured_root_path:
+            msg += f"""It looks like the root path was configured to {configured_root_path!r} in the settings
+            """
+        if root_path_asgi:
+            msg += f"""It looks like the root path set by the asgi framework was configured to {root_path_asgi!r}
+            """
+        warnings.warn(msg)
+    if host and forwarded_host and forwarded_proto:
+        port = request.base_url.port
+        ports = {"http": 80, "https": 443}
+        expected_origin = f"{forwarded_proto}://{forwarded_host}"
+        if port and port != ports[forwarded_proto]:
+            expected_origin += f":{port}"
+        starlette_origin = settings.main.base_url
+        # strip off trailing / because we compare to the naked root path
+        starlette_origin = starlette_origin.rstrip("/")
+        if naked_root_path:
+            # take off the root path
+            starlette_origin = starlette_origin[: -len(naked_root_path)]
+        if starlette_origin != expected_origin:
+            warnings.warn(f"""Origin as determined by starlette ({starlette_origin!r}) does not match expected origin ({expected_origin!r}) based on x-forwarded-proto ({forwarded_proto!r}) and x-forwarded-host ({forwarded_host!r}) headers.
+
+This might be a configuration mismatch behind a reverse proxy and can cause issues with redirect urls, and auth.
+Most likely your proxy server sets the host header incorrectly (value for this request was {host!r})
+
+See also https://solara.dev/documentation/getting_started/deploying/self-hosted
+""")
+
     request_path = request.url.path
     if request_path.startswith(root_path):
         request_path = request_path[len(root_path) :]
@@ -370,7 +448,7 @@ async def root(request: Request, fullpath: str = ""):
     # however, samesite=none requires Secure https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Set-Cookie/SameSite
     # when hosted on the localhost domain we can always set the Secure flag
     # to allow samesite https://developer.mozilla.org/en-US/docs/Web/HTTP/Cookies#restrict_access_to_cookies
-    if request.headers.get("x-forwarded-proto", "http") == "https" or request.base_url.hostname == "localhost":
+    if request.scope["scheme"] == "https" or request.headers.get("x-forwarded-proto", "http") == "https" or request.base_url.hostname == "localhost":
         samesite = "none"
         secure = True
     response.set_cookie(

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/server/static/solara_bootstrap.py

@@ -119,7 +119,7 @@ async def main():
     ]
     for dep in requirements:
         await micropip.install(dep, keep_going=True)
-    await micropip.install("/wheels/solara-1.37.2-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.38.0-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/server/utils.py

@@ -3,6 +3,7 @@ import logging
 import os
 from pathlib import Path
 import pdb
+import sys
 import traceback
 
 from rich import print
@@ -20,7 +21,13 @@ def start_error(title, msg, exception: Exception = None):
 def path_is_child_of(path: Path, parent: Path) -> bool:
     # We use os.path.normpath() because we do not want to follow symlinks
     # in editable installs, since some packages are symlinked
-    return os.path.normpath(path).startswith(os.path.normpath(parent))
+    path_string = os.path.normpath(path)
+    parent_string = os.path.normpath(parent)
+    if sys.platform == "win32":
+        # on windows, we sometimes get different casing (only seen on CI)
+        path_string = path_string.lower()
+        parent_string = parent_string.lower()
+    return path_string.startswith(parent_string)
 
 
 @contextlib.contextmanager

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/test/pytest_plugin.py

@@ -38,6 +38,7 @@ TEST_PORT_START = int(os.environ.get("PORT", "18765")) + 100  # do not interfere
 TEST_HOST = solara.server.settings.main.host
 TIMEOUT = float(os.environ.get("SOLARA_PW_TIMEOUT", "18"))
 PYTEST_IPYWIDGETS_SOLARA_APP_WAIT_TIMEOUT = int(os.environ.get("PYTEST_IPYWIDGETS_SOLARA_APP_WAIT_TIMEOUT", "10"))
+runners = os.environ.get("SOLARA_TEST_RUNNERS", "solara,voila,jupyter_lab,jupyter_notebook").split(",")
 
 
 @pytest.fixture(scope="session")
@@ -264,10 +265,13 @@ class ServerVoila(ServerBase):
             raise RuntimeError("Jupyter server already running, use lsof -i :{self.port} to find the process and kill it")
         cmd = (
             "voila --no-browser --VoilaTest.log_level=DEBUG --Voila.port_retries=0 --VoilaExecutor.timeout=240"
-            f" --Voila.port={self.port} --show_tracebacks=True {self.notebook_path} --enable_nbextensions=True"
+            f' --Voila.port={self.port} --show_tracebacks=True "{self.notebook_path}" --enable_nbextensions=True'
         )
         logger.info(f"Starting Voila server at {self.base_url} with command {cmd}")
-        args = shlex.split(cmd)
+        if sys.platform == "win32":
+            args = cmd
+        else:
+            args = shlex.split(cmd)
         self.popen = subprocess.Popen(args, shell=False, stdout=sys.stdout, stderr=sys.stderr, stdin=None)
         self.started.set()
 
@@ -294,15 +298,21 @@ class ServerJupyter(ServerBase):
     def serve(self):
         if self.has_started():
             raise RuntimeError(f"Jupyter server already running, use lsof -i :{self.port} to find the process and kill it")
-        cmd = f'jupyter lab --port={self.port} --no-browser --ServerApp.token="" --port-retries=0 {self.notebook_path}'
+        cmd = f'jupyter lab --port={self.port} --no-browser --ServerApp.token="" --port-retries=0 "{self.notebook_path}"'
         logger.info(f"Starting Jupyter (lab) server at {self.base_url} with command {cmd}")
-        args = shlex.split(cmd)
+        if sys.platform == "win32":
+            args = cmd
+        else:
+            args = shlex.split(cmd)
         self.popen = subprocess.Popen(args, shell=False, stdout=sys.stdout, stderr=sys.stderr, stdin=None)
         self.started.set()
 
 
 @pytest.fixture(scope="session")
 def voila_server(pytestconfig: Any, notebook_path):
+    if "voila" not in runners:
+        yield None
+        return
     port = pytestconfig.getoption("--voila-port")
     host = pytestconfig.getoption("--solara-host")
     write_notebook(["print('hello')"], notebook_path)
@@ -317,6 +327,9 @@ def voila_server(pytestconfig: Any, notebook_path):
 
 @pytest.fixture(scope="session")
 def jupyter_server(pytestconfig: Any, notebook_path):
+    if "jupyter_lab" not in runners and "jupyter_notebook" not in runners:
+        yield None
+        return
     port = pytestconfig.getoption("--jupyter-port")
     host = pytestconfig.getoption("--solara-host")
     write_notebook(["print('hello')"], notebook_path)
@@ -520,9 +533,6 @@ def create_runner_solara(solara_server, solara_app, page_session: "playwright.sy
         yield run
 
 
-runners = os.environ.get("SOLARA_TEST_RUNNERS", "solara,voila,jupyter_lab,jupyter_notebook").split(",")
-
-
 @pytest.fixture(params=runners)
 def ipywidgets_runner(
     solara_server,

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/toestand.py

@@ -144,7 +144,6 @@ class ValueBase(Generic[T]):
         for listener2, scope in self.listeners2[scope_id].copy():
             if scope is not None:
                 scopes.add(scope)
-        stack = contextlib.ExitStack()
         with contextlib.ExitStack() as stack:
             for scope in scopes:
                 stack.enter_context(scope)

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/website/pages/doc_use_download.py

@@ -20,7 +20,7 @@ def DownloadFile(file_path=file_path, url=url, expected_size=expected_size, on_d
         status = "Done 🎉"
     else:
         MEGABYTES = 2.0**20.0
-        status = "Downloading {}... ({:6.2f}/{:6.2f} MB)".format(file_path, downloaded_size / MEGABYTES, expected_size / MEGABYTES)
+        status = f"Downloading {file_path}... ({downloaded_size / MEGABYTES:6.2f}/{expected_size / MEGABYTES:6.2f} MB)"
     # status = "hi"
     # return MarkdownIt(f'{status}')
     assert download.progress is not None

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/website/pages/documentation/advanced/content/30-enterprise/10-oauth.md

@@ -170,13 +170,13 @@ Please note that Python 3.6 is not supported for Solara OAuth.
 
 ### Wrong redirection
 
-If the redirection back to solara return to the wrong address, it might be due to solara not choosing the right default for `SOLARA_BASE_URL`. For instance this variable could be set to `SOLARA_BASE_URL=https://solara.dev` for the solara.dev server. If you application runs behind a subpath, e.g. `/myapp`, you might have to set `SOLARA_ROOT_PATH=/myapp`.
+If the redirection back to solara return to the wrong address, it might be due to solara not choosing the right default for `SOLARA_BASE_URL`. This can happen in a situation where you have multiple reverse proxies that communicate via https and therefore need to set the Host header. For instance this variable could be set to `SOLARA_BASE_URL=https://solara.dev` for the solara.dev server. If you application runs behind a subpath, e.g. `/myapp`, you might have to set `SOLARA_ROOT_PATH=/myapp`.
 
 
 ### Wrong schema detected for redirect URL
 
-Solara needs to give the OAuth providers a redirect URL to get back to your Solara application after navigating to the OAuth provider website. For our documentation server, we ask the OAuth provider to redirect to `https://solara.dev/_solara/auth/authorize`. The protocol part (`https`) and the domain name part (`solara.dev`) or this URL is constructed from the request URL (what the browser sends to the server).
+Solara needs to give the OAuth providers a redirect URL to get back to your Solara application after navigating to the OAuth provider website. For our documentation server, we ask the OAuth provider to redirect to `https://solara.dev/_solara/auth/authorize`. The protocol part (`https`) and the domain name part (`solara.dev`) of this URL is constructed from the request (what the browser sends to the server).
 
-If you are running Solara behind a reverse proxy server (like nginx), make sure that the `X-Forwarded-Proto` and `Host` headers are forwarded correctly so Solara can construct the correct redirect URL to send to the OAuth provider.
+If you are running Solara behind a reverse proxy server (like nginx), make sure that the `X-Forwarded-Proto` and `Host` headers are forwarded correctly, and the proxy server is trusted by uvicorn (by configuring the `FORWARDED_ALLOW_IPS` environment variable) so Solara can construct the correct redirect URL to send to the OAuth provider.
 
 See our [self hosted deployment](https://solara.dev/documentation/getting_started/deploying/self-hosted) for more information on how to configure your reverse proxy server.

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/website/pages/documentation/getting_started/content/04-tutorials/_data_science.ipynb

@@ -69,7 +69,7 @@
     "\n",
     "\n",
     "df = px.data.iris()\n",
-    "df\n"
+    "df"
    ]
   },
   {
@@ -163,6 +163,7 @@
     "columns = list(df.columns)\n",
     "x_axis = solara.reactive(\"sepal_length\")\n",
     "\n",
+    "\n",
     "@solara.component\n",
     "def Page():\n",
     "    # Create a scatter plot by passing \"x_axis.value\" to px.scatter\n",
@@ -170,10 +171,10 @@
     "    # and re-execute this function when x_axis value changes\n",
     "    fig = px.scatter(df, x_axis.value, \"sepal_width\")\n",
     "    solara.FigurePlotly(fig)\n",
-    "    \n",
+    "\n",
     "    # Pass x_axis to Select component\n",
     "    # The select will control the x_axis reactive variable\n",
-    "    solara.Select(label=\"X-axis\", value=x_axis, values=columns)\n"
+    "    solara.Select(label=\"X-axis\", value=x_axis, values=columns)"
    ]
   },
   {
@@ -219,12 +220,13 @@
    "source": [
     "y_axis = solara.reactive(\"sepal_width\")\n",
     "\n",
+    "\n",
     "@solara.component\n",
     "def Page():\n",
     "    fig = px.scatter(df, x_axis.value, y_axis.value)\n",
     "    solara.FigurePlotly(fig)\n",
     "    solara.Select(label=\"X-axis\", value=x_axis, values=columns)\n",
-    "    solara.Select(label=\"Y-axis\", value=y_axis, values=columns)       "
+    "    solara.Select(label=\"Y-axis\", value=y_axis, values=columns)"
    ]
   },
   {
@@ -267,8 +269,7 @@
     "    solara.Select(label=\"X-axis\", value=x_axis, values=columns)\n",
     "    solara.Select(label=\"Y-axis\", value=y_axis, values=columns)\n",
     "    # display it pre-formatted using the backticks `` using Markdown\n",
-    "    solara.Markdown(f\"`{click_data}`\")\n",
-    "        "
+    "    solara.Markdown(f\"`{click_data}`\")"
    ]
   },
   {
@@ -319,7 +320,7 @@
     "        row_index = click_data.value[\"points\"][\"point_indexes\"][0]\n",
     "        x = click_data.value[\"points\"][\"xs\"][0]\n",
     "        y = click_data.value[\"points\"][\"ys\"][0]\n",
-    "        solara.Markdown(f\"`Click on index={row_index} x={x} y={y}`\")\n"
+    "        solara.Markdown(f\"`Click on index={row_index} x={x} y={y}`\")"
    ]
   },
   {
@@ -373,8 +374,8 @@
     "\n",
     "def find_nearest_neighbours(df, xcol, ycol, x, y, n=10):\n",
     "    df = df.copy()\n",
-    "    df[\"distance\"] = ((df[xcol] - x)**2 + (df[ycol] - y)**2)**0.5\n",
-    "    return df.sort_values('distance')[1:n+1]\n",
+    "    df[\"distance\"] = ((df[xcol] - x) ** 2 + (df[ycol] - y) ** 2) ** 0.5\n",
+    "    return df.sort_values(\"distance\")[1 : n + 1]\n",
     "\n",
     "\n",
     "@solara.component\n",
@@ -385,13 +386,12 @@
     "        x = click_data.value[\"points\"][\"xs\"][0]\n",
     "        y = click_data.value[\"points\"][\"ys\"][0]\n",
     "\n",
-    "        # add an indicator \n",
+    "        # add an indicator\n",
     "        fig.add_trace(px.scatter(x=[x], y=[y], text=[\"⭐️\"]).data[0])\n",
     "        df_nearest = find_nearest_neighbours(df, x_axis.value, y_axis.value, x, y, n=3)\n",
     "    else:\n",
     "        df_nearest = None\n",
     "\n",
-    "\n",
     "    solara.FigurePlotly(fig, on_click=click_data.set)\n",
     "    solara.Select(label=\"X-axis\", value=x_axis, values=columns)\n",
     "    solara.Select(label=\"Y-axis\", value=y_axis, values=columns)\n",

{solara_ui-1.37.2 → solara_ui-1.38.0}/solara/website/pages/documentation/getting_started/content/04-tutorials/_jupyter_dashboard_1.ipynb

@@ -348,8 +348,8 @@
     "from pathlib import Path\n",
     "import solara\n",
     "\n",
-    "ROOT = Path(solara.__file__).parent / 'website' / 'pages' / 'docs' / 'content' / '04-tutorial'\n",
-    "path = ROOT / Path('SF_crime_sample.csv.gz')\n",
+    "ROOT = Path(solara.__file__).parent / \"website\" / \"pages\" / \"docs\" / \"content\" / \"04-tutorial\"\n",
+    "path = ROOT / Path(\"SF_crime_sample.csv.gz\")\n",
     "url = \"https://raw.githubusercontent.com/widgetti/solara/master/solara/website/pages/docs/content/04-tutorial/SF_crime_sample.csv\"\n",
     "\n",
     "if path.exists():\n",
@@ -357,7 +357,7 @@
     "else:\n",
     "    df_crime = pd.read_csv(url)\n",
     "\n",
-    "df_crime\n"
+    "df_crime"
    ]
   },
   {
@@ -666,9 +666,9 @@
     }
    ],
    "source": [
-    "df_crime['Category'] = df_crime['Category'].str.title()\n",
-    "df_crime['PdDistrict'] = df_crime['PdDistrict'].str.title()\n",
-    "df_crime\n"
+    "df_crime[\"Category\"] = df_crime[\"Category\"].str.title()\n",
+    "df_crime[\"PdDistrict\"] = df_crime[\"PdDistrict\"].str.title()\n",
+    "df_crime"
    ]
   },
   {
@@ -687,12 +687,12 @@
    "outputs": [],
    "source": [
     "def crime_filter(df, district_values, category_values):\n",
-    "    df_dist = df.loc[df['PdDistrict'].isin(district_values)]\n",
-    "    df_category = df_dist.loc[df_dist['Category'].isin(category_values)]\n",
+    "    df_dist = df.loc[df[\"PdDistrict\"].isin(district_values)]\n",
+    "    df_category = df_dist.loc[df_dist[\"Category\"].isin(category_values)]\n",
     "    return df_category\n",
     "\n",
     "\n",
-    "dff_crime = crime_filter(df_crime, ['Bayview', 'Northern'], ['Vandalism', 'Assault', 'Robbery'])\n"
+    "dff_crime = crime_filter(df_crime, [\"Bayview\", \"Northern\"], [\"Vandalism\", \"Assault\", \"Robbery\"])"
    ]
   },
   {
@@ -723,24 +723,26 @@
    "source": [
     "import matplotlib.pyplot as plt\n",
     "\n",
+    "\n",
     "def crime_charts(df):\n",
-    "    cat_unique = df['Category'].value_counts()\n",
+    "    cat_unique = df[\"Category\"].value_counts()\n",
     "    cat_unique = cat_unique.reset_index()\n",
-    "    \n",
-    "    dist_unique = df['PdDistrict'].value_counts()\n",
+    "\n",
+    "    dist_unique = df[\"PdDistrict\"].value_counts()\n",
     "    dist_unique = dist_unique.reset_index()\n",
-    "    \n",
-    "    fig, (ax1, ax2) = plt.subplots(1, 2, figsize=(20,10))\n",
     "\n",
-    "    ax1.bar(cat_unique['Category'], cat_unique['count'])\n",
-    "    ax1.set_title('Amount of Criminal Case Based on Category')\n",
-    "    ax2.bar(dist_unique['PdDistrict'], dist_unique['count'])\n",
-    "    ax2.set_title('Amount of Criminal Case in Selected District')\n",
+    "    fig, (ax1, ax2) = plt.subplots(1, 2, figsize=(20, 10))\n",
+    "\n",
+    "    ax1.bar(cat_unique[\"Category\"], cat_unique[\"count\"])\n",
+    "    ax1.set_title(\"Amount of Criminal Case Based on Category\")\n",
+    "    ax2.bar(dist_unique[\"PdDistrict\"], dist_unique[\"count\"])\n",
+    "    ax2.set_title(\"Amount of Criminal Case in Selected District\")\n",
     "\n",
     "    display(fig)\n",
     "    plt.close(fig)\n",
     "\n",
-    "crime_charts(dff_crime)\n"
+    "\n",
+    "crime_charts(dff_crime)"
    ]
   },
   {
@@ -767,22 +769,28 @@
     "def crime_map(df):\n",
     "    latitude = 37.77\n",
     "    longitude = -122.42\n",
-    "    \n",
+    "\n",
     "    sanfran_map = folium.Map(location=[latitude, longitude], zoom_start=12)\n",
     "\n",
     "    incidents = folium.plugins.MarkerCluster().add_to(sanfran_map)\n",
     "\n",
     "    # loop through the dataframe and add each data point to the mark cluster\n",
-    "    for lat, lng, label, in zip(df.Y, df.X, df.Category):\n",
+    "    for (\n",
+    "        lat,\n",
+    "        lng,\n",
+    "        label,\n",
+    "    ) in zip(df.Y, df.X, df.Category):\n",
     "        folium.Marker(\n",
-    "        location=[lat, lng],\n",
-    "        icon=None,\n",
-    "        popup=label,\n",
+    "            location=[lat, lng],\n",
+    "            icon=None,\n",
+    "            popup=label,\n",
     "        ).add_to(incidents)\n",
-    "    \n",
+    "\n",
     "    # show map\n",
     "    display(sanfran_map)\n",
-    "crime_map(dff_crime.iloc[0:50, :])\n"
+    "\n",
+    "\n",
+    "crime_map(dff_crime.iloc[0:50, :])"
    ]
   },
   {
@@ -805,9 +813,12 @@
    "outputs": [],
    "source": [
     "import solara\n",
-    "districts = solara.reactive(['Bayview', 'Northern'],)\n",
-    "categories = solara.reactive(['Vandalism', 'Assault', 'Robbery'])\n",
-    "limit = solara.reactive(100)\n"
+    "\n",
+    "districts = solara.reactive(\n",
+    "    [\"Bayview\", \"Northern\"],\n",
+    ")\n",
+    "categories = solara.reactive([\"Vandalism\", \"Assault\", \"Robbery\"])\n",
+    "limit = solara.reactive(100)"
    ]
   },
   {
@@ -833,12 +844,14 @@
     "    row_count = len(dff)\n",
     "    if row_count > limit.value:\n",
     "        solara.Warning(f\"Only showing the first {limit.value} of {row_count:,} crimes on map\")\n",
-    "    crime_map(dff.iloc[:limit.value])\n",
+    "    crime_map(dff.iloc[: limit.value])\n",
     "    if row_count > 0:\n",
     "        crime_charts(dff)\n",
     "    else:\n",
     "        solara.Warning(\"You filtered out all the data, no charts shown\")\n",
-    "View()\n"
+    "\n",
+    "\n",
+    "View()"
    ]
   },
   {
@@ -857,7 +870,7 @@
    "outputs": [],
    "source": [
     "limit.value = 70\n",
-    "districts.value = ['Soutern', 'Northern']\n"
+    "districts.value = [\"Soutern\", \"Northern\"]"
    ]
   },
   {
@@ -885,7 +898,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "solara.SelectMultiple('District', all_values=[str(k) for k in df_crime['PdDistrict'].unique().tolist()], values=districts)\n"
+    "solara.SelectMultiple(\"District\", all_values=[str(k) for k in df_crime[\"PdDistrict\"].unique().tolist()], values=districts)"
    ]
   },
   {
@@ -907,11 +920,13 @@
    "source": [
     "@solara.component\n",
     "def Controls():\n",
-    "    solara.SelectMultiple('District', all_values=[str(k) for k in df_crime['PdDistrict'].unique().tolist()], values=districts)\n",
-    "    solara.SelectMultiple('Category', all_values=[str(k) for k in df_crime['Category'].unique().tolist()], values=categories)\n",
+    "    solara.SelectMultiple(\"District\", all_values=[str(k) for k in df_crime[\"PdDistrict\"].unique().tolist()], values=districts)\n",
+    "    solara.SelectMultiple(\"Category\", all_values=[str(k) for k in df_crime[\"Category\"].unique().tolist()], values=categories)\n",
     "    solara.Text(\"Maximum number of rows to show on map\")\n",
-    "    solara.SliderInt('', value=limit, min=1, max=1000)\n",
-    "Controls()\n"
+    "    solara.SliderInt(\"\", value=limit, min=1, max=1000)\n",
+    "\n",
+    "\n",
+    "Controls()"
    ]
   },
   {
@@ -930,7 +945,7 @@
    "outputs": [],
    "source": [
     "# Note that we can read AND write reactive variables\n",
-    "categories.value = [*categories.value, 'Warrants']\n"
+    "categories.value = [*categories.value, \"Warrants\"]"
    ]
   },
   {
@@ -957,7 +972,9 @@
     "    with solara.Sidebar():\n",
     "        Controls()\n",
     "    View()\n",
-    "Page()\n"
+    "\n",
+    "\n",
+    "Page()"
    ]
   },
   {