chellow 1754914129.0.0__tar.gz → 1755078653.0.0__tar.gz

{chellow-1754914129.0.0 → chellow-1755078653.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1754914129.0.0
+Version: 1755078653.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-1755078653.0.0/VERSION

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

{chellow-1754914129.0.0 → chellow-1755078653.0.0}/chellow/e/dno_rate_parser.py

@@ -145,6 +145,204 @@ BAND_WEEKEND = {
     "notes": None,
 }
 
+PERIODS = {
+    "monday to friday (including bank holidays) april to march inclusive": [
+        {
+            "weekend": False,
+            "start-month": 4,
+            "start-day": 1,
+            "finish-month": 12,
+            "finish-day": 31,
+        },
+        {
+            "weekend": False,
+            "start-month": 1,
+            "start-day": 1,
+            "finish-month": 3,
+            "finish-day": 31,
+        },
+    ],
+    "monday to friday (including bank holidays) april to october inclusive and march": [
+        {
+            "weekend": False,
+            "start-month": 4,
+            "start-day": 1,
+            "finish-month": 10,
+            "finish-day": 31,
+        },
+        {
+            "weekend": False,
+            "start-month": 3,
+            "start-day": 1,
+            "finish-month": 3,
+            "finish-day": 31,
+        },
+    ],
+    "monday to friday (including bank holidays) june to august inclusive": [
+        {
+            "weekend": False,
+            "start-month": 6,
+            "start-day": 1,
+            "finish-month": 8,
+            "finish-day": 31,
+        },
+    ],
+    "monday to friday (including bank holidays) november to february inclusive": [
+        {
+            "weekend": False,
+            "start-month": 11,
+            "start-day": 1,
+            "finish-month": 12,
+            "finish-day": 31,
+        },
+        {
+            "weekend": False,
+            "start-month": 1,
+            "start-day": 1,
+            "finish-month": 2,
+            "finish-day": "last",
+        },
+    ],
+    "monday to friday (including bank holidays) november to february inclusive "
+    "(excluding 22nd dec to 4th jan inclusive)": [
+        {
+            "weekend": False,
+            "start-month": 11,
+            "start-day": 1,
+            "finish-month": 12,
+            "finish-day": 21,
+        },
+        {
+            "weekend": False,
+            "start-month": 1,
+            "start-day": 5,
+            "finish-month": 2,
+            "finish-day": "last",
+        },
+    ],
+    "monday to friday (including bank holidays) march to october inclusive": [
+        {
+            "weekend": False,
+            "start-month": 3,
+            "start-day": 1,
+            "finish-month": 10,
+            "finish-day": 31,
+        },
+    ],
+    "monday to friday (including bank holidays) mar to oct inclusive": [
+        {
+            "weekend": False,
+            "start-month": 3,
+            "start-day": 1,
+            "finish-month": 10,
+            "finish-day": 31,
+        },
+    ],
+    "monday to friday (including bank holidays) nov to feb inclusive": [
+        {
+            "weekend": False,
+            "start-month": 11,
+            "start-day": 1,
+            "finish-month": 12,
+            "finish-day": 31,
+        },
+        {
+            "weekend": False,
+            "start-month": 1,
+            "start-day": 1,
+            "finish-month": 2,
+            "finish-day": "last",
+        },
+    ],
+    (
+        "monday to friday nov to feb (excluding 22nd dec to 4th jan inclusive)"
+        "monday to friday (including bank holidays) nov to feb inclusive "
+        "(excluding 22nd dec to 4th jan inclusive)"
+    ): [
+        {
+            "weekend": False,
+            "start-month": 11,
+            "start-day": 1,
+            "finish-month": 12,
+            "finish-day": 21,
+        },
+        {
+            "weekend": False,
+            "start-month": 1,
+            "start-day": 5,
+            "finish-month": 2,
+            "finish-day": "last",
+        },
+    ],
+    (
+        "monday to friday (including bank holidays) "
+        "mar to oct inclusive (plus 22nd dec to 4th jan inclusive)"
+    ): [
+        {
+            "weekend": False,
+            "start-month": 3,
+            "start-day": 1,
+            "finish-month": 10,
+            "finish-day": 31,
+        },
+        {
+            "weekend": False,
+            "start-month": 12,
+            "start-day": 22,
+            "finish-month": 12,
+            "finish-day": 31,
+        },
+        {
+            "weekend": False,
+            "start-month": 1,
+            "start-day": 1,
+            "finish-month": 1,
+            "finish-day": 4,
+        },
+    ],
+    (
+        "monday to friday "
+        "(including bank holidays) "
+        "nov to feb inclusive (excluding 22nd dec to 4th jan inclusive)"
+    ): [
+        {
+            "weekend": False,
+            "start-month": 11,
+            "start-day": 1,
+            "finish-month": 12,
+            "finish-day": 21,
+        },
+        {
+            "weekend": False,
+            "start-month": 1,
+            "start-day": 4,
+            "finish-month": 2,
+            "finish-day": "last",
+        },
+    ],
+    "saturday and sunday all year": [
+        {
+            "weekend": True,
+            "start-month": 1,
+            "start-day": 1,
+            "finish-month": 12,
+            "finish-day": 31,
+        }
+    ],
+    (
+        "monday to friday (including bank holidays) november to february "
+        "monday to friday nov to feb"
+    ): [
+        {
+            "weekend": False,
+            "start-month": 11,
+            "start-day": 1,
+            "finish-month": 2,
+            "finish-day": "last",
+        }
+    ],
+}
+
 
 def str_to_hr(hr_str):
     for sep in (":", "."):
@@ -209,6 +407,7 @@ def tab_lv_hv(sheet, gsp_rates):
         tariffs = gsp_rates["tariffs"] = {}
 
     bands = gsp_rates["bands"] = []
+    ums_bands = gsp_rates["ums_bands"] = []
 
     class State(Enum):
         OUTSIDE = auto()
@@ -236,15 +435,31 @@ def tab_lv_hv(sheet, gsp_rates):
 
             if is_weekend is None:
                 state = State.OUTSIDE
-            else:
-                for i, band_name in enumerate(("red", "amber")):
-                    for slot in val_to_slots(get_value(row, i + 1)):
-                        bands.append(
+                continue
+
+            for i, band_name in enumerate(("red", "amber")):
+                for slot in val_to_slots(get_value(row, i + 1)):
+                    bands.append(
+                        {
+                            "weekend": is_weekend,
+                            "start": slot["start"],
+                            "finish": slot["finish"],
+                            "band": band_name,
+                        }
+                    )
+
+            val_6 = " ".join(get_value(row, 6).split()).lower()
+            periods = PERIODS[val_6]
+
+            for i, band_name in enumerate(("black", "yellow")):
+                for slot in val_to_slots(get_value(row, i + 8)):
+                    for period in periods:
+                        ums_bands.append(
                             {
-                                "weekend": is_weekend,
-                                "start": slot["start"],
-                                "finish": slot["finish"],
                                 "band": band_name,
+                                **period,
+                                "start-decimal-hour": slot["start"],
+                                "finish-decimal-hour": slot["finish"],
                             }
                         )
 
@@ -255,6 +470,9 @@ def tab_lv_hv(sheet, gsp_rates):
                 llfcs_str = ",".join(
                     chain(to_llfcs(get_value(row, 1)), to_llfcs(get_value(row, 10)))
                 )
+                is_ums = "unmetered supplies" in val_0.lower()
+                high_band = "black" if is_ums else "red"
+                medium_band = "yellow" if is_ums else "amber"
                 pcs_str = ",".join(to_pcs(row, 2))
                 tariffs[llfcs_str + "_" + pcs_str] = {
                     "description": val_0,
@@ -267,8 +485,10 @@ def tab_lv_hv(sheet, gsp_rates):
                     "excess-gbp-per-kva-per-day": get_zero_rate(
                         row, col_match(title_row, "exce")
                     ),
-                    "red-gbp-per-kwh": get_rag_rate(row, col_match(title_row, "red")),
-                    "amber-gbp-per-kwh": get_rag_rate(
+                    f"{high_band}-gbp-per-kwh": get_rag_rate(
+                        row, col_match(title_row, "red")
+                    ),
+                    f"{medium_band}-gbp-per-kwh": get_rag_rate(
                         row, col_match(title_row, "amber")
                     ),
                     "green-gbp-per-kwh": get_rag_rate(
@@ -344,54 +564,15 @@ def tab_ehv(sheet, gsp_rates):
                 state = EHV_BLANK
             else:
                 period_str = " ".join(get_value(row, 0).split()).lower()
-                periods = []
-
-                if period_str in (
-                    "monday to friday nov to feb (excluding "
-                    "22nd dec to 4th jan inclusive)",
-                    "monday to friday (including bank holidays) nov to feb inclusive "
-                    "(excluding 22nd dec to 4th jan inclusive)",
-                ):
-                    periods.append(
-                        {
-                            "weekend": False,
-                            "start-month": 11,
-                            "start-day": 1,
-                            "finish-month": 12,
-                            "finish-day": 21,
-                        }
-                    )
-                    periods.append(
-                        {
-                            "weekend": False,
-                            "start-month": 1,
-                            "start-day": 5,
-                            "finish-month": 2,
-                            "finish-day": "last",
-                        }
-                    )
-
-                elif period_str in (
-                    "monday to friday (including bank holidays) november to february",
-                    "monday to friday nov to feb",
-                ):
-                    periods.append(
-                        {
-                            "weekend": False,
-                            "start-month": 11,
-                            "start-day": 1,
-                            "finish-month": 2,
-                            "finish-day": "last",
-                        }
-                    )
+                periods = PERIODS[period_str]
 
                 for slot in val_to_slots(get_value(row, 3)):
                     for period in periods:
                         bands.append(
                             {
                                 **period,
-                                "start-hour": slot["start"],
-                                "finish-hour": slot["finish"],
+                                "start-decimal-hour": slot["start"],
+                                "finish-decimal-hour": slot["finish"],
                             }
                         )
 

{chellow-1754914129.0.0 → chellow-1755078653.0.0}/chellow/e/duos.py

@@ -16,20 +16,17 @@ from chellow.utils import (
 )
 
 
-BANDS = ("super-red", "red", "amber", "green")
-
-KEYS = dict(
-    (
-        band,
-        {
-            "kwh": f"duos-{band}-kwh",
-            "tariff-rate": f"{band}-gbp-per-kwh",
-            "bill-rate": f"duos-{band}-rate",
-            "gbp": f"duos-{band}-gbp",
-        },
-    )
+BANDS = ("black", "super-red", "red", "amber", "yellow", "green")
+
+KEYS = {
+    band: {
+        "kwh": f"duos-{band}-kwh",
+        "tariff-rate": f"{band}-gbp-per-kwh",
+        "bill-rate": f"duos-{band}-rate",
+        "gbp": f"duos-{band}-gbp",
+    }
     for band in BANDS
-)
+}
 
 VL_LOOKUP = {
     "LV": {True: "lv-sub", False: "lv-net"},
@@ -706,6 +703,58 @@ def datum_2012_02_23(ds, hh):
                         band = "super-red"
                         break
 
+                bands_cache[start_date] = band
+    elif ds.dtc_meter_type_code is None:  # unmetered
+        try:
+            band = gsp_group_cache["ums-bands"][start_date]
+        except KeyError:
+            try:
+                bands_cache = gsp_group_cache["ums-bands"]
+            except KeyError:
+                bands_cache = gsp_group_cache["ums-bands"] = {}
+
+            try:
+                band = bands_cache[start_date]
+            except KeyError:
+                band = "green"
+                ct_hr = hh["ct-decimal-hour"]
+                ct_day = hh["ct-day"]
+                ct_month = hh["ct-month"]
+                weekend = hh["ct-day-of-week"] > 4
+                try:
+                    slots = ds.hh_rate(ds.dno_contract.id, start_date)[
+                        ds.gsp_group_code
+                    ]["ums_bands"]
+                except KeyError as e:
+                    raise BadRequest(str(e))
+
+                for slot in slots:
+                    if (
+                        slot["weekend"] == weekend
+                        and slot["start-decimal-hour"]
+                        <= ct_hr
+                        < slot["finish-decimal-hour"]
+                        and (
+                            ct_month > slot["start-month"]
+                            or (
+                                ct_month == slot["start-month"]
+                                and ct_day >= slot["start-day"]
+                            )
+                        )
+                        and (
+                            ct_month < slot["finish-month"]
+                            or (
+                                ct_month == slot["finish-month"]
+                                and (
+                                    slot["finish-day"] == "last"
+                                    or ct_day <= slot["finish-day"]
+                                )
+                            )
+                        )
+                    ):
+                        band = slot["band"]
+                        break
+
                 bands_cache[start_date] = band
     else:
 

{chellow-1754914129.0.0 → chellow-1755078653.0.0}/chellow/e/views.py

@@ -5730,6 +5730,51 @@ def supply_post(supply_id):
                         f"successfully updated with the MSN {msn}. "
                     )
             flash(msg)
+
+        if "new_llfc" in request.form:
+            start_date_str = req_str("start_date")
+            start_date = parse_hh_start(start_date_str)
+            if start_date is None:
+                raise BadRequest("The date of the MSN change is blank.")
+
+            llfc_code = req_str("llfc_code")
+            llfc = supply.dno.get_llfc_by_code(g.sess, llfc_code)
+            mpan_core = req_str("mpan_core")
+            msg = ""
+            era = supply.find_era_at(g.sess, start_date)
+            if era is not None and era.start_date != start_date:
+                era = supply.insert_era_at(g.sess, start_date)
+                g.sess.commit()
+            for era in supply.find_eras(g.sess, start_date, None):
+                if era.imp_mpan_core == mpan_core:
+                    if era.imp_llfc.code == llfc.code:
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} already has the "
+                            f"import LLFC {llfc.code}. "
+                        )
+                    else:
+                        era.imp_llfc = llfc
+
+                        g.sess.commit()
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} has been "
+                            f"successfully updated with the import LLFC {llfc.code}. "
+                        )
+                elif era.exp_mpan_core == mpan_core:
+                    if era.exp_llfc.code == llfc.code:
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} already has the "
+                            f"export LLFC {llfc.code}. "
+                        )
+                    else:
+                        era.exp_llfc = llfc
+
+                        g.sess.commit()
+                        msg += (
+                            f"The era at {hh_format(era.start_date)} has been "
+                            f"successfully updated with the export LLFC {llfc.code}. "
+                        )
+            flash(msg)
         return render_template("supply_post.html")
 
     except BadRequest as e:

{chellow-1754914129.0.0 → chellow-1755078653.0.0}/chellow/reports/report_111.py

@@ -321,9 +321,9 @@ def _process_supply(
     while len(bill_ids) > 0:
         bill_id = list(sorted(bill_ids))[0]
         bill_ids.remove(bill_id)
-        bill = (
-            sess.query(Bill)
-            .filter(Bill.id == bill_id)
+        bill = sess.scalar(
+            select(Bill)
+            .where(Bill.id == bill_id)
             .options(
                 joinedload(Bill.batch),
                 joinedload(Bill.bill_type),
@@ -332,7 +332,6 @@ def _process_supply(
                 joinedload(Bill.reads).joinedload(RegisterRead.present_type),
                 joinedload(Bill.reads).joinedload(RegisterRead.previous_type),
             )
-            .one()
         )
         virtual_bill = {"problem": ""}
         supply = bill.supply

{chellow-1754914129.0.0 → chellow-1755078653.0.0}/chellow/reports/report_ecoes_comparison.py

@@ -25,7 +25,7 @@ from chellow.models import (
     Supply,
     User,
 )
-from chellow.utils import csv_make_val, req_bool
+from chellow.utils import csv_make_val, req_bool, utc_datetime_now
 
 
 FNAME = "ecoes_comparison"
@@ -146,6 +146,7 @@ def _process(
     report_run,
 ):
     writer = csv.writer(f, lineterminator="\n")
+    now = utc_datetime_now()
 
     mpans = []
 
@@ -274,6 +275,7 @@ def _process(
         chellow_pc = ""
         chellow_mtc = ""
         chellow_llfc = ""
+        chellow_llfc_desc = ""
         chellow_ssc = ""
         chellow_es = ""
         chellow_supplier = ""
@@ -287,6 +289,11 @@ def _process(
         chellow_supply_id = None
         chellow_era_id = None
         ignore = True
+        ecoes_dno_code = ecoes["mpan-core"][:2]
+        ecoes_dno = Party.get_dno_by_code(sess, ecoes_dno_code, now)
+        ecoes_llfc_desc = ""
+        chellow_site_code = ""
+        chellow_site_name = ""
         diffs = []
 
         try:
@@ -404,11 +411,17 @@ def _process(
                     ignore = False
 
                 chellow_llfc = llfc.code
-                if ecoes["llfc"].zfill(3) != chellow_llfc:
+                chellow_llfc_desc = llfc.description
+                ecoes_llfc_code = ecoes["llfc"].zfill(3)
+                if ecoes_llfc_code != chellow_llfc:
                     problem += "The LLFCs don't match. "
                     ignore = False
                     diffs.append("llfc")
 
+                ecoes_llfc = ecoes_dno.find_llfc_by_code(sess, ecoes_llfc_code, now)
+                if ecoes_llfc is not None:
+                    ecoes_llfc_desc = ecoes_llfc.description
+
                 chellow_ssc = era.ssc
                 if chellow_ssc is None:
                     chellow_ssc = ""
@@ -466,6 +479,10 @@ def _process(
                     ignore = False
                     diffs.append("gsp_group")
 
+                chellow_site = era.get_physical_site(sess)
+                chellow_site_code = chellow_site.code
+                chellow_site_name = chellow_site.name
+
                 chellow_msn = era.msn
 
                 if set([m.strip() for m in chellow_msn.split(",")]) != set(
@@ -503,8 +520,10 @@ def _process(
                 "ecoes_mtc_date": _parse_date(ecoes["mtc-date"]),
                 "chellow_mtc": chellow_mtc,
                 "ecoes_llfc": ecoes["llfc"],
+                "ecoes_llfc_desc": ecoes_llfc_desc,
                 "ecoes_llfc_from": _parse_date(ecoes["llfc-from"]),
                 "chellow_llfc": chellow_llfc,
+                "chellow_llfc_desc": chellow_llfc_desc,
                 "ecoes_ssc": ecoes["ssc"],
                 "chellow_ssc": chellow_ssc,
                 "ecoes_es": ecoes["energisation-status"],
@@ -533,6 +552,8 @@ def _process(
                 "address": ", ".join(
                     [a for a in address_lines if len(a) > 0 and a != "NULL"]
                 ),
+                "chellow_site_code": chellow_site_code,
+                "chellow_site_name": chellow_site_name,
             }
             writer.writerow(csv_make_val(values[t]) for t in titles)
             values["chellow_supplier_contract_id"] = chellow_supplier_contract_id