Add configuration option to standlone reactpy to auto-load pyscript

Author: Archmonger

src/reactpy/executors/asgi/pyscript.py

@@ -2,6 +2,7 @@
 
 import hashlib
 import re
+from collections.abc import Sequence
 from dataclasses import dataclass
 from datetime import datetime, timezone
 from email.utils import formatdate
@@ -23,7 +24,7 @@ class ReactPyPyscript(ReactPy):
     def __init__(
         self,
         *file_paths: str | Path,
-        extra_py: tuple[str, ...] = (),
+        extra_py: Sequence[str] = (),
         extra_js: dict[str, str] | None = None,
         pyscript_config: dict[str, Any] | None = None,
         root_name: str = "root",

src/reactpy/executors/asgi/standalone.py

@@ -21,8 +21,14 @@
     AsgiWebsocketApp,
 )
 from reactpy.executors.utils import server_side_component_html, vdom_head_to_html
-from reactpy.types import ReactPyConfig, RootComponentConstructor, VdomDict
-from reactpy.utils import import_dotted_path
+from reactpy.pyscript.utils import pyscript_setup_html
+from reactpy.types import (
+    PyScriptOptions,
+    ReactPyConfig,
+    RootComponentConstructor,
+    VdomDict,
+)
+from reactpy.utils import html_to_vdom, import_dotted_path
 
 _logger = getLogger(__name__)
 
@@ -37,6 +43,8 @@ def __init__(
         http_headers: dict[str, str] | None = None,
         html_head: VdomDict | None = None,
         html_lang: str = "en",
+        pyscript_setup: bool = False,
+        pyscript_options: PyScriptOptions | None = None,
         **settings: Unpack[ReactPyConfig],
     ) -> None:
         """ReactPy's standalone ASGI application.
@@ -46,6 +54,8 @@ def __init__(
             http_headers: Additional headers to include in the HTTP response for the base HTML document.
             html_head: Additional head elements to include in the HTML response.
             html_lang: The language of the HTML document.
+            pyscript_setup: Whether to automatically load PyScript within your HTML head.
+            pyscript_options: Options to configure PyScript behavior.
             settings: Global ReactPy configuration settings that affect behavior and performance.
         """
         super().__init__(app=ReactPyApp(self), root_components=[], **settings)
@@ -55,6 +65,16 @@ def __init__(
         self.html_head = html_head or html.head()
         self.html_lang = html_lang
 
+        if pyscript_setup:
+            self.html_head.setdefault("children", [])
+            pyscript_options = pyscript_options or {}
+            extra_py = pyscript_options.get("extra_py", [])
+            extra_js = pyscript_options.get("extra_js", {})
+            config = pyscript_options.get("config", {})
+            self.html_head["children"].append(  # type: ignore
+                html_to_vdom(pyscript_setup_html(extra_py, extra_js, config))
+            )
+
     def match_dispatch_path(self, scope: asgi_types.WebSocketScope) -> bool:
         """Method override to remove `dotted_path` from the dispatcher URL."""
         return str(scope["path"]) == self.dispatcher_path

src/reactpy/pyscript/components.py

@@ -1,48 +1,44 @@
 from __future__ import annotations
 
+from pathlib import Path
 from typing import TYPE_CHECKING
-from uuid import uuid4
 
-from reactpy import component, hooks, html
-from reactpy.pyscript.utils import render_pyscript_executor
+from reactpy import component, hooks
+from reactpy.pyscript.utils import pyscript_component_html
 from reactpy.types import ComponentType
-from reactpy.utils import vdom_to_html
+from reactpy.utils import html_to_vdom
 
 if TYPE_CHECKING:
     from reactpy.types import VdomDict
 
 
 @component
 def _pyscript_component(
-    *file_paths: str,
+    *file_paths: str | Path,
     initial: str | VdomDict = "",
     root: str = "root",
 ) -> None | VdomDict:
     if not file_paths:
         raise ValueError("At least one file path must be provided.")
 
     rendered, set_rendered = hooks.use_state(False)
-    uuid = hooks.use_ref(uuid4().hex.replace("-", "")).current
-    initial = initial if isinstance(initial, str) else vdom_to_html(initial)
-    executor = render_pyscript_executor(file_paths=file_paths, uuid=uuid, root=root)
+    initial = html_to_vdom(initial) if isinstance(initial, str) else initial
 
     if not rendered:
         # FIXME: This is needed to properly re-render PyScript during a WebSocket
         # disconnection / reconnection. There may be a better way to do this in the future.
         set_rendered(True)
         return None
 
-    return html.fragment(
-        html.div(
-            {"id": f"pyscript-{uuid}", "className": "pyscript", "data-uuid": uuid},
-            initial,
-        ),
-        html.script({"type": "py"}, executor),
+    result = html_to_vdom(
+        pyscript_component_html(tuple(str(fp) for fp in file_paths), initial, root)
     )
+    result["tagName"] = ""
+    return result
 
 
 def pyscript_component(
-    *file_paths: str,
+    *file_paths: str | Path,
     initial: str | VdomDict | ComponentType = "",
     root: str = "root",
 ) -> ComponentType:

src/reactpy/pyscript/utils.py

@@ -48,7 +48,7 @@ def minify_python(source: str):
 )
 
 
-def render_pyscript_executor(file_paths: tuple[str, ...], uuid: str, root: str) -> str:
+def pyscript_executor_html(file_paths: Sequence[str], uuid: str, root: str) -> str:
     """Inserts the user's code into the PyScript template using pattern matching."""
     # Create a valid PyScript executor by replacing the template values
     executor = PYSCRIPT_COMPONENT_TEMPLATE.replace("UUID", uuid)
@@ -63,19 +63,23 @@ def render_pyscript_executor(file_paths: tuple[str, ...], uuid: str, root: str)
     user_code = user_code.replace("\t", "    ")  # Normalize the text
     user_code = textwrap.indent(user_code, "    ")  # Add indentation to match template
 
+    # Ensure the root component exists
+    if f"def {root}():" not in user_code:
+        raise ValueError(
+            f"Could not find the root component function '{root}' in your PyScript file(s)."
+        )
+
     # Insert the user code into the PyScript template
     return executor.replace("    def root(): ...", user_code)
 
 
 def pyscript_component_html(
-    file_paths: tuple[str, ...], initial: str | VdomDict, root: str
+    file_paths: Sequence[str], initial: str | VdomDict, root: str
 ) -> str:
     """Renders a PyScript component with the user's code."""
     _initial = initial if isinstance(initial, str) else vdom_to_html(initial)
     uuid = uuid4().hex
-    executor_code = render_pyscript_executor(
-        file_paths=file_paths, uuid=uuid, root=root
-    )
+    executor_code = pyscript_executor_html(file_paths=file_paths, uuid=uuid, root=root)
 
     return (
         f'<div id="pyscript-{uuid}" class="pyscript" data-uuid="{uuid}">'