chellow 1720601862.0.0__py3-none-any.whl → 1721742190.0.0__py3-none-any.whl

chellow/e/bill_parsers/mm.py

@@ -3,9 +3,11 @@ from collections import defaultdict
 from decimal import Decimal
 from io import StringIO
 
+from dateutil.relativedelta import relativedelta
+
 from werkzeug.exceptions import BadRequest
 
-from chellow.utils import HH, parse_mpan_core, to_ct, to_utc
+from chellow.utils import parse_mpan_core, to_ct, to_utc
 
 
 def parse_date(date_str):
@@ -55,7 +57,11 @@ def _handle_0100(headers, pre_record, record):
 def _handle_0101(headers, pre_record, record):
     parts = _chop_record(record, start_date=DATE_LENGTH, finish_date=DATE_LENGTH)
     headers["start_date"] = parse_date(parts["start_date"])
-    headers["finish_date"] = to_utc(to_ct(parse_date_naive(parts["finish_date"]) - HH))
+    headers["finish_date"] = to_utc(
+        to_ct(
+            parse_date_naive(parts["finish_date"]) + relativedelta(hours=23, minutes=30)
+        )
+    )
 
 
 CHARGE_UNITS_LOOKUP = {
@@ -132,6 +138,12 @@ CONSUMPTION_UNITS_LOOKUP = {"KWH": "kWh", "KVA": "kVA", "KVARH": "kVArh", "KW":
 
 REGISTER_CODE_LOOKUP = {"DAY": "00040", "NIGHT": "00206", "SINGLE": "00001"}
 
+READ_TYPE_LOOKUP = {
+    " ": "E",
+    "E": "E",
+    "N": "N",
+}
+
 
 def _handle_0461(headers, pre_record, record):
     parts = _chop_record(
@@ -161,6 +173,8 @@ def _handle_0461(headers, pre_record, record):
     prev_read_date_str = parts["prev_read_date"].strip()
     if len(prev_read_date_str) > 0:
         tpr_code = REGISTER_CODE_LOOKUP[parts["register_code"].strip()]
+        prev_type_code = READ_TYPE_LOOKUP[parts["prev_read_type"]]
+        pres_type_code = READ_TYPE_LOOKUP[parts["pres_read_type"]]
 
         headers["reads"].append(
             {
@@ -171,10 +185,10 @@ def _handle_0461(headers, pre_record, record):
                 "tpr_code": tpr_code,
                 "prev_date": parse_date(parts["prev_read_date"]),
                 "prev_value": Decimal(parts["prev_read_value"]),
-                "prev_type_code": parts["prev_read_type"],
+                "prev_type_code": prev_type_code,
                 "pres_date": parse_date(parts["pres_read_date"]),
                 "pres_value": Decimal(parts["pres_read_value"]),
-                "pres_type_code": parts["pres_read_type"],
+                "pres_type_code": pres_type_code,
             }
         )
 
@@ -183,8 +197,23 @@ def _handle_0470(headers, pre_record, record):
     pass
 
 
+def _handle_0860(headers, pre_record, record):
+    parts = _chop_record(
+        record,
+        metering_gbp=12,
+        unknown_1=12,
+        unknown_2=12,
+        metering_date=DATE_LENGTH,
+        description=80,
+    )
+    bd = headers["breakdown"]
+    bd["metering-gbp"] += Decimal(parts["metering_gbp"]) / Decimal("100")
+
+
 def _handle_1455(headers, pre_record, record):
-    parts = _chop_record(record, ccl_kwh=13, unknown_1=8, ccl_rate=15, ccl_gbp=13)
+    parts = _chop_record(
+        record, ccl_kwh=13, unknown_1=8, ccl_rate=15, ccl_gbp=12, unkown_2=8
+    )
     bd = headers["breakdown"]
     bd["ccl-kwh"] += Decimal(parts["ccl_kwh"])
     if "ccl-rate" in bd:
@@ -261,6 +290,7 @@ LINE_HANDLERS = {
     "0460": _handle_0460,
     "0461": _handle_0461,
     "0470": _handle_0470,
+    "0860": _handle_0860,
     "1455": _handle_1455,
     "1460": _handle_1460,
     "1500": _handle_1500,

chellow/reports/report_ecoes_comparison.py

@@ -470,10 +470,8 @@ def _process(
                     diffs.append("gsp_group")
 
                 chellow_msn = era.msn
-                if chellow_msn is None:
-                    chellow_msn = ""
 
-                if chellow_msn != ecoes["msn"]:
+                if chellow_msn.split(",")[0] != ecoes["msn"]:
                     problem += "The meter serial numbers don't match. "
                     diffs.append("msn")
                     if mpan_spaces not in ignore_mpan_cores_msn:

chellow/reports/report_g_monthly_duration.py

@@ -110,7 +110,7 @@ def _process_era(
             f"contain the 'kwh' key."
         )
 
-    billed_kwh = billed_gbp = 0
+    billed_kwh = billed_net_gbp = billed_vat_gbp = billed_gross_gbp = 0
 
     g_era_associates = {s.site.code for s in g_era.site_g_eras if not s.is_physical}
 
@@ -127,7 +127,9 @@ def _process_era(
         ).total_seconds() + (30 * 60)
         overlap_proportion = overlap_duration / bill_duration
         billed_kwh += overlap_proportion * float(g_bill.kwh)
-        billed_gbp += overlap_proportion * float(g_bill.net)
+        billed_net_gbp += overlap_proportion * float(g_bill.net)
+        billed_vat_gbp += overlap_proportion * float(g_bill.vat)
+        billed_gross_gbp += overlap_proportion * float(g_bill.gross)
 
     associated_site_ids = ",".join(sorted(g_era_associates))
     g_era_rows.append(
@@ -149,12 +151,14 @@ def _process_era(
                 kwh,
                 gbp,
                 billed_kwh,
-                billed_gbp,
+                billed_net_gbp,
+                billed_vat_gbp,
+                billed_gross_gbp,
             ]
         ]
         + [make_val(bill.get(t)) for t in vb_titles]
     )
-    return kwh, gbp, billed_kwh, billed_gbp
+    return kwh, gbp, billed_kwh, billed_net_gbp, billed_vat_gbp, billed_gross_gbp
 
 
 def content(
@@ -227,7 +231,14 @@ def content(
                 "associated_site_ids",
                 "month",
             ]
-            summary_titles = ["kwh", "gbp", "billed_kwh", "billed_gbp"]
+            summary_titles = [
+                "kwh",
+                "gbp",
+                "billed_kwh",
+                "billed_net_gbp",
+                "billed_vat_gbp",
+                "billed_gross_gbp",
+            ]
 
             vb_titles = []
             conts = (
@@ -264,7 +275,8 @@ def content(
                     GEra.start_date <= month_finish,
                     or_(GEra.finish_date == null(), GEra.finish_date >= month_start),
                 ):
-                    site_kwh = site_gbp = site_billed_kwh = site_billed_gbp = 0
+                    site_kwh = site_gbp = site_billed_kwh = site_billed_net_gbp = 0
+                    site_billed_vat_gbp = site_billed_gross_gbp = 0
 
                     g_eras_q = (
                         select(GEra)
@@ -290,7 +302,14 @@ def content(
 
                     for g_era in sess.scalars(g_eras_q):
                         try:
-                            kwh, gbp, billed_kwh, billed_gbp = _process_era(
+                            (
+                                kwh,
+                                gbp,
+                                billed_kwh,
+                                billed_net_gbp,
+                                billed_vat_gbp,
+                                billed_gross_gbp,
+                            ) = _process_era(
                                 report_context,
                                 sess,
                                 site,
@@ -305,7 +324,9 @@ def content(
                             site_kwh += kwh
                             site_gbp += gbp
                             site_billed_kwh += billed_kwh
-                            site_billed_gbp += billed_gbp
+                            site_billed_net_gbp += billed_net_gbp
+                            site_billed_vat_gbp += billed_vat_gbp
+                            site_billed_gross_gbp += billed_gross_gbp
                         except BadRequest as e:
                             raise BadRequest(
                                 f"Problem with g_era {g_era.id}: {e.description}"
@@ -328,7 +349,9 @@ def content(
                                 site_kwh,
                                 site_gbp,
                                 site_billed_kwh,
-                                site_billed_gbp,
+                                site_billed_net_gbp,
+                                site_billed_vat_gbp,
+                                site_billed_gross_gbp,
                             ]
                         ]
                     )

{chellow-1720601862.0.0.dist-info → chellow-1721742190.0.0.dist-info}/METADATA

@@ -1,12 +1,13 @@
 Metadata-Version: 2.3
 Name: chellow
-Version: 1720601862.0.0
+Version: 1721742190.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)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.9
+Requires-Dist: cryptography==42.0.8
 Requires-Dist: flask-restx==1.2.0
 Requires-Dist: flask==2.3.3
 Requires-Dist: odio==0.0.23

{chellow-1720601862.0.0.dist-info → chellow-1721742190.0.0.dist-info}/RECORD

@@ -51,7 +51,7 @@ chellow/e/bill_parsers/gdf_csv.py,sha256=ZfK3Oc6oP28p_P9DIevLNB_zW2WLcEJ3Lvb1gL3
 chellow/e/bill_parsers/haven_csv.py,sha256=0uENq8IgVNqdxfBQMBxLTSZWCOuDHXZC0xzk52SbfyE,13652
 chellow/e/bill_parsers/haven_edi.py,sha256=YGPHRxPOhje9s32jqPHHELni2tooOYj3cMC_qaZVPq4,16107
 chellow/e/bill_parsers/haven_edi_tprs.py,sha256=ZVX9CCqUybsot_Z0BEOJPvl9x5kSr7fEWyuJXvZDcz4,11841
-chellow/e/bill_parsers/mm.py,sha256=WpjKJZ0HW6Yko3aZiq43HQU-i_rrBWgQTqggJB3FIEU,8627
+chellow/e/bill_parsers/mm.py,sha256=0Ch-ngypH2X7eeEq5tDkaGQreCZUbjeDCmhbyGo2_vQ,9305
 chellow/e/bill_parsers/nonsettlement_dc_stark_xlsx.py,sha256=yogXTuQHGRL7IiqvRWr2C9V24ez1j9Yx0128UygPE_k,4723
 chellow/e/bill_parsers/settlement_dc_stark_xlsx.py,sha256=PlEqCZuJ9DfQXeeYQ64jtf3ML7sUt_tt61QOOTnkE5c,6380
 chellow/e/bill_parsers/sse_edi.py,sha256=L85DOfNkqexeEIEr8pCBn_2sHJI-zEaw6cogpE3YyYM,15204
@@ -93,8 +93,8 @@ chellow/reports/report_bills.py,sha256=AHW6tiZAOE0gXDfencPvemE4zqK6eTqfN8_bWQ4RT
 chellow/reports/report_csv_llfcs.py,sha256=OHSbP64lQ6dlAMcQYgvdANlA4lQyF0iBlwk7V9c9nuo,1944
 chellow/reports/report_csv_site_hh_data.py,sha256=T-clGDmYdn0ej7zZfL3kDp4Vyd82WzptxEzxx9KqAZg,4270
 chellow/reports/report_csv_site_snags.py,sha256=gG2sYQrLoIBwCoMUC8rhmAL7Kffh_rvNb9UOX7cYDko,2668
-chellow/reports/report_ecoes_comparison.py,sha256=mInFX4UmrPnjO-nLarqrCmyLx6O0wlCd94AUN2JlqZQ,21716
-chellow/reports/report_g_monthly_duration.py,sha256=vI5FKAU8_oThjR5oflPZont7Z7sVAunr0qlMfJsaPJI,12004
+chellow/reports/report_ecoes_comparison.py,sha256=PGDJKI2f6DCVCH0xcp--BzXWAWFfTDGgcKVQnfqxBKg,21653
+chellow/reports/report_g_monthly_duration.py,sha256=FMMFIWFfGW2Bd9Excpf4LLXXqQ-fbnZZ_KfNa1VaPqA,13034
 chellow/reports/report_g_supplies_snapshot.py,sha256=0M0x_0o0985Hu45gUJJJwzfx0DDOAuXBJ1UVUDbQ36g,4718
 chellow/reports/report_g_supply_virtual_bill.py,sha256=x_KtQ02dwgmXvAEUXJ1poK0BRwqxa-GcbJ5pddEina0,3694
 chellow/reports/report_g_virtual_bills.py,sha256=t3hmTiURk1E_mPucIboCdPBlSLapDIUdHYRpVTFtJgw,4569
@@ -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-1720601862.0.0.dist-info/METADATA,sha256=2-sKtDCPvyvgI7OPq9z6W1_D-pV4hyQgo6LESB3zomw,12205
-chellow-1720601862.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-chellow-1720601862.0.0.dist-info/RECORD,,
+chellow-1721742190.0.0.dist-info/METADATA,sha256=pO8MYNQFGnV170Ar3U4yBTCtGFuUpG6NRlK1Qb6xHEk,12241
+chellow-1721742190.0.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+chellow-1721742190.0.0.dist-info/RECORD,,