chellow 1753175604.0.0__tar.gz → 1753180539.0.0__tar.gz

{chellow-1753175604.0.0 → chellow-1753180539.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1753175604.0.0
+Version: 1753180539.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-1753180539.0.0/VERSION

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

{chellow-1753175604.0.0 → chellow-1753180539.0.0}/chellow/gas/bill_parser_bgs_xlsx.py

@@ -5,12 +5,13 @@ from decimal import Decimal, InvalidOperation
 from enum import Enum, auto
 from io import BytesIO
 
+from dateutil.relativedelta import relativedelta
 
 from openpyxl import load_workbook
 
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import c_months_u, to_ct, to_utc
+from chellow.utils import to_ct, to_utc
 
 
 class Title(Enum):
@@ -151,13 +152,13 @@ def _parse_row(bills, sheet, row, title_row):
     column_map = make_column_map(title_row)
     mprn_raw = get_value(sheet, row, column_map[Title.MPRN])
     mprn = str(mprn_raw)
-    reference = get_value(sheet, row, column_map[Title.BILL])
+    reference = str(get_value(sheet, row, column_map[Title.BILL]))
     account = get_value(sheet, row, column_map[Title.ACCOUNT])
     issue_date = get_date(sheet, row, column_map[Title.BILL_DATE])
-    period_naive = get_date_naive(sheet, row, column_map[Title.BILLING_PERIOD])
-    start_date, finish_date = list(
-        c_months_u(start_year=period_naive.year, start_month=period_naive.month)
-    )[0]
+    charge_period_from = get_date(sheet, row, column_map[Title.CHARGE_PERIOD_FROM])
+    charge_period_end_naive = get_date_naive(
+        sheet, row, column_map[Title.CHARGE_PERIOD_END]
+    )
 
     try:
         mprn_values = bills[mprn]
@@ -165,16 +166,18 @@ def _parse_row(bills, sheet, row, title_row):
         mprn_values = bills[mprn] = {}
 
     try:
-        bill = mprn_values[period_naive]
+        bill = mprn_values[reference]
     except KeyError:
-        bill = mprn_values[period_naive] = {
-            "bill_type_code": "N",
+        bill = mprn_values[reference] = {
+            "bill_type_code": "W" if reference.startswith("CR") else "N",
             "mprn": mprn,
             "reference": reference,
             "account": account,
             "issue_date": issue_date,
-            "start_date": start_date,
-            "finish_date": finish_date,
+            "start_date": charge_period_from,
+            "finish_date": to_utc(
+                to_ct(charge_period_end_naive) + relativedelta(hours=23, minutes=30)
+            ),
             "kwh": Decimal("0"),
             "breakdown": defaultdict(int, {}),
             "net_gbp": Decimal("0.00"),
@@ -190,6 +193,8 @@ def _parse_row(bills, sheet, row, title_row):
     qunit = get_value(sheet, row, column_map[Title.QUNIT])
     charge = get_dec(sheet, row, column_map[Title.CHARGE]) / Decimal("100")
     total = get_dec(sheet, row, column_map[Title.TOTAL])
+    if bill["bill_type_code"] == "W":
+        quantity = quantity * -1
     if element_desc == "VAT":
         bill["net_gbp"] += quantity
         bill["vat_gbp"] += total

chellow-1753180539.0.0/test/gas/bill_parsers/test_bill_parser_bgs_xlsx.py

@@ -0,0 +1,296 @@
+from collections import defaultdict
+from datetime import datetime as Datetime
+from decimal import Decimal
+
+from openpyxl import Workbook
+
+
+from chellow.gas.bill_parser_bgs_xlsx import _make_raw_bills, _parse_row
+from chellow.utils import ct_datetime, to_utc, utc_datetime
+
+
+def test_parse_row():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            584773269,
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 31),
+            0,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            0.00,
+        ],
+    ]
+
+    for row, row_values in enumerate(rows, start=1):
+        for column, value in enumerate(row_values, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    row = 2
+    title_row = tuple(ws.rows)[0]
+    bills = {}
+    _parse_row(bills, ws, row, title_row)
+
+
+def test_make_raw_bills():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            584773269,
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 31),
+            0,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            0.00,
+        ],
+    ]
+
+    for row, row_vals in enumerate(rows, start=1):
+        for column, value in enumerate(row_vals, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    bills = _make_raw_bills(ws)
+    expected_bills = [
+        {
+            "bill_type_code": "N",
+            "mprn": "86762618",
+            "reference": "584773269",
+            "account": 69389283,
+            "issue_date": utc_datetime(2025, 6, 12, 23, 0),
+            "start_date": utc_datetime(2025, 4, 30, 23, 0),
+            "finish_date": utc_datetime(2025, 5, 31, 22, 30),
+            "kwh": Decimal("0"),
+            "breakdown": {
+                "admin_variable_gbp": Decimal("0.0"),
+                "admin_variable_kwh": Decimal("0"),
+                "admin_variable_rate": {Decimal("0.005311")},
+            },
+            "net_gbp": Decimal("0.00"),
+            "vat_gbp": Decimal("0.00"),
+            "gross_gbp": Decimal("0.00"),
+            "raw_lines": "['Zorin Industries', 69389283, 86762618, 584773269, 'Extinct "
+            "Volcano', datetime.datetime(2025, 6, 13, 0, 0), "
+            "datetime.datetime(2025, 5, 1, 0, 0), 0, 'Gas', "
+            "datetime.datetime(2025, 5, 1, 0, 0), datetime.datetime(2025, "
+            "5, 31, 0, 0), 0, 'kWh', 0.5311, 'p/kWh', 0.0]",
+            "reads": [],
+        }
+    ]
+    assert bills == expected_bills
+
+
+def test_make_raw_bills_part_month():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            584773269,
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 15),
+            0,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            0.00,
+        ],
+    ]
+
+    for row, row_vals in enumerate(rows, start=1):
+        for column, value in enumerate(row_vals, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    bills = _make_raw_bills(ws)
+    expected_bills = [
+        {
+            "bill_type_code": "N",
+            "mprn": "86762618",
+            "reference": "584773269",
+            "account": 69389283,
+            "issue_date": utc_datetime(2025, 6, 12, 23, 0),
+            "start_date": to_utc(ct_datetime(2025, 5, 1, 0, 0)),
+            "finish_date": to_utc(ct_datetime(2025, 5, 15, 23, 30)),
+            "kwh": Decimal("0"),
+            "breakdown": defaultdict(
+                int,
+                {
+                    "admin_variable_gbp": Decimal("0.0"),
+                    "admin_variable_kwh": Decimal("0"),
+                    "admin_variable_rate": {Decimal("0.005311")},
+                },
+            ),
+            "net_gbp": Decimal("0.00"),
+            "vat_gbp": Decimal("0.00"),
+            "gross_gbp": Decimal("0.00"),
+            "raw_lines": "['Zorin Industries', 69389283, 86762618, 584773269, 'Extinct "
+            "Volcano', datetime.datetime(2025, 6, 13, 0, 0), "
+            "datetime.datetime(2025, 5, 1, 0, 0), 0, 'Gas', "
+            "datetime.datetime(2025, 5, 1, 0, 0), datetime.datetime(2025, "
+            "5, 15, 0, 0), 0, 'kWh', 0.5311, 'p/kWh', 0.0]",
+            "reads": [],
+        }
+    ]
+    assert bills == expected_bills
+
+
+def test_make_raw_bills_credit():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "Customer",
+            "Account",
+            "MPRN",
+            "Bill",
+            "SupplyAddress",
+            "BillDate",
+            "BillingPeriod",
+            "kWhs",
+            "ChargeType",
+            "ChargePeriodFrom",
+            "ChargePeriodEnd",
+            "Quantity",
+            "QUnit",
+            "Charge",
+            "CUnit",
+            "Total",
+        ],
+        [
+            "Zorin Industries",
+            69389283,
+            86762618,
+            "CR584773269",
+            "Extinct Volcano",
+            Datetime(2025, 6, 13),
+            Datetime(2025, 5, 1),
+            0,
+            "Gas",
+            Datetime(2025, 5, 1),
+            Datetime(2025, 5, 31),
+            10,
+            "kWh",
+            0.5311,
+            "p/kWh",
+            -5.00,
+        ],
+    ]
+
+    for row, row_vals in enumerate(rows, start=1):
+        for column, value in enumerate(row_vals, start=1):
+            ws.cell(row=row, column=column, value=value)
+
+    bills = _make_raw_bills(ws)
+    expected_bills = [
+        {
+            "bill_type_code": "W",
+            "mprn": "86762618",
+            "reference": "CR584773269",
+            "account": 69389283,
+            "issue_date": utc_datetime(2025, 6, 12, 23, 0),
+            "start_date": utc_datetime(2025, 4, 30, 23, 0),
+            "finish_date": utc_datetime(2025, 5, 31, 22, 30),
+            "kwh": Decimal("0"),
+            "breakdown": {
+                "admin_variable_gbp": Decimal("-5.00"),
+                "admin_variable_kwh": Decimal("-10"),
+                "admin_variable_rate": {Decimal("0.005311")},
+            },
+            "net_gbp": Decimal("0.00"),
+            "vat_gbp": Decimal("0.00"),
+            "gross_gbp": Decimal("0.00"),
+            "raw_lines": "['Zorin Industries', 69389283, 86762618, 'CR584773269', "
+            "'Extinct Volcano', datetime.datetime(2025, 6, 13, 0, 0), "
+            "datetime.datetime(2025, 5, 1, 0, 0), 0, 'Gas', "
+            "datetime.datetime(2025, 5, 1, 0, 0), datetime.datetime(2025, "
+            "5, 31, 0, 0), 10, 'kWh', 0.5311, 'p/kWh', -5.0]",
+            "reads": [],
+        }
+    ]
+    assert bills == expected_bills

chellow-1753175604.0.0/VERSION

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

chellow-1753175604.0.0/test/gas/bill_parsers/test_bill_parser_bgs_xlsx.py

@@ -1,138 +0,0 @@
-from datetime import datetime as Datetime
-from decimal import Decimal
-
-from openpyxl import Workbook
-
-
-from chellow.gas.bill_parser_bgs_xlsx import _make_raw_bills, _parse_row
-from chellow.utils import utc_datetime
-
-
-def test_parse_row():
-    wb = Workbook()
-    ws = wb.active
-
-    rows = [
-        [
-            "Customer",
-            "Account",
-            "MPRN",
-            "Bill",
-            "SupplyAddress",
-            "BillDate",
-            "BillingPeriod",
-            "kWhs",
-            "ChargeType",
-            "ChargePeriodFrom",
-            "ChargePeriodEnd",
-            "Quantity",
-            "QUnit",
-            "Charge",
-            "CUnit",
-            "Total",
-        ],
-        [
-            "Zorin Industries",
-            69389283,
-            86762618,
-            584773269,
-            "Extinct Volcano",
-            Datetime(2025, 6, 13),
-            Datetime(2025, 5, 1),
-            0,
-            "Gas",
-            Datetime(2025, 5, 1),
-            Datetime(2025, 5, 31),
-            0,
-            "kWh",
-            0.5311,
-            "p/kWh",
-            0.00,
-        ],
-    ]
-
-    for row, row_values in enumerate(rows, start=1):
-        for column, value in enumerate(row_values, start=1):
-            ws.cell(row=row, column=column, value=value)
-
-    row = 2
-    title_row = tuple(ws.rows)[0]
-    bills = {}
-    _parse_row(bills, ws, row, title_row)
-
-
-def test_make_raw_bills():
-    wb = Workbook()
-    ws = wb.active
-
-    rows = [
-        [
-            "Customer",
-            "Account",
-            "MPRN",
-            "Bill",
-            "SupplyAddress",
-            "BillDate",
-            "BillingPeriod",
-            "kWhs",
-            "ChargeType",
-            "ChargePeriodFrom",
-            "ChargePeriodEnd",
-            "Quantity",
-            "QUnit",
-            "Charge",
-            "CUnit",
-            "Total",
-        ],
-        [
-            "Zorin Industries",
-            69389283,
-            86762618,
-            584773269,
-            "Extinct Volcano",
-            Datetime(2025, 6, 13),
-            Datetime(2025, 5, 1),
-            0,
-            "Gas",
-            Datetime(2025, 5, 1),
-            Datetime(2025, 5, 31),
-            0,
-            "kWh",
-            0.5311,
-            "p/kWh",
-            0.00,
-        ],
-    ]
-
-    for row, row_vals in enumerate(rows, start=1):
-        for column, value in enumerate(row_vals, start=1):
-            ws.cell(row=row, column=column, value=value)
-
-    bills = _make_raw_bills(ws)
-    expected_bills = [
-        {
-            "bill_type_code": "N",
-            "mprn": "86762618",
-            "reference": 584773269,
-            "account": 69389283,
-            "issue_date": utc_datetime(2025, 6, 12, 23, 0),
-            "start_date": utc_datetime(2025, 4, 30, 23, 0),
-            "finish_date": utc_datetime(2025, 5, 31, 22, 30),
-            "kwh": Decimal("0"),
-            "breakdown": {
-                "admin_variable_gbp": Decimal("0.0"),
-                "admin_variable_kwh": Decimal("0"),
-                "admin_variable_rate": {Decimal("0.005311")},
-            },
-            "net_gbp": Decimal("0.00"),
-            "vat_gbp": Decimal("0.00"),
-            "gross_gbp": Decimal("0.00"),
-            "raw_lines": "['Zorin Industries', 69389283, 86762618, 584773269, 'Extinct "
-            "Volcano', datetime.datetime(2025, 6, 13, 0, 0), "
-            "datetime.datetime(2025, 5, 1, 0, 0), 0, 'Gas', "
-            "datetime.datetime(2025, 5, 1, 0, 0), datetime.datetime(2025, "
-            "5, 31, 0, 0), 0, 'kWh', 0.5311, 'p/kWh', 0.0]",
-            "reads": [],
-        }
-    ]
-    assert bills == expected_bills