chellow 1729012049.0.0__py3-none-any.whl → 1729269304.0.0__py3-none-any.whl

chellow/e/bill_parsers/engie_export_xlsx.py

@@ -0,0 +1,167 @@
+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, 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_ct(sheet, col, row):
+    date_str = get_str(sheet, col, row)
+    return to_ct(Datetime.strptime(date_str, "%d/%m/%Y"))
+
+
+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 = {
+    "Admin Fee": {
+        "gbp": "admin-gbp",
+        "units": None,
+        "rate": None,
+    },
+    "VAT": None,
+    "GDUOS Charges": {
+        "gbp": "duos-gbp",
+        "units": None,
+        "rate": None,
+    },
+    "Power Generation": {
+        "gbp": "ssp-gbp",
+        "units": "ssp-kwh",
+        "rate": "ssp-rate",
+    },
+}
+
+
+def _make_raw_bills(book):
+    bills = {}
+    mpan_lookup = {}
+    sheet = book.worksheets[0]
+    for row in range(2, len(sheet["A"]) + 1):
+        val = get_cell(sheet, "A", row).value
+        if val is None or val == "":
+            break
+
+        description = get_str(sheet, "T", row)
+        desc_parts = [d.strip() for d in description.split("-")]
+        if len(desc_parts) > 1:
+            start_date_ct = to_ct(Datetime.strptime(desc_parts[1], "%b %y"))
+            finish_date_ct = start_date_ct + relativedelta(months=1) - HH
+        else:
+            start_date_ct = get_date_ct(sheet, "M", row)
+            finish_date_ct = get_date_ct(sheet, "N", row) + relativedelta(
+                hours=23, minutes=30
+            )
+
+        desc_elem = desc_parts[0]
+        start_date = to_utc(start_date_ct)
+        finish_date = to_utc(finish_date_ct)
+        reference = get_str(sheet, "G", row)
+        issue_date = to_utc(get_date_ct(sheet, "I", row))
+
+        bill_key = reference, start_date
+        try:
+            bill = bills[bill_key]
+        except KeyError:
+            bill = bills[bill_key] = {
+                "bill_type_code": "N",
+                "kwh": Decimal(0),
+                "vat": Decimal("0.00"),
+                "net": Decimal("0.00"),
+                "gross": Decimal("0.00"),
+                "reads": [],
+                "breakdown": {},
+                "issue_date": issue_date,
+                "start_date": start_date,
+                "finish_date": finish_date,
+                "reference": reference,
+            }
+
+        net = round(get_dec(sheet, "V", row), 2)
+        vat = round(get_dec(sheet, "W", row), 2)
+        gross = round(get_dec(sheet, "X", row), 2)
+        bill["net"] += net
+        bill["vat"] += vat
+        bill["gross"] += gross
+
+        mpan_core_str = get_str(sheet, "E", row)
+        if len(mpan_core_str) > 0:
+            mpan_lookup[reference] = parse_mpan_core(mpan_core_str)
+
+        mpan_core = mpan_lookup[reference]
+
+        bill["mpan_core"] = mpan_core
+        bill["account"] = mpan_core
+
+        titles = ELEM_LOOKUP[desc_elem]
+        if titles is None:
+            continue
+
+        breakdown = bill["breakdown"]
+        breakdown[titles["gbp"]] = net
+
+        units_title = titles["units"]
+        rate_title = titles["rate"]
+        units = get_dec(sheet, "P", row)
+        rate = get_dec(sheet, "U", row) / Decimal(1000)
+
+        if units_title is not None:
+            breakdown[units_title] = units
+        if rate_title is not None:
+            breakdown[rate_title] = [rate]
+    return bills.values()
+
+
+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/gas/bill_parser_total_edi.py

@@ -4,9 +4,12 @@ from decimal import Decimal
 
 from dateutil.relativedelta import relativedelta
 
+from sqlalchemy import select
+
 from werkzeug.exceptions import BadRequest
 
 from chellow.edi_lib import parse_edi, to_date, to_decimal
+from chellow.models import GEra, Session
 from chellow.utils import HH, to_ct, to_utc
 
 # From Total 2024-05-29
@@ -28,6 +31,7 @@ SUPPLIER_CODE_MAP = {
     "STD": ("standing", Decimal("1000"), Decimal("1")),
     "MET": ("commodity", Decimal("100000"), Decimal("1000")),
     "CCL": ("ccl", Decimal("100000"), Decimal("1000")),
+    "SUN": ("sundry", Decimal("1000"), Decimal("100")),
 }
 
 UNIT_MAP = {"M3": "M3", "HH": "HCUF", "HCUF": "HCUF"}
@@ -110,14 +114,19 @@ def _process_CCD2(elements, headers):
     units_billed = to_decimal(nuct) / units_divisor
     breakdown[key] += units_billed
 
-    if tpref == "standing" or "start_date" not in headers:
-        headers["start_date"] = to_date(csdt[0])
+    start_date = to_date(csdt[0])
+    if start_date is not None and (tpref == "standing" or "start_date" not in headers):
+        headers["start_date"] = start_date
 
-    if tpref == "standing" or "finish_date" not in headers:
-        headers["finish_date"] = _to_finish_date(cedt[0])
+    finish_date = _to_finish_date(cedt[0])
+    if finish_date is not None and (
+        tpref == "standing" or "finish_date" not in headers
+    ):
+        headers["finish_date"] = finish_date
 
-    if "mprn" not in headers:
-        headers["mprn"] = mloc[0]
+    mprn = mloc[0]
+    if "mprn" not in headers and len(mprn) > 0:
+        headers["mprn"] = mprn
 
     if len(conb) > 0 and len(conb[0]) > 0:
         headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
@@ -152,6 +161,93 @@ def _process_CCD2(elements, headers):
         )
 
 
+def _process_CCD3(elements, headers):
+    breakdown = headers["breakdown"]
+    ccde = elements["CCDE"]
+    nuct = elements["NUCT"]
+    mtnr = elements["MTNR"]
+    conb = elements["CONB"]
+    adjf = elements["ADJF"]
+    prdt = elements["PRDT"]
+    pvdt = elements["PVDT"]
+    prrd = elements["PRRD"]
+    cppu = elements["CPPU"]
+    ctot = elements["CTOT"]
+    csdt = elements["CSDT"]
+    cedt = elements["CEDT"]
+    mloc = elements["MLOC"]
+
+    ccde_supplier_code = ccde[2]
+    tpref, rate_divisor, units_divisor = SUPPLIER_CODE_MAP[ccde_supplier_code]
+
+    rate_str = cppu[0]
+    if len(rate_str.strip()) > 0:
+        rate_key = f"{tpref}_rate"
+        if rate_key not in breakdown:
+            breakdown[rate_key] = set()
+        rate = Decimal(rate_str) / rate_divisor
+        breakdown[rate_key].add(rate)
+
+    breakdown[f"{tpref}_gbp"] += to_decimal(ctot) / Decimal("100")
+
+    if len(nuct) > 1:
+        suff = NUCT_LOOKUP[nuct[1].strip()]
+        key = f"{tpref}_{suff}"
+        units_billed = to_decimal(nuct) / units_divisor
+        breakdown[key] += units_billed
+
+    start_date = to_date(csdt[0])
+    if start_date is not None and (tpref == "standing" or "start_date" not in headers):
+        headers["start_date"] = start_date
+
+    finish_date = _to_finish_date(cedt[0])
+    if finish_date is not None and (
+        tpref == "standing" or "finish_date" not in headers
+    ):
+        headers["finish_date"] = finish_date
+
+    mprn = mloc[0]
+    if "mprn" not in headers and len(mprn) > 0:
+        headers["mprn"] = mprn
+
+    if len(conb) > 0 and len(conb[0]) > 0:
+        headers["breakdown"]["units_consumed"] += to_decimal(conb) / Decimal("1000")
+
+    if tpref == "commodity":
+        headers["kwh"] += units_billed
+
+    if len(prrd) > 0 and len(prrd[0]) > 0:
+        pres_read_date = to_date(prdt[0])
+        prev_read_date = to_date(pvdt[0])
+
+        pres_read_value = Decimal(prrd[0])
+        pres_read_type = READ_TYPE_MAP[prrd[1]]
+        prev_read_value = Decimal(prrd[2])
+        prev_read_type = READ_TYPE_MAP[prrd[3]]
+        msn = mtnr[0]
+        unit = UNIT_MAP[conb[1]]
+        correction_factor = Decimal(adjf[1]) / Decimal(100000)
+
+        headers["reads"].append(
+            {
+                "msn": msn,
+                "unit": unit,
+                "correction_factor": correction_factor,
+                "prev_date": prev_read_date,
+                "prev_value": prev_read_value,
+                "prev_type_code": prev_read_type,
+                "pres_date": pres_read_date,
+                "pres_value": pres_read_value,
+                "pres_type_code": pres_read_type,
+            }
+        )
+
+
+def _process_CLO(elements, headers):
+    cloc = elements["CLOC"]
+    headers["account"] = cloc[2]
+
+
 def _process_MTR(elements, headers):
     if headers["message_type"] == "UTLBIL":
         breakdown = headers["breakdown"]
@@ -159,11 +255,35 @@ def _process_MTR(elements, headers):
             if isinstance(v, set):
                 breakdown[k] = sorted(v)
 
+        account = headers["account"]
+        try:
+            mprn = headers["mprn"]
+        except KeyError:
+            with Session() as sess:
+                g_era = sess.scalars(
+                    select(GEra)
+                    .where(GEra.account == account)
+                    .order_by(GEra.start_date)
+                ).first()
+                if g_era is None:
+                    raise BadRequest(
+                        f"Couldn't find an MPRN, and then couldn't fine a supply "
+                        f"with account {account}."
+                    )
+                else:
+                    mprn = g_era.g_supply.mprn
+
+        start_date = headers["start_date"]
+        if "finish_date" in headers:
+            finish_date = headers["finish_date"]
+        else:
+            finish_date = start_date
+
         return {
             "raw_lines": "\n".join(headers["raw_lines"]),
-            "mprn": headers["mprn"],
+            "mprn": mprn,
             "reference": headers["reference"],
-            "account": headers["mprn"],
+            "account": account,
             "reads": headers["reads"],
             "kwh": headers["kwh"],
             "breakdown": headers["breakdown"],
@@ -171,8 +291,8 @@ def _process_MTR(elements, headers):
             "vat_gbp": headers["vat"],
             "gross_gbp": headers["gross"],
             "bill_type_code": headers["bill_type_code"],
-            "start_date": headers["start_date"],
-            "finish_date": headers["finish_date"],
+            "start_date": start_date,
+            "finish_date": finish_date,
             "issue_date": headers["issue_date"],
         }
 
@@ -215,10 +335,10 @@ CODE_FUNCS = {
     "BTL": _process_NOOP,
     "CCD1": _process_NOOP,
     "CCD2": _process_CCD2,
-    "CCD3": _process_NOOP,
+    "CCD3": _process_CCD3,
     "CCD4": _process_NOOP,
     "CDT": _process_NOOP,
-    "CLO": _process_NOOP,
+    "CLO": _process_CLO,
     "END": _process_NOOP,
     "FIL": _process_NOOP,
     "MHD": _process_MHD,

chellow/templates/user.html

@@ -23,7 +23,7 @@
 		<form method="post">
 			<fieldset>
 				<legend>Update details</legend>	
-				<label>Username</label>
+				<label>Username (case sensitive)</label>
 				<input name="email_address" size="100" value="
 						{%- if request.values.email_address -%}
 							{{ request.values.email_address }}
@@ -67,11 +67,11 @@
 				<fieldset>
 					<legend>Change password</legend>	
 					<input type="hidden" name="change_password">
-					<label>Current password</label>
+					<label>Current password (case sensitive)</label>
 					<input type="password" name="current_password">
-					<label>New password</label>
+					<label>New password (case sensitive)</label>
 					<input type="password" name="new_password">
-					<label>Confirm new Password</label>
+					<label>Confirm new Password (case sensitive)</label>
 					<input type="password" name="confirm_new_password">
 					<input type="submit" value="Change">
 				</fieldset>

chellow/templates/users.html

@@ -4,14 +4,6 @@
 	» Users
 {% endblock %}
 
-{% block inside_head %}
-	<style type="text/css">
-		label {
-			width: 10em;
-		}
-	</style>
-{% endblock %}
-
 {% block nav %}
 	Users
 {% endblock %}
@@ -50,10 +42,10 @@
 		<fieldset>
 			<legend>Add new user</legend>	
 
-			<label>Username</label>
+			<label>Username (case sensitive)</label>
 			{{input_text('email_address')}}
 			{% if not ad_auth_on %}
-				<label>Password</label>
+				<label>Password (case sensitive)</label>
 				<input type="password" name="password">
 			{% endif %}
 			<fieldset>
@@ -74,24 +66,6 @@
 						checked
 					{% endif %}
 				>
-				<label>Party Viewer</label>
-				<input type="radio" name="user_role_code" value="party-viewer"
-					{% if request.values.user_role_code == 'party-viewer' %}
-						checked
-					{% endif %}
-				>
-				<label>Party Viewer Party</label>
-				<select name="party_id">
-					{% for party in parties %}
-						<option value="{{ party.id }}"
-							{%- if request.values.user_role_id == party.id -%}
-								selected
-							{% endif %}
-						>{{ party.name }} {{ party.participant.code }}
-							{{ party.market_role.description }}
-						</option>
-					{% endfor %}
-				</select>
 			</fieldset>
 			<input type="submit" value="Add">
 		</fieldset>

{chellow-1729012049.0.0.dist-info → chellow-1729269304.0.0.dist-info}/METADATA

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

@@ -49,6 +49,7 @@ chellow/e/bill_parsers/bgb_edi.py,sha256=GuwHeYbAGk7BVg5n19FcTANFDyKI-y0z3f9niQa
 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_export_xlsx.py,sha256=oZO0qHdDlOxjJ6J5Ate82CkAoX4bxed1EJyUKHxBcpk,4690
 chellow/e/bill_parsers/engie_xls.py,sha256=jrut2heH_ZWmSjcn7celOydZS9Y49GfpYjDk_EKwamI,14453
 chellow/e/bill_parsers/engie_xlsx.py,sha256=4Hu3ls1uNMH7vjDHgcP6QARlGlvb616CqG3xZVjAKWo,16888
 chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL310YU,7382
@@ -63,7 +64,7 @@ chellow/e/bill_parsers/sww_xls.py,sha256=QEjiuvwvr5FuWCfqqVw8LaA_vZyAKsvRAS5fw3x
 chellow/gas/bill_import.py,sha256=w0lPgK_Drzh8rtnEBQe3qFuxrgzZ6qQSgpaGrrGznMU,6549
 chellow/gas/bill_parser_csv.py,sha256=Ecdy-apFT-mWAxddAsM4k1s-9-FpIaOfjP0oFc0rdQg,5557
 chellow/gas/bill_parser_engie_edi.py,sha256=Ko0vZP-QdVQ1uuhS_5cdrii60_cM4b_LFJMoY0pZqnk,8950
-chellow/gas/bill_parser_total_edi.py,sha256=HdX2ctKvqIA5saf8VkpWmYWfqaZsdB-sAEcMSZjTgE4,7425
+chellow/gas/bill_parser_total_edi.py,sha256=bMAeIkzHwNhv0qdKYXtRl-tzUUYtjNkbM3PMl3NurFc,11225
 chellow/gas/ccl.py,sha256=DMlcPUELZi00CaDekVJINYk3GgH5apFrImVdmkbyba0,2913
 chellow/gas/cv.py,sha256=4cdYYQ8Qak6NeYdBCB4YaQ0jX8-UkaydIIdibCQuXxM,7344
 chellow/gas/dn_rate_parser.py,sha256=Mq8rAcUEUxIQOks59bsCKl8GrefvoHbrTCHqon9N0z0,11340
@@ -155,9 +156,9 @@ chellow/templates/sites.html,sha256=4ouJ5xYqYHjXCv3cDucTjgbOd_whReFPPHopLBdW6Go,
 chellow/templates/supplies.html,sha256=Ie_4K4-KwXqrCBwaUcjWxmV27rYjeESI_DCS9gLUipk,3488
 chellow/templates/system.html,sha256=PP8MN8mieil3AwLS1WlQBcgbl0J61bksN-Cy4toYNqo,1871
 chellow/templates/tester.html,sha256=4DYrtcnFY0y6o3K6_tSmFpPlCRngZj1zo8nJ1NI4pk8,623
-chellow/templates/user.html,sha256=tUeE5v-MOayJD_vP1P4g1ruoVMCTcbk-u28fOVTPj84,2412
+chellow/templates/user.html,sha256=bv1AuqnU_GFELaIbDaXSZ3FK6XJaM8so5fOkE8pVpPY,2480
 chellow/templates/user_roles.html,sha256=Pfjr4uApEmJl8t9s0qJTxigQcAVYw7gpV_ECE8c0Cto,399
-chellow/templates/users.html,sha256=dBB0yOvsoYbY_I9le1XGqZ0SlesUbWMqfRGlZOtOgNs,2244
+chellow/templates/users.html,sha256=8jZTeMlV0Bg5FhLJrIVhsMggQUnd9ipc1dw6-SXdVP8,1601
 chellow/templates/e/asset_comparison.html,sha256=QyN3WMw8YoFaSWUvD2NOnRLdLdB3Kv6m3t8Id8Mb6_A,678
 chellow/templates/e/channel.html,sha256=R5fhdsHvhB7k57Rw_gviUQ7_EXBGwP05E691V1BUNSQ,2056
 chellow/templates/e/channel_add.html,sha256=szwQJBHx2kAoSFomXDHD0N_7PSd4drqOoAWhM-jvSqM,1676
@@ -369,6 +370,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-1729012049.0.0.dist-info/METADATA,sha256=KGncQBfTFXII_d4142UqVWnPjzQDIkmVbxHvd9Bj9-Y,12204
-chellow-1729012049.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1729012049.0.0.dist-info/RECORD,,
+chellow-1729269304.0.0.dist-info/METADATA,sha256=OwkMhByEZZ_kZ86oUHDEOo73f69mk8jiX9KoFziS20M,12204
+chellow-1729269304.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1729269304.0.0.dist-info/RECORD,,