emhass 0.11.4__py3-none-any.whl → 0.15.5__py3-none-any.whl

emhass/static/advanced.html

@@ -18,6 +18,13 @@
 </br></br>
 <button type="button" id="regressor-model-fit" class="button button1">ML regressor model fit</button>
 <button type="button" id="regressor-model-predict" class="button button2">ML regressor model predict</button>
+</br></br>
+<div id="export-influxdb-section" style="display: none;">
+    <h4>Export InfluxDB data to CSV for ML training</h4>
+    <p style="font-size: 0.9em; color: #666; margin-top: -10px;">Export historical sensor data from InfluxDB to train ML regressor models</p>
+    <button type="button" id="export-influxdb-to-csv" class="button button1">Export InfluxDB to CSV</button>
+    </br></br>
+</div>
 <!-- -->
 <!--dynamic runtime parameter input (list and box) elements section -->
 <h4>Input Runtime Parameters</h4>

emhass/static/configuration_list.html

@@ -29,13 +29,17 @@
 <div id="Solar System (PV)" class="section-card">
   <div class="section-card-header">
     <h4>Solar System (PV)</h4>
+    <label class="switch" for="set_use_pv"> <!-- switch connected to set_use_pv  -->
+      <input id="set_use_pv" type="checkbox">
+      <span class="slider"></span>
+    </label>
   </div>
   <div class="section-body"> </div> <!--  parameters will get generated here -->
 </div>
 <div id="Battery" class="section-card">
   <div class="section-card-header">
     <h4>Battery</h4>
-    <label class="switch"> <!-- switch connected to set_use_battery  -->
+    <label class="switch" for="set_use_battery"> <!-- switch connected to set_use_battery  -->
       <input id="set_use_battery" type="checkbox">
       <span class="slider"></span>
     </label>

emhass/static/configuration_script.js

@@ -19,11 +19,11 @@
 //on page reload
 window.onload = async function () {
   ///fetch configuration parameters from definitions json file
-  param_definitions = await getParamDefinitions();
+  let param_definitions = await getParamDefinitions();
   //obtain configuration from emhass (pull)
-  config = await obtainConfig();
+  let config = await obtainConfig();
   //obtain configuration_list.html html as a template to dynamically to render parameters in a list view (parameters as input items)
-  list_html = await getListHTML();
+  let list_html = await getListHTML();
   //load list parameter page (default)
   loadConfigurationListView(param_definitions, config, list_html);
 
@@ -70,14 +70,14 @@ async function obtainConfig() {
   const response = await fetch(`get-config`, {
     method: "GET",
   });
-  response_status = await response.status; //return status
+  let  response_status = response.status; //return status
   //if request failed
   if (response_status !== 200 && response_status !== 201) {
     showChangeStatus(response_status, await response.json());
     return {};
   }
   //else extract json rom data
-  blob = await response.blob(); //get data blob
+  let blob = await response.blob(); //get data blob
   config = await new Response(blob).json(); //obtain json from blob
   showChangeStatus(response_status, {});
   return config;
@@ -90,13 +90,13 @@ async function ObtainDefaultConfig() {
     method: "GET",
   });
   //if request failed
-  response_status = await response.status; //return status
+  let response_status = response.status; //return status
   if (response_status !== 200 && response_status !== 201) {
     showChangeStatus(response_status, await response.json());
     return {};
   }
   //else extract json rom data
-  blob = await response.blob(); //get data blob
+  let blob = await response.blob(); //get data blob
   config = await new Response(blob).json(); //obtain json from blob
   showChangeStatus(response_status, {});
   return config;
@@ -109,9 +109,9 @@ async function getListHTML() {
     errorAlert("Unable to obtain configuration_list.html file");
     return {};
   }
-  blob = await response.blob(); //get data blob
-  htmlTemplateData = await new Response(blob).text(); //obtain html from blob
-  return await htmlTemplateData;
+  let blob = await response.blob(); //get data blob
+  let htmlTemplateData = await new Response(blob).text(); //obtain html from blob
+  return htmlTemplateData;
 }
 
 //load list configuration view
@@ -121,13 +121,13 @@ function loadConfigurationListView(param_definitions, config, list_html) {
   }
 
   //list parameters used in the section headers
-  header_input_list = ["set_use_battery", "number_of_deferrable_loads"];
+  let header_input_list = ["set_use_battery", "set_use_pv", "number_of_deferrable_loads"];
 
   //get the main container and append list template html
   document.getElementById("configuration-container").innerHTML = list_html;
 
-  //loop though configuration sections ('Local','System','Tariff','Solar System (PV)') in definitions file
-  for (var section in param_definitions) {
+  //loop through configuration sections ('Local','System','Tariff','Solar System (PV)') in definitions file
+  for (let section in param_definitions) {
     // build each section by adding parameters with their corresponding input elements
     buildParamContainers(
       section,
@@ -138,12 +138,12 @@ function loadConfigurationListView(param_definitions, config, list_html) {
 
     //after sections have been built, add event listeners for section header inputs
     //loop though headers
-    for (header_input_param of header_input_list) {
+    for (let header_input_param of header_input_list) {
       if (param_definitions[section].hasOwnProperty(header_input_param)) {
         //grab default from definitions file
-        value = param_definitions[section][header_input_param]["default_value"];
+        let value = param_definitions[section][header_input_param]["default_value"];
         //find input element (using the parameter name as the input element ID)
-        header_input_element = document.getElementById(header_input_param);
+        let header_input_element = document.getElementById(header_input_param);
         if (header_input_element !== null) {
           //add event listener to element (trigger on input change)
           header_input_element.addEventListener("input", (e) =>
@@ -164,6 +164,74 @@ function loadConfigurationListView(param_definitions, config, list_html) {
       }
     }
   }
+
+  // Dynamic hiding for InfluxDB options
+  const use_influx_param = "use_influxdb";
+  const influx_related_params = [
+    "influxdb_host",
+    "influxdb_port",
+    "influxdb_username",
+    "influxdb_password",
+    "influxdb_database",
+    "influxdb_measurement",
+    "influxdb_retention_policy",
+    "influxdb_use_ssl",
+    "influxdb_verify_ssl"
+  ];
+
+  const influx_toggle_div = document.getElementById(use_influx_param);
+  if (influx_toggle_div) {
+    // The actual input is inside the div with the ID
+    const influx_input = influx_toggle_div.querySelector("input");
+    if (influx_input) {
+      const toggleInfluxVisibility = () => {
+        const isChecked = influx_input.checked;
+        influx_related_params.forEach(paramId => {
+          const paramDiv = document.getElementById(paramId);
+          if (paramDiv) {
+            paramDiv.style.display = isChecked ? "" : "none";
+          }
+        });
+      };
+
+      // Add listener and set initial state
+      influx_input.addEventListener("change", toggleInfluxVisibility);
+      toggleInfluxVisibility();
+    }
+  }
+
+  // ML Forecaster Visibility Logic
+  const forecast_method_param = "load_forecast_method";
+  const ml_related_params = [
+    "model_type",
+    "var_model",
+    "sklearn_model",
+    "regression_model",
+    "num_lags",
+    "split_date_delta",
+    "n_trials",
+    "perform_backtest"
+  ];
+
+  const forecast_method_div = document.getElementById(forecast_method_param);
+  if (forecast_method_div) {
+    const method_select = forecast_method_div.querySelector("select, input");
+    if (method_select) {
+      const toggleMLVisibility = () => {
+        const isML = method_select.value === "mlforecaster";
+        ml_related_params.forEach(paramId => {
+          const paramDiv = document.getElementById(paramId);
+          if (paramDiv) {
+            paramDiv.style.display = isML ? "" : "none";
+          }
+        });
+      };
+      // Add listener and set initial state
+      method_select.addEventListener("change", toggleMLVisibility);
+      method_select.addEventListener("input", toggleMLVisibility); // Handle both select and text input types
+      toggleMLVisibility();
+    }
+  }
 }
 
 //build sections body, containing parameter/param containers (containing parameter/param inputs)
@@ -174,9 +242,9 @@ function buildParamContainers(
   header_input_list
 ) {
   //get the section container element
-  SectionContainer = document.getElementById(section);
+  let SectionContainer = document.getElementById(section);
   //get the body container inside the section (where the parameters will be appended)
-  SectionParamElement = SectionContainer.getElementsByClassName("section-body");
+  let SectionParamElement = SectionContainer.getElementsByClassName("section-body");
   if (SectionContainer == null || SectionParamElement.length == 0) {
     console.error("Unable to find Section container or Section Body");
     return 0;
@@ -217,7 +285,7 @@ function buildParamContainers(
     }
 
     //if parameter type == array.* and not in "Deferrable Loads" section, append plus and minus buttons in param div
-    array_buttons = "";
+    let array_buttons = "";
     if (
       parameter_definition_object["input"].search("array.") > -1 &&
       section != "Deferrable Loads"
@@ -265,7 +333,7 @@ function buildParamContainers(
   });
 
   //check initial checkbox state, check "value" of input and match to "checked" value
-  let checkbox = document.querySelectorAll("input[type='checkbox']");
+  let checkbox = SectionContainer.querySelectorAll("input[type='checkbox']");
   checkbox.forEach(function (answer) {
     let value = answer.value === "true";
     answer.checked = value;
@@ -305,7 +373,7 @@ function buildParamContainers(
       }
 
       //obtain required param inputs, add event listeners
-      requirement_inputs =
+      let requirement_inputs =
         requirement_element.getElementsByClassName("param_input");
       //grab required value
       const requirement_value = Object.values(
@@ -334,10 +402,11 @@ function buildParamElement(
   parameter_definition_name,
   config
 ) {
-  var type = "";
-  var inputs = "";
-  var type_specific_html = "";
-  var type_specific_html_end = "";
+  let type = "";
+  let inputs = "";
+  let type_specific_html = "";
+  let type_specific_html_end = "";
+  let placeholder = ""
 
   //switch statement to adjust generated html according to the parameter data type (definitions in definitions file)
   switch (parameter_definition_object["input"]) {
@@ -345,12 +414,12 @@ function buildParamElement(
     //number
     case "int":
       type = "number";
-      placeholder = parseInt(parameter_definition_object["default_value"]);
+      placeholder = Number.parseInt(parameter_definition_object["default_value"]);
       break;
     case "array.float":
     case "float":
       type = "number";
-      placeholder = parseFloat(parameter_definition_object["default_value"]);
+      placeholder = Number.parseFloat(parameter_definition_object["default_value"]);
       break;
     //text (string)
     case "array.string":
@@ -384,9 +453,8 @@ function buildParamElement(
 
   //check default values saved in param definitions
   //definitions default value is used if none is found in the configs, or an array element has been added in the ui (deferrable load number increase or plus button pressed)
-  value = parameter_definition_object["default_value"];
   //check if a param value is saved in the config file (if so overwrite definition default)
-  value = checkConfigParam(value, config, parameter_definition_name);
+  let value = checkConfigParam(placeholder, config, parameter_definition_name);
 
   //generate and return param input html,
   //check if param value is not an object, if so assume its a single value.
@@ -395,7 +463,7 @@ function buildParamElement(
     if (parameter_definition_object["input"] == "select") {
       let inputs = `<select class="param_input">`;
       for (const options of parameter_definition_object["select_options"]) {
-        selected = ""
+        let selected = ""
         //if item in select is the same as the config value, then append "selected" tag
         if (options==value) {selected = `selected="selected"`}
         inputs += `<option ${selected}>${options}</option>`;
@@ -416,8 +484,8 @@ function buildParamElement(
   else {
     //for items such as load_peak_hour_periods (object of objects with arrays)
     if (typeof Object.values(value)[0] === "object") {
-      for (param of Object.values(value)) {
-        for (items of Object.values(param)) {
+      for (let param of Object.values(value)) {
+        for (let items of Object.values(param)) {
           inputs += `<input class="param_input" type="${type}" placeholder=${Object.values(items)[0]} value=${
             Object.values(items)[0]
           }>`;
@@ -429,7 +497,7 @@ function buildParamElement(
     // array of values
     else {
       let inputs = "";
-      for (param of value) {
+      for (let param of value) {
         inputs += `
           ${type_specific_html}
           <input class="param_input" type="${type}" placeholder=${parameter_definition_object["default_value"]} value=${param}>
@@ -448,14 +516,14 @@ function plusElements(
   section,
   config
 ) {
-  param_element = document.getElementById(parameter_definition_name);
+  let param_element = document.getElementById(parameter_definition_name);
   if (param_element == null) {
     console.log(
       "Unable to find " + parameter_definition_name + " param div container"
     );
     return 1;
   }
-  param_input_container =
+  let param_input_container =
     param_element.getElementsByClassName("param-input")[0];
   // Add a copy of the param element
   param_input_container.innerHTML += buildParamElement(
@@ -467,14 +535,15 @@ function plusElements(
 
 //Remove param inputs in param div container (minimum 1)
 function minusElements(param) {
-  param_element = document.getElementById(param);
+  let param_element = document.getElementById(param);
+  let param_input
   if (param_element == null) {
     console.log(
       "Unable to find " + parameter_definition_name + " param div container"
     );
     return 1;
   }
-  param_input_list = param_element.getElementsByTagName("input");
+  let param_input_list = param_element.getElementsByTagName("input");
   if (param_input_list.length == 0) {
     console.log(
       "Unable to find " + parameter_definition_name + " param input/s"
@@ -493,7 +562,7 @@ function minusElements(param) {
   //if param is "load_peak_hour_periods", remove both start and end param inputs as well as the line brake tag separating the inputs
   if (param == "load_peak_hour_periods") {
     if (param_input_list.length > 2) {
-      brs = document.getElementById(param).getElementsByTagName("br");
+      let brs = document.getElementById(param).getElementsByTagName("br");
       param_input_list[param_input_list.length - 1].remove();
       param_input_list[param_input_list.length - 1].remove();
       brs[brs.length - 1].remove();
@@ -511,6 +580,7 @@ function checkRequirements(
   param_element,
   requirement_value
 ) {
+  let requirement_element_value
   //get current value of required element
   if (requirement_element.type == "checkbox") {
     requirement_element_value = requirement_element.checked;
@@ -522,22 +592,22 @@ function checkRequirements(
     if (!param_element.classList.contains("requirement-disable")) {
       param_element.classList.add("requirement-disable");
     }
-  } else {
-    if (param_element.classList.contains("requirement-disable")) {
+  } else if (param_element.classList.contains("requirement-disable")) {
       param_element.classList.remove("requirement-disable");
-    }
   }
 }
 
 //on header input change, execute accordingly
 function headerElement(element, param_definitions, config) {
   //obtain section body element
-  section_card = element.closest(".section-card");
+  let section_card = element.closest(".section-card");
+  let param_list 
+  let difference
   if (section_card == null) {
     console.log("Unable to obtain section-card");
     return 1;
   }
-  param_container = section_card.getElementsByClassName("section-body");
+  let param_container = section_card.getElementsByClassName("section-body");
   if (param_container.length > 0) {
     param_container = section_card.getElementsByClassName("section-body")[0];
   } else {
@@ -559,6 +629,19 @@ function headerElement(element, param_definitions, config) {
       }
       break;
 
+    //if set_use_pv, add or remove PV section (inc. related params)
+    case "set_use_pv":
+      if (element.checked) {
+        param_container.innerHTML = "";
+        buildParamContainers("Solar System (PV)", param_definitions["Solar System (PV)"], config, [
+          "set_use_pv",
+        ]);
+        element.checked = true;
+      } else {
+        param_container.innerHTML = "";
+      }
+      break;
+
     //if number_of_deferrable_loads, the number of inputs in the "Deferrable Loads" section should add up to number_of_deferrable_loads value in header
     case "number_of_deferrable_loads":
       //get a list of param in section
@@ -571,7 +654,7 @@ function headerElement(element, param_definitions, config) {
       }
       //calculate how much off the fist parameters input elements amount to is, compering to the number_of_deferrable_loads value
       difference =
-        parseInt(element.value) -
+        Number.parseInt(element.value) -
         param_container.firstElementChild.querySelectorAll("input").length;
       //add elements based on how many elements are missing
       if (difference > 0) {
@@ -608,22 +691,24 @@ function checkConfigParam(value, config, parameter_definition_name) {
 //send all parameter input values to EMHASS, to save to config.json and param.pkl
 async function saveConfiguration(param_definitions) {
   //start wth none
-  config = {};
+  let config = {};
+  let param_inputs
+  let param_element
 
   //if section-cards (config sections/list) exists
-  config_card = document.getElementsByClassName("section-card");
+  let config_card = document.getElementsByClassName("section-card");
   //check if page is in list or box view
-  config_box_element = document.getElementById("config-box");
+  let config_box_element = document.getElementById("config-box");
 
   //if true, in list view
   if (Boolean(config_card.length)) {
     //retrieve params and their input/s by looping though param_definitions list
     //loop through the sections
-    for (var [section_name, section_object] of Object.entries(
+    for (const [, section_object] of Object.entries(
       param_definitions
     )) {
       //loop through parameters
-      for (var [
+      for (let [
         parameter_definition_name,
         parameter_definition_object,
       ] of Object.entries(section_object)) {
@@ -637,7 +722,6 @@ async function saveConfiguration(param_definitions) {
               parameter_definition_name +
               " param div container element, skipping this param"
           );
-          continue;
         }
         //extract input/s and their value/s from param container div
         else {
@@ -649,10 +733,10 @@ async function saveConfiguration(param_definitions) {
           }
 
           // loop though param_inputs, extract the element/s values
-          for (var input of param_inputs) {
+          for (let input of param_inputs) {
             switch (input.type) {
               case "number":
-                param_values.push(parseFloat(input.value));
+                param_values.push(Number.parseFloat(input.value));
                 break;
               case "checkbox":
                 param_values.push(input.checked);
@@ -737,20 +821,20 @@ async function ToggleView(param_definitions, list_html, default_reset) {
   config = {};
 
   //find out if list or box view is active
-  configuration_container = document.getElementById("configuration-container");
+  let configuration_container = document.getElementById("configuration-container");
   if (configuration_container == null) {
     errorAlert("Unable to find Configuration Container element");
   }
   //get yaml button
-  yaml_button = document.getElementById("yaml");
+  let yaml_button = document.getElementById("yaml");
   if (yaml_button == null) {
     console.log("Unable to obtain yaml button");
   }
 
   // if section-cards (config sections/list) exists
-  config_card = configuration_container.getElementsByClassName("section-card");
+  let config_card = configuration_container.getElementsByClassName("section-card");
   //selected view (0 = box)
-  selected_view = Boolean(config_card.length);
+  let selected_view = Boolean(config_card.length);
 
   //if default_reset is passed do not switch views, instead reinitialize view with default config as values
   if (default_reset) {
@@ -788,7 +872,7 @@ async function ToggleView(param_definitions, list_html, default_reset) {
 //load box (json textarea) view
 async function loadConfigurationBoxPage(config) {
   //get configuration container element
-  configuration_container = document.getElementById("configuration-container");
+  let configuration_container = document.getElementById("configuration-container");
   if (configuration_container == null) {
     errorAlert("Unable to find Configuration Container element");
   }
@@ -806,7 +890,7 @@ async function loadConfigurationBoxPage(config) {
 
 //function in control of status icons and alert box from a fetch request
 async function showChangeStatus(status, logJson) {
-  var loading = document.getElementById("loader"); //element showing statuses
+  let loading = document.getElementById("loader"); //element showing statuses
   if (loading === null) {
     console.log("unable to find loader element");
     return 1;
@@ -847,7 +931,7 @@ async function errorAlert(text) {
 //convert yaml box into json box
 async function yamlToJson() {
   //get box element
-  config_box_element = document.getElementById("config-box");
+  let config_box_element = document.getElementById("config-box");
   if (config_box_element == null) {
     errorAlert("Unable to obtain config box");
   } else {
@@ -858,10 +942,10 @@ async function yamlToJson() {
       },
       body: config_box_element.value,
     });
-    response_status = await response.status; //return status
+    let response_status = response.status; //return status
     if (response_status == 201) {
       showChangeStatus(response_status, {});
-      blob = await response.blob(); //get data blob
+      let blob = await response.blob(); //get data blob
       config = await new Response(blob).json(); //obtain json from blob
       config_box_element.value = JSON.stringify(config, null, 2);
     } else {
@@ -869,4 +953,4 @@ async function yamlToJson() {
     }
   }
   return 0;
-}
+}