chellow 1713268896.0.0__py3-none-any.whl → 1713290435.0.0__py3-none-any.whl

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/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/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/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/general_import.py

@@ -1255,8 +1255,12 @@ def general_import_supply(sess, action, vals, args):
         cop = Cop.get_by_code(sess, cop_code)
         comm_code = add_arg(args, "Comms Type", vals, 16)
         comm = Comm.get_by_code(sess, comm_code)
-        ssc_code = add_arg(args, "Standard Settlement Configuration", vals, 17)
-        ssc = Ssc.get_by_code(sess, ssc_code) if len(ssc_code) > 0 else None
+        ssc_code_str = add_arg(args, "Standard Settlement Configuration", vals, 17)
+        if len(ssc_code_str) > 0:
+            ssc = Ssc.get_by_code(sess, ssc_code_str, start_date)
+            ssc_code = ssc.code
+        else:
+            ssc_code = None
         energisation_status_code = add_arg(args, "Energisation Status", vals, 18)
         energisation_status = EnergisationStatus.get_by_code(
             sess, energisation_status_code
@@ -1340,7 +1344,7 @@ def general_import_supply(sess, action, vals, args):
             mtc_code,
             cop,
             comm,
-            ssc,
+            ssc_code,
             energisation_status,
             properties,
             imp_mpan_core,

chellow/models.py

@@ -2845,44 +2845,21 @@ class MtcSsc(Base, PersistentClass):
     mtc_llfc_sscs = relationship("MtcLlfcSsc", backref="mtc_ssc")
     __table_args__ = (UniqueConstraint("mtc_participant_id", "ssc_id", "valid_from"),)
 
-    def __init__(
-        self,
-        mtc_participant,
-        ssc,
-        valid_from,
-        valid_to,
-    ):
+    def __init__(self, mtc_participant, ssc, valid_from, valid_to):
         self.mtc_participant = mtc_participant
         self.ssc = ssc
         self.valid_from = valid_from
-        self.update(
-            valid_to,
-        )
+        self.update(valid_to)
 
-    def update(
-        self,
-        valid_to,
-    ):
+    def update(self, valid_to):
         self.valid_to = valid_to
 
         if hh_after(self.valid_from, valid_to):
             raise BadRequest("The valid_from date can't be after the valid_to date.")
 
     @classmethod
-    def insert(
-        cls,
-        sess,
-        mtc_participant,
-        ssc,
-        valid_from,
-        valid_to,
-    ):
-        mtc_ssc = cls(
-            mtc_participant,
-            ssc,
-            valid_from,
-            valid_to,
-        )
+    def insert(cls, sess, mtc_participant, ssc, valid_from, valid_to):
+        mtc_ssc = cls(mtc_participant, ssc, valid_from, valid_to)
         sess.add(mtc_ssc)
         sess.flush()
         return mtc_ssc
@@ -2924,44 +2901,21 @@ class MtcLlfcSsc(Base, PersistentClass):
     mtc_llfc_ssc_pcs = relationship("MtcLlfcSscPc", backref="mtc_llfc_ssc")
     __table_args__ = (UniqueConstraint("mtc_ssc_id", "llfc_id", "valid_from"),)
 
-    def __init__(
-        self,
-        mtc_ssc,
-        llfc,
-        valid_from,
-        valid_to,
-    ):
+    def __init__(self, mtc_ssc, llfc, valid_from, valid_to):
         self.mtc_ssc = mtc_ssc
         self.llfc = llfc
         self.valid_from = valid_from
-        self.update(
-            valid_to,
-        )
+        self.update(valid_to)
 
-    def update(
-        self,
-        valid_to,
-    ):
+    def update(self, valid_to):
         self.valid_to = valid_to
 
         if hh_after(self.valid_from, valid_to):
             raise BadRequest("The valid_from date can't be after the valid_to date.")
 
     @classmethod
-    def insert(
-        cls,
-        sess,
-        mtc_ssc,
-        llfc,
-        valid_from,
-        valid_to,
-    ):
-        mtc_llfc_ssc = cls(
-            mtc_ssc,
-            llfc,
-            valid_from,
-            valid_to,
-        )
+    def insert(cls, sess, mtc_ssc, llfc, valid_from, valid_to):
+        mtc_llfc_ssc = cls(mtc_ssc, llfc, valid_from, valid_to)
         sess.add(mtc_llfc_ssc)
         sess.flush()
         return mtc_llfc_ssc

{chellow-1713268896.0.0.dist-info → chellow-1713290435.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1713268896.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-1713268896.0.0.dist-info → chellow-1713290435.0.0.dist-info}/RECORD

@@ -4,8 +4,8 @@ chellow/bank_holidays.py,sha256=T_utYMwe_g1dz5X-aOTdIPryg49SvB7QsWM1yphlqG8,4423
 chellow/commands.py,sha256=ESBe9ZWj1c3vdZgqMZ9gFvYAB3hRag2R1PzOwuw9yFo,1302
 chellow/dloads.py,sha256=5SmP-0QPK6xCkd_wjIWh_8FAzN5OxNHCzyEQ1Xb-Y-M,5256
 chellow/edi_lib.py,sha256=het3R0DBGtXEo-Sy1zvXQuX9EWQ1X6Y33G4l1hYYuds,51859
-chellow/general_import.py,sha256=d_bDfUW8VulF6FqT5q7jiQ0a_NmVpUVyzXNgNBLpn0k,65263
-chellow/models.py,sha256=9SDx150OdxFnw4tfpvLn2fB0NsqlrE57VqdRPYz9OnE,237335
+chellow/general_import.py,sha256=Su_JW28Wb2fG3x8fAbNmvB_YAEPieO_arhlhp31DHD8,65369
+chellow/models.py,sha256=POIL0dfwZFuqht7xHZaE6KJ7fk4kxMZC2aXzgg5kEFY,236921
 chellow/national_grid.py,sha256=uxcv0qisHPyzw9AVIYPzsRqwt2XPAcZL-SBR12qcrS0,4364
 chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=vNuKzlr0lkAzZ4zG7zboStoo92_6iLKAxbw1yZ-ucII,5626
@@ -20,7 +20,7 @@ chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=CYeFrg0TNF7Av49nqxa0guA8CMcJhdMpBRmOq8PH6G0,564
 chellow/e/cfd.py,sha256=V1DTT5XBQbt8hO1gae1u3315fZ4iuYk3XC7J2sUbhKQ,14352
 chellow/e/computer.py,sha256=YL1JFUYfFW-i9DODfvSnp6gTL_MwIfwoWj1TWtOsxPg,67105
-chellow/e/dno_rate_parser.py,sha256=5MYEbcYngh7n6Szn2h9zLTwQKXH-WHKy6c80PYwNLLQ,20983
+chellow/e/dno_rate_parser.py,sha256=OeD1flXsyTH6cdP4jlg2aG8yA46pRxQR3dpd8MvzMOA,21347
 chellow/e/duos.py,sha256=ISTcNqe9KNjVNM2Qs8IBoQxnmSXOt5W_G7tZxp4T78M,28870
 chellow/e/elexon.py,sha256=ALhXS9Es7PV0z9ukPbIramn3cf3iLyFi-PMWPSm5iOs,5487
 chellow/e/energy_management.py,sha256=aXC2qlGt3FAODlNl_frWzVYAQrJLP8FFOiNX3m-QE_Y,12388
@@ -34,9 +34,9 @@ chellow/e/mdd_importer.py,sha256=9GN-at0DC3vOjd-0N2U856O3hInnjkMWWcRfxzQ5DjA,320
 chellow/e/rcrc.py,sha256=92CA1uIotIHd1epQ_jEPdJKzXqDFV-AoJOJeRO6MEyA,4274
 chellow/e/ro.py,sha256=dZKZv_9wXSWuwcb3jiKavoD_9ot-PZseNVeEEe0siLo,596
 chellow/e/scenario.py,sha256=1tUxnvwTzr6cKqiw2wphdv5XDzV6JO6UVYkyQa67vHs,23263
-chellow/e/system_price.py,sha256=3cPWohHmmBI9v7fENLBzXQkpAeC3r0s5xV29Nmr6k_E,5839
-chellow/e/tlms.py,sha256=kHAy2A2d1Mma7x4GdNDyrzscJd5DpJtDBYiZEg241Dw,8538
-chellow/e/tnuos.py,sha256=KoMPJDIXfE4zwhSDuywGF1ooxjTYLVjtF7BkSFm6X24,4158
+chellow/e/system_price.py,sha256=6w5J7bzwFAZubE2zdOFRiS8IIrVP8hkoIOaG2yCt-Ic,6232
+chellow/e/tlms.py,sha256=M33D6YpMixu2KkwSCzDRM3kThLgShg8exp63Obo75l8,8905
+chellow/e/tnuos.py,sha256=XseYztPUsQXNKuBmystO2kzzwAG9ehCZgpGBTdgSk-A,4313
 chellow/e/triad.py,sha256=S6LEMHvUKhAZe0-yfLIRciYDZ8IKMn1jh1TmmsbQD3s,13588
 chellow/e/views.py,sha256=ccA5ebQA8Oefwi9L71rbStvHenDMB4rhAu0iRMandLc,213977
 chellow/e/bill_parsers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -363,6 +363,6 @@ chellow/templates/g/supply_note_edit.html,sha256=6UQf_qbhFDys3cVsTp-c7ABWZpggW9R
 chellow/templates/g/supply_notes.html,sha256=WR3YwGh_qqTklSJ7JqWX6BKBc9rk_jMff4RiWZiF2CM,936
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1713268896.0.0.dist-info/METADATA,sha256=WJKCUej3oxzq27gZWOLH0JBzVZOal2NmaTyMmJSLcnQ,12205
-chellow-1713268896.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
-chellow-1713268896.0.0.dist-info/RECORD,,
+chellow-1713290435.0.0.dist-info/METADATA,sha256=yIG8sLzbptjjWt7VZHhuLjq-OJW23hR_UnDvLmfkE-M,12205
+chellow-1713290435.0.0.dist-info/WHEEL,sha256=K0BPUNF1N3kQ9olb8aVEtkObePEjdr2JOLT1N83EVws,87
+chellow-1713290435.0.0.dist-info/RECORD,,