reactpy_django 3.8.1__tar.gz → 5.0.0__tar.gz

{reactpy_django-3.8.1/src/reactpy_django.egg-info → reactpy_django-5.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: reactpy_django
-Version: 3.8.1
+Version: 5.0.0
 Summary: It's React, but in Python. Now with Django integration.
 Home-page: https://github.com/reactive-python/reactpy-django
 Author: Mark Bakhit
@@ -27,14 +27,13 @@ License-File: LICENSE.md
 Requires-Dist: channels>=4.0.0
 Requires-Dist: django>=4.2.0
 Requires-Dist: reactpy<1.1.0,>=1.0.2
-Requires-Dist: reactpy-router<1.0.0,>=0.1.1
-Requires-Dist: aiofile>=3.0
+Requires-Dist: reactpy-router<2.0.0,>=1.0.0
 Requires-Dist: dill>=0.3.5
 Requires-Dist: orjson>=3.6.0
 Requires-Dist: nest_asyncio>=1.5.0
 Requires-Dist: typing_extensions
 
-# <img src="https://raw.githubusercontent.com/reactive-python/reactpy/main/branding/svg/reactpy-logo-square.svg" align="left" height="45"/> ReactPy Django
+# <img src="https://raw.githubusercontent.com/reactive-python/reactpy/main/branding/svg/reactpy-logo-square.svg" align="left" height="45"/> ReactPy-Django
 
 <p>
     <a href="https://github.com/reactive-python/reactpy-django/actions?query=workflow%3ATest">
@@ -57,6 +56,7 @@ Requires-Dist: typing_extensions
 [ReactPy-Django](https://github.com/reactive-python/reactpy-django) is used to add [ReactPy](https://reactpy.dev/) support to an existing **Django project**. This package also turbocharges ReactPy with features such as...
 
 -   [SEO compatible rendering](https://reactive-python.github.io/reactpy-django/latest/reference/settings/#reactpy_prerender)
+-   [Client-Side Python components](https://reactive-python.github.io/reactpy-django/latest/reference/template-tag/#pyscript-component)
 -   [Single page application (SPA) capabilities](https://reactive-python.github.io/reactpy-django/latest/reference/router/#django-router)
 -   [Distributed computing](https://reactive-python.github.io/reactpy-django/latest/reference/settings/#reactpy_default_hosts)
 -   [Performance enhancements](https://reactive-python.github.io/reactpy-django/latest/reference/settings/#performance-settings)
@@ -118,7 +118,7 @@ def hello_world(recipient: str):
 
 <!--py-code-end-->
 
-## [`my_app/templates/my-template.html`](https://docs.djangoproject.com/en/dev/topics/templates/)
+## [`my_app/templates/my_template.html`](https://docs.djangoproject.com/en/stable/topics/templates/)
 
 <!--html-header-start-->
 

{reactpy_django-3.8.1 → reactpy_django-5.0.0}/README.md

@@ -1,4 +1,4 @@
-# <img src="https://raw.githubusercontent.com/reactive-python/reactpy/main/branding/svg/reactpy-logo-square.svg" align="left" height="45"/> ReactPy Django
+# <img src="https://raw.githubusercontent.com/reactive-python/reactpy/main/branding/svg/reactpy-logo-square.svg" align="left" height="45"/> ReactPy-Django
 
 <p>
     <a href="https://github.com/reactive-python/reactpy-django/actions?query=workflow%3ATest">
@@ -21,6 +21,7 @@
 [ReactPy-Django](https://github.com/reactive-python/reactpy-django) is used to add [ReactPy](https://reactpy.dev/) support to an existing **Django project**. This package also turbocharges ReactPy with features such as...
 
 -   [SEO compatible rendering](https://reactive-python.github.io/reactpy-django/latest/reference/settings/#reactpy_prerender)
+-   [Client-Side Python components](https://reactive-python.github.io/reactpy-django/latest/reference/template-tag/#pyscript-component)
 -   [Single page application (SPA) capabilities](https://reactive-python.github.io/reactpy-django/latest/reference/router/#django-router)
 -   [Distributed computing](https://reactive-python.github.io/reactpy-django/latest/reference/settings/#reactpy_default_hosts)
 -   [Performance enhancements](https://reactive-python.github.io/reactpy-django/latest/reference/settings/#performance-settings)
@@ -82,7 +83,7 @@ def hello_world(recipient: str):
 
 <!--py-code-end-->
 
-## [`my_app/templates/my-template.html`](https://docs.djangoproject.com/en/dev/topics/templates/)
+## [`my_app/templates/my_template.html`](https://docs.djangoproject.com/en/stable/topics/templates/)
 
 <!--html-header-start-->
 

{reactpy_django-3.8.1 → reactpy_django-5.0.0}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools>=42", "wheel", "nodejs-bin==18.4.0a4"]
+requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [tool.mypy]

{reactpy_django-3.8.1 → reactpy_django-5.0.0}/setup.cfg

@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [egg_info]
 tag_build = 
 tag_date = 0

{reactpy_django-3.8.1 → reactpy_django-5.0.0}/setup.py

@@ -1,22 +1,27 @@
 from __future__ import annotations, print_function
 
+import shutil
+import subprocess
 import sys
 import traceback
-from distutils import log
+from logging import getLogger
 from pathlib import Path
 
-from nodejs import npm
 from setuptools import find_namespace_packages, setup
 from setuptools.command.develop import develop
 from setuptools.command.sdist import sdist
 
+log = getLogger(__name__)
+
 # -----------------------------------------------------------------------------
 # Basic Constants
 # -----------------------------------------------------------------------------
 name = "reactpy_django"
 root_dir = Path(__file__).parent
 src_dir = root_dir / "src"
+js_dir = src_dir / "js"
 package_dir = src_dir / name
+static_dir = package_dir / "static" / name
 
 
 # -----------------------------------------------------------------------------
@@ -94,25 +99,59 @@ package["long_description_content_type"] = "text/markdown"
 # ----------------------------------------------------------------------------
 # Build Javascript
 # ----------------------------------------------------------------------------
+def copy_js_files(source_dir: Path, destination: Path) -> None:
+    if destination.exists():
+        shutil.rmtree(destination)
+    destination.mkdir()
+
+    for file in source_dir.iterdir():
+        if file.is_file():
+            shutil.copy(file, destination / file.name)
+        else:
+            copy_js_files(file, destination / file.name)
+
+
 def build_javascript_first(build_cls: type):
     class Command(build_cls):
         def run(self):
-            js_dir = str(src_dir / "js")
 
             log.info("Installing Javascript...")
-            result = npm.call(["install"], cwd=js_dir)
+            result = subprocess.run(
+                ["bun", "install"], cwd=str(js_dir), check=True
+            ).returncode
             if result != 0:
                 log.error(traceback.format_exc())
                 log.error("Failed to install Javascript")
                 raise RuntimeError("Failed to install Javascript")
 
             log.info("Building Javascript...")
-            result = npm.call(["run", "build"], cwd=js_dir)
+            result = subprocess.run(
+                [
+                    "bun",
+                    "build",
+                    "./src/index.tsx",
+                    "--outfile",
+                    str(static_dir / "client.js"),
+                    "--minify",
+                ],
+                cwd=str(js_dir),
+                check=True,
+            ).returncode
             if result != 0:
                 log.error(traceback.format_exc())
                 log.error("Failed to build Javascript")
                 raise RuntimeError("Failed to build Javascript")
 
+            log.info("Copying @pyscript/core distribution")
+            pyscript_dist = js_dir / "node_modules" / "@pyscript" / "core" / "dist"
+            pyscript_static_dir = static_dir / "pyscript"
+            copy_js_files(pyscript_dist, pyscript_static_dir)
+
+            log.info("Copying Morphdom distribution")
+            morphdom_dist = js_dir / "node_modules" / "morphdom" / "dist"
+            morphdom_static_dir = static_dir / "morphdom"
+            copy_js_files(morphdom_dist, morphdom_static_dir)
+
             log.info("Successfully built Javascript")
             super().run()
 

{reactpy_django-3.8.1 → reactpy_django-5.0.0}/src/reactpy_django/__init__.py

@@ -2,22 +2,26 @@ import contextlib
 
 import nest_asyncio
 
-from reactpy_django import checks, components, decorators, hooks, router, types, utils
-from reactpy_django.websocket.paths import (
-    REACTPY_WEBSOCKET_PATH,
-    REACTPY_WEBSOCKET_ROUTE,
+from reactpy_django import (
+    components,
+    decorators,
+    hooks,
+    html,
+    router,
+    types,
+    utils,
 )
+from reactpy_django.websocket.paths import REACTPY_WEBSOCKET_ROUTE
 
-__version__ = "3.8.1"
+__version__ = "5.0.0"
 __all__ = [
-    "REACTPY_WEBSOCKET_PATH",
     "REACTPY_WEBSOCKET_ROUTE",
+    "html",
     "hooks",
     "components",
     "decorators",
     "types",
     "utils",
-    "checks",
     "router",
 ]
 

{reactpy_django-3.8.1 → reactpy_django-5.0.0}/src/reactpy_django/checks.py

@@ -19,7 +19,7 @@ def reactpy_warnings(app_configs, **kwargs):
     warnings = []
     INSTALLED_APPS: list[str] = getattr(settings, "INSTALLED_APPS", [])
 
-    # REACTPY_DATABASE is not an in-memory database.
+    # Check if REACTPY_DATABASE is not an in-memory database.
     if (
         getattr(settings, "DATABASES", {})
         .get(getattr(settings, "REACTPY_DATABASE", "default"), {})
@@ -36,7 +36,7 @@ def reactpy_warnings(app_configs, **kwargs):
             )
         )
 
-    # ReactPy URLs exist
+    # Check if ReactPy URLs are reachable
     try:
         reverse("reactpy:web_modules", kwargs={"file": "example"})
         reverse("reactpy:view_to_iframe", kwargs={"dotted_path": "example"})
@@ -102,16 +102,7 @@ def reactpy_warnings(app_configs, **kwargs):
 
     # DELETED W007: Check if REACTPY_WEBSOCKET_URL doesn't end with a slash
     # DELETED W008: Check if REACTPY_WEBSOCKET_URL doesn't start with an alphanumeric character
-
-    # Removed REACTPY_WEBSOCKET_URL setting
-    if getattr(settings, "REACTPY_WEBSOCKET_URL", None):
-        warnings.append(
-            Warning(
-                "REACTPY_WEBSOCKET_URL has been removed.",
-                hint="Use REACTPY_URL_PREFIX instead.",
-                id="reactpy_django.W009",
-            )
-        )
+    # DELETED W009: Check if deprecated value REACTPY_WEBSOCKET_URL exists
 
     # Check if REACTPY_URL_PREFIX is being used properly in our HTTP URLs
     with contextlib.suppress(NoReverseMatch):
@@ -152,22 +143,16 @@ def reactpy_warnings(app_configs, **kwargs):
     ):
         warnings.append(
             Warning(
-                "You have not configured runserver to use ASGI.",
+                "You have not configured the `runserver` command to use ASGI. "
+                "ReactPy will work properly in this configuration.",
                 hint="Add daphne to settings.py:INSTALLED_APPS.",
                 id="reactpy_django.W012",
             )
         )
 
-    # Removed REACTPY_RECONNECT_MAX setting
-    if getattr(settings, "REACTPY_RECONNECT_MAX", None):
-        warnings.append(
-            Warning(
-                "REACTPY_RECONNECT_MAX has been removed.",
-                hint="See the docs for the new REACTPY_RECONNECT_* settings.",
-                id="reactpy_django.W013",
-            )
-        )
+    # DELETED W013: Check if deprecated value REACTPY_RECONNECT_MAX exists
 
+    # Check if REACTPY_RECONNECT_INTERVAL is set to a large value
     if (
         isinstance(config.REACTPY_RECONNECT_INTERVAL, int)
         and config.REACTPY_RECONNECT_INTERVAL > 30000
@@ -181,20 +166,22 @@ def reactpy_warnings(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_MAX_RETRIES is set to a large value
     if (
         isinstance(config.REACTPY_RECONNECT_MAX_RETRIES, int)
         and config.REACTPY_RECONNECT_MAX_RETRIES > 5000
     ):
         warnings.append(
             Warning(
-                "REACTPY_RECONNECT_MAX_RETRIES is set to a very large value. Are you sure this is intentional? "
+                "REACTPY_RECONNECT_MAX_RETRIES is set to a very large value "
+                f"{config.REACTPY_RECONNECT_MAX_RETRIES}. Are you sure this is intentional? "
                 "This may leave your clients attempting reconnections for a long time.",
                 hint="Check your value for REACTPY_RECONNECT_MAX_RETRIES or suppress this warning.",
                 id="reactpy_django.W015",
             )
         )
 
-    # Check if the value is too large (greater than 50)
+    # Check if the REACTPY_RECONNECT_BACKOFF_MULTIPLIER is set to a large value
     if (
         isinstance(config.REACTPY_RECONNECT_BACKOFF_MULTIPLIER, (int, float))
         and config.REACTPY_RECONNECT_BACKOFF_MULTIPLIER > 100
@@ -207,6 +194,7 @@ def reactpy_warnings(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_MAX_INTERVAL is reachable
     if (
         isinstance(config.REACTPY_RECONNECT_MAX_INTERVAL, int)
         and isinstance(config.REACTPY_RECONNECT_INTERVAL, int)
@@ -239,6 +227,7 @@ def reactpy_warnings(app_configs, **kwargs):
             )
         )
 
+    # Check if 'reactpy_django' is in the correct position in INSTALLED_APPS
     position_to_beat = 0
     for app in INSTALLED_APPS:
         if app.startswith("django.contrib."):
@@ -255,6 +244,7 @@ def reactpy_warnings(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_CLEAN_SESSION is not a valid property
     if getattr(settings, "REACTPY_CLEAN_SESSION", None):
         warnings.append(
             Warning(
@@ -301,7 +291,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
-    # All settings in reactpy_django.conf are the correct data type
+    # Check if REACTPY_URL_PREFIX is a valid data type
     if not isinstance(getattr(settings, "REACTPY_URL_PREFIX", ""), str):
         errors.append(
             Error(
@@ -311,6 +301,8 @@ def reactpy_errors(app_configs, **kwargs):
                 id="reactpy_django.E003",
             )
         )
+
+    # Check if REACTPY_SESSION_MAX_AGE is a valid data type
     if not isinstance(getattr(settings, "REACTPY_SESSION_MAX_AGE", 0), int):
         errors.append(
             Error(
@@ -320,6 +312,8 @@ def reactpy_errors(app_configs, **kwargs):
                 id="reactpy_django.E004",
             )
         )
+
+    # Check if REACTPY_CACHE is a valid data type
     if not isinstance(getattr(settings, "REACTPY_CACHE", ""), str):
         errors.append(
             Error(
@@ -329,6 +323,8 @@ def reactpy_errors(app_configs, **kwargs):
                 id="reactpy_django.E005",
             )
         )
+
+    # Check if REACTPY_DATABASE is a valid data type
     if not isinstance(getattr(settings, "REACTPY_DATABASE", ""), str):
         errors.append(
             Error(
@@ -338,6 +334,8 @@ def reactpy_errors(app_configs, **kwargs):
                 id="reactpy_django.E006",
             )
         )
+
+    # Check if REACTPY_DEFAULT_QUERY_POSTPROCESSOR is a valid data type
     if not isinstance(
         getattr(settings, "REACTPY_DEFAULT_QUERY_POSTPROCESSOR", ""), (str, type(None))
     ):
@@ -349,6 +347,8 @@ def reactpy_errors(app_configs, **kwargs):
                 id="reactpy_django.E007",
             )
         )
+
+    # Check if REACTPY_AUTH_BACKEND is a valid data type
     if not isinstance(getattr(settings, "REACTPY_AUTH_BACKEND", ""), str):
         errors.append(
             Error(
@@ -361,6 +361,7 @@ def reactpy_errors(app_configs, **kwargs):
 
     # DELETED E009: Check if `channels` is in INSTALLED_APPS
 
+    # Check if REACTPY_DEFAULT_HOSTS is a valid data type
     if not isinstance(getattr(settings, "REACTPY_DEFAULT_HOSTS", []), list):
         errors.append(
             Error(
@@ -371,7 +372,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
-    # Check of all values in the list are strings
+    # Check of all values in the REACTPY_DEFAULT_HOSTS are strings
     if isinstance(getattr(settings, "REACTPY_DEFAULT_HOSTS", None), list):
         for host in settings.REACTPY_DEFAULT_HOSTS:
             if not isinstance(host, str):
@@ -385,6 +386,7 @@ def reactpy_errors(app_configs, **kwargs):
                 )
                 break
 
+    # Check if REACTPY_RECONNECT_INTERVAL is a valid data type
     if not isinstance(config.REACTPY_RECONNECT_INTERVAL, int):
         errors.append(
             Error(
@@ -394,6 +396,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_INTERVAL is a positive integer
     if (
         isinstance(config.REACTPY_RECONNECT_INTERVAL, int)
         and config.REACTPY_RECONNECT_INTERVAL < 0
@@ -406,6 +409,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_MAX_INTERVAL is a valid data type
     if not isinstance(config.REACTPY_RECONNECT_MAX_INTERVAL, int):
         errors.append(
             Error(
@@ -415,6 +419,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_MAX_INTERVAL is a positive integer
     if (
         isinstance(config.REACTPY_RECONNECT_MAX_INTERVAL, int)
         and config.REACTPY_RECONNECT_MAX_INTERVAL < 0
@@ -427,6 +432,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_MAX_INTERVAL is greater than REACTPY_RECONNECT_INTERVAL
     if (
         isinstance(config.REACTPY_RECONNECT_MAX_INTERVAL, int)
         and isinstance(config.REACTPY_RECONNECT_INTERVAL, int)
@@ -440,6 +446,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_MAX_RETRIES is a valid data type
     if not isinstance(config.REACTPY_RECONNECT_MAX_RETRIES, int):
         errors.append(
             Error(
@@ -449,6 +456,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_MAX_RETRIES is a positive integer
     if (
         isinstance(config.REACTPY_RECONNECT_MAX_RETRIES, int)
         and config.REACTPY_RECONNECT_MAX_RETRIES < 0
@@ -461,6 +469,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_BACKOFF_MULTIPLIER is a valid data type
     if not isinstance(config.REACTPY_RECONNECT_BACKOFF_MULTIPLIER, (int, float)):
         errors.append(
             Error(
@@ -470,6 +479,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_RECONNECT_BACKOFF_MULTIPLIER is greater than or equal to 1
     if (
         isinstance(config.REACTPY_RECONNECT_BACKOFF_MULTIPLIER, (int, float))
         and config.REACTPY_RECONNECT_BACKOFF_MULTIPLIER < 1
@@ -482,6 +492,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_PRERENDER is a valid data type
     if not isinstance(config.REACTPY_PRERENDER, bool):
         errors.append(
             Error(
@@ -491,6 +502,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_AUTO_RELOGIN is a valid data type
     if not isinstance(config.REACTPY_AUTO_RELOGIN, bool):
         errors.append(
             Error(
@@ -500,6 +512,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_CLEAN_INTERVAL is a valid data type
     if not isinstance(config.REACTPY_CLEAN_INTERVAL, (int, type(None))):
         errors.append(
             Error(
@@ -509,6 +522,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_CLEAN_INTERVAL is a positive integer
     if (
         isinstance(config.REACTPY_CLEAN_INTERVAL, int)
         and config.REACTPY_CLEAN_INTERVAL < 0
@@ -521,6 +535,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_CLEAN_SESSIONS is a valid data type
     if not isinstance(config.REACTPY_CLEAN_SESSIONS, bool):
         errors.append(
             Error(
@@ -530,6 +545,7 @@ def reactpy_errors(app_configs, **kwargs):
             )
         )
 
+    # Check if REACTPY_CLEAN_USER_DATA is a valid data type
     if not isinstance(config.REACTPY_CLEAN_USER_DATA, bool):
         errors.append(
             Error(

{reactpy_django-3.8.1 → reactpy_django-5.0.0}/src/reactpy_django/clean.py

@@ -87,7 +87,7 @@ def clean_user_data(verbosity: int = 1):
     start_time = timezone.now()
     user_model = get_user_model()
     all_users = user_model.objects.all()
-    all_user_pks = all_users.values_list(user_model._meta.pk.name, flat=True)  # type: ignore
+    all_user_pks = all_users.values_list(user_model._meta.pk.name, flat=True)
 
     # Django doesn't support using QuerySets as an argument with cross-database relations.
     if user_model.objects.db != UserDataModel.objects.db: