reactpy 2.0.0b4__py3-none-any.whl → 2.0.0b6__py3-none-any.whl

reactpy/core/vdom.py

@@ -3,10 +3,9 @@ from __future__ import annotations
 
 import json
 import re
-from collections.abc import Mapping, Sequence
+from collections.abc import Callable, Mapping, Sequence
 from typing import (
     Any,
-    Callable,
     cast,
     overload,
 )
@@ -18,11 +17,11 @@ from reactpy.config import REACTPY_CHECK_JSON_ATTRS, REACTPY_DEBUG
 from reactpy.core._f_back import f_module_name
 from reactpy.core.events import EventHandler, to_event_handler_function
 from reactpy.types import (
-    ComponentType,
+    BaseEventHandler,
+    Component,
     CustomVdomConstructor,
     EllipsisRepr,
     EventHandlerDict,
-    EventHandlerType,
     ImportSourceDict,
     InlineJavaScript,
     InlineJavaScriptDict,
@@ -42,7 +41,6 @@ VDOM_JSON_SCHEMA = {
             "type": "object",
             "properties": {
                 "tagName": {"type": "string"},
-                "key": {"type": ["string", "number", "null"]},
                 "error": {"type": "string"},
                 "children": {"$ref": "#/definitions/elementChildren"},
                 "attributes": {"type": "object"},
@@ -171,7 +169,6 @@ class Vdom:
     ) -> VdomDict:
         """The entry point for the VDOM API, for example reactpy.html(<WE_ARE_HERE>)."""
         attributes, children = separate_attributes_and_children(attributes_and_children)
-        key = attributes.get("key", None)
         attributes, event_handlers, inline_javascript = (
             separate_attributes_handlers_and_inline_javascript(attributes)
         )
@@ -181,7 +178,6 @@ class Vdom:
         # Run custom constructor, if defined
         if self.custom_constructor:
             result = self.custom_constructor(
-                key=key,
                 children=children,
                 attributes=attributes,
                 event_handlers=event_handlers,
@@ -190,7 +186,6 @@ class Vdom:
         # Otherwise, use the default constructor
         else:
             result = {
-                **({"key": key} if key is not None else {}),
                 **({"children": children} if children else {}),
                 **({"attributes": attributes} if attributes else {}),
                 **({"eventHandlers": event_handlers} if event_handlers else {}),
@@ -232,13 +227,13 @@ def separate_attributes_handlers_and_inline_javascript(
     attributes: Mapping[str, Any],
 ) -> tuple[VdomAttributes, EventHandlerDict, InlineJavaScriptDict]:
     _attributes: VdomAttributes = {}
-    _event_handlers: dict[str, EventHandlerType] = {}
+    _event_handlers: dict[str, BaseEventHandler] = {}
     _inline_javascript: dict[str, InlineJavaScript] = {}
 
     for k, v in attributes.items():
         if callable(v):
             _event_handlers[k] = EventHandler(to_event_handler_function(v))
-        elif isinstance(v, EventHandler):
+        elif isinstance(v, BaseEventHandler):
             _event_handlers[k] = v
         elif EVENT_ATTRIBUTE_PATTERN.match(k) and isinstance(v, str):
             _inline_javascript[k] = InlineJavaScript(v)
@@ -276,9 +271,11 @@ def _validate_child_key_integrity(value: Any) -> None:
         )
     else:
         for child in value:
-            if isinstance(child, ComponentType) and child.key is None:
+            if isinstance(child, Component) and child.key is None:
                 warn(f"Key not specified for child in list {child}", UserWarning)
-            elif isinstance(child, Mapping) and "key" not in child:
+            elif isinstance(child, Mapping) and "key" not in child.get(
+                "attributes", {}
+            ):
                 # remove 'children' to reduce log spam
                 child_copy = {**child, "children": EllipsisRepr()}
                 warn(f"Key not specified for child in list {child_copy}", UserWarning)

reactpy/executors/asgi/__init__.py

@@ -1,5 +1,10 @@
-from reactpy.executors.asgi.middleware import ReactPyMiddleware
-from reactpy.executors.asgi.pyscript import ReactPyCsr
-from reactpy.executors.asgi.standalone import ReactPy
+try:
+    from reactpy.executors.asgi.middleware import ReactPyMiddleware
+    from reactpy.executors.asgi.pyscript import ReactPyCsr
+    from reactpy.executors.asgi.standalone import ReactPy
 
-__all__ = ["ReactPy", "ReactPyCsr", "ReactPyMiddleware"]
+    __all__ = ["ReactPy", "ReactPyCsr", "ReactPyMiddleware"]
+except ModuleNotFoundError as e:
+    raise ModuleNotFoundError(
+        "ASGI executors require the 'reactpy[asgi]' extra to be installed."
+    ) from e

reactpy/executors/asgi/middleware.py

@@ -8,13 +8,12 @@ import urllib.parse
 from collections.abc import Iterable
 from dataclasses import dataclass
 from pathlib import Path
-from typing import Any
+from typing import Any, Unpack
 
 import orjson
 from asgi_tools import ResponseText, ResponseWebSocket
 from asgiref.compatibility import guarantee_single_callable
 from servestatic import ServeStaticASGI
-from typing_extensions import Unpack
 
 from reactpy import config
 from reactpy.core.hooks import ConnectionContext

reactpy/executors/asgi/pyscript.py

@@ -4,12 +4,10 @@ import hashlib
 import re
 from collections.abc import Sequence
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from email.utils import formatdate
 from pathlib import Path
-from typing import Any
-
-from typing_extensions import Unpack
+from typing import Any, Unpack
 
 from reactpy import html
 from reactpy.executors.asgi.middleware import ReactPyMiddleware
@@ -118,6 +116,4 @@ class ReactPyPyscriptApp(ReactPyApp):
             "</html>"
         )
         self._etag = f'"{hashlib.md5(self._index_html.encode(), usedforsecurity=False).hexdigest()}"'
-        self._last_modified = formatdate(
-            datetime.now(tz=timezone.utc).timestamp(), usegmt=True
-        )
+        self._last_modified = formatdate(datetime.now(tz=UTC).timestamp(), usegmt=True)

reactpy/executors/asgi/standalone.py

@@ -2,14 +2,14 @@ from __future__ import annotations
 
 import hashlib
 import re
+from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime, timezone
+from datetime import UTC, datetime
 from email.utils import formatdate
 from logging import getLogger
-from typing import Callable, Literal, cast, overload
+from typing import Literal, Unpack, cast, overload
 
 from asgi_tools import ResponseHTML
-from typing_extensions import Unpack
 
 from reactpy import html
 from reactpy.executors.asgi.middleware import ReactPyMiddleware
@@ -239,6 +239,4 @@ class ReactPyApp:
             "</html>"
         )
         self._etag = f'"{hashlib.md5(self._index_html.encode(), usedforsecurity=False).hexdigest()}"'
-        self._last_modified = formatdate(
-            datetime.now(tz=timezone.utc).timestamp(), usegmt=True
-        )
+        self._last_modified = formatdate(datetime.now(tz=UTC).timestamp(), usegmt=True)

reactpy/executors/asgi/types.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
-from collections.abc import Awaitable, MutableMapping
-from typing import Any, Callable, Protocol
+from collections.abc import Awaitable, Callable, MutableMapping
+from typing import Any, Protocol
 
 from asgiref import typing as asgi_types
 

reactpy/pyscript/components.py

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING
 
 from reactpy import component, hooks
 from reactpy.pyscript.utils import pyscript_component_html
-from reactpy.types import ComponentType, Key
+from reactpy.types import Component, Key
 from reactpy.utils import string_to_reactpy
 
 if TYPE_CHECKING:
@@ -39,10 +39,10 @@ def _pyscript_component(
 
 def pyscript_component(
     *file_paths: str | Path,
-    initial: str | VdomDict | ComponentType = "",
+    initial: str | VdomDict | Component = "",
     root: str = "root",
     key: Key | None = None,
-) -> ComponentType:
+) -> Component:
     """
     Args:
         file_paths: File path to your client-side ReactPy component. If multiple paths are \

reactpy/pyscript/utils.py

@@ -1,4 +1,4 @@
-# ruff: noqa: S603, S607
+# ruff: noqa: S607
 from __future__ import annotations
 
 import functools
@@ -11,6 +11,7 @@ from glob import glob
 from logging import getLogger
 from pathlib import Path
 from typing import TYPE_CHECKING, Any
+from urllib import request
 from uuid import uuid4
 
 import reactpy
@@ -110,8 +111,6 @@ def extend_pyscript_config(
     extra_js: dict[str, str] | str,
     config: dict[str, Any] | str,
 ) -> str:
-    import orjson
-
     # Extends ReactPy's default PyScript config with user provided values.
     pyscript_config: dict[str, Any] = {
         "packages": [reactpy_version_string(), "jsonpointer==3.*", "ssl"],
@@ -120,10 +119,13 @@ def extend_pyscript_config(
                 f"{REACTPY_PATH_PREFIX.current}static/morphdom/morphdom-esm.js": "morphdom"
             }
         },
-        "packages_cache": "never",
     }
     pyscript_config["packages"].extend(extra_py)
 
+    # FIXME: https://github.com/pyscript/pyscript/issues/2282
+    if any(pkg.endswith(".whl") for pkg in pyscript_config["packages"]):  # nocov
+        pyscript_config["packages_cache"] = "never"
+
     # Extend the JavaScript dependency list
     if extra_js and isinstance(extra_js, str):
         pyscript_config["js_modules"]["main"].update(json.loads(extra_js))
@@ -135,7 +137,7 @@ def extend_pyscript_config(
         pyscript_config.update(json.loads(config))
     elif config and isinstance(config, dict):
         pyscript_config.update(config)
-    return orjson.dumps(pyscript_config).decode("utf-8")
+    return json.dumps(pyscript_config)
 
 
 def reactpy_version_string() -> str:  # nocov
@@ -144,10 +146,10 @@ def reactpy_version_string() -> str:  # nocov
     local_version = reactpy.__version__
 
     # Get a list of all versions via `pip index versions`
-    result = cached_pip_index_versions("reactpy")
+    result = get_reactpy_versions()
 
     # Check if the command failed
-    if result.returncode != 0:
+    if not result:
         _logger.warning(
             "Failed to verify what versions of ReactPy exist on PyPi. "
             "PyScript functionality may not work as expected.",
@@ -155,16 +157,8 @@ def reactpy_version_string() -> str:  # nocov
         return f"reactpy=={local_version}"
 
     # Have `pip` tell us what versions are available
-    available_version_symbol = "Available versions: "
-    latest_version_symbol = "LATEST: "
-    known_versions: list[str] = []
-    latest_version: str = ""
-    for line in result.stdout.splitlines():
-        if line.startswith(available_version_symbol):
-            known_versions.extend(line[len(available_version_symbol) :].split(", "))
-        elif latest_version_symbol in line:
-            symbol_postion = line.index(latest_version_symbol)
-            latest_version = line[symbol_postion + len(latest_version_symbol) :].strip()
+    known_versions: list[str] = result.get("versions", [])
+    latest_version: str = result.get("latest", "")
 
     # Return early if the version is available on PyPi and we're not in a CI environment
     if local_version in known_versions and not GITHUB_ACTIONS:
@@ -173,8 +167,8 @@ def reactpy_version_string() -> str:  # nocov
     # We are now determining an alternative method of installing ReactPy for PyScript
     if not GITHUB_ACTIONS:
         _logger.warning(
-            "Your current version of ReactPy isn't available on PyPi. Since a packaged version "
-            "of ReactPy is required for PyScript, we are attempting to find an alternative method..."
+            "Your ReactPy version isn't available on PyPi. "
+            "Attempting to find an alternative installation method for PyScript...",
         )
 
     # Build a local wheel for ReactPy, if needed
@@ -189,42 +183,51 @@ def reactpy_version_string() -> str:  # nocov
             check=False,
             cwd=Path(reactpy.__file__).parent.parent.parent,
         )
-    wheel_glob = glob(str(dist_dir / f"reactpy-{local_version}-*.whl"))
+        wheel_glob = glob(str(dist_dir / f"reactpy-{local_version}-*.whl"))
 
-    # Building a local wheel failed, try our best to give the user any possible version.
-    if not wheel_glob:
-        if latest_version:
+    # Move the local wheel to the web modules directory, if it exists
+    if wheel_glob:
+        wheel_file = Path(wheel_glob[0])
+        new_path = REACTPY_WEB_MODULES_DIR.current / wheel_file.name
+        if not new_path.exists():
             _logger.warning(
-                "Failed to build a local wheel for ReactPy, likely due to missing build dependencies. "
-                "PyScript will default to using the latest ReactPy version on PyPi."
+                "PyScript will utilize local wheel '%s'.",
+                wheel_file.name,
             )
-            return f"reactpy=={latest_version}"
-        _logger.error(
-            "Failed to build a local wheel for ReactPy, and could not determine the latest version on PyPi. "
-            "PyScript functionality may not work as expected.",
-        )
-        return f"reactpy=={local_version}"
+            shutil.copy(wheel_file, new_path)
+        return f"{REACTPY_PATH_PREFIX.current}modules/{wheel_file.name}"
 
-    # Move the local wheel file to the web modules directory, if needed
-    wheel_file = Path(wheel_glob[0])
-    new_path = REACTPY_WEB_MODULES_DIR.current / wheel_file.name
-    if not new_path.exists():
+    # Building a local wheel failed, try our best to give the user any version.
+    if latest_version:
         _logger.warning(
-            "PyScript will utilize local wheel '%s'.",
-            wheel_file.name,
+            "Failed to build a local wheel for ReactPy, likely due to missing build dependencies. "
+            "PyScript will default to using the latest ReactPy version on PyPi."
         )
-        shutil.copy(wheel_file, new_path)
-    return f"{REACTPY_PATH_PREFIX.current}modules/{wheel_file.name}"
+        return f"reactpy=={latest_version}"
+    _logger.error(
+        "Failed to build a local wheel for ReactPy, and could not determine the latest version on PyPi. "
+        "PyScript functionality may not work as expected.",
+    )
+    return f"reactpy=={local_version}"
 
 
 @functools.cache
-def cached_pip_index_versions(package_name: str) -> subprocess.CompletedProcess[str]:
-    return subprocess.run(
-        ["pip", "index", "versions", package_name],
-        capture_output=True,
-        text=True,
-        check=False,
-    )
+def get_reactpy_versions() -> dict[Any, Any]:
+    """Fetches the available versions of a package from PyPI."""
+    try:
+        try:
+            response = request.urlopen("https://pypi.org/pypi/reactpy/json", timeout=5)
+        except Exception:
+            response = request.urlopen("http://pypi.org/pypi/reactpy/json", timeout=5)
+        if response.status == 200:  # noqa: PLR2004
+            data = json.load(response)
+            versions = list(data.get("releases", {}).keys())
+            latest = data.get("info", {}).get("version", "")
+            if versions and latest:
+                return {"versions": versions, "latest": latest}
+    except Exception:
+        _logger.exception("Error fetching ReactPy package versions from PyPI!")
+    return {}
 
 
 @functools.cache