Handle reactpy-django at app install level

tethys_cli/install_commands.py

@@ -769,6 +769,14 @@ def install_command(args):
                 if validate_schema("pip", requirements_config):
                     write_msg("Running pip installation tasks...")
                     call(["pip", "install", *requirements_config["pip"]])
+                    if 'reactpy-django' in requirements_config["pip"]:
+                        from .settings_commands import read_settings, write_settings
+                        tethys_settings = read_settings()
+                        if 'INSTALLED_APPS' not in tethys_settings:
+                            tethys_settings['INSTALLED_APPS'] = []
+                        if 'reactpy_django' not in tethys_settings['INSTALLED_APPS']:
+                            tethys_settings['INSTALLED_APPS'].append('reactpy_django')
+                            write_settings(tethys_settings)
                 try:
                     public_resources_dir = [
                         *Path().glob(str(Path("tethysapp", "*", "public"))),

tethys_cli/scaffold_commands.py

@@ -443,26 +443,6 @@ def scaffold_command(args):
 
             write_pretty_output('Created: "{}"'.format(project_file_path), FG_WHITE)
 
-    if template_name == 'reactpy':
-        from .settings_commands import read_settings, write_settings
-        from argparse import Namespace
-        tethys_settings = read_settings()
-        if 'INSTALLED_APPS' not in tethys_settings:
-            tethys_settings['INSTALLED_APPS'] = []
-        if 'reactpy_django' not in tethys_settings['INSTALLED_APPS']:
-            tethys_settings['INSTALLED_APPS'].append('reactpy_django')
-            write_settings(tethys_settings)
-
-    if template_name == 'reactpy':
-        from .settings_commands import read_settings, write_settings
-        from argparse import Namespace
-        tethys_settings = read_settings()
-        if 'INSTALLED_APPS' not in tethys_settings:
-            tethys_settings['INSTALLED_APPS'] = []
-        if 'reactpy_django' not in tethys_settings['INSTALLED_APPS']:
-            tethys_settings['INSTALLED_APPS'].append('reactpy_django')
-            write_settings(tethys_settings)
-
     write_pretty_output(
         'Successfully scaffolded new project "{}"'.format(project_name), FG_WHITE
     )

tethys_cli/scaffold_templates/app_templates/reactpy/install.yml_tmpl

@@ -13,5 +13,6 @@ requirements:
     packages:
 
   pip:
+    - reactpy-django
 
 post:

tethys_portal/asgi.py

@@ -16,9 +16,9 @@ def build_application(asgi_app):
     if has_module("reactpy_django"):
         from reactpy_django import REACTPY_WEBSOCKET_ROUTE
         from reactpy_django.utils import register_component
+
         register_component('tethys_apps.base.controller.page_component_wrapper')
-
-    app_websocket_urls.append(REACTPY_WEBSOCKET_ROUTE)
+        app_websocket_urls.append(REACTPY_WEBSOCKET_ROUTE)
 
     application = ProtocolTypeRouter(
         {

tethys_sdk/gizmos.py

@@ -11,5 +11,4 @@
 # flake8: noqa
 # DO NOT ERASE
 from tethys_gizmos.gizmo_options import *
-from tethys_gizmos.react_components import *
 from tethys_gizmos.gizmo_options.base import TethysGizmoOptions, SecondaryGizmoOptions