chellow 1740757748.0.0__tar.gz → 1742291966.0.0__tar.gz

{chellow-1740757748.0.0 → chellow-1742291966.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: chellow
-Version: 1740757748.0.0
+Version: 1742291966.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-1742291966.0.0/VERSION

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

{chellow-1740757748.0.0 → chellow-1742291966.0.0}/chellow/e/bill_parsers/engie_edi.py

@@ -65,6 +65,8 @@ TCOD_MAP = {
         "duos-excess-availability-rate",
         "duos-excess-availability-kva",
     ),
+    "301541": ("duos-fixed-gbp", None, None),
+    "099335": ("duos-fixed-gbp", None, None),
     "986159": ("duos-fixed-gbp", "duos-fixed-rate", "duos-fixed-days"),
     "838286": ("duos-reactive-gbp", "duos-reactive-rate", "duos-reactive-kvarh"),
     "242643": ("duos-fixed-gbp", "duos-fixed-rate", "duos-fixed-days"),
@@ -74,12 +76,15 @@ TCOD_MAP = {
     "257303": ("duos-red-gbp", "duos-red-rate", "duos-red-kwh"),
     "661439": ("duos-red-gbp", "duos-red-rate", "duos-red-kwh"),
     "661441": ("duos-red-gbp", "duos-red-rate", "duos-red-kwh"),
+    "504364": ("ebrs-gbp", None, "ebrs-kwh"),
     "563023": ("ebrs-gbp", None, "ebrs-kwh"),
     "823408": ("ebrs-gbp", None, "ebrs-kwh"),
     "871593": ("ebrs-gbp", "ebrs-rate", "ebrs-kwh"),
     "873894": ("ebrs-gbp", "ebrs-rate", "ebrs-kwh"),
     "309707": ("fit-gbp", "fit-rate", "fit-kwh"),
     "994483": ("reconciliation-gbp", None, None),
+    "310129": ("meter-rental-gbp", None, None),
+    "452415": ("meter-rental-gbp", None, None),
     "544936": ("meter-rental-gbp", "meter-rental-rate", "meter-rental-days"),
     "265091": ("night-gbp", "night-rate", "night-kwh"),
     "483457": ("peak-gbp", "peak-rate", "peak-kwh"),
@@ -90,6 +95,8 @@ TCOD_MAP = {
     "632209": ("summer-night-gbp", "summer-night-rate", "summer-night-kwh"),
     "663682": ("summer-weekday-gbp", "summer-weekday-rate", "summer-weekday-kwh"),
     "299992": ("summer-weekend-gbp", "summer-weekend-rate", "summer-weekend-kwh"),
+    "211000": ("tnuos-gbp", "tnuos-rate", "tnuos-days"),
+    "790618": ("tnuos-gbp", None, None),
     "447769": ("triad-gbp", "triad-rate", "triad-kw"),
     "647721": ("triad-gbp", "triad-rate", "triad-kw"),
     "276631": ("triad-gbp", "triad-rate", "triad-kw"),
@@ -99,6 +106,12 @@ TCOD_MAP = {
     "700285": ("duo-fixed-gbp", "duos-fixed-rate", "duos-fixed-days"),
 }
 
+TPR_LOOKUP = {
+    "Day": "00043",
+    "Off Peak / Weekends": "00210",
+    "Night": "00210",
+}
+
 
 def _process_BCD(elements, headers):
     issue_date = to_date(elements["IVDT"][0])
@@ -111,6 +124,7 @@ def _process_BCD(elements, headers):
 
 
 def _process_CCD1(elements, headers):
+    tcod = elements["TCOD"]
     pres_read_date = to_finish_date(elements["PRDT"][0])
 
     prev_read_date = to_finish_date(elements["PVDT"][0])
@@ -137,6 +151,7 @@ def _process_CCD1(elements, headers):
         tpr_code = None
     else:
         units = "kWh"
+        tpr_code = TPR_LOOKUP[tcod[1]]
 
     try:
         reads = headers["reads"]
@@ -203,7 +218,7 @@ def _process_CCD2(elements, headers):
 
     try:
         reads = headers["reads"]
-        del headers["reads"][:]
+        headers["reads"] = []
     except KeyError:
         reads = []
 
@@ -265,14 +280,14 @@ def _process_CCD3(elements, headers):
 
     try:
         reads = headers["reads"]
-        del headers["reads"][:]
+        headers["reads"] = []
     except KeyError:
         reads = []
 
     return {
         "bill_type_code": headers["bill_type_code"],
         "issue_date": headers["issue_date"],
-        "reference": headers["reference"],
+        "reference": headers["reference"] + "_" + eln_gbp[:-4],
         "mpan_core": mpan_core,
         "account": mpan_core,
         "start_date": start_date,

{chellow-1740757748.0.0 → chellow-1742291966.0.0}/chellow/e/bill_parsers/mm.py

@@ -92,29 +92,35 @@ CHARGE_UNITS_LOOKUP = {
 }
 
 ELEMENT_LOOKUP = {
-    "1ANNUAL": "duos-red",
-    "2ANNUAL": "duos-amber",
-    "3ANNUAL": "duos-green",
-    "7ANNUAL": "duos-fixed",
-    "9ANNUAL": "duos-reactive",
-    "10ANNUAL": "standing",
-    "20RS0108": "single",
-    "30ANNUAL": "mop",
-    "50ANNUAL": "dc",
-    "9WANNUAL": "site-fee",
-    "20RS0123": "day",
-    "30RS0123": "night",
-    "90ANNUAL": "duos-fixed",
-    "9QANNUAL": "duos-availability",
-    "9UANNUAL": "tnuos",
-    "40ANNUAL": "maximum-demand",
-    "20ANNUAL": "triad",
-    "70ANNUAL": "elexon",
-    "10RS0050": "duos-red",
-    "20RS0050": "duos-amber",
-    "30RS0050": "duos-red",
-    "9CANNUAL": "duos-reactive",
-    "40RS0050": "duos-super-red",
+    "1ANNUAL": {"UNIT": "duos-red"},
+    "2ANNUAL": {"UNIT": "duos-amber"},
+    "3ANNUAL": {"UNIT": "duos-green"},
+    "20RS0108": {"UNIT": "single"},
+    "10ANNUAL": {
+        "STDG": "standing",
+        "DCDA": "dc",
+    },
+    "9ANNUAL": {"REAP": "duos-reactive"},
+    "7ANNUAL": {"STDG": "duos-fixed"},
+    "30ANNUAL": {"MOP1": "mop"},
+    "50ANNUAL": {"COMM": "dc"},
+    "9WANNUAL": {
+        "STDG": "site-fee",
+        "AVAL": "duos-availability",
+    },
+    "20RS0123": {"UNIT": "day"},
+    "30RS0123": {"UNIT": "night"},
+    "90ANNUAL": {"STDG": "duos-fixed"},
+    "9QANNUAL": {"AVAL": "duos-availability"},
+    "9UANNUAL": {"TNUOS": "tnuos"},
+    "40ANNUAL": {"MD": "maximum-demand"},
+    "20ANNUAL": {"LOADU": "triad"},
+    "70ANNUAL": {"SAG": "elexon"},
+    "10RS0050": {"UNIT": "duos-red"},
+    "20RS0050": {"UNIT": "duos-amber"},
+    "30RS0050": {"UNIT": "duos-red"},
+    "9CANNUAL": {"REAP": "duos-reactive"},
+    "40RS0050": {"UNIT": "duos-super-red"},
 }
 
 
@@ -133,11 +139,12 @@ def _handle_0460(headers, pre_record, record):
         unknown_3=51,
         days=2,
     )
-    units = CHARGE_UNITS_LOOKUP[parts["units"].strip()]
+    units_code = parts["units"].strip()
+    units = CHARGE_UNITS_LOOKUP[units_code]
     gbp = Decimal(parts["gbp"]) / 100
     quantity = Decimal(parts["quantity"])
     rate = Decimal(parts["rate"])
-    element_name = ELEMENT_LOOKUP[parts["code"].strip()]
+    element_name = ELEMENT_LOOKUP[parts["code"].strip()][units_code]
     breakdown = headers["breakdown"]
     breakdown[f"{element_name}-{units}"] += quantity
     rate_name = f"{element_name}-rate"
@@ -289,7 +296,7 @@ def _handle_1500(headers, pre_record, record):
         del headers["late_payment"]
 
     return {
-        "bill_type_code": "N",
+        "bill_type_code": "W" if net < 0 else "N",
         "mpan_core": headers["mpan_core"],
         "account": headers["account"],
         "reference": headers["reference"],

{chellow-1740757748.0.0 → chellow-1742291966.0.0}/chellow/e/duos.py

@@ -696,7 +696,10 @@ def datum_2012_02_23(ds, hh):
                             hh["ct-month"] < slot["finish-month"]
                             or (
                                 hh["ct-month"] == slot["finish-month"]
-                                and hh["ct-day"] <= slot["finish-day"]
+                                and (
+                                    slot["finish-day"] == "last"
+                                    or hh["ct-day"] <= slot["finish-day"]
+                                )
                             )
                         )
                     ):

{chellow-1740757748.0.0 → chellow-1742291966.0.0}/test/e/bill_parsers/test_bill_parser_engie_edi.py

@@ -28,7 +28,7 @@ def test_CODE_FUNCS():
 def test_process_CCD1(mocker):
     elements = {
         "CCDE": ["1", "f"],
-        "TCOD": ["584867", "AAHEDC"],
+        "TCOD": ["584867", "Day"],
         "TMOD": ["1", "2", "3", "4"],
         "MTNR": ["rikt8"],
         "MLOC": ["alskdj"],
@@ -60,7 +60,7 @@ def test_process_CCD1(mocker):
                 "mpan": "   al skdj  ",
                 "coefficient": Decimal("0.00688"),
                 "units": "kWh",
-                "tpr_code": "1",
+                "tpr_code": "00043",
                 "prev_date": utc_datetime(2018, 8, 1, 22, 30),
                 "prev_value": Decimal("78649"),
                 "prev_type_code": "N",

{chellow-1740757748.0.0 → chellow-1742291966.0.0}/test/e/bill_parsers/test_bill_parser_mm.py

@@ -3,6 +3,7 @@ from decimal import Decimal
 
 from chellow.e.bill_parsers.mm import (
     _handle_0101,
+    _handle_0460,
     _handle_0461,
     _handle_0860,
     _handle_1455,
@@ -26,6 +27,39 @@ def test_handle_0101():
     }
 
 
+def test_handle_0460():
+    headers = {"breakdown": defaultdict(int, {"vat": {}}), "reads": []}
+    pre_record = ""
+    record = "".join(
+        (
+            "xxxxxxxxxxxx",  # unknown_1=12
+            "xxxxxxxxxxxx",  # unknown_2=12
+            "10RS0050",  # code=8
+            "000000000871",  # quantity=12
+            "UNIT                  ",  # units=22
+            "00000000000.0429",  # rate=16
+            "20240401",  # unknown_date=DATE_LENGTH
+            "000000761.59",  # gbp=12
+            "                                   ",  # charge_description=35,
+            "xxx",  # unknown_3=51
+            "21",  # days=2
+        )
+    )
+    _handle_0460(headers, pre_record, record)
+    assert headers == {
+        "reads": [],
+        "breakdown": defaultdict(
+            int,
+            {
+                "duos-red-gbp": Decimal("7.6159"),
+                "duos-red-kwh": Decimal("871"),
+                "duos-red-rate": {Decimal("0.0429")},
+                "vat": {},
+            },
+        ),
+    }
+
+
 def test_handle_0461():
     headers = {"kwh": Decimal(0), "reads": []}
     pre_record = ""

chellow-1740757748.0.0/VERSION

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