chellow 1755614564.0.0__py3-none-any.whl → 1759155233.0.0__py3-none-any.whl

chellow/e/bill_parsers/sww_xls.py

@@ -6,7 +6,7 @@ from werkzeug.exceptions import BadRequest
 
 from xlrd import open_workbook
 
-from chellow.utils import HH, utc_datetime, utc_datetime_now
+from chellow.utils import HH, ct_datetime, to_utc, utc_datetime_now
 
 
 def get_value(row, title_row, name):
@@ -46,93 +46,76 @@ def get_rate(row, title_row, name):
 def get_date_ct(row, title_row, name):
     s = get_value(row, title_row, name)
     nums = list(map(int, s.split("-")))
-    return utc_datetime(nums[0], nums[1], nums[2])
-
-
-def _parse_row(row, row_index, datemode, title_row):
-    titles = [c.value for c in title_row]
-    bill_start_date = get_date_ct(row, titles, "BILL START DATE")
-    bill_finish_date = get_date_ct(row, titles, "BILL END DATE") + (HH * 47)
-    issue_date = utc_datetime_now()
-
-    aahedc_kwh = get_dec(row, titles, "LVY-AAHEDC-ALL USE KWH")
-
-    vals = [
-        ("capmechob-kwh", get_dec(row, titles, "LVY-CMLOB-ALL USE KWH")),
-        ("capmechob-rate", get_dec(row, titles, "LVY-CMLOB-ALL RATE P/KWH")),
-        ("capmechob-gbp", get_dec(row, titles, "LVY-CMLOB-ALL COST GBP")),
-        ("capmechop-kwh", get_dec(row, titles, "LVY-CMLOP-ALL USE KWH")),
-        ("capmechop-rate", get_dec(row, titles, "LVY-CMLOP-ALL RATE P/KWH")),
-        ("capmechop-gbp", get_dec(row, titles, "LVY-CMLOP-ALL COST GBP")),
-        ("duos-fixed-days", get_dec(row, titles, "DUOS-STND-SITE USE DAY")),
-        (
-            "duos-availability-kva-days",
-            [get_dec(row, titles, "DUOS-AVAIL-AV USE KVADAY")],
-        ),
-        (
-            "duos-availability-rate",
-            get_rate(row, titles, "DUOS-AVAIL-AV RATE P/KVADAY"),
-        ),
-        ("duos-availability-gbp", get_dec(row, titles, "DUOS-AVAIL-AV COST GBP")),
-        ("duos-fixed-rate", get_rate(row, titles, "DUOS-STND-SITE RATE P/DAY")),
-        ("duos-fixed-gbp", get_dec(row, titles, "DUOS-STND-SITE COST GBP")),
-        ("duos-amber-kwh", get_dec(row, titles, "DUOS-UNIT-AMBER USE KWH")),
-        ("duos-amber-rate", get_rate(row, titles, "DUOS-UNIT-AMBER RATE P/KWH")),
-        ("duos-amber-gbp", get_dec(row, titles, "DUOS-UNIT-AMBER COST GBP")),
-        ("duos-green-kwh", get_dec(row, titles, "DUOS-UNIT-GREEN USE KWH")),
-        ("duos-green-rate", get_rate(row, titles, "DUOS-UNIT-GREEN RATE P/KWH")),
-        ("duos-green-gbp", get_dec(row, titles, "DUOS-UNIT-GREEN COST GBP")),
-        ("duos-red-kwh", get_dec(row, titles, "DUOS-UNIT-RED USE KWH")),
-        ("duos-red-rate", get_rate(row, titles, "DUOS-UNIT-RED RATE P/KWH")),
-        ("duos-red-gbp", get_dec(row, titles, "DUOS-UNIT-RED COST GBP")),
-        ("aahedc-kwh", aahedc_kwh),
-        ("aahedc-rate", get_rate(row, titles, "LVY-AAHEDC-ALL RATE P/KWH")),
-        ("aahedc-gbp", get_dec(row, titles, "LVY-AAHEDC-ALL COST GBP")),
-        ("bsuos-nbp-kwh", get_dec(row, titles, "LVY-BSUOS-ALL USE KWH")),
-        ("bsuos-rate", get_rate(row, titles, "LVY-BSUOS-ALL RATE P/KWH")),
-        ("bsuos-gbp", get_dec(row, titles, "LVY-BSUOS-ALL COST GBP")),
-        ("ccl-kwh", get_dec(row, titles, "LVY-CCL-ALL USE KWH")),
-        ("ccl-rate", get_rate(row, titles, "LVY-CCL-ALL RATE P/KWH")),
-        ("ccl-gbp", get_dec(row, titles, "LVY-CCL-ALL COST GBP")),
-        ("cfdob-kwh", get_dec(row, titles, "LVY-CFDOB-ALL USE KWH")),
-        ("cfdob-rate", get_rate(row, titles, "LVY-CFDOB-ALL RATE P/KWH")),
-        ("cfdob-gbp", get_dec(row, titles, "LVY-CFDOB-ALL COST GBP")),
-        ("cfdop-kwh", get_dec(row, titles, "LVY-CFDOP-ALL USE KWH")),
-        ("cfdop-rate", get_rate(row, titles, "LVY-CFDOP-ALL RATE P/KWH")),
-        ("cfdop-gbp", get_dec(row, titles, "LVY-CFDOP-ALL COST GBP")),
-        ("fit-kwh", get_dec(row, titles, "LVY-FIT-ALL USE KWH")),
-        ("fit-rate", get_rate(row, titles, "LVY-FIT-ALL RATE P/KWH")),
-        ("fit-gbp", get_dec(row, titles, "LVY-FIT-ALL COST GBP")),
-        ("ro-kwh", get_dec(row, titles, "LVY-RO-ALL USE KWH")),
-        ("ro-rate", get_rate(row, titles, "LVY-RO-ALL RATE P/KWH")),
-        ("ro-gbp", get_dec(row, titles, "LVY-RO-ALL COST GBP")),
-        ("summer-kwh", get_dec(row, titles, "NRG-UNIT-SUMMER USE KWH")),
-        ("summer-rate", get_rate(row, titles, "NRG-UNIT-SUMMER RATE P/KWH")),
-        ("summer-gbp", get_dec(row, titles, "NRG-UNIT-SUMMER COST GBP")),
-        ("winter-kwh", get_dec(row, titles, "NRG-UNIT-WINTER USE KWH")),
-        ("winter-rate", get_rate(row, titles, "NRG-UNIT-WINTER RATE P/KWH")),
-        ("winter-gbp", get_dec(row, titles, "NRG-UNIT-WINTER COST GBP")),
-        ("admin-months", get_dec(row, titles, "SYS-ADMIN-ALL USE MO")),
-        ("admin-rate", [get_dec(row, titles, "SYS-ADMIN-ALL RATE GBP/MO")]),
-        ("admin-gbp", get_dec(row, titles, "SYS-ADMIN-ALL COST GBP")),
-        ("triad-days", get_dec(row, titles, "TUOS-TRIAD-SITE USE DAY")),
-        ("triad-rate", [get_dec(row, titles, "TUOS-TRIAD-SITE RATE GBP/DAY")]),
-        ("triad-gbp", get_dec(row, titles, "TUOS-TRIAD-SITE COST GBP")),
-    ]
-
-    bd = {
-        "raw_lines": [str(title_row), str(row)],
-    }
-
-    for k, v in vals:
-        if v is not None and v != [None]:
-            bd[k] = v
-
-    kwh = Decimal("0.00") if aahedc_kwh is None else aahedc_kwh
+    return ct_datetime(nums[0], nums[1], nums[2])
+
+
+ELEMENT_NAME_LOOKUP = {
+    "LVY-CMLOB-ALL": "capmechob",
+    "LVY-CMLOP-ALL": "capmechop",
+    "DUOS-STND-SITE": "duos-fixed",
+    "DUOS-AVAIL-AV": "duos-availability",
+    "DUOS-UNIT-AMBER": "duos-amber",
+    "DUOS-UNIT-GREEN": "duos-green",
+    "DUOS-UNIT-RED": "duos-red",
+    "LVY-AAHEDC-ALL": "aahedc",
+    "LVY-BSUOS-ALL": "bsuos",
+    "LVY-CCL-ALL": "ccl",
+    "LVY-CFDOB-ALL": "cfdob",
+    "LVY-CFDOP-ALL": "cfdop",
+    "LVY-FIT-ALL": "fit",
+    "LVY-RO-ALL": "ro",
+    "NRG-UNIT-SUMMER": "summer",
+    "NRG-UNIT-WINTER": "winter",
+    "SYS-ADMIN-ALL": "admin",
+    "TUOS-TRIAD-SITE": "triad",
+}
+
+
+def _parse_row(issue_date, row, row_index, datemode, title_row):
+    titles = [c.value for c in title_row if c.value is not None]
+    bill_start_date_ct = get_date_ct(row, titles, "BILL START DATE")
+    start_date = to_utc(bill_start_date_ct)
+    bill_finish_date_ct = get_date_ct(row, titles, "BILL END DATE") + (HH * 47)
+    finish_date = to_utc(bill_finish_date_ct)
+
+    elements = {}
+
+    kwh = 0
     net_gbp = Decimal("0.00")
-    net_gbp += sum(v for k, v in bd.items() if k.endswith("-gbp"))
     vat_gbp = Decimal("0.00")
-    reference = issue_date.strftime("%Y%m%dT%H%M") + "_" + str(row_index + 1)
+    for title in titles[3:]:
+        val = get_dec(row, titles, title)
+        if val is not None:
+            parts = title.split()
+            if len(parts) != 3:
+                continue
+            element_code, typ, units = parts
+            element_name = ELEMENT_NAME_LOOKUP[element_code]
+            try:
+                element = elements[element_name]
+            except KeyError:
+                element = elements[element_name] = {
+                    "name": element_name,
+                    "breakdown": {},
+                    "net": Decimal("0.00"),
+                    "start_date": start_date,
+                    "finish_date": finish_date,
+                }
+
+            bd = element["breakdown"]
+            if typ == "COST":
+                element["net"] += round(val, 2)
+                net_gbp += round(val, 2)
+            elif typ == "USE":
+                bd[units.lower()] = val
+                if element_name == "aahedc":
+                    kwh += val
+            elif typ == "RATE":
+                bd["rate"] = val
+
+    bd = {"raw_lines": [str(title_row), str(row)]}
+
+    reference = f"{issue_date.strftime('%Y%m%dT%H%M')}_{row_index + 1}"
 
     return {
         "bill_type_code": "N",
@@ -141,13 +124,14 @@ def _parse_row(row, row_index, datemode, title_row):
         "net": net_gbp,
         "gross": net_gbp + vat_gbp,
         "reads": [],
-        "breakdown": bd,
+        "breakdown": {},
         "account": "2007",
         "issue_date": issue_date,
-        "start_date": bill_start_date,
-        "finish_date": bill_finish_date,
+        "start_date": start_date,
+        "finish_date": finish_date,
         "mpan_core": "22 0003 0354 632",
         "reference": reference,
+        "elements": list(elements.values()),
     }
 
 
@@ -176,11 +160,14 @@ class Parser:
     def make_raw_bills(self):
         bills = []
         title_row = self.sheet.row(0)
+        issue_date = utc_datetime_now()
         for row_index in range(1, self.sheet.nrows):
             row = self.sheet.row(row_index)
             datemode = self.book.datemode
             try:
-                bills.append(_parse_row(row, row_index, datemode, title_row))
+                bills.append(
+                    _parse_row(issue_date, row, row_index, datemode, title_row)
+                )
             except BadRequest as e:
-                raise BadRequest("On row " + str(row_index) + ": " + str(e.description))
+                raise BadRequest(f"On row {row_index}: {e.description}")
         return bills

chellow/e/computer.py

@@ -967,7 +967,7 @@ class SupplySource(DataSource):
 
         self.is_displaced = False
         self.bill = bill
-        if self.bill is not None:
+        if self.bill is not None and hasattr(self.bill, "start_date"):
             self.bill_start = bill.start_date
             self.bill_finish = bill.finish_date
             self.is_last_bill_gen = (