wip

Author: theomonnom

livekit-rtc/jupyter-html/src/App.tsx

@@ -18,7 +18,7 @@ import { ConnectionState } from 'livekit-client';
 export async function fetchJoinInfo(): Promise<{ url: string; token: string }> {
   const invoke = (window as any).google?.colab?.kernel?.invokeFunction;
   if (invoke) {
-    const res = await invoke("create_join_token", []);
+    const res = await invoke("get_join_token", []);
     return res.data["application/json"];
   } else if ((window as any).jupyterFetchJoinToken) {
     return await (window as any).jupyterFetchJoinToken();

livekit-rtc/livekit/rtc/jupyter.py

@@ -1,28 +1,58 @@
+from __future__ import annotations
+
 import atexit
+import sys
 import contextlib
 import os
-from IPython.core.display import HTML
+from IPython.core.display import HTML, JSON
 from importlib.resources import as_file, files
 
 _resource_stack = contextlib.ExitStack()
 atexit.register(_resource_stack.close)
 
 
-def display_room() -> HTML:
-    try:
-        from google.colab import secrets
+def display_room(url: str | None = None, token: str | None = None) -> HTML:
+    """
+    Display a LiveKit room in Jupyter or Google Colab.
+
+    Args:
+        url (str | None): The LiveKit room URL. If None, the function attempts
+            to use the LIVEKIT_JUPYTER_URL environment variable in a local or
+            Colab environment.
+        token (str | None): The LiveKit join token. If None, the function
+            attempts to use the LIVEKIT_JUPYTER_URL environment variable in a
+            local or Colab environment.
+
+    Returns:
+        IPython.core.display.HTML: The HTML object that embeds the LiveKit room.
+
+    Raises:
+        ValueError: If both `url` and `token` are None and
+            `LIVEKIT_JUPYTER_URL` is not set.
+    """
+    IN_COLAB = "google.colab" in sys.modules
+
+    if url is None and token is None:
+        if IN_COLAB:
+            from google.colab import userdata
+
+            LIVEKIT_JUPYTER_URL = userdata.get("LIVEKIT_JUPYTER_URL")
+        else:
+            LIVEKIT_JUPYTER_URL = os.environ.get("LIVEKIT_JUPYTER_URL")
+
+        if not LIVEKIT_JUPYTER_URL:
+            raise ValueError("LIVEKIT_JUPYTER_URL must be set (or url/token must be provided).")
+
+    if IN_COLAB:
+        from google.colab import output
 
-        LIVEKIT_JUPYTER_URL = secrets.get("LIVEKIT_JUPYTER_URL")
-    except ImportError:
-        LIVEKIT_JUPYTER_URL = os.environ.get("LIVEKIT_JUPYTER_URL")
+        def create_join_token():
+            return JSON({"url": url or "", "token": token or ""})
 
-    if not LIVEKIT_JUPYTER_URL:
-        raise ValueError(
-            "LIVEKIT_JUPYTER_URL must be set via Google Colab secrets or as an environment variable."
-        )
+        output.register_callback("get_join_token", create_join_token)
 
+    # Load the local HTML file that embeds the LiveKit client
     index_path = files("livekit.rtc.resources") / "jupyter-html" / "index.html"
     index_path = _resource_stack.enter_context(as_file(index_path))
-    html_text = index_path.read_text()
 
-    return HTML(html_text)
+    return HTML(index_path.read_text())