chellow 1754662596.0.0__tar.gz → 1755011219.0.0__tar.gz

{chellow-1754662596.0.0 → chellow-1755011219.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1754662596.0.0
+Version: 1755011219.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-1755011219.0.0/VERSION

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

{chellow-1754662596.0.0 → chellow-1755011219.0.0}/chellow/e/bill_parsers/drax_edi.py

@@ -30,6 +30,8 @@ ELEMENT_MAP = {
     "ADH": {
         "ADHOC": {
             "020330": ("eii-gbp", None, None),
+            "064305": ("fit-gbp", None, None),
+            "590346": ("cfd-operational-gbp", None, None),
             "637050": ("meter-rental-gbp", "meter-rental-rate", "meter-rental-days"),
         },
     },
@@ -88,6 +90,8 @@ ELEMENT_MAP = {
             "209269": ("tnuos-gbp", "tnuos-rate", "tnuos-days"),
         },
         "DUS002": {
+            "185913": ("duos-yellow-gbp", "duos-yellow-rate", "duos-yellow-kwh"),
+            "517270": ("duos-black-gbp", "duos-black-rate", "duos-black-kwh"),
             "797790": (
                 "duos-reactive-gbp",
                 "duos-reactive-rate",
@@ -147,13 +151,6 @@ ELEMENT_MAP = {
             "012069": ("triad-gbp", "triad-rate", "triad-kw"),
         },
     },
-    "064305": ("fit-gbp", None, None),
-    "590346": ("cfd-operational-gbp", None, None),
-    "439724": ("eii-gbp", None, None),
-    "247610": ("eii-gbp", None, None),
-    "930504": ("eii-gbp", None, None),
-    "331201": ("eii-gbp", None, None),
-    "307253": ("eii-gbp", "eii-rate", "eii-kwh"),
 }
 
 TPR_LOOKUP = {

{chellow-1754662596.0.0 → chellow-1755011219.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-1754662596.0.0 → chellow-1755011219.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-1754662596.0.0 → chellow-1755011219.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-1754662596.0.0 → chellow-1755011219.0.0}/test/e/test_dno_rate_parser.py

@@ -106,6 +106,15 @@ def test_tab_lv_hv():
     sheet["E6"].value = "00:00 - 09:30\n21:20 - 24:00"
     sheet["A7"].value = "Notes"
 
+    sheet["G6"].value = (
+        "Monday to Friday\n(Including Bank Holidays)\n Nov to Feb Inclusive "
+        "(excluding 22nd Dec to 4th Jan inclusive)"
+    )
+    sheet["H6"].value = ""
+    sheet["I6"].value = "17:00 to 19:00"
+    sheet["J6"].value = "07:30 to 17:00\n19:00 to 21:30"
+    sheet["G7"].value = "Notes"
+
     rates = {}
     tab_lv_hv(sheet, rates)
     assert rates == {
@@ -117,6 +126,68 @@ def test_tab_lv_hv():
                 "weekend": True,
             }
         ],
+        "ums_bands": [
+            {
+                "band": "black",
+                "finish-month": 12,
+                "finish-day": 21,
+                "finish-decimal-hour": Decimal("19"),
+                "start-month": 11,
+                "start-day": 1,
+                "start-decimal-hour": Decimal("17"),
+                "weekend": False,
+            },
+            {
+                "band": "black",
+                "finish-day": "last",
+                "finish-decimal-hour": Decimal("19"),
+                "finish-month": 2,
+                "start-day": 4,
+                "start-decimal-hour": Decimal("17"),
+                "start-month": 1,
+                "weekend": False,
+            },
+            {
+                "band": "yellow",
+                "finish-day": 21,
+                "finish-decimal-hour": Decimal("17"),
+                "finish-month": 12,
+                "start-day": 1,
+                "start-decimal-hour": Decimal("7.5"),
+                "start-month": 11,
+                "weekend": False,
+            },
+            {
+                "band": "yellow",
+                "finish-day": "last",
+                "finish-decimal-hour": Decimal("17"),
+                "finish-month": 2,
+                "start-day": 4,
+                "start-decimal-hour": Decimal("7.5"),
+                "start-month": 1,
+                "weekend": False,
+            },
+            {
+                "band": "yellow",
+                "finish-day": 21,
+                "finish-decimal-hour": Decimal("21.5"),
+                "finish-month": 12,
+                "start-day": 1,
+                "start-decimal-hour": Decimal("19"),
+                "start-month": 11,
+                "weekend": False,
+            },
+            {
+                "band": "yellow",
+                "finish-day": "last",
+                "finish-decimal-hour": Decimal("21.5"),
+                "finish-month": 2,
+                "start-day": 4,
+                "start-decimal-hour": Decimal("19"),
+                "start-month": 1,
+                "weekend": False,
+            },
+        ],
         "tariffs": {},
     }
 
@@ -127,6 +198,13 @@ def test_tab_ehv():
     sheet = wb.worksheets[1]
     sheet.insert_rows(0, 10)
     sheet.insert_cols(0, 15)
+    sheet["A5"].value = "time periods"
+    sheet["A6"].value = (
+        "Monday to Friday (Including Bank Holidays) Nov to Feb Inclusive (excluding "
+        "22nd Dec to 4th Jan inclusive)"
+    )
+    sheet["D6"].value = "17:00 to 19:00"
+    sheet["A7"].value = "Notes"
     sheet["A10"].value = "Import Unique Identifier"
     sheet["B10"].value = "LLFC"
     sheet["E10"].value = "LLFC"
@@ -154,7 +232,26 @@ def test_tab_ehv():
                 "description": "Designated EHV2",
             }
         },
-        "super_red": [],
+        "super_red": [
+            {
+                "finish-day": 21,
+                "finish-decimal-hour": Decimal("19"),
+                "finish-month": 12,
+                "start-day": 1,
+                "start-decimal-hour": Decimal("17"),
+                "start-month": 11,
+                "weekend": False,
+            },
+            {
+                "finish-day": "last",
+                "finish-decimal-hour": Decimal("19"),
+                "finish-month": 2,
+                "start-day": 4,
+                "start-decimal-hour": Decimal("17"),
+                "start-month": 1,
+                "weekend": False,
+            },
+        ],
     }