chellow 1729081025.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/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 %}

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1729081025.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-1729081025.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
@@ -157,7 +158,7 @@ chellow/templates/system.html,sha256=PP8MN8mieil3AwLS1WlQBcgbl0J61bksN-Cy4toYNqo
 chellow/templates/tester.html,sha256=4DYrtcnFY0y6o3K6_tSmFpPlCRngZj1zo8nJ1NI4pk8,623
 chellow/templates/user.html,sha256=bv1AuqnU_GFELaIbDaXSZ3FK6XJaM8so5fOkE8pVpPY,2480
 chellow/templates/user_roles.html,sha256=Pfjr4uApEmJl8t9s0qJTxigQcAVYw7gpV_ECE8c0Cto,399
-chellow/templates/users.html,sha256=F2eS3ow3VrxA-FnSbWK2Z-9mtPhZeC-VNPVWDXDWZHM,1706
+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-1729081025.0.0.dist-info/METADATA,sha256=Ygi8fee2scaBMTgIk5iIgnwRKmnpuhknbCNGFdn-VHU,12204
-chellow-1729081025.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1729081025.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,,