chellow 1718704260.0.0__tar.gz → 1718904221.0.0__tar.gz

{chellow-1718704260.0.0 → chellow-1718904221.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1718704260.0.0
+Version: 1718904221.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-1718904221.0.0/VERSION

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

{chellow-1718704260.0.0 → chellow-1718904221.0.0}/chellow/e/bill_parsers/engie_xlsx.py

@@ -1,7 +1,7 @@
 import csv
 from datetime import datetime as Datetime
 from decimal import Decimal, InvalidOperation
-from itertools import count
+from enum import Enum, auto
 
 from dateutil.relativedelta import relativedelta
 
@@ -147,39 +147,56 @@ def _find_names(tree, path):
     return tree[None]
 
 
-COLUMNS = [
-    "Billing Entity",
-    "Customer Name",
-    "Customer Number",
-    "Account Name",
-    "Account Number",
-    "Billing Address",
-    "Bill Number",
-    "Bill Date",
-    "Due Date",
-    "Accepted Date",
-    "Bill Period",
-    "Agreement Number",
-    "Product Bundle",
-    "Product Name",
-    "Bill Status",
-    "Product Item Class",
-    "Type",
-    "Description",
-    "From Date",
-    "To Date",
-    "Sales Tax Rate",
-    "Meter Point",
-    "Usage",
-    "Usage Unit",
-    "Price",
-    "Amount",
-    "Currency",
-    "Indicator",
-    "Product Item Name",
-    "Rate Name",
-]
-COLUMN_MAP = dict(zip(COLUMNS, count(1)))
+class Title(Enum):
+    METER_POINT = auto()
+    BILL_PERIOD = auto()
+    FROM_DATE = auto()
+    TO_DATE = auto()
+    BILL_DATE = auto()
+    BILL_NUMBER = auto()
+    USAGE = auto()
+    PRICE = auto()
+    AMOUNT = auto()
+    PRODUCT_ITEM_NAME = auto()
+    RATE_NAME = auto()
+    DESCRIPTION = auto()
+    PRODUCT_ITEM_CLASS = auto()
+    CUSTOMER_NUMBER = auto()
+
+
+COLUMNS = {
+    Title.METER_POINT: ["Meter Point", "MeterPoint"],
+    Title.BILL_PERIOD: ["Bill Period", "BillPeriod"],
+    Title.FROM_DATE: ["From Date", "FromDate"],
+    Title.TO_DATE: ["To Date", "ToDate"],
+    Title.BILL_DATE: ["Bill Date", "BillDate"],
+    Title.BILL_NUMBER: ["Bill Number", "BillNumber"],
+    Title.USAGE: ["Usage"],
+    Title.PRICE: ["Price"],
+    Title.AMOUNT: ["Amount"],
+    Title.PRODUCT_ITEM_NAME: ["Product Item Name", "ProductItemName"],
+    Title.RATE_NAME: ["Rate Name", "RateName"],
+    Title.DESCRIPTION: ["Description"],
+    Title.PRODUCT_ITEM_CLASS: ["Product Item Class", "ProductItemClass"],
+    Title.CUSTOMER_NUMBER: ["Customer Number", "CustomerNumber"],
+}
+
+
+def make_column_map(title_row):
+    titles = [cell.value for cell in title_row]
+    column_map = {}
+    for title, title_names in COLUMNS.items():
+        idx = None
+        for title_name in title_names:
+            try:
+                idx = titles.index(title_name)
+            except ValueError:
+                pass
+        if idx is None:
+            raise BadRequest(f"For the title {title} a column can't be found")
+
+        column_map[title] = idx + 1
+    return column_map
 
 
 def get_date_naive(sheet, row, col):
@@ -198,8 +215,7 @@ def get_date(sheet, row, col_name):
     return None if dt is None else to_utc(to_ct(dt))
 
 
-def get_value(sheet, row, col_name):
-    col = COLUMN_MAP[col_name]
+def get_value(sheet, row, col):
     try:
         return sheet.cell(row=row, column=col).value
     except IndexError:
@@ -256,7 +272,6 @@ def _bd_add(bd, el_name, val):
 
 
 def _customer_mods(cust_number, description, bill):
-    print(cust_number, type(cust_number), description)
     if cust_number == 10001596:
         if (
             description == "RO Mutualisation 2021-22"
@@ -272,7 +287,8 @@ def _customer_mods(cust_number, description, bill):
 
 
 def _parse_row(sheet, row, title_row):
-    val = get_value(sheet, row, "Meter Point")
+    column_map = make_column_map(title_row)
+    val = get_value(sheet, row, column_map[Title.METER_POINT])
     try:
         mpan_core = parse_mpan_core(str(int(val)))
     except ValueError as e:
@@ -281,7 +297,7 @@ def _parse_row(sheet, row, title_row):
             f"{e}"
         )
 
-    bill_period = get_value(sheet, row, "Bill Period")
+    bill_period = get_value(sheet, row, column_map[Title.BILL_PERIOD])
     if "-" in bill_period:
         period_start_naive, period_finish_naive = [
             Datetime.strptime(v, "%Y-%m-%d") for v in bill_period.split(" - ")
@@ -291,14 +307,14 @@ def _parse_row(sheet, row, title_row):
     else:
         period_start, period_finish = None, None
 
-    from_date = get_date(sheet, row, "From Date")
+    from_date = get_date(sheet, row, column_map[Title.FROM_DATE])
     if from_date is None:
         if period_start is None:
             raise BadRequest("Can't find a bill start date.")
         else:
             from_date = period_start
 
-    to_date_naive = get_date_naive(sheet, row, "To Date")
+    to_date_naive = get_date_naive(sheet, row, column_map[Title.TO_DATE])
     if to_date_naive is None:
         if period_finish is None:
             raise BadRequest("Can't find a bill finish date.")
@@ -308,8 +324,8 @@ def _parse_row(sheet, row, title_row):
     else:
         to_date = to_utc(to_ct(to_date_naive + relativedelta(days=1) - HH))
 
-    issue_date = get_date(sheet, row, "Bill Date")
-    bill_number = get_value(sheet, row, "Bill Number")
+    issue_date = get_date(sheet, row, column_map[Title.BILL_DATE])
+    bill_number = get_value(sheet, row, column_map[Title.BILL_NUMBER])
     bill = {
         "bill_type_code": "N",
         "kwh": Decimal(0),
@@ -325,16 +341,16 @@ def _parse_row(sheet, row, title_row):
     }
     bd = bill["breakdown"]
 
-    usage = get_dec(sheet, row, "Usage")
+    usage = get_dec(sheet, row, column_map[Title.USAGE])
     # usage_units = get_value(sheet, row, 'Usage Unit')
-    price = get_dec(sheet, row, "Price")
-    amount = get_dec(sheet, row, "Amount")
-    product_item_name = get_value(sheet, row, "Product Item Name")
-    rate_name = get_value(sheet, row, "Rate Name")
+    price = get_dec(sheet, row, column_map[Title.PRICE])
+    amount = get_dec(sheet, row, column_map[Title.AMOUNT])
+    product_item_name = get_value(sheet, row, column_map[Title.PRODUCT_ITEM_NAME])
+    rate_name = get_value(sheet, row, column_map[Title.RATE_NAME])
     if product_item_name == "Renewables Obligation (RO)" and usage is not None:
         bill["kwh"] += round(usage, 2)
-    description = get_value(sheet, row, "Description")
-    product_class = get_value(sheet, row, "Product Item Class")
+    description = get_value(sheet, row, column_map[Title.DESCRIPTION])
+    product_class = get_value(sheet, row, column_map[Title.PRODUCT_ITEM_CLASS])
     if description in ("Standard VAT@20%", "Reduced VAT@5%"):
         bill["vat"] += round(amount, 2)
         if description.endswith("20%"):
@@ -416,7 +432,7 @@ def _parse_row(sheet, row, title_row):
 
     bill["reference"] = reference
     bill["gross"] = bill["net"] + bill["vat"]
-    customer_number = get_value(sheet, row, "Customer Number")
+    customer_number = get_value(sheet, row, column_map[Title.CUSTOMER_NUMBER])
     return _customer_mods(customer_number, description, bill)
 
 

{chellow-1718704260.0.0 → chellow-1718904221.0.0}/chellow/e/cfd.py

@@ -370,7 +370,10 @@ def import_forecast_ilr_tra(sess, log, set_progress, s):
         )
 
     for record in api_records(log, s, "fbece4ce-7cfc-42b7-8fb2-387cf59a3c32"):
-        period_start = _parse_varying_date(record["Period_Start"])
+        period_start_str = record["Period_Start"]
+        if len(period_start_str) == 0:
+            continue
+        period_start = _parse_varying_date(period_start_str)
 
         rs = sess.execute(
             select(RateScript).where(

{chellow-1718704260.0.0 → chellow-1718904221.0.0}/chellow/templates/site.html

@@ -351,9 +351,8 @@ Table of site level monthly kWh, MD kWh etc.</a>
 		<fieldset>
 			<input type="hidden" name="site_id" value="{{site.id}}">
 			<legend>Monthly Duration</legend>
-			<br>
-			For {{input_text('months', '1', 2, 2)}} month(s) until the end of
-			{{input_date('finish', last_month_finish, resolution='month')}}
+			<label>Number Of Months</label> {{input_text('months', '1', 2, 2)}}
+			<label>Last Month</label> {{input_date('finish', last_month_finish, resolution='month')}}
 			<input type="submit" value="Download">
 		</fieldset>
 	</form>			

chellow-1718904221.0.0/test/e/bill_parsers/test_bill_parser_engie_xlsx.py

@@ -0,0 +1,283 @@
+from datetime import datetime as Datetime
+from decimal import Decimal
+
+from openpyxl import Workbook
+
+import pytest
+
+
+from werkzeug.exceptions import BadRequest
+
+from chellow.e.bill_parsers.engie_xlsx import _bd_add, _make_raw_bills, _parse_row
+from chellow.utils import utc_datetime
+
+
+def test_parse_row():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "BillingEntity",
+            "CustomerName",
+            "CustomerNumber",
+            "AccountName",
+            "AccountNumber",
+            "BillingAddresss",
+            "BillNumber",
+            "BillDate",
+            "DueDate",
+            "AcceptedDate",
+            "BillPeriod",
+            "AgreementNumber",
+            "ProductBundle",
+            "ProductItemName",
+            "BillStatus",
+            "ProductItemClass",
+            "Type",
+            "Description",
+            "FromDate",
+            "ToDate",
+            "SalesTaxRate",
+            "MeterPoint",
+            "Usage",
+            "UsageUnit",
+            "Price",
+            "Amount",
+            "Currency",
+            "Indicator",
+            "RateName",
+            "ProductName",
+        ],
+        [
+            "Power Comany Ltd.",
+            "Bill Paja",
+            "556",
+            "BILL PAJA",
+            "883",
+            "1 True Way",
+            "672770",
+            Datetime(2019, 3, 31, 23, 30),
+            Datetime(2019, 3, 31, 23, 30),
+            "",
+            "2019-03-01 - 2019-03-31",
+            "",
+            "",
+            "",
+            "Draft",
+            "",
+            "Product",
+            "Hand Held Read -",
+            Datetime(2019, 3, 31, 23, 30),
+            Datetime(2019, 3, 31, 0, 0),
+            "",
+            "2299999999929",
+            "",
+            "",
+            "",
+            "785",
+            "GBP",
+            "INV",
+            "",
+            "",
+        ],
+    ]
+
+    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]
+    bill = _parse_row(ws, row, title_row)
+    assert bill["finish_date"] == utc_datetime(2019, 3, 31, 22, 30)
+
+
+def test_bd_add():
+    el_name = "duos_red"
+    bd = {el_name: 0}
+    val = None
+
+    with pytest.raises(BadRequest):
+        _bd_add(bd, el_name, val)
+
+
+def test_bill_parser_engie_xls_billed_kwh():
+    """
+    Blank units should still give billed kWh
+    """
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "BillingEntity",
+            "CustomerName",
+            "CustomerNumber",
+            "AccountName",
+            "AccountNumber",
+            "BillingAddresss",
+            "BillNumber",
+            "BillDate",
+            "DueDate",
+            "AcceptedDate",
+            "BillPeriod",
+            "AgreementNumber",
+            "ProductBundle",
+            "ProductItemName",
+            "BillStatus",
+            "ProductItemClass",
+            "Type",
+            "Description",
+            "FromDate",
+            "ToDate",
+            "SalesTaxRate",
+            "MeterPoint",
+            "Usage",
+            "UsageUnit",
+            "Price",
+            "Amount",
+            "Currency",
+            "Indicator",
+            "RateName",
+            "ProductName",
+        ],
+        [
+            "Mistral Wind Power Ltd.",
+            "Bill Paja",
+            "886572998",
+            "Bill Paja",
+            "869987122",
+            "BA1 5TT",
+            "99708221",
+            Datetime(2019, 3, 31, 23, 30),
+            42694,
+            42629,
+            "2016-08-01 - 2016-08-31",
+            "458699",
+            "Standard Deluxe",
+            "Renewables Obligation (RO)",
+            "Accepted",
+            "Pass Thru - UK Electricity Cost Component",
+            "Product",
+            "Renewables Obligation (RO)",
+            Datetime(2019, 3, 31, 23, 30),
+            Datetime(2019, 3, 31, 23, 30),
+            "Commercial UK Energy VAT",
+            "2298132107763",
+            27997.33,
+            "",
+            0.0971123676,
+            "9224",
+            "GBP",
+            "INV",
+            "Renewables Obligation (RO)",
+            "",
+        ],
+    ]
+    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)
+
+    row = 2
+    title_row = tuple(ws.rows)[0]
+    bill = _parse_row(ws, row, title_row)
+    assert bill["kwh"] == Decimal("27997.33")
+
+
+def test_make_raw_bills_vat():
+    wb = Workbook()
+    ws = wb.active
+
+    rows = [
+        [
+            "BillingEntity",
+            "CustomerName",
+            "CustomerNumber",
+            "AccountName",
+            "AccountNumber",
+            "BillingAddresss",
+            "BillNumber",
+            "BillDate",
+            "DueDate",
+            "AcceptedDate",
+            "BillPeriod",
+            "AgreementNumber",
+            "ProductBundle",
+            "ProductItemName",
+            "BillStatus",
+            "ProductItemClass",
+            "Type",
+            "Description",
+            "FromDate",
+            "ToDate",
+            "SalesTaxRate",
+            "MeterPoint",
+            "Usage",
+            "UsageUnit",
+            "Price",
+            "Amount",
+            "Currency",
+            "Indicator",
+            "RateName",
+            "ProductName",
+        ],
+        [
+            "Mistral Wind Power Ltd.",
+            "Bill Paja",
+            "886572998",
+            "Bill Paja",
+            "869987122",
+            "BA1 5TT",
+            "99708221",
+            Datetime(2019, 3, 31, 23, 30),
+            Datetime(2019, 3, 31, 23, 30),
+            Datetime(2019, 3, 31, 23, 30),
+            "2016-08-01 - 2016-08-31",
+            "",
+            "",
+            "",
+            "Accepted",
+            "",
+            "Sales Tax",
+            "Standard VAT@20%",
+            "",
+            "",
+            "",
+            "2298132107763",
+            "",
+            "",
+            "",
+            "9224",
+            "GBP",
+            "INV",
+            "",
+            "",
+        ],
+    ]
+
+    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",
+            "kwh": Decimal("0"),
+            "vat": Decimal("9224.00"),
+            "net": Decimal("0.00"),
+            "reads": [],
+            "breakdown": {
+                "vat_percentage": Decimal("20"),
+            },
+            "account": "22 9813 2107 763",
+            "issue_date": utc_datetime(2019, 3, 31, 22, 30),
+            "start_date": utc_datetime(2016, 7, 31, 23, 0),
+            "finish_date": utc_datetime(2016, 8, 31, 22, 30),
+            "mpan_core": "22 9813 2107 763",
+            "reference": "99708221_2",
+            "gross": Decimal("9224.00"),
+        }
+    ]
+    assert bills == expected_bills

{chellow-1718704260.0.0 → chellow-1718904221.0.0}/test/e/test_cfd.py

@@ -106,6 +106,39 @@ def test_import_forecast_ilr_tra(sess, mocker):
     import_forecast_ilr_tra(sess, log, set_progress, s)
 
 
+def test_import_forecast_ilr_tra_blank_lines(sess, mocker):
+    vf = to_utc(ct_datetime(1996, 1, 1))
+    participant = Participant.insert(sess, "CALB", "Calb")
+    market_role = MarketRole.insert(sess, "Z", "Non-core")
+    participant.insert_party(sess, market_role, "None core", vf, None, None)
+    sess.commit()
+
+    s = mocker.Mock()
+    mock_request = mocker.Mock()
+    req_j = {
+        "success": True,
+        "fields": [
+            {"id": "_id", "type": "int"},
+            {"id": "Quarterly_Obligation_Period", "type": "text"},
+            {"id": "Period_Start", "type": "text"},
+            {"id": "Period_End", "type": "text"},
+            {"id": "Interim_Levy_Rate_GBP_Per_MWh", "type": "text"},
+            {"id": "Total_Reserve_Amount_GBP", "type": "text"},
+            {"id": "Eligible_Demand_MWh", "type": "text"},
+            {"id": "BMRP_GBP_Per_MWh", "type": "text"},
+            {"id": "IMRP_GBP_Per_MWh", "type": "text"},
+            {"id": "Adjusted_ILR_GBP_Per_MWh", "type": "text"},
+            {"id": "Additional_TRA_GBP", "type": "text"},
+        ],
+        "records": [[1, "", "", "", "", "", "", "", "", "", ""]],
+    }
+    mock_request.json = mocker.Mock(return_value=req_j)
+    s.get = mocker.Mock(return_value=mock_request)
+    log = mocker.Mock()
+    set_progress = mocker.Mock()
+    import_forecast_ilr_tra(sess, log, set_progress, s)
+
+
 def test_hh(sess, mocker):
     vf = to_utc(ct_datetime(1996, 1, 1))
     site = Site.insert(sess, "CI017", "Water Works")

chellow-1718704260.0.0/VERSION

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