chellow 1722002880.0.0__tar.gz → 1723041465.0.0__tar.gz

{chellow-1722002880.0.0 → chellow-1723041465.0.0}/PKG-INFO

@@ -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-1723041465.0.0/VERSION

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

chellow-1723041465.0.0/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-1722002880.0.0 → chellow-1723041465.0.0}/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-1722002880.0.0 → chellow-1723041465.0.0}/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-1723041465.0.0/test/e/bill_parsers/test_bill_parser_edf_export_xlsx.py

@@ -0,0 +1,68 @@
+from decimal import Decimal
+
+from openpyxl import Workbook
+
+from chellow.e.bill_parsers.edf_export_xlsx import _make_raw_bills
+from chellow.utils import ct_datetime, to_utc
+
+
+def test_make_raw_bills():
+    wb = Workbook()
+    statement_sheet = wb.worksheets[0]
+    wb.create_sheet()  # HH Data
+    wb.create_sheet()  # Calculations
+    gduos_sheet = wb.create_sheet()  # GDUoS
+
+    statement_sheet["D22"] = "01-May-2024"
+    statement_sheet["F22"] = "31-May-2024"
+    statement_sheet["H24"] = ct_datetime(2024, 8, 4)
+    statement_sheet["D25"] = 1000000000003
+    statement_sheet["D33"] = Decimal("302")
+    statement_sheet["H33"] = Decimal("23.09")
+
+    gduos_sheet["A2"] = 1000000000003
+    gduos_sheet["B2"] = "2024-04"
+    gduos_sheet["D2"] = "Capacity"
+    gduos_sheet["E2"] = Decimal("41")
+    gduos_sheet["F2"] = Decimal("4.97")
+    gduos_sheet["G2"] = Decimal("83.12")
+
+    bills = _make_raw_bills(wb)
+    expected_bills = [
+        {
+            "account": "10 0000 0000 003",
+            "bill_type_code": "N",
+            "breakdown": {"ssp-gbp": Decimal("23.09"), "ssp-kwh": Decimal("302")},
+            "finish_date": to_utc(ct_datetime(2024, 5, 31, 23, 30)),
+            "gross": Decimal("23.09"),
+            "issue_date": to_utc(ct_datetime(2024, 8, 4)),
+            "kwh": Decimal("302"),
+            "mpan_core": "10 0000 0000 003",
+            "net": Decimal("23.09"),
+            "reads": [],
+            "reference": "20240501_20240531_20240804_10 0000 0000 003_ssp",
+            "start_date": to_utc(ct_datetime(2024, 5, 1)),
+            "vat": Decimal("0.00"),
+        },
+        {
+            "account": "10 0000 0000 003",
+            "bill_type_code": "N",
+            "breakdown": {
+                "duos-availability-gbp": Decimal("83.12"),
+                "duos-availability-kva": Decimal("41"),
+                "duos-availability-rate": [Decimal("4.97")],
+            },
+            "finish_date": to_utc(ct_datetime(2024, 4, 30, 23, 30)),
+            "gross": Decimal("83.12"),
+            "issue_date": to_utc(ct_datetime(2024, 8, 4)),
+            "kwh": Decimal("0"),
+            "mpan_core": "10 0000 0000 003",
+            "net": Decimal("83.12"),
+            "reads": [],
+            "reference": "20240401_20240430_20240804_10 0000 0000 "
+            "003_duos-availability",
+            "start_date": to_utc(ct_datetime(2024, 4, 1)),
+            "vat": Decimal("0.00"),
+        },
+    ]
+    assert bills == expected_bills

chellow-1722002880.0.0/VERSION

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