refactor executors module

Author: Archmonger

src/reactpy/asgi/__init__.py

@@ -0,0 +1,5 @@
+from reactpy.executors.asgi.middleware import ReactPyMiddleware
+from reactpy.executors.asgi.pyscript import ReactPyPyscript
+from reactpy.executors.asgi.standalone import ReactPy
+
+__all__ = ["ReactPy", "ReactPyMiddleware", "ReactPyPyscript"]

src/reactpy/asgi/executors/__init__.py src/reactpy/executors/__init__.pysrc/reactpy/asgi/executors/__init__.py renamed to src/reactpy/executors/__init__.py

@@ -18,18 +18,18 @@
 from typing_extensions import Unpack
 
 from reactpy import config
-from reactpy.asgi.types import (
+from reactpy.core.hooks import ConnectionContext
+from reactpy.core.layout import Layout
+from reactpy.core.serve import serve_layout
+from reactpy.executors.asgi.types import (
     AsgiApp,
     AsgiHttpApp,
     AsgiLifespanApp,
     AsgiWebsocketApp,
     AsgiWebsocketReceive,
     AsgiWebsocketSend,
 )
-from reactpy.asgi.utils import check_path, import_components, process_settings
-from reactpy.core.hooks import ConnectionContext
-from reactpy.core.layout import Layout
-from reactpy.core.serve import serve_layout
+from reactpy.executors.utils import check_path, import_components, process_settings
 from reactpy.types import Connection, Location, ReactPyConfig, RootComponentConstructor
 
 _logger = logging.getLogger(__name__)
@@ -90,7 +90,7 @@ def __init__(
 
         # Directory attributes
         self.web_modules_dir = config.REACTPY_WEB_MODULES_DIR.current
-        self.static_dir = Path(__file__).parent.parent / "static"
+        self.static_dir = Path(__file__).parent.parent.parent / "static"
 
         # Initialize the sub-applications
         self.component_dispatch_app = ComponentDispatchApp(parent=self)

src/reactpy/executors/asgi/__init__.py

@@ -12,14 +12,14 @@
 from typing_extensions import Unpack
 
 from reactpy import html
-from reactpy.asgi.executors.standalone import ReactPy, ReactPyApp
-from reactpy.asgi.middleware import ReactPyMiddleware
-from reactpy.asgi.utils import vdom_head_to_html
+from reactpy.executors.asgi.middleware import ReactPyMiddleware
+from reactpy.executors.asgi.standalone import ReactPy, ReactPyApp
+from reactpy.executors.utils import vdom_head_to_html
 from reactpy.pyscript.utils import pyscript_component_html, pyscript_setup_html
 from reactpy.types import ReactPyConfig, VdomDict
 
 
-class ReactPyPyodide(ReactPy):
+class ReactPyPyscript(ReactPy):
     def __init__(
         self,
         *file_paths: str | Path,
@@ -34,7 +34,7 @@ def __init__(
         **settings: Unpack[ReactPyConfig],
     ) -> None:
         """Variant of ReactPy's standalone that only performs Client-Side Rendering (CSR) via
-        Pyodide (using the PyScript API).
+        PyScript (using the Pyodide interpreter).
 
         This ASGI webserver is only used to serve the initial HTML document and static files.
 
@@ -87,7 +87,7 @@ def match_dispatch_path(self, scope: WebSocketScope) -> bool:
 class ReactPyPyodideApp(ReactPyApp):
     """ReactPy's standalone ASGI application for Client-Side Rendering (CSR)."""
 
-    parent: ReactPyPyodide
+    parent: ReactPyPyscript
     _index_html = ""
     _etag = ""
     _last_modified = ""

src/reactpy/asgi/middleware.py src/reactpy/executors/asgi/middleware.pysrc/reactpy/asgi/middleware.py renamed to src/reactpy/executors/asgi/middleware.py

@@ -13,14 +13,16 @@
 from typing_extensions import Unpack
 
 from reactpy import html
-from reactpy.asgi.middleware import ReactPyMiddleware
-from reactpy.asgi.types import AsgiApp, AsgiHttpApp, AsgiLifespanApp, AsgiWebsocketApp
-from reactpy.asgi.utils import (
-    asgi_component_html,
-    import_dotted_path,
-    vdom_head_to_html,
+from reactpy.executors.asgi.middleware import ReactPyMiddleware
+from reactpy.executors.asgi.types import (
+    AsgiApp,
+    AsgiHttpApp,
+    AsgiLifespanApp,
+    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
 
 _logger = getLogger(__name__)
 
@@ -209,7 +211,7 @@ def render_index_html(self) -> None:
             f'<html lang="{self.parent.html_lang}">'
             f"{vdom_head_to_html(self.parent.html_head)}"
             "<body>"
-            f"{asgi_component_html(element_id='app', class_='', component_path='')}"
+            f"{server_side_component_html(element_id='app', class_='', component_path='')}"
             "</body>"
             "</html>"
         )

src/reactpy/asgi/executors/pyodide.py src/reactpy/executors/asgi/pyscript.pysrc/reactpy/asgi/executors/pyodide.py renamed to src/reactpy/executors/asgi/pyscript.py

@@ -2,7 +2,6 @@
 
 import logging
 from collections.abc import Iterable
-from importlib import import_module
 from typing import Any
 
 from reactpy._option import Option
@@ -14,31 +13,11 @@
     REACTPY_RECONNECT_MAX_RETRIES,
 )
 from reactpy.types import ReactPyConfig, VdomDict
-from reactpy.utils import vdom_to_html
+from reactpy.utils import import_dotted_path, vdom_to_html
 
 logger = logging.getLogger(__name__)
 
 
-def import_dotted_path(dotted_path: str) -> Any:
-    """Imports a dotted path and returns the callable."""
-    if "." not in dotted_path:
-        raise ValueError(f'"{dotted_path}" is not a valid dotted path.')
-
-    module_name, component_name = dotted_path.rsplit(".", 1)
-
-    try:
-        module = import_module(module_name)
-    except ImportError as error:
-        msg = f'ReactPy failed to import "{module_name}"'
-        raise ImportError(msg) from error
-
-    try:
-        return getattr(module, component_name)
-    except AttributeError as error:
-        msg = f'ReactPy failed to import "{component_name}" from "{module_name}"'
-        raise AttributeError(msg) from error
-
-
 def import_components(dotted_paths: Iterable[str]) -> dict[str, Any]:
     """Imports a list of dotted paths and returns the callables."""
     return {
@@ -82,7 +61,9 @@ def process_settings(settings: ReactPyConfig) -> None:
             raise ValueError(f'Unknown ReactPy setting "{setting}".')
 
 
-def asgi_component_html(element_id: str, class_: str, component_path: str) -> str:
+def server_side_component_html(
+    element_id: str, class_: str, component_path: str
+) -> str:
     return (
         f'<div id="{element_id}" class="{class_}"></div>'
         '<script type="module" crossorigin="anonymous">'

src/reactpy/asgi/executors/standalone.py src/reactpy/executors/asgi/standalone.pysrc/reactpy/asgi/executors/standalone.py renamed to src/reactpy/executors/asgi/standalone.py

@@ -2,6 +2,7 @@
 
 import re
 from collections.abc import Iterable
+from importlib import import_module
 from itertools import chain
 from typing import Any, Callable, Generic, TypeVar, Union, cast
 
@@ -313,3 +314,23 @@ def _vdom_attr_to_html_str(key: str, value: Any) -> tuple[str, str]:
 
 # Pattern for delimitting camelCase names (e.g. camelCase to camel-case)
 _CAMEL_CASE_SUB_PATTERN = re.compile(r"(?<!^)(?=[A-Z])")
+
+
+def import_dotted_path(dotted_path: str) -> Any:
+    """Imports a dotted path and returns the callable."""
+    if "." not in dotted_path:
+        raise ValueError(f'"{dotted_path}" is not a valid dotted path.')
+
+    module_name, component_name = dotted_path.rsplit(".", 1)
+
+    try:
+        module = import_module(module_name)
+    except ImportError as error:
+        msg = f'ReactPy failed to import "{module_name}"'
+        raise ImportError(msg) from error
+
+    try:
+        return getattr(module, component_name)
+    except AttributeError as error:
+        msg = f'ReactPy failed to import "{component_name}" from "{module_name}"'
+        raise AttributeError(msg) from error

src/reactpy/asgi/types.py src/reactpy/executors/asgi/types.pysrc/reactpy/asgi/types.py renamed to src/reactpy/executors/asgi/types.py

@@ -1,24 +1,7 @@
 import pytest
 
 from reactpy import config
-from reactpy.asgi import utils
-
-
-def test_invalid_dotted_path():
-    with pytest.raises(ValueError, match='"abc" is not a valid dotted path.'):
-        utils.import_dotted_path("abc")
-
-
-def test_invalid_component():
-    with pytest.raises(
-        AttributeError, match='ReactPy failed to import "foobar" from "reactpy"'
-    ):
-        utils.import_dotted_path("reactpy.foobar")
-
-
-def test_invalid_module():
-    with pytest.raises(ImportError, match='ReactPy failed to import "foo"'):
-        utils.import_dotted_path("foo.bar")
+from reactpy.executors import utils
 
 
 def test_invalid_vdom_head():