Remove reactpy_django.config.REACTPY_DEBUG_MODE

Author: Archmonger

src/reactpy_django/clean.py

@@ -49,7 +49,9 @@ def clean_sessions(verbosity: int = 1):
     """Deletes expired component sessions from the database.
     As a performance optimization, this is only run once every REACTPY_SESSION_MAX_AGE seconds.
     """
-    from reactpy_django.config import REACTPY_DEBUG_MODE, REACTPY_SESSION_MAX_AGE
+    from django.conf import settings as django_settings
+
+    from reactpy_django.config import REACTPY_SESSION_MAX_AGE
     from reactpy_django.models import ComponentSession
 
     if verbosity >= 2:
@@ -66,7 +68,7 @@ def clean_sessions(verbosity: int = 1):
 
     session_objects.delete()
 
-    if REACTPY_DEBUG_MODE or verbosity >= 2:
+    if django_settings.DEBUG or verbosity >= 2:
         inspect_clean_duration(start_time, "component sessions", verbosity)
 
 
@@ -78,7 +80,8 @@ def clean_user_data(verbosity: int = 1):
     However, we can't use Django to enforce this relationship since ReactPy can be configured to
     use any database.
     """
-    from reactpy_django.config import REACTPY_DEBUG_MODE
+    from django.conf import settings as django_settings
+
     from reactpy_django.models import UserDataModel
 
     if verbosity >= 2:
@@ -102,7 +105,7 @@ def clean_user_data(verbosity: int = 1):
 
     user_data_objects.delete()
 
-    if REACTPY_DEBUG_MODE or verbosity >= 2:
+    if django_settings.DEBUG or verbosity >= 2:
         inspect_clean_duration(start_time, "user data", verbosity)
 
 

src/reactpy_django/config.py

@@ -18,13 +18,12 @@
 from reactpy_django.utils import import_dotted_path
 
 # Non-configurable values
-REACTPY_DEBUG_MODE = _REACTPY_DEBUG_MODE.current
 REACTPY_REGISTERED_COMPONENTS: dict[str, ComponentConstructor] = {}
 REACTPY_FAILED_COMPONENTS: set[str] = set()
 REACTPY_REGISTERED_IFRAME_VIEWS: dict[str, Callable | View] = {}
 
 # Configurable through Django settings.py
-_REACTPY_DEBUG_MODE.set_current(getattr(settings, "DEBUG"))
+_REACTPY_DEBUG_MODE.set_current(settings.DEBUG)
 _REACTPY_ASYNC_RENDERING.set_current(
     getattr(settings, "REACTPY_ASYNC_RENDERING", _REACTPY_ASYNC_RENDERING.current)
 )

src/reactpy_django/templates/reactpy/component.html

@@ -1,6 +1,6 @@
 {% load static %}
 
-{% if reactpy_failure and reactpy_debug_mode %}
+{% if reactpy_failure and debug %}
 <pre>{% firstof reactpy_error "UnknownError" %}: "{% firstof reactpy_dotted_path "UnknownPath" %}"</pre>
 {% endif %}
 
@@ -10,18 +10,18 @@
 {% if reactpy_prerender_html %}<div id="{{reactpy_uuid}}-prerender">{{reactpy_prerender_html|safe}}</div>{% endif %}
 {% if reactpy_offline_html %}<div id="{{reactpy_uuid}}-offline" hidden>{{reactpy_offline_html|safe}}</div>{% endif %}
 <script type="module" crossorigin="anonymous">
-  import { mountComponent } from "{% static 'reactpy_django/client.js' %}";
-  const mountElement = document.getElementById("{{reactpy_uuid}}");
-  mountComponent(
-    mountElement,
-    "{{reactpy_host}}",
-    "{{reactpy_url_prefix}}",
-    "{{reactpy_component_path}}",
-    "{{reactpy_resolved_web_modules_path}}",
-    Number("{{reactpy_reconnect_interval}}"),
-    Number("{{reactpy_reconnect_max_interval}}"),
-    Number("{{reactpy_reconnect_max_retries}}"),
-    Number("{{reactpy_reconnect_backoff_multiplier}}"),
-  );
+    import { mountComponent } from "{% static 'reactpy_django/client.js' %}";
+    const mountElement = document.getElementById("{{reactpy_uuid}}");
+    mountComponent(
+        mountElement,
+        "{{reactpy_host}}",
+        "{{reactpy_url_prefix}}",
+        "{{reactpy_component_path}}",
+        "{{reactpy_resolved_web_modules_path}}",
+        Number("{{reactpy_reconnect_interval}}"),
+        Number("{{reactpy_reconnect_max_interval}}"),
+        Number("{{reactpy_reconnect_max_retries}}"),
+        Number("{{reactpy_reconnect_backoff_multiplier}}"),
+    );
 </script>
 {% endif %}

src/reactpy_django/templates/reactpy/pyscript_setup.html

@@ -1,7 +1,7 @@
 {% load static %}
 <link rel="stylesheet" href="{% static 'reactpy_django/pyscript/core.css' %}" />
 <link rel="stylesheet" href="{% static 'reactpy_django/pyscript-custom.css' %}" />
-{% if not reactpy_debug_mode %}
+{% if not debug %}
 <link rel="stylesheet" href="{% static 'reactpy_django/pyscript-hide-debug.css' %}" />
 {% endif %}
 <script type="module" async crossorigin="anonymous" src="{% static 'reactpy_django/pyscript/core.js' %}"></script>

src/reactpy_django/templatetags/reactpy.py

@@ -74,6 +74,8 @@ def component(
         </body>
         </html>
     """
+    from django.conf import settings as django_settings
+
     request: HttpRequest | None = context.get("request")
     perceived_host = (request.get_host() if request else "").strip("/")
     host = (
@@ -93,7 +95,7 @@ def component(
     _offline_html = ""
 
     # Validate the host
-    if host and reactpy_config.REACTPY_DEBUG_MODE:
+    if host and django_settings.DEBUG:
         try:
             validate_host(host)
         except InvalidHostError as e:
@@ -108,7 +110,7 @@ def component(
             return failure_context(dotted_path, ComponentDoesNotExistError(msg))
 
     # Validate the component args & kwargs
-    if is_local and reactpy_config.REACTPY_DEBUG_MODE:
+    if is_local and django_settings.DEBUG:
         try:
             validate_component_args(user_component, *args, **kwargs)
         except ComponentParamError as e:
@@ -234,17 +236,21 @@ def pyscript_setup(
         config: A JSON string or Python dictionary containing PyScript \
             configuration values.
     """
+    from django.conf import settings as django_settings
+
     return {
         "pyscript_config": extend_pyscript_config(extra_py, extra_js, config),
         "pyscript_layout_handler": PYSCRIPT_LAYOUT_HANDLER,
-        "reactpy_debug_mode": reactpy_config.REACTPY_DEBUG_MODE,
+        "debug": django_settings.DEBUG,
     }
 
 
 def failure_context(dotted_path: str, error: Exception):
+    from django.conf import settings as django_settings
+
     return {
         "reactpy_failure": True,
-        "reactpy_debug_mode": reactpy_config.REACTPY_DEBUG_MODE,
+        "debug": django_settings.DEBUG,
         "reactpy_dotted_path": dotted_path,
         "reactpy_error": type(error).__name__,
     }