[pre-commit.ci lite] apply automatic fixes

Author: pre-commit-ci-lite[bot]

apps/predbat/predbat.py

@@ -4150,33 +4150,32 @@ def get_html_plan_header(self, plan_debug):
         html += "</tr>"
         return html
 
-
     def publish_json_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10, load_minutes_step, load_minutes_step10, end_record):
         output = {}
 
         plan_debug = self.get_arg("plan_debug")
         """
         Publish the current plan in JSON format
         """
-        output['plan_starts'] = self.now_utc.strftime("%Y-%m-%d %H:%M")
-        output['last_updated'] = self.now_utc_real.strftime("%H:%M:%S")
-        output['version'] = THIS_VERSION
-        output['config'] = {}
-        output['config']['best_soc_min'] = self.best_soc_min
-        output['config']['best_soc_max'] = self.best_soc_max
-        output['config']['best_soc_keep'] = self.best_soc_keep
-        output['config']['carbon_metric'] = self.carbon_metric
-        output['config']['metric_self_sufficiency'] = self.metric_self_sufficiency
-        output['config']['metric_battery_value_scaling'] = self.metric_battery_value_scaling
-        output['config']['currency'] = self.currency_symbols
+        output["plan_starts"] = self.now_utc.strftime("%Y-%m-%d %H:%M")
+        output["last_updated"] = self.now_utc_real.strftime("%H:%M:%S")
+        output["version"] = THIS_VERSION
+        output["config"] = {}
+        output["config"]["best_soc_min"] = self.best_soc_min
+        output["config"]["best_soc_max"] = self.best_soc_max
+        output["config"]["best_soc_keep"] = self.best_soc_keep
+        output["config"]["carbon_metric"] = self.carbon_metric
+        output["config"]["metric_self_sufficiency"] = self.metric_self_sufficiency
+        output["config"]["metric_battery_value_scaling"] = self.metric_battery_value_scaling
+        output["config"]["currency"] = self.currency_symbols
 
         minute_now_align = int(self.minutes_now / 30) * 30
         end_plan = min(end_record, self.forecast_minutes) + minute_now_align
         rowspan = 0
         in_span = False
         start_span = False
 
-        output['slots'] = []
+        output["slots"] = []
 
         for minute in range(minute_now_align, end_plan, 30):
             slot = {}
@@ -4263,123 +4262,120 @@ def publish_json_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10,
             metric_end = self.predict_metric_best.get(minute_relative_slot_end, metric_start)
             metric_change = metric_end - metric_start
 
-            slot['state'] = {}
-
-            slot['state']['soc'] = {}
-            slot['state']['soc']['percent'] = soc_percent
-            slot['state']['soc']['percent_end'] = soc_percent_end
-            slot['state']['soc']['percent_end_window'] = soc_percent_end_window
-            slot['state']['soc']['percent_max'] = soc_percent_max
-            slot['state']['soc']['percent_min'] = soc_percent_min
-            slot['state']['soc']['percent_max_window'] = soc_percent_max_window
-            slot['state']['soc']['percent_min_window'] = soc_percent_min_window
-            slot['state']['soc']['change'] = self.dp2(soc_change)
+            slot["state"] = {}
 
+            slot["state"]["soc"] = {}
+            slot["state"]["soc"]["percent"] = soc_percent
+            slot["state"]["soc"]["percent_end"] = soc_percent_end
+            slot["state"]["soc"]["percent_end_window"] = soc_percent_end_window
+            slot["state"]["soc"]["percent_max"] = soc_percent_max
+            slot["state"]["soc"]["percent_min"] = soc_percent_min
+            slot["state"]["soc"]["percent_max_window"] = soc_percent_max_window
+            slot["state"]["soc"]["percent_min_window"] = soc_percent_min_window
+            slot["state"]["soc"]["change"] = self.dp2(soc_change)
 
             if minute in self.manual_idle_times:
-                slot['state']['override'] = True
+                slot["state"]["override"] = True
 
             split = False
 
-            slot['pv'] = {}
-            slot['pv']['forecast'] = pv_forecast
-            slot['pv']['forecast10'] = pv_forecast10
+            slot["pv"] = {}
+            slot["pv"]["forecast"] = pv_forecast
+            slot["pv"]["forecast10"] = pv_forecast10
 
             if plan_debug and pv_forecast10 > 0.0:
-                slot['pv']['debug'] = str(pv_forecast10)
+                slot["pv"]["debug"] = str(pv_forecast10)
 
-            slot['load'] = {}
-            slot['load']['forecast'] = load_forecast
-            slot['load']['forecast10'] = load_forecast10
+            slot["load"] = {}
+            slot["load"]["forecast"] = load_forecast
+            slot["load"]["forecast10"] = load_forecast10
 
             if plan_debug and load_forecast10 > 0.0:
-                slot['load']['debug'] = str(load_forecast10)
+                slot["load"]["debug"] = str(load_forecast10)
 
             if charge_window_n >= 0:
                 limit = self.charge_limit_best[charge_window_n]
                 limit_percent = int(self.charge_limit_percent_best[charge_window_n])
                 if limit > 0.0:
                     if self.set_charge_freeze and (limit == self.reserve):
-                        slot['state']['mode'] = 'Freeze charge'
+                        slot["state"]["mode"] = "Freeze charge"
                         limit_percent = soc_percent
                     elif limit_percent == soc_percent_min_window:
-                        slot['state']['mode'] = 'Hold charge'
+                        slot["state"]["mode"] = "Hold charge"
                     elif limit_percent < soc_percent_min_window:
-                        slot['state']['mode'] = 'No charge'
+                        slot["state"]["mode"] = "No charge"
                     else:
-                        slot['state']['mode'] = 'Charge'
+                        slot["state"]["mode"] = "Charge"
 
                     if self.charge_window_best[charge_window_n]["start"] in self.manual_charge_times:
-                        slot['state']['override'] = True
+                        slot["state"]["override"] = True
                     elif self.charge_window_best[charge_window_n]["start"] in self.manual_freeze_charge_times:
-                        slot['state']['override'] = True
+                        slot["state"]["override"] = True
 
-                    slot['state']['limit'] = limit_percent
+                    slot["state"]["limit"] = limit_percent
             else:
                 if discharge_window_n >= 0:
                     start = self.discharge_window_best[discharge_window_n]["start"]
                     if start > minute:
                         soc_change_this = self.predict_soc_best.get(max(start - self.minutes_now, 0), 0.0) - self.predict_soc_best.get(minute_relative_start, 0.0)
-                        slot['state']['soc']['change'] = self.dp2(soc_change_this)
+                        slot["state"]["soc"]["change"] = self.dp2(soc_change_this)
 
             if discharge_window_n >= 0:
                 limit = self.discharge_limits_best[discharge_window_n]
                 if limit == 99:
                     # TODO: figure out the split state logic, and how to reflect it here
-                    slot['state']['mode'] = 'Freeze discharge'
-                    slot['state']['limit'] = limit
+                    slot["state"]["mode"] = "Freeze discharge"
+                    slot["state"]["limit"] = limit
                 elif limit < 100:
                     # TODO: figure out the split state logic, and how to reflect it here
                     if limit > soc_percent_max_window:
-                        slot['state']['mode'] = 'Hold discharge'
+                        slot["state"]["mode"] = "Hold discharge"
                     else:
-                        slot['state']['mode'] = 'Discharge'
-                    slot['state']['limit'] = limit
+                        slot["state"]["mode"] = "Discharge"
+                    slot["state"]["limit"] = limit
 
                 if self.discharge_window_best[discharge_window_n]["start"] in self.manual_discharge_times:
-                    slot['state']['override'] = True
+                    slot["state"]["override"] = True
                 elif self.discharge_window_best[discharge_window_n]["start"] in self.manual_freeze_discharge_times:
-                    slot['state']['override'] = True
-
+                    slot["state"]["override"] = True
 
-            slot['rate'] = {}
-            slot['rate']['start'] = rate_start.strftime("%a %H:%M")
+            slot["rate"] = {}
+            slot["rate"]["start"] = rate_start.strftime("%a %H:%M")
 
             # Import and export rates -> to JSON
-            slot['rate']['import'] = {}
-            slot['rate']['import']['value'] = rate_value_import
-            slot['rate']['import']['adjust_type'] = self.rate_import_replicated.get(minute, None)
+            slot["rate"]["import"] = {}
+            slot["rate"]["import"]["value"] = rate_value_import
+            slot["rate"]["import"]["adjust_type"] = self.rate_import_replicated.get(minute, None)
 
             if plan_debug:
-                slot['rate']['import']['debug'] = "%02.02f" % (rate_value_import / self.battery_loss / self.inverter_loss + self.metric_battery_cycle)
+                slot["rate"]["import"]["debug"] = "%02.02f" % (rate_value_import / self.battery_loss / self.inverter_loss + self.metric_battery_cycle)
 
             if charge_window_n >= 0:
-                slot['rate']['import']['charge'] = True
+                slot["rate"]["import"]["charge"] = True
 
-            slot['rate']['export'] = {}
-            slot['rate']['export']['value'] = rate_value_export
-            slot['rate']['export']['adjust_type'] = self.rate_export_replicated.get(minute, None)
+            slot["rate"]["export"] = {}
+            slot["rate"]["export"]["value"] = rate_value_export
+            slot["rate"]["export"]["adjust_type"] = self.rate_export_replicated.get(minute, None)
 
             if plan_debug:
-                slot['rate']['export']['debug'] = "%02.02f" % (rate_value_export * self.battery_loss_discharge * self.inverter_loss - self.metric_battery_cycle)
+                slot["rate"]["export"]["debug"] = "%02.02f" % (rate_value_export * self.battery_loss_discharge * self.inverter_loss - self.metric_battery_cycle)
 
             if discharge_window_n >= 0:
-                slot['rate']['export']['discharge'] = True
+                slot["rate"]["export"]["discharge"] = True
 
-
-            slot['cost'] = {}
+            slot["cost"] = {}
 
             # Total cost at start of slot, add leading minus if negative
-            slot['cost']['start'] = metric_start
-            slot['cost']['change'] = self.dp2(metric_change)
+            slot["cost"]["start"] = metric_start
+            slot["cost"]["change"] = self.dp2(metric_change)
 
             # Car charging?
-            slot['car'] = {}
+            slot["car"] = {}
             if self.num_cars > 0:
-                slot['car']['charging_kwh'] = self.car_charge_slot_kwh(minute_start, minute_end)
+                slot["car"]["charging_kwh"] = self.car_charge_slot_kwh(minute_start, minute_end)
 
             # iBoost
-            slot['iboost'] = {}
+            slot["iboost"] = {}
             if self.iboost_enable:
                 iboost_slot_end = minute_relative_slot_end
                 iboost_amount = self.predict_iboost_best.get(minute_relative_start, 0)
@@ -4394,40 +4390,38 @@ def publish_json_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10,
                     )
                 else:
                     iboost_change = max(iboost_amount_end - iboost_amount, 0.0)
-                slot['iboost']['change'] = iboost_change
-                slot['iboost']['amount'] = iboost_amount
-                slot['iboost']['amount_end'] = iboost_amount_end
-                slot['iboost']['amount_prev'] = iboost_amount_prev
+                slot["iboost"]["change"] = iboost_change
+                slot["iboost"]["amount"] = iboost_amount
+                slot["iboost"]["amount_end"] = iboost_amount_end
+                slot["iboost"]["amount_prev"] = iboost_amount_prev
 
-            slot['carbon'] = {}
+            slot["carbon"] = {}
             if self.carbon_enable:
                 # Work out carbon intensity and carbon use
-                slot['carbon']['amount']     = self.predict_carbon_best.get(minute_relative_start, 0)
-                slot['carbon']['amount_end'] = self.predict_carbon_best.get(minute_relative_slot_end, 0)
-                slot['carbon']['change']     = self.dp2(carbon_amount_end - carbon_amount)
-                slot['carbon']['intensity']  = self.dp0(self.carbon_intensity.get(minute_relative_start, 0))
-
+                slot["carbon"]["amount"] = self.predict_carbon_best.get(minute_relative_start, 0)
+                slot["carbon"]["amount_end"] = self.predict_carbon_best.get(minute_relative_slot_end, 0)
+                slot["carbon"]["change"] = self.dp2(carbon_amount_end - carbon_amount)
+                slot["carbon"]["intensity"] = self.dp0(self.carbon_intensity.get(minute_relative_start, 0))
 
             if start_span:
-                slot['span'] = 'start'
+                slot["span"] = "start"
             elif in_span:
-                slot['span'] = 'in_span'
+                slot["span"] = "in_span"
             elif not in_span:
-                slot['span'] = 'not in_span'
+                slot["span"] = "not in_span"
             else:
-                slot['span'] = 'unknown'
+                slot["span"] = "unknown"
 
-            output['slots'].append(slot)
+            output["slots"].append(slot)
 
-        #output['raw'] = {}
-        #output['raw']['pv_forecast_minute_step'] = pv_forecast_minute_step
-        #output['raw']['pv_forecast_minute_step10'] = pv_forecast_minute_step10
-        #output['raw']['load_minutes_step'] = load_minutes_step
-        #output['raw']['load_minutes_step10'] = load_minutes_step10
+        # output['raw'] = {}
+        # output['raw']['pv_forecast_minute_step'] = pv_forecast_minute_step
+        # output['raw']['pv_forecast_minute_step10'] = pv_forecast_minute_step10
+        # output['raw']['load_minutes_step'] = load_minutes_step
+        # output['raw']['load_minutes_step10'] = load_minutes_step10
 
         self.dashboard_item(self.prefix + ".plan_json", state="", attributes={"json": json.dumps(output), "friendly_name": "Plan in JSON", "icon": "mdi:web-box"})
 
-
     def publish_html_plan(self, pv_forecast_minute_step, pv_forecast_minute_step10, load_minutes_step, load_minutes_step10, end_record):
         """
         Publish the current plan in HTML format