v8.15.11 bugfix release

Author: kizniche

CHANGELOG.md

@@ -1,3 +1,13 @@
+## 8.15.11 (2023.10.18)
+
+This release fixes a bug that prevents installing some dependencies.
+
+### Bugfixes
+
+ - Fix issue installing some dependencies
+ - Fix automatically reloading the frontend when adding certain Widgets
+
+
 ## 8.15.10 (2023.10.15)
 
 This release is a bugfix release to fix issues related to installing Mycodo on the latest Raspberry Pi OS (Debian 12, Bookworm).

README.rst

@@ -3,7 +3,7 @@ Mycodo
 
 Environmental Regulation System
 
-Latest version: 8.15.10
+Latest version: 8.15.11
 
 Mycodo is open source software for the Raspberry Pi that couples inputs and outputs in interesting ways to sense and manipulate the environment.
 

mycodo/config.py

@@ -13,7 +13,7 @@
 sys.path.append(os.path.abspath(os.path.dirname(__file__)))
 from config_translations import TRANSLATIONS as T
 
-MYCODO_VERSION = '8.15.10'
+MYCODO_VERSION = '8.15.11'
 ALEMBIC_VERSION = '16b28ef31b5b'
 
 # FORCE UPGRADE MASTER

mycodo/mycodo_flask/routes_admin.py

@@ -178,13 +178,22 @@ def install_dependencies(dependencies):
     for each_dep in dependencies:
         if each_dep[2] == 'bash-commands':
             for each_command in each_dep[1]:
-                command = "{cmd} | ts '[%Y-%m-%d %H:%M:%S]' >> {log} 2>&1".format(
-                    cmd=each_command,
-                    log=DEPENDENCY_LOG_FILE)
-                cmd_out, cmd_err, cmd_status = cmd_output(
-                    command, timeout=600, cwd="/tmp")
-                logger.info("Command returned: out: {}, error: {}, status: {}".format(
-                    cmd_out, cmd_err, cmd_status))
+                try:
+                    with open(DEPENDENCY_LOG_FILE, 'a') as f:
+                        now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                        f.write(f"\n[{now}] Executing command: {each_command}\n")
+
+                    command = "{cmd} | ts '[%Y-%m-%d %H:%M:%S]' >> {log} 2>&1".format(
+                        cmd=each_command,
+                        log=DEPENDENCY_LOG_FILE)
+                    cmd_out, cmd_err, cmd_status = cmd_output(
+                        command, user='root', timeout=600, cwd="/tmp")
+
+                    with open(DEPENDENCY_LOG_FILE, 'a') as f:
+                        now = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
+                        f.write(f"\n[{now}] Command returned: out: {cmd_out}, error: {cmd_err}, status: {cmd_status}\n")
+                except:
+                    logger.exception("Executing command")
         else:
             cmd = "{pth}/mycodo/scripts/mycodo_wrapper install_dependency {dep}" \
                   " | ts '[%Y-%m-%d %H:%M:%S]' >> {log} 2>&1".format(

mycodo/mycodo_flask/routes_dashboard.py

@@ -1,13 +1,14 @@
 # coding=utf-8
 """collection of Page endpoints."""
+import flask_login
 import logging
 import os
-
-import flask_login
+import subprocess
 from flask import redirect, render_template, request, url_for
 from flask.blueprints import Blueprint
 from sqlalchemy import and_
 
+from mycodo.config import INSTALL_DIRECTORY
 from mycodo.config import PATH_HTML_USER
 from mycodo.databases.models import (PID, Camera, Conditional, Conversion,
                                      CustomController, Dashboard,
@@ -125,7 +126,11 @@ def page_dashboard(dashboard_id):
 
         # Widget
         elif form_base.widget_add.data:
-            unmet_dependencies = utils_dashboard.widget_add(form_base, request.form)
+            unmet_dependencies, reload_flask = utils_dashboard.widget_add(form_base, request.form)
+            if not unmet_dependencies and reload_flask:
+                return redirect(url_for(
+                    'routes_dashboard.restart_flask_auto_advance_page',
+                    dashboard_id=this_dashboard.unique_id))
         elif form_base.widget_mod.data:
             utils_dashboard.widget_mod(form_base, request.form)
         elif form_base.widget_delete.data:
@@ -319,3 +324,17 @@ def page_dashboard(dashboard_id):
                            form_base=form_base,
                            form_dashboard=form_dashboard,
                            widget=widget)
+
+
+@blueprint.route('/reload_flask/<dashboard_id>')
+@flask_login.login_required
+def restart_flask_auto_advance_page(dashboard_id=""):
+    """Wait then automatically load next page"""
+    logger.info("Reloading frontend in 5 seconds")
+
+    cmd = f"sleep 5 && {INSTALL_DIRECTORY}/mycodo/scripts/mycodo_wrapper frontend_reload 2>&1"
+    subprocess.Popen(cmd, shell=True)
+    logger.info("Rendering wait page")
+
+    return render_template('pages/wait_and_autoload.html',
+                           dashboard_id=dashboard_id)

mycodo/mycodo_flask/templates/pages/wait_and_autoload.html

@@ -0,0 +1,21 @@
+{% extends "layout.html" %}
+
+{% set dashboard_dict = dict() %}
+
+{% block title %} - Please Wait 10 Seconds{% endblock %}
+
+{% block head %}
+  <meta http-equiv="refresh" content="10;url=/dashboard/{{dashboard_id}}" />
+{% endblock %}
+
+{% block body %}
+  <!-- Route: /dashboard -->
+  <div class="container">
+  {% include 'flash_messages.html' %}
+  </div>
+
+  <div class="container-fluid" style="text-align: center">
+    To add this Widget, the Frontend needs to reload. Please wait for the frontend to reload. You will be automatically redirected after 10 seconds.
+  </div>
+
+{% endblock %}

mycodo/mycodo_flask/utils/utils_dashboard.py

@@ -157,6 +157,8 @@ def widget_add(form_base, request_form):
         controller=TRANSLATIONS['widget']['title'])
     error = []
 
+    reload_flask = False
+
     dict_widgets = parse_widget_information()
 
     if form_base.widget_type.data:
@@ -230,9 +232,7 @@ def dict_has_value(key):
             # It has already handled its first request, any changes will not be applied consistently.
             # Make sure all imports, decorators, functions, etc. needed to set up the application are done before running it.
             if Widget.query.filter(Widget.graph_type == widget_name).count() == 1:
-                cmd = f"{INSTALL_DIRECTORY}/mycodo/scripts/mycodo_wrapper frontend_reload 2>&1"
-                init = subprocess.Popen(cmd, shell=True)
-                init.wait()
+                reload_flask = True
 
             if not current_app.config['TESTING']:
                 # Refresh widget settings
@@ -252,7 +252,7 @@ def dict_has_value(key):
     for each_error in error:
         flash(each_error, "error")
 
-    return dep_unmet
+    return dep_unmet, reload_flask
 
 
 def widget_mod(form_base, request_form):