chellow 1718704260.0.0__py3-none-any.whl → 1718904221.0.0__py3-none-any.whl

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/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/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-1718704260.0.0.dist-info → chellow-1718904221.0.0.dist-info}/METADATA

@@ -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-1718704260.0.0.dist-info → chellow-1718904221.0.0.dist-info}/RECORD

@@ -18,7 +18,7 @@ chellow/e/bill_importer.py,sha256=7UcnqNlKbJc2GhW9gy8sDp9GuqambJVpZLvbafOZztA,74
 chellow/e/bmarketidx.py,sha256=C0BaHn2RxIuWH2QzA-OmSP0fbUGvW9tqEUhLnzOEdmA,7968
 chellow/e/bsuos.py,sha256=hdP9vnOJSuZl46OAkJeUg1XJYvYIBj4J6Sqce1Hy9Vs,15542
 chellow/e/ccl.py,sha256=30dh_SvlgzsTQPPAJNZWILaMvbeDsv9-P-S1JxS5_SQ,3184
-chellow/e/cfd.py,sha256=V1DTT5XBQbt8hO1gae1u3315fZ4iuYk3XC7J2sUbhKQ,14352
+chellow/e/cfd.py,sha256=RvJRLDLY-KvT299a8xF-HRmslPZczqTgJ9C1zBo55U8,14456
 chellow/e/computer.py,sha256=KjHE57I3I7-1zPkyqX0mSjORlyUNfSEhQb2df4sCNkU,67244
 chellow/e/dno_rate_parser.py,sha256=9A3SEBUQnnjx2Tw3CpA2q0KsJ-Pjgmt_mbADkEtsIzc,21497
 chellow/e/duos.py,sha256=nwviRjz-qIt3GxIMHk0hItIT4dtKsxOWq9TUC1z-hO8,30864
@@ -46,7 +46,7 @@ chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQa
 chellow/e/bill_parsers/csv.py,sha256=U5zcIaZ6B5QTTpFDAcBnk4G2r8B3j5kJhDPL4AJNkEk,5640
 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=L6lmTslsJxtFAWkRn6f4xFHBCwgoH5sW8x4_ckE4T7g,15793
+chellow/e/bill_parsers/engie_xlsx.py,sha256=4Hu3ls1uNMH7vjDHgcP6QARlGlvb616CqG3xZVjAKWo,16888
 chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL310YU,7382
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
@@ -139,7 +139,7 @@ chellow/templates/report_run_row.html,sha256=bmtcdqJaS1CXpL0i8PuqvmeF98jKNYX5-mn
 chellow/templates/report_run_row_bill_check.html,sha256=aC2LMu_6NvmTN3ZdxHJPPPczyxPN6hg0F-PPcqIWUws,4683
 chellow/templates/report_run_supply_contacts.html,sha256=JNzwz9M6qbLRDMkCzFCxxANapUer5klxo7t5a48nAzg,2117
 chellow/templates/report_runs.html,sha256=Xef2nilmHHSnyRNKUQJrU2qWsQfslFL_wWD5rR92SOo,667
-chellow/templates/site.html,sha256=3gIxMZmIBwU--zmY6L3eRIwJ_c__aQKueHkbJCO5gLA,10084
+chellow/templates/site.html,sha256=H0hHgwLSkTZKRh1_aW9X9EKd6HUWJhGIu3AXBBskOmw,10104
 chellow/templates/site_add.html,sha256=NxYmOIZQH6X8EBOuJUbhUJ8IYB3t0BukjR1yVRhnJhM,422
 chellow/templates/site_edit.html,sha256=TJ_ZDDkodj-uDB3GPP9Cel3FGZY2oP42KCzHOydPWVc,2909
 chellow/templates/site_gen_graph.html,sha256=LXkD4n_aC_sFm9JJTCmBRrczpyTn2UUEgBToFiM5RPo,3468
@@ -364,6 +364,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-1718704260.0.0.dist-info/METADATA,sha256=x7O0IguijEUTz7OSVR7s3clEig-oNl7IOxsCZn0gFBM,12205
-chellow-1718704260.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
-chellow-1718704260.0.0.dist-info/RECORD,,
+chellow-1718904221.0.0.dist-info/METADATA,sha256=IisGBzL1b8FQnHDQYk0fVZH4QA21ue5l6JYZ8K4pVIE,12205
+chellow-1718904221.0.0.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
+chellow-1718904221.0.0.dist-info/RECORD,,