emhass 0.7.8__tar.gz → 0.8.0__tar.gz

{emhass-0.7.8 → emhass-0.8.0}/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## [0.8.0] - 2024-02-25
+### Improvement
+- Thanks to the great work from @GeoDerp we now have a unified/centralized Dockerfile that allows for testing different installation configuration methods in one place. This greatly helps testing, notably emulating the add-on environment. This will improve overall testing for both teh core code and the add-on. Again many thanks!
+- There were also a lot of nice improveements from @GeoDerp to the webui, namely: styling, dynamic table, optimization feedback after button press, logging, a new clear button, etc.
+- From now on we will unify the semantic versioning for both the main core code and the add-on.
+
 ## [0.7.8] - 2024-02-18
 ### Improvement
 Added some nice logging functionalities and responsiveness on the webui.

{emhass-0.7.8 → emhass-0.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emhass
-Version: 0.7.8
+Version: 0.8.0
 Summary: An Energy Management System for Home Assistant
 Home-page: https://github.com/davidusb-geek/emhass
 Author: David HERNANDEZ
@@ -460,7 +460,7 @@ Check the dedicated section in the documentation here: [https://emhass.readthedo
 
 ## Development
 
-Pull request are very much accepted on this project. For development you can find some instructions here [Development](./docs/develop.md)
+Pull request are very much accepted on this project. For development you can find some instructions here [Development](https://emhass.readthedocs.io/en/latest/develop.html)
 
 ## Troubleshooting
 

{emhass-0.7.8 → emhass-0.8.0}/README.md

@@ -425,7 +425,7 @@ Check the dedicated section in the documentation here: [https://emhass.readthedo
 
 ## Development
 
-Pull request are very much accepted on this project. For development you can find some instructions here [Development](./docs/develop.md)
+Pull request are very much accepted on this project. For development you can find some instructions here [Development](https://emhass.readthedocs.io/en/latest/develop.html)
 
 ## Troubleshooting
 

{emhass-0.7.8 → emhass-0.8.0}/setup.py

@@ -19,7 +19,7 @@ long_description = (here / 'README.md').read_text(encoding='utf-8')
 
 setup(
     name='emhass',  # Required
-    version='0.7.8',  # Required
+    version='0.8.0',  # Required
     description='An Energy Management System for Home Assistant',  # Optional
     long_description=long_description,  # Optional
     long_description_content_type='text/markdown',  # Optional (see note above)
@@ -62,5 +62,6 @@ setup(
             'emhass=emhass.command_line:main',
         ],
     },
-    package_data={'emhass': ['templates/index.html','templates/template.html','static/style.css','static/img/emhass_icon.png','static/img/emhass_logo_short.svg']},
+    package_data={'emhass': ['templates/index.html','templates/template.html',
+    'static/style.css','static/img/emhass_icon.png','static/img/emhass_logo_short.svg']},
 )

{emhass-0.7.8 → emhass-0.8.0}/src/emhass/static/style.css

@@ -814,7 +814,8 @@ th {
   text-align: center;
 }
 
-#input-select {
+#input-select,
+#input-clear {
   width: 77px;
 }
 

{emhass-0.7.8 → emhass-0.8.0}/src/emhass/templates/index.html

@@ -44,6 +44,7 @@
                         <option value="List" selected>List</option>
                         <option value="Box">Box</option>
                     </select>
+                    <button type="button" id="input-clear">Clear</button>
                 </div>
             </div>
             <div id="input-container"> <!-- (Box/List) dynamic input elements will be added here -->
@@ -175,7 +176,7 @@
         if (testStorage()) { //if local storage exists and works
             let selectElement = document.getElementById('input-select') // select button element
             var input_container = document.getElementById('input-container'); // container div containing all dynamic input elements (Box/List)
-            if (localStorage.getItem("input_container_content")) { //If items already stored in local storage, then override default
+            if (localStorage.getItem("input_container_content") && localStorage.getItem("input_container_content") !== "{}" ) { //If items already stored in local storage, then override default
                 if (selectElement.value == "Box") { //if Box is selected, show saved json data into box 
                     document.getElementById("text-area").value = localStorage.getItem("input_container_content");
                 }
@@ -299,10 +300,7 @@
         //if box is selected, remove input-list elements and replace (with text-area)
         if (selectElement.value == "Box") {
             if (input_container_child_name == "input-list" || input_container_child === null) { // if input list exists or no Box element
-                inputListArr = input_container.getElementsByClassName('input-list');
-                while (inputListArr[0]) { //while there is still input-list elements remove 
-                    inputListArr[0].parentNode.removeChild(inputListArr[0]);
-                };
+                input_container.innerHTML = ""; //remove input-list list elements via erasing container innerHTML
                 let div = document.createElement('div'); //add input-box element
                 div.className = "input-box";
                 div.innerHTML = `
@@ -325,6 +323,30 @@
         }
     }
 
+    //clear stored input data from localStorage (if any), clear input elements
+    async function ClearInputData(id) {
+        if (testStorage() && localStorage.getItem("input_container_content") !== null) {
+            localStorage.setItem("input_container_content", "{}")
+        }
+        ClearInputElements();
+
+    }
+
+    //clear input elements
+    async function ClearInputElements() {
+        let selectElement = document.getElementById('input-select')
+        var input_container = document.getElementById('input-container'); 
+        if (selectElement.value == "Box") { 
+            document.getElementById("text-area").value = "{}";
+        }
+        if (selectElement.value == "List") { 
+            input_container.innerHTML = "";
+        }
+
+    }
+
+
+
     //add listeners to buttons
     [
         "dayahead-optim",
@@ -344,6 +366,9 @@
     [
         "input-select"
     ].forEach((id) => document.getElementById(id).addEventListener('change', () => getSavedData(id)));
+    [
+        "input-clear"
+    ].forEach((id) => document.getElementById(id).addEventListener('click', () => ClearInputData(id)));
 </script>
 
 </html>

{emhass-0.7.8 → emhass-0.8.0}/src/emhass/web_server.py

@@ -205,12 +205,14 @@ if __name__ == "__main__":
     use_options = os.getenv('USE_OPTIONS', default=False)
     # Define the paths
     if args.addon==1:
-        OPTIONS_PATH = os.getenv('OPTIONS_PATH', default="/data/options.json")
+        OPTIONS_PATH = os.getenv('OPTIONS_PATH', default="/app/options.json")
         options_json = Path(OPTIONS_PATH)
-        CONFIG_PATH = os.getenv("CONFIG_PATH", default="/usr/src/config_emhass.yaml")
+        CONFIG_PATH = os.getenv("CONFIG_PATH", default="/app/config_emhass.yaml")
         #Obtain url and key from ENV or ARG
         hass_url = os.getenv("EMHASS_URL", default=args.url)
-        key =  os.getenv("EMHASS_KEY", default=args.key) 
+        key =  os.getenv("SUPERVISOR_TOKEN", default=args.key) 
+        if hass_url != "http://supervisor/core/api":
+            key =  os.getenv("EMHASS_KEY", key)  
         #If url or key is None, Set as empty string to reduce NoneType errors bellow
         if key is None: key = ""
         if hass_url is None: hass_url = ""
@@ -220,7 +222,7 @@ if __name__ == "__main__":
                 options = json.load(data)
         else:
             app.logger.error("options.json does not exists")
-        DATA_PATH = os.getenv("DATA_PATH", default="/share/")
+        DATA_PATH = os.getenv("DATA_PATH", default="/app/data/")
     else:
         if use_options:
             OPTIONS_PATH = os.getenv('OPTIONS_PATH', default="/app/options.json")

{emhass-0.7.8 → emhass-0.8.0}/src/emhass.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: emhass
-Version: 0.7.8
+Version: 0.8.0
 Summary: An Energy Management System for Home Assistant
 Home-page: https://github.com/davidusb-geek/emhass
 Author: David HERNANDEZ
@@ -460,7 +460,7 @@ Check the dedicated section in the documentation here: [https://emhass.readthedo
 
 ## Development
 
-Pull request are very much accepted on this project. For development you can find some instructions here [Development](./docs/develop.md)
+Pull request are very much accepted on this project. For development you can find some instructions here [Development](https://emhass.readthedocs.io/en/latest/develop.html)
 
 ## Troubleshooting