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

solara/server/flask.py

@@ -74,7 +74,7 @@ class WebsocketWrapper(websocket.WebsocketWrapper):
         from anyio import to_thread
 
         try:
-            return await to_thread.run_sync(lambda: self.ws.receive())
+            return await to_thread.run_sync(lambda: self.ws.receive())  # type: ignore
         except simple_websocket.ws.ConnectionClosed:
             raise websocket.WebSocketDisconnect()
 

solara/server/kernel.py

@@ -196,7 +196,7 @@ def deserialize_binary_message(bmsg):
 SESSION_KEY = b"solara"
 
 
-class WebsocketStream(object):
+class WebsocketStream:
     def __init__(self, session, channel: str):
         self.session = session
         self.channel = channel
@@ -222,7 +222,7 @@ def send_websockets(websockets: Set[websocket.WebsocketWrapper], binary_msg):
 
 class SessionWebsocket(session.Session):
     def __init__(self, *args, **kwargs):
-        super(SessionWebsocket, self).__init__(*args, **kwargs)
+        super().__init__(*args, **kwargs)
         self.websockets: Set[websocket.WebsocketWrapper] = set()  # map from .. msg id to websocket?
 
     def close(self):
@@ -263,7 +263,7 @@ class Kernel(ipykernel.kernelbase.Kernel):
     banner = "solara"
 
     def __init__(self):
-        super(Kernel, self).__init__()
+        super().__init__()
         self.session = SessionWebsocket(parent=self, key=SESSION_KEY)
         self.msg_queue = queue.Queue()  # type: ignore
         self.stream = self.iopub_socket = WebsocketStream(self.session, "iopub")

solara/server/patch.py

@@ -255,6 +255,8 @@ def WidgetContextAwareThread__init__(self, *args, **kwargs):
 
 
 def Thread_debug_run(self):
+    if not hasattr(self, "current_context"):
+        return Thread__run(self)
     if self.current_context:
         kernel_context.set_context_for_thread(self.current_context, self)
         shell = self.current_context.kernel.shell

solara/server/reload.py

@@ -100,7 +100,7 @@ else:
                 self.directories.add(directory)
 
         def on_modified(self, event):
-            super(WatcherWatchdog, self).on_modified(event)
+            super().on_modified(event)
             logger.debug("Watch event: %s", event)
             if not event.is_directory:
                 if event.src_path in self.files:

solara/server/server.py

@@ -252,9 +252,65 @@ def read_root(path: str, root_path: str = "", render_kwargs={}, use_nbextensions
     else:
         nbextensions = []
 
+    from markupsafe import Markup
+
+    def resolve_static_path(path: str) -> Path:
+        # this solve a similar problem as the starlette and flask endpoints
+        # maybe this can be common code for all of them.
+        if path.startswith("/static/public/"):
+            directories = [default_app.directory.parent / "public"]
+            filename = path[len("/static/public/") :]
+        elif path.startswith("/static/assets/"):
+            directories = [default_app.directory.parent / "assets", solara_static.parent / "assets"]
+            filename = path[len("/static/assets/") :]
+        elif path.startswith("/static/"):
+            directories = [solara_static.parent / "static"]
+            filename = path[len("/static/") :]
+        else:
+            raise ValueError(f"invalid static path: {path}")
+        for directory in directories:
+            full_path = directory / filename
+            if full_path.exists():
+                return full_path
+        raise ValueError(f"static path not found: {filename} (path={path}), looked in {directories}")
+
+    def include_css(path: str) -> Markup:
+        filepath = resolve_static_path(path)
+        content, hash = solara.util.get_file_hash(filepath)
+        url = f"{root_path}{path}?v={hash}"
+        # when < 10k we embed, also when we use a url, it can be relative, which can break the url
+        embed = len(content) < 1024 * 10 and b"url" not in content
+        if embed:
+            content_utf8 = content.decode("utf-8")
+            code = f"<style>/*\npath={path}\n*/\n{content_utf8}</style>"
+        else:
+            code = f'<link rel="stylesheet" type="text/css" href="{url}">'
+        return Markup(code)
+
+    def include_js(path: str, module=False) -> Markup:
+        filepath = resolve_static_path(path)
+        content, hash = solara.util.get_file_hash(filepath)
+        content_utf8 = content.decode("utf-8")
+        url = f"{root_path}{path}?v={hash}"
+        # when < 10k we embed, but if we use currentScript, it can break things
+        embed = len(content) < 1024 * 10 and b"currentScript" not in content
+        if embed:
+            if module:
+                code = f'<script type="module">/*\npath={path}\n*/{content_utf8}</script>'
+            else:
+                code = f"<script>/*\npath={path}\n*/{content_utf8}</script>"
+        else:
+            if module:
+                code = f'<script type="module" src="{url}"></script>'
+            else:
+                code = f'<script src="{url}"></script>'
+        return Markup(code)
+
     resources = {
         "theme": "light",
         "nbextensions": nbextensions,
+        "include_css": include_css,
+        "include_js": include_js,
     }
     template: jinja2.Template = get_jinja_env(app_name="__default__").get_template(template_name)
     pre_rendered_html = ""
@@ -290,6 +346,7 @@ def read_root(path: str, root_path: str = "", render_kwargs={}, use_nbextensions
         "assets": settings.assets.dict(),
         "cdn": cdn,
         "ipywidget_major_version": ipywidgets_major,
+        "solara_version": solara.__version__,
         "platform": settings.main.platform,
         "vue3": vue3,
         "perform_check": settings.main.mode != "production" and solara.checks.should_perform_solara_check(),

solara/server/starlette.py

@@ -31,6 +31,8 @@ if has_solara_enterprise and sys.version_info[:2] > (3, 6):
 else:
     has_auth_support = False
 
+import solara
+from solara.server.threaded import ServerBase
 from starlette.applications import Starlette
 from starlette.exceptions import HTTPException
 from starlette.middleware import Middleware
@@ -42,9 +44,6 @@ from starlette.routing import Mount, Route, WebSocketRoute
 from starlette.staticfiles import StaticFiles
 from starlette.types import Receive, Scope, Send
 
-import solara
-from solara.server.threaded import ServerBase
-
 from . import app as appmod
 from . import kernel_context, server, settings, telemetry, websocket
 from .cdn_helper import cdn_url_path, get_path
@@ -106,7 +105,7 @@ class WebsocketWrapper(websocket.WebsocketWrapper):
     async def receive(self):
         if hasattr(self.portal, "start_task_soon"):
             # version 3+
-            fut = self.portal.start_task_soon(self.ws.receive)
+            fut = self.portal.start_task_soon(self.ws.receive)  # type: ignore
         else:
             fut = self.portal.spawn_task(self.ws.receive)  # type: ignore
 
@@ -155,7 +154,7 @@ class ServerStarlette(ServerBase):
             asyncio.set_event_loop(loop)
 
         # uvloop will trigger a: RuntimeError: There is no current event loop in thread 'fastapi-thread'
-        config = Config(self.app, host=self.host, port=self.port, **self.kwargs, loop="asyncio")
+        config = Config(self.app, host=self.host, port=self.port, **self.kwargs, access_log=False, loop="asyncio")
         self.server = Server(config=config)
         self.started.set()
         self.server.run()
@@ -169,7 +168,6 @@ async def kernel_connection(ws: starlette.websockets.WebSocket):
     session_id = ws.cookies.get(server.COOKIE_KEY_SESSION_ID)
 
     if settings.oauth.private and not has_auth_support:
-        breakpoint()
         raise RuntimeError("SOLARA_OAUTH_PRIVATE requires solara-enterprise")
     if has_auth_support and "session" in ws.scope:
         user = get_user(ws)
@@ -211,14 +209,14 @@ async def kernel_connection(ws: starlette.websockets.WebSocket):
                 telemetry.connection_close(session_id)
 
         # sometimes throws: RuntimeError: Already running asyncio in this thread
-        anyio.run(run)
+        anyio.run(run)  # type: ignore
 
     # this portal allows us to sync call the websocket calls from this current event loop we are in
     # each websocket however, is handled from a separate thread
     try:
         async with anyio.from_thread.BlockingPortal() as portal:
             ws_wrapper = WebsocketWrapper(ws, portal)
-            thread_return = anyio.to_thread.run_sync(websocket_thread_runner, ws, portal)
+            thread_return = anyio.to_thread.run_sync(websocket_thread_runner, ws, portal)  # type: ignore
             await thread_return
     finally:
         if settings.main.experimental_performance:
@@ -249,7 +247,8 @@ async def root(request: Request, fullpath: str = ""):
     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
-        root_path = request.scope.get("root_path", "")
+        scope = request.scope
+        root_path = scope.get("route_root_path", scope.get("root_path", ""))
         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")

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.25.0-py2.py3-none-any.whl", keep_going=True)
+    await micropip.install("/wheels/solara-1.25.1-py2.py3-none-any.whl", keep_going=True)
     import solara
 
     el = solara.Warning("lala")

solara/server/telemetry.py

@@ -172,11 +172,14 @@ _thread = threading.Thread(target=_track, daemon=True)
 
 
 def server_start():
-    if settings.main.mode == "development":
+    if _auto_restart_enabled:
         return
     if not settings.telemetry.mixpanel_enable:
         return
-    _thread.start()
+    try:
+        _thread.start()
+    except RuntimeError:
+        pass
 
 
 def server_stop():

solara/server/templates/loader-plain.html

@@ -11,7 +11,7 @@
             </v-card-title>
         </v-card>
     </div>
-    <div v-else style="isolation: isolate">
+    <div v-else>
         <jupyter-widget-mount-point v-if="!loading" mount-id="solara-main">
             A widget with mount-id="solara-main" should go here
         </jupyter-widget-mount-point>

solara/server/templates/loader-solara.html

@@ -28,7 +28,7 @@
             <b>Made with <a href="https://solara.dev">Solara</a></b>
         </div>
     </div>
-    <div v-else style="isolation: isolate">
+    <div v-else>
         <jupyter-widget-mount-point mount-id="solara-main">
             A widget with mount-id="solara-main" should go here
         </jupyter-widget-mount-point>

solara/server/templates/solara.html.j2

@@ -15,31 +15,24 @@
     {{ pre_rendered_css | safe }}
 
     {% if vue3 == True %}
-    <link href="{{cdn}}/@widgetti/solara-vuetify3-app@1.0.0/dist/main.css" rel="stylesheet"></link>
+    <link href="{{cdn}}/@widgetti/solara-vuetify3-app@1.1.0/dist/main.css" rel="stylesheet"></link>
     {% else %}
-    <link href="{{cdn}}/@widgetti/solara-vuetify-app@6.0.0/dist/main.css" rel="stylesheet"></link>
+    <link href="{{cdn}}/@widgetti/solara-vuetify-app@6.1.0/dist/main.css" rel="stylesheet"></link>
     {% endif %}
 
 
     {% if assets.fontawesome_enabled == True %}
     <link rel="stylesheet" href="{{cdn}}{{assets.fontawesome_path}}" type="text/css">
     {% endif %}
-    <link href="{{root_path}}/static/highlight.css" rel="stylesheet">
-    <link href="{{root_path}}/static/highlight-dark.css" rel="stylesheet">
-    </link>
-    <link href="{{root_path}}/static/assets/style.css" rel="stylesheet">
-    </link>
-    <link href="{{root_path}}/static/assets/index.css" rel="stylesheet">
-    </link>
+    {{ resources.include_css("/static/highlight.css") }}
+    {{ resources.include_css("/static/highlight-dark.css") }}
+    {{ resources.include_css("/static/assets/style.css") }}
     {% if theme.variant == "light" %}
-    <link href="{{root_path}}/static/assets/theme-light.css" rel="stylesheet">
-    </link>
+        {{ resources.include_css("/static/assets/theme-light.css") }}
     {% elif theme.variant == "dark" %}
-    <link href="{{root_path}}/static/assets/theme-dark.css" rel="stylesheet">
-    </link>
+        {{ resources.include_css("/static/assets/theme-dark.css") }}
     {% endif %}
-    <link href="{{root_path}}/static/assets/custom.css" rel="stylesheet">
-    </link>
+    {{ resources.include_css("/static/assets/custom.css") }}
 
     <script id="jupyter-config-data" type="application/json">
     {
@@ -64,7 +57,7 @@
         {% endraw -%}
         {# {% include "transition-domino.html" %} #}
         {% include "loader-" ~ theme.loader ~ ".html" %}
-        <v-overlay :value="(connectionStatus != 'connected') & wasConnected">
+        <v-overlay style="z-index: 100002;" :value="(connectionStatus != 'connected') & wasConnected">
             <v-progress-circular indeterminate size="128" style="text-align: center;">Server
                 disconnected.</v-progress-circular>
         </v-overlay>
@@ -201,7 +194,7 @@
 
 <body data-base-url="{{root_path}}/static/">
     {% if perform_check %}
-    <iframe src="https://solara.dev/static/public/success.html?system=solara&check=html" style="display: none"></iframe>
+    <iframe src="https://solara.dev/static/public/success.html?system=solara&check=html&version={{solara_version}}" style="display: none"></iframe>
     {% endif %}
     {% if theme.variant == "auto" %}
     {% endif %}
@@ -216,16 +209,18 @@
     </div>
     {% block after_pre_rendered_html %}{% endblock %}
     {% if vue3 == True %}
+        <link href="{{cdn}}/@widgetti/solara-vuetify3-app@1.1.0/dist/fonts.css" rel="stylesheet"></link>
         {% if production %}
-        <script src="{{cdn}}/@widgetti/solara-vuetify3-app@1.0.0/dist/solara-vuetify-app{{ipywidget_major_version}}.min.js"></script>
+        <script src="{{cdn}}/@widgetti/solara-vuetify3-app@1.1.0/dist/solara-vuetify-app{{ipywidget_major_version}}.min.js"></script>
         {% else %}
-        <script src="{{cdn}}/@widgetti/solara-vuetify3-app@1.0.0/dist/solara-vuetify-app{{ipywidget_major_version}}.js"></script>
+        <script src="{{cdn}}/@widgetti/solara-vuetify3-app@1.1.0/dist/solara-vuetify-app{{ipywidget_major_version}}.js"></script>
         {% endif %}
     {% else %}
+        <link href="{{cdn}}/@widgetti/solara-vuetify-app@6.1.0/dist/fonts.css" rel="stylesheet" fetchpriority="low"></link>
         {% if production %}
-        <script src="{{cdn}}/@widgetti/solara-vuetify-app@6.0.0/dist/solara-vuetify-app{{ipywidget_major_version}}.min.js"></script>
+        <script src="{{cdn}}/@widgetti/solara-vuetify-app@6.1.0/dist/solara-vuetify-app{{ipywidget_major_version}}.min.js"></script>
         {% else %}
-        <script src="{{cdn}}/@widgetti/solara-vuetify-app@6.0.0/dist/solara-vuetify-app{{ipywidget_major_version}}.js"></script>
+        <script src="{{cdn}}/@widgetti/solara-vuetify-app@6.1.0/dist/solara-vuetify-app{{ipywidget_major_version}}.js"></script>
         {% endif %}
     {% endif %}
     {% if production %}
@@ -238,13 +233,13 @@
         console.log("rootPath", solara.rootPath);
     </script>
 
-    <script src="{{root_path}}/static/assets/custom.js"></script>
-    <script src="{{root_path}}/static/assets/theme.js"></script>
+    {{ resources.include_js("/static/assets/custom.js") }}
+    {{ resources.include_js("/static/assets/theme.js") }}
 
     <script src="{{cdn}}/requirejs@2.3.6/require.js" crossorigin="anonymous">
     </script>
-    <script src="{{root_path}}/static/main-vuetify.js"></script>
-    <script src="{{root_path}}/static/ansi.js"></script>
+    {{ resources.include_js("/static/main-vuetify.js") }}
+    {{ resources.include_js("/static/ansi.js") }}
 
     <script>
         solara.production = {{ production | tojson | safe }};

solara/util.py

@@ -1,11 +1,12 @@
 import base64
 import contextlib
+import hashlib
 import os
 import sys
 import threading
 from collections import abc
 from pathlib import Path
-from typing import TYPE_CHECKING, Dict, List, Union
+from typing import TYPE_CHECKING, Dict, List, Tuple, Union
 
 if TYPE_CHECKING:
     import numpy as np
@@ -252,3 +253,15 @@ def parse_timedelta(size: str) -> float:
         return float(size[:-1])
     else:
         return float(size)
+
+
+def get_file_hash(path: Path, algorithm="md5") -> Tuple[bytes, str]:
+    """Compute the hash of a file. Note that we also return the file content as bytes."""
+    data = path.read_bytes()
+    if sys.version_info[:2] < (3, 9):
+        # usedforsecurity is only available in Python 3.9+
+        h = hashlib.new(algorithm)
+    else:
+        h = hashlib.new(algorithm, usedforsecurity=False)  # type: ignore
+    h.update(data)
+    return data, h.hexdigest()

solara/website/pages/apps/jupyter-dashboard-1.py

@@ -82,18 +82,16 @@ def crime_map(df):
 
 @solara.component
 def View():
-    with solara.Column():
-        dff = crime_filter(df_crime, districts.value, categories.value)
-        row_count = len(dff)
-        if row_count > limit.value:
-            solara.Warning(f"Only showing the first {limit.value} of {row_count:,} crimes on map")
-        with solara.Column():
-            with solara.Column(style={"max-height": "400px"}):
-                crime_map(dff.iloc[: limit.value])
-            if row_count > 0:
-                crime_charts(dff)
-            else:
-                solara.Warning("You filtered out all the data, no charts shown")
+    dff = crime_filter(df_crime, districts.value, categories.value)
+    row_count = len(dff)
+    if row_count > limit.value:
+        solara.Warning(f"Only showing the first {limit.value} of {row_count:,} crimes on map")
+    with solara.Column(style={"max-height": "400px"}):
+        crime_map(dff.iloc[: limit.value])
+    if row_count > 0:
+        crime_charts(dff)
+    else:
+        solara.Warning("You filtered out all the data, no charts shown")
 
 
 @solara.component

solara/website/pages/apps/scatter.py

@@ -28,10 +28,10 @@ class State:
 
     @staticmethod
     def load_sample():
-        State.x.value = str("gdpPercap")
-        State.y.value = str("lifeExp")
-        State.size.value = str("pop")
-        State.color.value = str("continent")
+        State.x.value = "gdpPercap"
+        State.y.value = "lifeExp"
+        State.size.value = "pop"
+        State.color.value = "continent"
         State.logx.value = True
         State.df.value = df_sample
 

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 %s... (%6.2f/%6.2f MB)" % (file_path, downloaded_size / MEGABYTES, expected_size / MEGABYTES)
+        status = "Downloading {}... ({:6.2f}/{:6.2f} MB)".format(file_path, downloaded_size / MEGABYTES, expected_size / MEGABYTES)
     # status = "hi"
     # return MarkdownIt(f'{status}')
     assert download.progress is not None

solara/website/pages/docs/content/04-tutorial/_jupyter_dashboard_1.ipynb

@@ -7,12 +7,12 @@
    "source": [
     "# Build your Jupyter dashboard using Solara\n",
     "\n",
-    "Welcome to **the** first part of a series of tutorial**s** that will show you how to create a dashboard in Jupyter and deploy it as a standalone web **app**. **Importantly, there will be** no need to rewrite your app in a different framework, no need to use a non-Python solution, **and** no need to use JavaScript or CSS.\n",
+    "Welcome to the first part of a series of tutorials that will show you how to create a dashboard in Jupyter and deploy it as a standalone web app. Importantly, there will be no need to rewrite your app in a different framework, no need to use a non-Python solution, and no need to use JavaScript or CSS.\n",
     "\n",
-    "Jupyter notebooks are an incredible tool for data analysis, **since they enable** blending code, visualization and narrative in**to** a single document.\n",
+    "Jupyter notebooks are an incredible tool for data analysis, since they enable blending code, visualization and narrative into a single document.\n",
     "However, if the insights need to be presented to a non-technical audience, we usually do not want to show the code.\n",
     "\n",
-    "In this tutorial, we will create a simple dashboard using Solara's UI components. **The final product will** allow an end-user to filter,\n",
+    "In this tutorial, we will create a simple dashboard using Solara's UI components. The final product will allow an end-user to filter,\n",
     "visualize and explore a dataset on a map.\n",
     "\n",
     "![image](/static/public/docs/tutorial/jupyter-dashboard1.jpg)\n",
@@ -33,7 +33,7 @@
     "\n",
     "## The start\n",
     "\n",
-    "We will use a subsample of the [San Fanfrisco crime dataset](https://www.kaggle.com/competitions/sf-crime/data) which **contains information on types of crimes and where they were committed**.\n",
+    "We will use a subsample of the [San Fanfrisco crime dataset](https://www.kaggle.com/competitions/sf-crime/data) which contains information on types of crimes and where they were committed.\n",
     "\n",
     "[Download the CSV file](https://raw.githubusercontent.com/widgetti/solara/master/solara/website/pages/docs/content/04-tutorial/SF_crime_sample.csv.gz) if you want to run this locally, or let the code below sort it out."
    ]
@@ -365,7 +365,7 @@
    "id": "08a9644a",
    "metadata": {},
    "source": [
-    "The data looks clean but since we will work with the `Category` and `PdDistrict` column data, lets **convert those columns to title case**."
+    "The data looks clean but since we will work with the `Category` and `PdDistrict` column data, lets convert those columns to title case."
    ]
   },
   {
@@ -676,7 +676,7 @@
    "id": "62df988f",
    "metadata": {},
    "source": [
-    "Using proper software engineering practices, we write a function that filter**s** a dataframe to contain only the rows that match our chosen districts and categories."
+    "Using proper software engineering practices, we write a function that filters a dataframe to contain only the rows that match our chosen districts and categories."
    ]
   },
   {
@@ -940,7 +940,7 @@
    "source": [
     "## The final dashboard\n",
     "\n",
-    "We now have two parts of our UI in separate cells. This can be an amazing experience when developing **in a** notebook, as it flows **naturally** in the data exploration process while writing your notebook.\n",
+    "We now have two parts of our UI in separate cells. This can be an amazing experience when developing in a notebook, as it flows naturally in the data exploration process while writing your notebook.\n",
     "\n",
     "However, your end user will probably want something more coherent. The components we created are perfectly re-usable, so we put them together in a single UI."
    ]
@@ -967,7 +967,7 @@
    "source": [
     "## Conclusions\n",
     "\n",
-    "Using Solara, you created an interactive dashboard **within a** Jupyter notebook. Your Solara components are declarative, and **when** using reactive variables also reactive. **Whether** you change a reactive variables via code or the UI elements, your visualizations and map update automatically.\n",
+    "Using Solara, you created an interactive dashboard within a Jupyter notebook. Your Solara components are declarative, and when using reactive variables also reactive. Whether you change a reactive variables via code or the UI elements, your visualizations and map update automatically.\n",
     "\n",
     "Your dashboard prototype now runs in your Jupyter notebook environment, but we still have a few steps to we want to take. In our next tutorial, we will focus on deploying our notebook, without making any code changes. In our third tutorial we will expand our dashboard with a few more components and focus on creating a more advanced layout.\n",
     "\n",

solara/website/pages/docs/content/10-howto/ipywidget_libraries.md

@@ -47,7 +47,7 @@ def Page():
     )
 ```
 
-Note that this is about the worst example of something that looks easy in ipyleaflet using the classical API becomes a but more involved in Solara.
+Note that this is about the worst example of something that looks easy in ipyleaflet using the classical API becoming a bit more involved in Solara.
 In practice, this does not happen often, and your code in general will be shorter and more readable.
 
 See also [the basic ipyleaflet example](/examples/libraries/ipyleaflet) and [the advanced ipyleaflet example](/examples/libraries/ipyleaflet_advanced).

solara/website/pages/docs/content/95-changelog.md

@@ -1,5 +1,13 @@
 # Solara Changelog
 
+## Version 1.25.1
+
+### Details
+
+* Performance: Removed unnecessary CSS and JS.
+* Performance: Quality of Life - JS and CSS resources automatically reloaded on version change.
+* Bug fix: overlay disabling navigation for display width < 960px.
+
 
 ## Version 1.25.0
 

solara/website/public/success.html

@@ -1,15 +1,24 @@
 <html>
-<script async src="https://www.googletagmanager.com/gtag/js?id=G-G985FTLWGQ"></script>
+<!-- Google Tag Manager -->
 <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag() { dataLayer.push(arguments); }
-    gtag('js', new Date());
-    gtag('config', 'G-G985FTLWGQ', {
-        cookie_flags: 'secure;samesite=none'
-    });
+(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+    new Date().getTime(),event:'gtm.js'});
+    var f=d.getElementsByTagName(s)[0], j=d.createElement(s), dl=l!='dataLayer'?'&l='+l:'';
+    j.async=true;
+    j.src='https://www.googletagmanager.com/gtm.js?id='+i+dl;
+    f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-KC98NKNL');
 </script>
+<!-- End Google Tag Manager -->
 
 <body>
+<!-- Google Tag Manager (noscript) -->
+<noscript>
+    <iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KC98NKNL"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe>
+</noscript>
+<!-- End Google Tag Manager (noscript) -->
+
     Used to detect failed Jupyter and Solara installations.
 </body>
 

solara/website/templates/index.html.j2

@@ -13,27 +13,25 @@
     <link rel="stylesheet" href="/_solara/cdn/@docsearch/css@3/dist/style.css" />
     <script src="/_solara/cdn/@docsearch/js@3"></script>
 
-    <!-- Google tag (gtag.js) -->
-    <script async src="https://www.googletagmanager.com/gtag/js?id=G-G985FTLWGQ"></script>
-    <script>
-    window.dataLayer = window.dataLayer || [];
-    function gtag(){dataLayer.push(arguments);}
-    gtag('js', new Date());
-
-    gtag('config', 'G-G985FTLWGQ', {
-        cookie_flags: 'secure;samesite=none'
-    });
-    </script>
-    <!-- End Google Analytics -->
+    <!-- Google Tag Manager -->
+    <script>(function(w,d,s,l,i){w[l]=w[l]||[];w[l].push({'gtm.start':
+    new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],
+    j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=
+    'https://www.googletagmanager.com/gtm.js?id='+i+dl;f.parentNode.insertBefore(j,f);
+    })(window,document,'script','dataLayer','GTM-KC98NKNL');</script>
+    <!-- End Google Tag Manager -->
 
-    <!-- MailChimp -->
-    <link href="//cdn-images.mailchimp.com/embedcode/classic-061523.css" rel="stylesheet" type="text/css">
-    <script type="text/javascript" src="//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js"></script>
     {{ super() }}
 {% endblock %}
 
 {% block after_pre_rendered_html %}
     {{ super() }}
+
+    <!-- Google Tag Manager (noscript) -->
+    <noscript><iframe src="https://www.googletagmanager.com/ns.html?id=GTM-KC98NKNL"
+    height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
+    <!-- End Google Tag Manager (noscript) -->
+
     <style id="algolia">
     .DocSearch-Button {
         background-color: rgb(255, 238, 197);
@@ -95,5 +93,8 @@
             });
         }
     </script>
+    <!-- MailChimp -->
+    <link href="//cdn-images.mailchimp.com/embedcode/classic-061523.css" rel="stylesheet" type="text/css">
+    <script type="text/javascript" src="//s3.amazonaws.com/downloads.mailchimp.com/js/mc-validate.js"></script>
 {% endblock %}
 ```