chellow 1722002880.0.0__py3-none-any.whl → 1723041465.0.0__py3-none-any.whl

chellow/e/bill_parsers/edf_export_xlsx.py

@@ -0,0 +1,217 @@
+from datetime import datetime as Datetime
+from decimal import Decimal, InvalidOperation
+
+from dateutil.relativedelta import relativedelta
+
+from openpyxl import load_workbook
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.utils import HH, ct_datetime, parse_mpan_core, to_ct, to_utc
+
+
+def get_cell(sheet, col, row):
+    try:
+        coordinates = f"{col}{row}"
+        return sheet[coordinates]
+    except IndexError:
+        raise BadRequest(f"Can't find the cell {coordinates} on sheet {sheet}.")
+
+
+def get_date(sheet, col, row):
+    cell = get_cell(sheet, col, row)
+    val = cell.value
+    if not isinstance(val, Datetime):
+        raise BadRequest(
+            f"Problem reading {val} (of type {type(val)}) as a timestamp at "
+            f"{cell.coordinate}."
+        )
+    return val
+
+
+def get_str(sheet, col, row):
+    return get_cell(sheet, col, row).value.strip()
+
+
+def get_dec(sheet, col, row):
+    cell = get_cell(sheet, col, row)
+    try:
+        return Decimal(str(cell.value))
+    except InvalidOperation as e:
+        raise BadRequest(f"Problem parsing the number at {cell.coordinate}. {e}")
+
+
+def get_int(sheet, col, row):
+    return int(get_cell(sheet, col, row).value)
+
+
+ELEM_LOOKUP = {
+    "Capacity": {
+        "name": "duos-availability",
+        "gbp": "duos-availability-gbp",
+        "units": "duos-availability-kva",
+        "rate": "duos-availability-rate",
+    },
+    "Fixed Charge": {
+        "name": "duos-fixed",
+        "gbp": "duos-fixed-gbp",
+        "units": "duos-fixed-days",
+        "rate": "duos-fixed-rate",
+    },
+    "Unit Rate Zero": None,
+    "Excess Reactive Power": {
+        "name": "duos-reactive",
+        "gbp": "duos-reactive-gbp",
+        "units": "duos-reactive-kvarh",
+        "rate": "duos-reactive-gbp-per-kvarh",
+    },
+    "Unit Rate Amber": {
+        "name": "duos-amber",
+        "gbp": "duos-amber-gbp",
+        "units": "duos-amber-kwh",
+        "rate": "duos-amber-gbp-per-kwh",
+    },
+    "Unit Rate Green": {
+        "name": "duos-green",
+        "gbp": "duos-green-gbp",
+        "units": "duos-green-kwh",
+        "rate": "duos-green-gbp-per-kwh",
+    },
+    "Unit Rate Red": {
+        "name": "duos-red",
+        "gbp": "duos-red-gbp",
+        "units": "duos-red-kwh",
+        "rate": "duos-red-gbp-per-kwh",
+    },
+}
+
+
+def _make_raw_bills(book):
+    bills = []
+    sheet = book.worksheets[0]
+    issue_date_raw = get_date(sheet, "H", 24)
+    issue_date = to_utc(
+        ct_datetime(issue_date_raw.year, issue_date_raw.month, issue_date_raw.day)
+    )
+
+    mpan_core = parse_mpan_core(str(get_int(sheet, "D", 25)))
+    start_date_str = get_str(sheet, "D", 22)
+    start_date_ct = to_ct(Datetime.strptime(start_date_str, "%d-%b-%Y"))
+    start_date = to_utc(start_date_ct)
+    finish_date_str = get_str(sheet, "F", 22)
+    finish_date_ct = to_ct(Datetime.strptime(finish_date_str, "%d-%b-%Y"))
+    finish_date = to_utc(finish_date_ct + relativedelta(hours=23, minutes=30))
+    net = round(get_dec(sheet, "H", 33), 2)
+    kwh = get_dec(sheet, "D", 33)
+
+    breakdown = {
+        "ssp-kwh": kwh,
+        "ssp-gbp": net,
+    }
+
+    bills.append(
+        {
+            "bill_type_code": "N",
+            "kwh": kwh,
+            "vat": Decimal("0.00"),
+            "net": net,
+            "gross": net,
+            "reads": [],
+            "breakdown": breakdown,
+            "account": mpan_core,
+            "issue_date": issue_date,
+            "start_date": start_date,
+            "finish_date": finish_date,
+            "mpan_core": mpan_core,
+            "reference": "_".join(
+                (
+                    to_ct(start_date).strftime("%Y%m%d"),
+                    to_ct(finish_date).strftime("%Y%m%d"),
+                    to_ct(issue_date).strftime("%Y%m%d"),
+                    mpan_core,
+                    "ssp",
+                )
+            ),
+        }
+    )
+    sheet = book.worksheets[3]
+    for row in range(2, len(sheet["A"]) + 1):
+        val = get_cell(sheet, "A", row).value
+        if val is None or val == "":
+            break
+
+        start_date_str = get_str(sheet, "B", row)
+        start_date_ct = to_ct(Datetime.strptime(start_date_str, "%Y-%m"))
+        start_date = to_utc(start_date_ct)
+        finish_date = to_utc(start_date_ct + relativedelta(months=1) - HH)
+
+        element_desc = get_str(sheet, "D", row).strip()
+        units = get_dec(sheet, "E", row)
+        rate = get_dec(sheet, "F", row)
+        net = round(get_dec(sheet, "G", row), 2)
+
+        titles = ELEM_LOOKUP[element_desc]
+        if titles is None:
+            continue
+
+        breakdown = {
+            titles["gbp"]: net,
+            titles["units"]: units,
+            titles["rate"]: [rate],
+        }
+
+        bills.append(
+            {
+                "bill_type_code": "N",
+                "kwh": Decimal(0),
+                "vat": Decimal("0.00"),
+                "net": net,
+                "gross": net,
+                "reads": [],
+                "breakdown": breakdown,
+                "account": mpan_core,
+                "issue_date": issue_date,
+                "start_date": start_date,
+                "finish_date": finish_date,
+                "mpan_core": mpan_core,
+                "reference": "_".join(
+                    (
+                        to_ct(start_date).strftime("%Y%m%d"),
+                        to_ct(finish_date).strftime("%Y%m%d"),
+                        to_ct(issue_date).strftime("%Y%m%d"),
+                        mpan_core,
+                        titles["name"],
+                    )
+                ),
+            }
+        )
+    return bills
+
+
+class Parser:
+    def __init__(self, f):
+        self.book = load_workbook(f, data_only=True)
+
+        self.last_line = None
+        self._line_number = None
+        self._title_line = None
+
+    @property
+    def line_number(self):
+        return None if self._line_number is None else self._line_number + 1
+
+    def _set_last_line(self, i, line):
+        self._line_number = i
+        self.last_line = line
+        if i == 0:
+            self._title_line = line
+        return line
+
+    def make_raw_bills(self):
+        row = bills = None
+        try:
+            bills = _make_raw_bills(self.book)
+        except BadRequest as e:
+            raise BadRequest(f"Row number: {row} {e.description}")
+
+        return bills

chellow/e/bill_parsers/mm.py

@@ -80,6 +80,11 @@ CHARGE_UNITS_LOOKUP = {
 }
 
 ELEMENT_LOOKUP = {
+    "1ANNUAL": "duos-red",
+    "2ANNUAL": "duos-amber",
+    "3ANNUAL": "duos-green",
+    "7ANNUAL": "duos-fixed",
+    "9ANNUAL": "duos-reactive",
     "10ANNUAL": "standing",
     "20RS0108": "single",
     "30ANNUAL": "mop",
@@ -119,7 +124,7 @@ def _handle_0460(headers, pre_record, record):
     gbp = Decimal(parts["gbp"]) / 100
     quantity = Decimal(parts["quantity"])
     rate = Decimal(parts["rate"])
-    element_name = ELEMENT_LOOKUP[parts["code"]]
+    element_name = ELEMENT_LOOKUP[parts["code"].strip()]
     breakdown = headers["breakdown"]
     breakdown[f"{element_name}-{units}"] += quantity
     rate_name = f"{element_name}-rate"

chellow/views.py

@@ -1501,7 +1501,7 @@ def report_run_row_get(row_id):
                 "virtual-problem",
             ):
                 toks = t.split("-")
-                name = toks[1]
+                name = "-".join(toks[1:-1])
                 try:
                     table = elements[name]
                 except KeyError:

{chellow-1722002880.0.0.dist-info → chellow-1723041465.0.0.dist-info}/METADATA

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

@@ -11,7 +11,7 @@ chellow/proxy.py,sha256=cVXIktPlX3tQ1BYcwxq0nJXKE6r3DtFTtfFHPq55HaM,1351
 chellow/rate_server.py,sha256=fg-Pf_9Hk3bXmC9riPQNGQxBvLvBa_WtNYdwDCjnCSg,5678
 chellow/testing.py,sha256=Od4HHH6pZrhJ_De118_F55RJEKmAvhUH2S24QE9qFQk,3635
 chellow/utils.py,sha256=32qPWEGzCPKPhSM7ztpzcR6ZG74sVZanScDIdK50Rq4,19308
-chellow/views.py,sha256=eDvTQM_PUqRvrCQvBdlF5q7MEs7w2yJmRjcC8WDbHtE,79584
+chellow/views.py,sha256=s_pKNpBkiegxevAWEjowJKAtUPXpowOTbXI5473em4Y,79597
 chellow/e/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 chellow/e/aahedc.py,sha256=d2usudp7KYWpU6Pk3fal5EQ47EbvkvKeaFGylnb3NWw,606
 chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,7411
@@ -44,6 +44,7 @@ chellow/e/bill_parsers/activity_mop_stark_xlsx.py,sha256=UgWXDPzQkQghyj_lfgBqoSJ
 chellow/e/bill_parsers/annual_mop_stark_xlsx.py,sha256=-HMoIfa_utXYKA44RuC0Xqv3vd2HLeQU_4P0iBUd3WA,4219
 chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQaPSSw,4828
 chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
+chellow/e/bill_parsers/edf_export_xlsx.py,sha256=t-M9-dGNWXu3VDI1DbS5Ez1oHW33oopJryNgMTvTjys,6307
 chellow/e/bill_parsers/engie_edi.py,sha256=CTobTskDjzdcqqf_qk2ukDSaTLrVpGZMM0sYlwehog4,14985
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
 chellow/e/bill_parsers/engie_xlsx.py,sha256=4Hu3ls1uNMH7vjDHgcP6QARlGlvb616CqG3xZVjAKWo,16888
@@ -51,7 +52,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=0Ch-ngypH2X7eeEq5tDkaGQreCZUbjeDCmhbyGo2_vQ,9305
+chellow/e/bill_parsers/mm.py,sha256=KhAwF8o3cdabTBmc2pbZgm9MlkAachwNsy4bsivTSrM,9459
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -364,6 +365,6 @@ chellow/templates/g/supply_note_edit.html,sha256=b8mB6_ucBwoljp03iy6AgVaZUhGw3-1
 chellow/templates/g/supply_notes.html,sha256=6epNmZ3NKdXZz27fvmRUGeffg_oc1kmwuBeyRzQe3Rg,854
 chellow/templates/g/unit.html,sha256=KouNVU0-i84afANkLQ_heJ0uDfJ9H5A05PuLqb8iCN8,438
 chellow/templates/g/units.html,sha256=p5Nd-lAIboKPEOO6N451hx1bcKxMg4BDODnZ-43MmJc,441
-chellow-1722002880.0.0.dist-info/METADATA,sha256=oEvvu_5ycUK-OM8xM9AzvKRuCFxHnfIlR1Bl46mQGJ4,12241
-chellow-1722002880.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1722002880.0.0.dist-info/RECORD,,
+chellow-1723041465.0.0.dist-info/METADATA,sha256=97E2o-6rhdaB00zicHeZC1x2945uPxYqRtm-K1m1uLo,12241
+chellow-1723041465.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1723041465.0.0.dist-info/RECORD,,