chellow 1713275535.0.0__tar.gz → 1713290435.0.0__tar.gz

{chellow-1713275535.0.0 → chellow-1713290435.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1713275535.0.0
+Version: 1713290435.0.0
 Summary: Web Application for checking UK energy bills.
 Project-URL: Homepage, https://github.com/WessexWater/chellow
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)

chellow-1713290435.0.0/VERSION

@@ -0,0 +1 @@
+__version__ = "1713290435.0.0"

{chellow-1713275535.0.0 → chellow-1713290435.0.0}/chellow/e/dno_rate_parser.py

@@ -180,7 +180,7 @@ def val_to_slots(val):
     return slots
 
 
-def col_match(row, pattern, repeats=1):
+def col_find(row, pattern, repeats=1):
     for i, cell in enumerate(row):
         txt = cell.value
         if txt is not None:
@@ -191,10 +191,15 @@ def col_match(row, pattern, repeats=1):
                 else:
                     repeats -= 1
 
-    raise BadRequest(
-        f"Pattern '{pattern}' not found in row "
-        + ", ".join(str(cell.value) for cell in row)
-    )
+
+def col_match(row, pattern, repeats=1):
+    result = col_find(row, pattern, repeats=repeats)
+    if result is None:
+        raise BadRequest(
+            f"Pattern '{pattern}' not found in row "
+            + ", ".join(str(cell.value) for cell in row)
+        )
+    return result
 
 
 def tab_lv_hv(sheet, gsp_rates):
@@ -308,6 +313,8 @@ def tab_ehv(sheet, gsp_rates):
                 llfc_val = get_value(row, col_match(title_row, "llfc", repeats=repeats))
                 llfc = None if llfc_val is None else str(llfc_val).strip()
                 if llfc not in (None, ""):
+                    band_col = col_find(title_row, "residual")
+                    band = "" if band_col is None else int(get_decimal(row, band_col))
                     tariffs[llfc] = {
                         "gbp-per-kwh": get_rate(
                             row, col_match(title_row, polarity + " super red")
@@ -321,6 +328,7 @@ def tab_ehv(sheet, gsp_rates):
                         "excess-gbp-per-kva-per-day": get_zero_rate(
                             row, col_match(title_row, polarity + " exce")
                         ),
+                        "description": f"Designated EHV{band}",
                     }
 
         elif state == EHV_BANDS:

{chellow-1713275535.0.0 → chellow-1713290435.0.0}/chellow/e/system_price.py

@@ -11,7 +11,7 @@ import xlrd
 from zish import loads
 
 from chellow.models import Contract, RateScript
-from chellow.utils import HH, hh_format, to_ct, to_utc
+from chellow.utils import HH, ct_datetime, hh_format, to_ct, to_utc
 
 
 def key_format(dt):
@@ -61,7 +61,20 @@ def hh(data_source):
 
 
 def elexon_import(sess, log, set_progress, s, scripting_key):
-    contract = Contract.get_non_core_by_name(sess, "system_price")
+    log("Starting to check System Prices.")
+    contract_name = "system_price"
+    contract = Contract.find_non_core_by_name(sess, contract_name)
+    if contract is None:
+        contract = Contract.insert_non_core(
+            sess,
+            contract_name,
+            "",
+            {"enabled": True},
+            to_utc(ct_datetime(1996, 4, 1)),
+            None,
+            {},
+        )
+        sess.commit()
     contract_props = contract.make_properties()
 
     if not contract_props.get("enabled", False):
@@ -71,15 +84,13 @@ def elexon_import(sess, log, set_progress, s, scripting_key):
         )
         return
 
-    log("Starting to check System Prices.")
-
     for rscript in sess.scalars(
         select(RateScript)
         .where(RateScript.contract == contract)
         .order_by(RateScript.start_date.desc())
     ):
         ns = loads(rscript.script)
-        rates = ns["gbp_per_nbp_mwh"]
+        rates = ns.get("gbp_per_nbp_mwh", {})
         if len(rates) == 0:
             fill_start = rscript.start_date
             break
@@ -121,11 +132,12 @@ def elexon_import(sess, log, set_progress, s, scripting_key):
                         sp_month = {}
                         sp_months.append(sp_month)
                     ssp_val = ssp_row[col_idx].value
-                    sp_month[hh_date] = {
-                        "run": run_code,
-                        "sbp": sbp_val,
-                        "ssp": ssp_val,
-                    }
+                    if sp_month is not None:
+                        sp_month[hh_date] = {
+                            "run": run_code,
+                            "sbp": sbp_val,
+                            "ssp": ssp_val,
+                        }
             hh_date += HH
     log("Successfully extracted data.")
     last_date = sorted(sp_months[-1].keys())[-1]

{chellow-1713275535.0.0 → chellow-1713290435.0.0}/chellow/e/tlms.py

@@ -12,7 +12,7 @@ from werkzeug.exceptions import BadRequest
 from zish import dumps, loads
 
 from chellow.models import Contract, RateScript
-from chellow.utils import HH, hh_format, hh_range, to_ct, to_utc
+from chellow.utils import HH, ct_datetime, hh_format, hh_range, to_ct, to_utc
 
 
 RUNS = ["DF", "RF", "R3", "R2", "R1", "SF", "II"]
@@ -106,7 +106,19 @@ def elexon_import(sess, log, set_progress, s, scripting_key):
     cache = {"rate_scripts": [], "timestamps": {}}
     caches = {}
     log("Starting to check TLMs.")
-    contract = Contract.get_non_core_by_name(sess, "tlms")
+    contract_name = "tlms"
+    contract = Contract.find_non_core_by_name(sess, contract_name)
+    if contract is None:
+        contract = Contract.insert_non_core(
+            sess,
+            contract_name,
+            "",
+            {"enabled": True},
+            to_utc(ct_datetime(1997, 1, 1)),
+            to_utc(ct_datetime(1997, 1, 31, 23, 30)),
+            {"tlms": {}},
+        )
+        sess.commit()
     contract_props = contract.make_properties()
     if contract_props.get("enabled", False):
 

{chellow-1713275535.0.0 → chellow-1713290435.0.0}/chellow/e/tnuos.py

@@ -51,6 +51,11 @@ BAND_LOOKUP = {
     "Non-Domestic Aggregated Band 4": "LV_NoMIC_4",
     "Non-Domestic Aggregated No Residual": "LV_NoMIC_1",
     "Unmetered Supplies": "Unmetered",
+    "Designated EHV0": "EHV1",
+    "Designated EHV1": "EHV1",
+    "Designated EHV2": "EHV2",
+    "Designated EHV3": "EHV3",
+    "Designated EHV4": "EHV4",
 }
 
 

chellow-1713275535.0.0/VERSION

@@ -1 +0,0 @@
-__version__ = "1713275535.0.0"